Merge tag 'rdma-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 24 Jun 2012 18:00:07 +0000 (11:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 24 Jun 2012 18:00:07 +0000 (11:00 -0700)
commit08d49c46cf61f707f3f44228b362947bb57343e7
treea17255e96a1ca86ec5c8f789422cb7e46232d762
parenta4a20fd981b2e6419556ca474b3b9689d42e5233
parent2e51fd3c13e330d9364a211ddcd3e38771eeb4b4
Merge tag 'rdma-fixes' of git://git./linux/kernel/git/roland/infiniband

Pull InfiniBand/RDMA fixes from Roland Dreier:
 - Fixes to new ocrdma driver
 - Typo in test in CMA

* tag 'rdma-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  RDMA/cma: QP type check on received REQs should be AND not OR
  RDMA/ocrdma: Fix off by one in ocrdma_query_gid()
  RDMA/ocrdma: Fixed RQ error CQE polling
  RDMA/ocrdma: Correct queue SGE calculation
  RDMA/ocrdma: Correct reported max queue sizes
  RDMA/ocrdma: Fixed GID table for vlan and events