Hi Linus,

Please pull from

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

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

Final RDMA changes for the 3.6 merge window:
 - Fix IPoIB to stop using unsafe linkage between networking neighbour
   layer and private path database.
 - Small fixes for bugs found by Fengguang Wu's automated builds.

----------------------------------------------------------------
Fengguang Wu (1):
      RDMA/cma: Use PTR_RET rather than if (IS_ERR(...)) + PTR_ERR

Mike Marciniszyn (1):
      IB/qib: Fix size of cc_supported_table_entries

Roland Dreier (3):
      RDMA/ocrdma: Fix check of GSI CQs
      RDMA/ucma: Convert open-coded equivalent to memdup_user()
      Merge branches 'cma', 'ipoib', 'ocrdma' and 'qib' into for-next

Shlomo Pongratz (1):
      IPoIB: Use a private hash table for path lookup in xmit path

 drivers/infiniband/core/cma.c                  |    5 +-
 drivers/infiniband/core/ucma.c                 |   19 +-
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c    |    4 +-
 drivers/infiniband/hw/qib/qib.h                |   10 +-
 drivers/infiniband/ulp/ipoib/ipoib.h           |   56 +-
 drivers/infiniband/ulp/ipoib/ipoib_cm.c        |   16 +-
 drivers/infiniband/ulp/ipoib/ipoib_main.c      |  646 ++++++++++++++++++------
 drivers/infiniband/ulp/ipoib/ipoib_multicast.c |   57 +--
 8 files changed, 555 insertions(+), 258 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to