Linus, please pull from master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This tree is also available from kernel.org mirrors at: git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git for-linus This adds IB multicast tracking, to allow userspace to use multicast groups in a sane way, an ehca interrupt handling fixup, and a few other minor things. I don't think there is anything major left, so we should be good for 2.6.21-rc1 after this pull. Dotan Barak (1): IB/mthca: Allow the QP state transition RESET->RESET Hoang-Nam Nguyen (4): IB/ehca: Rework irq handler IB/ehca: Fix race condition/locking issues in scaling code IB/ehca: Allow en/disabling scaling code via module parameter IB/ehca: Change query_port() to return LINK_UP instead UNKNOWN Michael S. Tsirkin (1): IPoIB: CM error handling thinko fix Roland Dreier (5): IB/mthca: Fix allocation of ICM chunks in coherent memory IPoIB: Only allow root to change between datagram and connected mode IB/core: Fix sparse warnings about shadowed declarations IB/ipath: Make ipath_map_sg() static IB/core: Set static rate in ib_init_ah_from_path() Sean Hefty (2): IB/sa: Track multicast join/leave requests RDMA/cma: Add multicast communication support Steve Wise (3): RDMA/iwcm: iw_cm_id destruction race fixes RDMA/cxgb3: Fail posts synchronously when in TERMINATE state RDMA/cxgb3: Remove Open Grid Computing copyrights in iw_cxgb3 driver drivers/infiniband/core/Makefile | 2 +- drivers/infiniband/core/cma.c | 359 +++++++++-- drivers/infiniband/core/fmr_pool.c | 4 +- drivers/infiniband/core/iwcm.c | 47 +- drivers/infiniband/core/multicast.c | 837 ++++++++++++++++++++++++ drivers/infiniband/core/sa.h | 66 ++ drivers/infiniband/core/sa_query.c | 30 +- drivers/infiniband/core/sysfs.c | 2 - drivers/infiniband/core/ucma.c | 204 ++++++- drivers/infiniband/hw/cxgb3/cxio_dbg.c | 1 - drivers/infiniband/hw/cxgb3/cxio_hal.c | 1 - drivers/infiniband/hw/cxgb3/cxio_hal.h | 1 - drivers/infiniband/hw/cxgb3/cxio_resource.c | 1 - drivers/infiniband/hw/cxgb3/cxio_resource.h | 1 - drivers/infiniband/hw/cxgb3/cxio_wr.h | 1 - drivers/infiniband/hw/cxgb3/iwch.c | 1 - drivers/infiniband/hw/cxgb3/iwch.h | 1 - drivers/infiniband/hw/cxgb3/iwch_cm.c | 1 - drivers/infiniband/hw/cxgb3/iwch_cm.h | 1 - drivers/infiniband/hw/cxgb3/iwch_cq.c | 1 - drivers/infiniband/hw/cxgb3/iwch_ev.c | 1 - drivers/infiniband/hw/cxgb3/iwch_mem.c | 1 - drivers/infiniband/hw/cxgb3/iwch_provider.c | 1 - drivers/infiniband/hw/cxgb3/iwch_provider.h | 1 - drivers/infiniband/hw/cxgb3/iwch_qp.c | 3 +- drivers/infiniband/hw/cxgb3/iwch_user.h | 1 - drivers/infiniband/hw/ehca/Kconfig | 8 - drivers/infiniband/hw/ehca/ehca_classes.h | 19 +- drivers/infiniband/hw/ehca/ehca_eq.c | 1 + drivers/infiniband/hw/ehca/ehca_hca.c | 3 + drivers/infiniband/hw/ehca/ehca_irq.c | 307 +++++---- drivers/infiniband/hw/ehca/ehca_irq.h | 1 + drivers/infiniband/hw/ehca/ehca_main.c | 32 +- drivers/infiniband/hw/ehca/ipz_pt_fn.h | 11 +- drivers/infiniband/hw/ipath/ipath_dma.c | 4 +- drivers/infiniband/hw/mthca/mthca_memfree.c | 4 +- drivers/infiniband/hw/mthca/mthca_qp.c | 5 + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 4 +- drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 195 ++---- include/rdma/ib_addr.h | 6 + include/rdma/ib_sa.h | 159 ++--- include/rdma/rdma_cm.h | 21 +- include/rdma/rdma_cm_ib.h | 4 +- include/rdma/rdma_user_cm.h | 13 +- 44 files changed, 1889 insertions(+), 478 deletions(-) create mode 100644 drivers/infiniband/core/multicast.c create mode 100644 drivers/infiniband/core/sa.h - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/