From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 24 Jun 2012 18:00:07 +0000 (-0700)
Subject: Merge tag 'rdma-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
X-Git-Tag: firefly_0821_release~3680^2~2565
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=08d49c46cf61f707f3f44228b362947bb57343e7;p=firefly-linux-kernel-4.4.55.git

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
---

08d49c46cf61f707f3f44228b362947bb57343e7