[GIT PULL] please pull infiniband.git

From: Roland Dreier
Date: Sun Jun 24 2012 - 08:10:25 EST


Hi Linus,

Please pull from

git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git tags/rdma-fixes

----------------------------------------------------------------

InfiniBand/RDMA fixes for 3.5-rc:
- Fixes to new ocrdma driver
- Typo in test in CMA

----------------------------------------------------------------
Dan Carpenter (1):
RDMA/ocrdma: Fix off by one in ocrdma_query_gid()

Mahesh Vardhamanaiah (2):
RDMA/ocrdma: Correct reported max queue sizes
RDMA/ocrdma: Correct queue SGE calculation

Parav Pandit (2):
RDMA/ocrdma: Fixed GID table for vlan and events
RDMA/ocrdma: Fixed RQ error CQE polling

Roland Dreier (1):
Merge branches 'cma' and 'ocrdma' into for-linus

Sean Hefty (1):
RDMA/cma: QP type check on received REQs should be AND not OR

drivers/infiniband/core/cma.c | 2 +-
drivers/infiniband/hw/ocrdma/ocrdma.h | 1 +
drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 18 ++++----
drivers/infiniband/hw/ocrdma/ocrdma_main.c | 63 +++++++++++++++------------
drivers/infiniband/hw/ocrdma/ocrdma_sli.h | 5 ++-
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 12 ++---
6 files changed, 55 insertions(+), 46 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/