summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2013-07-12 01:49:30 +0200
committerRoland Dreier <roland@purestorage.com>2013-07-12 01:49:30 +0200
commite04abfa2436e3ab016b23eb1afb2c5578b8dc2cf (patch)
tree8230008b7e9a520699de1f593cc399f2211a7bd3 /drivers/infiniband
parentMerge branches 'af_ib', 'cxgb4', 'misc', 'mlx5', 'ocrdma', 'qib' and 'srp' in... (diff)
parentmlx5: Return -EFAULT instead of -EPERM (diff)
parentIB/qib: Log all SDMA errors unconditionally (diff)
parentIB/srp: Let srp_abort() return FAST_IO_FAIL if TL offline (diff)
downloadlinux-e04abfa2436e3ab016b23eb1afb2c5578b8dc2cf.tar.xz
linux-e04abfa2436e3ab016b23eb1afb2c5578b8dc2cf.zip
Merge branches 'mlx5', 'qib' and 'srp' into for-next