diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 15:59:46 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 15:59:46 +0100 |
| commit | 0625bef6060fab4aab0e484130b59af5e9ac81bc (patch) | |
| tree | 2774beafe6bcab689ab5da5413726d8f8f606241 /drivers/infiniband/Makefile | |
| parent | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/same... (diff) | |
| parent | Merge branches 'misc', 'nes' and 'srp' into for-next (diff) | |
| download | linux-0625bef6060fab4aab0e484130b59af5e9ac81bc.tar.xz linux-0625bef6060fab4aab0e484130b59af5e9ac81bc.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB: Increase DMA max_segment_size on Mellanox hardware
IB/mad: Improve an error message so error code is included
RDMA/nes: Don't print success message at level KERN_ERR
RDMA/addr: Fix return of uninitialized ret value
IB/srp: try to use larger FMR sizes to cover our mappings
IB/srp: add support for indirect tables that don't fit in SRP_CMD
IB/srp: rework mapping engine to use multiple FMR entries
IB/srp: allow sg_tablesize to be set for each target
IB/srp: move IB CM setup completion into its own function
IB/srp: always avoid non-zero offsets into an FMR
Diffstat (limited to 'drivers/infiniband/Makefile')
0 files changed, 0 insertions, 0 deletions