summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/r...Linus Torvalds2014-01-25100-567/+7663
|\
| * Merge branch 'ip-roce' into for-nextRoland Dreier2014-01-2336-389/+939
| |\
| | * IB/mlx4: Use IS_ENABLED(CONFIG_IPV6)Roland Dreier2014-01-201-6/+6
| | * RDMA/ocrdma: Add dependency on INETRoland Dreier2014-01-201-1/+1
| | * RDMA/ocrdma: Move ocrdma_inetaddr_event outside of "#if CONFIG_IPV6"Roland Dreier2014-01-201-4/+4
| | * IB/mlx4: Add dependency INETMatan Barak2014-01-201-1/+1
| | * IB/cm: Fix missing unlock on error in cm_init_qp_rtr_attr()Wei Yongjun2014-01-201-1/+3
| | * IB/core: Make ib_addr a core IB moduleMatan Barak2014-01-202-4/+6
| | * IB/core: Resolve Ethernet L2 addresses when modifying QPOr Gerlitz2014-01-203-0/+49
| | * RDMA/ocrdma: Populate GID table with IP based gidsMoni Shoua2014-01-202-99/+41
| | * RDMA/ocrdma: Handle Ethernet L2 parameters for IP based GID addressingMoni Shoua2014-01-204-22/+17
| | * IB/mlx4: Handle Ethernet L2 parameters for IP based GID addressingMoni Shoua2014-01-186-62/+130
| | * 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-183-47/+28
| | * IB/core: Ethernet L2 attributes in verbs/cm structuresMatan Barak2014-01-1418-24/+343
| | |
| | \
| | \
| | \
| | \
| | \
| | \
| | \
| | \
| | \
| | \
| | \
| | \
| | \
| | \
| | \
| | \
| | \
| *-----------------. \ Merge branches 'cma', 'cxgb4', 'flowsteer', 'ipoib', 'misc', 'mlx4', 'mlx5', ...Roland Dreier2014-01-2373-176/+6719
| |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | * | IB/usnic: Remove unused includes of <linux/version.h>Wei Yongjun2014-01-233-3/+0
| | | | | | | | | | | * | IB/usnic: Use GFP_ATOMIC under spinlockDan Carpenter2014-01-211-1/+1
| | | | | | | | | | | * | IB/usnic: Remove unused variable in usnic_debugfs_exit()Wei Yongjun2014-01-181-4/+0
| | | | | | | | | | | * | IB/usnic: Set userspace/kernel ABI ver to 4Upinder Malhi2014-01-181-1/+1
| | | | | | | | | | | * | IB/usnic: Advertise usNIC devices as RDMA_NODE_USNIC_UDPUpinder Malhi2014-01-181-1/+1
| | | | | | | | | | | * | IB/core: Add support for RDMA_NODE_USNIC_UDPUpinder Malhi2014-01-183-0/+4
| | | | | | | | | | | * | IB/usnic: Add dependency on CONFIG_INETUpinder Malhi2014-01-181-1/+1
| | | | | | | | | | | * | IB/usnic: Fix endianness-related warningsUpinder Malhi2014-01-182-3/+2
| | | | | | | | | | | * | IB/usnic: Append documentation to usnic_transport.h and cleanupUpinder Malhi2014-01-142-1/+4
| | | | | | | | | | | * | IB/usnic: Fix typo "Ignorning" -> "Ignoring"Roland Dreier2014-01-141-4/+4
| | | | | | | | | | | * | IB/usnic: Expose flows via debugfsUpinder Malhi2014-01-146-10/+111
| | | | | | | | | | | * | IB/usnic: Use for_each_sg instead of a for-loopUpinder Malhi2014-01-141-8/+9
| | | | | | | | | | | * | IB/usnic: Remove superflous parenthesesUpinder Malhi2014-01-143-14/+14
| | | | | | | | | | | * | IB/core: Add RDMA_TRANSPORT_USNIC_UDPUpinder Malhi2014-01-142-2/+4
| | | | | | | | | | | * | IB/usnic: Add UDP support in usnic_ib_qp_grp.[hc]Upinder Malhi2014-01-142-0/+99
| | | | | | | | | | | * | IB/usnic: Add UDP support in u*verbs.c, u*main.c and u*util.hUpinder Malhi2014-01-143-9/+136
| | | | | | | | | | | * | IB:usnic: Add UDP support to usnic_transport.[hc]Upinder Malhi2014-01-142-7/+105
| | | | | | | | | | | * | IB/usnic: Add UDP support to usnic_fwd.[hc]Upinder Malhi2014-01-142-0/+75
| | | | | | | | | | | * | IB/usnic: Update ABI and Version file for UDP supportUpinder Malhi2014-01-142-4/+12
| | | | | | | | | | | * | IB/usnic: Port over sysfs to new usnic_fwd.hUpinder Malhi2014-01-141-7/+3
| | | | | | | | | | | * | IB/usnic: Port over usnic_ib_qp_grp.[hc] to new usnic_fwd.hUpinder Malhi2014-01-142-122/+249
| | | | | | | | | | | * | IB/usnic: Port over main.c and verbs.c to the usnic_fwd.hUpinder Malhi2014-01-143-39/+39
| | | | | | | | | | | * | IB/usnic: Push all forwarding state to usnic_fwd.[hc]Upinder Malhi2014-01-142-125/+212
| | | | | | | | | | | * | IB/usnic: Add struct usnic_transport_specUpinder Malhi2014-01-141-0/+9
| | | | | | | | | | | * | IB/usnic: Change WARN_ON to lockdep_assert_heldUpinder Malhi2014-01-141-8/+8
| | | | | | | | | | | * | IB/usnic: Add Cisco VIC low-level hardware driverUpinder Malhi2014-01-1430-0/+4904
| | | | | | | | | | | |/
| | | | | | | | | | * | scsi_transport_srp: Fix kernel-doc warningsBart Van Assche2014-01-212-4/+40
| | | | | | | | | | * | scsi_transport_srp: Add rport state diagramBart Van Assche2014-01-212-0/+33
| | | | | | | | | | * | scsi_transport_srp: Fix a race conditionBart Van Assche2014-01-213-42/+46
| | | | | | | | | | * | scsi_transport_srp: Block rport upon TL error even with fast_io_fail_tmo = offBart Van Assche2014-01-211-13/+17
| | | | | | | | | | * | MAINTAINERS: Pass the torch of SRP submaintainershipDavid Dillow2014-01-211-1/+1
| | | | | | | | | | |/
| | | | | | | | | * / IB/qib: Fix QP check when looping back to/from QP1Ira Weiny2014-01-231-1/+8
| | | | | | | | | |/
| | | | | | | | * | RDMA/ocrdma: Fix OCRDMA_GEN2_FAMILY macro definitionDevesh Sharma2014-01-131-1/+1
| | | | | | | | * | RDMA/ocrdma: Fix AV_VALID bit positionDevesh Sharma2014-01-132-1/+2
| | | | | | | | |/