tree 2774beafe6bcab689ab5da5413726d8f8f606241
parent a6a1d6485e77f28c11cdf943a3ed2a3fd83ac727
parent ba82638247c10cfda32268c894f78f8124f54084
author Linus Torvalds <torvalds@linux-foundation.org> 1300978786 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1300978786 -0700

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