summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2012-10-05 04:12:22 +0200
committerRoland Dreier <roland@purestorage.com>2012-10-05 04:12:22 +0200
commit56040f07b26bb32f4b70ec2192ecddeb6cef3754 (patch)
tree20755ae79321d67c96ddc0f3aa146bff26d1fc75 /drivers/infiniband
parentRDMA/cma: Check that retry count values are in range (diff)
parentIPoIB: Fix build with CONFIG_INFINIBAND_IPOIB_CM=n (diff)
parentIB/iser: Add more RX CQs to scale out processing of SCSI responses (diff)
parentmlx4_core: Adjust flow steering attach wrapper so that IB works on SR-IOV VFs (diff)
parentRDMA/nes: Bump the version number of nes driver (diff)
downloadlinux-56040f07b26bb32f4b70ec2192ecddeb6cef3754.tar.xz
linux-56040f07b26bb32f4b70ec2192ecddeb6cef3754.zip
Merge branches 'cma', 'ipoib', 'iser', 'mlx4' and 'nes' into for-next