summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pendingLinus Torvalds2014-02-152-7/+8
|\
| * IB/srpt: replace strict_strtoul() with kstrtoul()Jingoo Han2014-02-121-7/+7
| * iser-target: Fix leak on failure in isert_conn_create_fastreg_poolNicholas Bellinger2014-02-121-0/+1
| |
| \
| \
| \
| \
| \
| \
| \
| \
| \
| \
| \
| \
| \
| \
| \
*---------------. \ Merge branches 'cma', 'cxgb4', 'iser', 'misc', 'mlx4', 'mlx5', 'nes', 'ocrdma...Roland Dreier2014-02-1415-70/+206
|\ \ \ \ \ \ \ \ \ \
| | | | | | | | | * | IB/usnic: Fix smatch endianness errorUpinder Malhi2014-02-141-1/+8
| | | | | | | | | |/
| | | | | | | | * / IB/qib: Add missing serdes init sequenceMike Marciniszyn2014-02-131-0/+5
| | | | | | | | |/
| | | | | | | * | RDMA/ocrdma: Fix load time panic during GID table initDevesh Sharma2014-02-141-1/+1
| | | | | | | * | RDMA/ocrdma: Fix traffic class shiftDevesh Sharma2014-02-141-1/+1
| | | | | | | |/
| | | | | | * / RDMA/nes: Fix error return codeJulia Lawall2014-02-121-1/+4
| | | | | | |/
| | | | | * | IB/mlx5: Remove dependency on X86Eli Cohen2014-02-131-1/+1
| | | | | * | IB/mlx5: Don't set "block multicast loopback" capabilityEli Cohen2014-02-062-4/+3
| | | | | * | IB/mlx5: Fix binary compatibility with libmlx5Eli Cohen2014-02-063-4/+32
| | | | | * | IB/mlx5: Fix RC transport send queue overhead computationEli Cohen2014-02-061-1/+3
| | | | | |/
| | | | * | IB/mlx4: Build the port IBoE GID table properly under bondingMoni Shoua2014-02-131-4/+37
| | | | * | IB/mlx4: Do IBoE GID table resets per-portMoni Shoua2014-02-131-17/+18
| | | | * | IB/mlx4: Do IBoE locking earlier when initializing the GID tableMoni Shoua2014-02-131-3/+3
| | | | * | IB/mlx4: Move rtnl locking to the right placeMoni Shoua2014-02-131-2/+2
| | | | * | IB/mlx4: Make sure GID index 0 is always occupiedMoni Shoua2014-02-131-24/+68
| | | | * | IB/mlx4: Don't allocate range of steerable UD QPs for Ethernet-only deviceMatan Barak2014-02-131-1/+6
| | | | |/
| | | * / RDMA/amso1100: Fix error return codeJulia Lawall2014-02-122-2/+5
| | | |/
| | * | IB/iser: Fix use after free in iser_snd_completion()Dan Carpenter2014-02-141-1/+2
| | * | IB/iser: Avoid dereferencing iscsi_iser conn object when not bound to iser co...Roi Dayan2014-02-141-3/+7
| | |/
| * / RDMA/cxgb4: Add missing neigh_release in LE-Workaround pathKumar Sanghvi2014-02-131-0/+1
| |/
* / IB: Report using RoCE IP based gids in port capsMoni Shoua2014-02-132-2/+2
|/
* Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/...Linus Torvalds2014-01-312-111/+121
|\
| * iscsi-target: Convert gfp_t parameter to task state bitmaskNicholas Bellinger2014-01-251-7/+7
| * IB/isert: pass scatterlist instead of cmd to fast_reg_mr routineSagi Grimberg2014-01-191-16/+12
| * IB/isert: Move fastreg descriptor creation to a functionSagi Grimberg2014-01-191-20/+32
| * IB/isert: Avoid frwr notation, user fastregSagi Grimberg2014-01-192-45/+47
| * IB/isert: seperate connection protection domains and dma MRsSagi Grimberg2014-01-192-24/+24
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2014-01-251-1/+1
|\ \
| * | net: replace macros net_random and net_srandom with direct calls to prandomAruna-Hewapathirane2014-01-141-1/+1
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-01-068-80/+90
| |\ \
| * | | infiniband: slight optimization of addr comparedingtianhong2013-12-261-2/+1
| | |/ | |/|
* | | Merge branch 'ip-roce' into for-nextRoland Dreier2014-01-2228-363/+834
|\ \ \
| * | | IB/mlx4: Use IS_ENABLED(CONFIG_IPV6)Roland Dreier2014-01-191-6/+6
| * | | RDMA/ocrdma: Add dependency on INETRoland Dreier2014-01-191-1/+1
| * | | RDMA/ocrdma: Move ocrdma_inetaddr_event outside of "#if CONFIG_IPV6"Roland Dreier2014-01-191-4/+4
| * | | IB/mlx4: Add dependency INETMatan Barak2014-01-191-1/+1
| * | | IB/cm: Fix missing unlock on error in cm_init_qp_rtr_attr()Wei Yongjun2014-01-191-1/+3
| * | | IB/core: Make ib_addr a core IB moduleMatan Barak2014-01-192-4/+6
| * | | IB/core: Resolve Ethernet L2 addresses when modifying QPOr Gerlitz2014-01-193-0/+49
| * | | RDMA/ocrdma: Populate GID table with IP based gidsMoni Shoua2014-01-192-99/+41
| * | | RDMA/ocrdma: Handle Ethernet L2 parameters for IP based GID addressingMoni Shoua2014-01-194-22/+17
| * | | IB/mlx4: Handle Ethernet L2 parameters for IP based GID addressingMoni Shoua2014-01-184-58/+99
| * | | IB/mlx4: Use IBoE (RoCE) IP based GIDs in the port GID tableMoni Shoua2014-01-182-143/+334
| * | | IB/cma: IBoE (RoCE) IP-based GID addressingMoni Shoua2014-01-182-24/+16
| * | | IB/core: Ethernet L2 attributes in verbs/cm structuresMatan Barak2014-01-1412-21/+277
| | |/ | |/|
| | |
| \ \
| \ \
| \ \
| \ \
| \ \
| \ \
| \ \
| \ \
| \ \
| \ \
| \ \
| \ \
| \ \
| \ \
| \ \
| \ \
| \ \
*-----------------. \ \ Merge branches 'cma', 'cxgb4', 'flowsteer', 'ipoib', 'misc', 'mlx4', 'mlx5', ...Roland Dreier2014-01-2251-97/+6368
|\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * | | IB/usnic: Remove unused includes of <linux/version.h>Wei Yongjun2014-01-223-3/+0