[openib-general] [GIT PULL] please pull infiniband.git

[Or Gerlitz]

Roland Dreier wrote:
> 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
> 
> Finishing up the major 2.6.20 merges, plus some fixes:

Roland,

you have CC-ed lkml at cisco.com on this email, is there a chance you 
wanted to CC linux-kernel at vger.kernel.org instead ...

May i ask what prevented the v3 of the mthca profile patch (see 
http://article.gmane.org/gmane.linux.drivers.openib/34005) to get in?

Or.

> 
> Krishna Kumar (1):
>       RDMA/amso1100: Fix memory leak in c2_qp_modify()
> 
> Ralph Campbell (6):
>       IB: Add DMA mapping functions to allow device drivers to interpose
>       IB/ipath: Implement new verbs DMA mapping functions
>       IB/core: Use the new verbs DMA mapping functions
>       IPoIB: Use the new verbs DMA mapping functions
>       IB/srp: Use new verbs IB DMA mapping functions
>       IB/iser: Use the new verbs DMA mapping functions
> 
> Roland Dreier (5):
>       IB/fmr: ib_flush_fmr_pool() may wait too long
>       IB/ipath: Remove unused "write-only" variables
>       IB/iser: Remove unused "write-only" variables
>       IB/ipath: Fix IRQ for PCI Express HCAs
>       IPoIB: Make sure struct ipoib_neigh.queue is always initialized
> 
> Sean Hefty (5):
>       RDMA/cma: Remove unneeded qp_type parameter from rdma_cm
>       RDMA/cma: Report connect info with connect events
>       RDMA/cma: Allow early transition to RTS to handle lost CM messages
>       RDMA/cma: Add support for RDMA_PS_UDP
>       RDMA/cma: Export rdma cm interface to userspace
> 
>  drivers/infiniband/core/Makefile              |    6 +-
>  drivers/infiniband/core/cm.c                  |    4 +
>  drivers/infiniband/core/cma.c                 |  416 +++++++++---
>  drivers/infiniband/core/fmr_pool.c            |   12 +-
>  drivers/infiniband/core/mad.c                 |   90 ++--
>  drivers/infiniband/core/mad_priv.h            |    6 +-
>  drivers/infiniband/core/ucma.c                |  874 +++++++++++++++++++++++++
>  drivers/infiniband/core/uverbs_marshall.c     |    5 +-
>  drivers/infiniband/core/uverbs_mem.c          |   12 +-
>  drivers/infiniband/hw/amso1100/c2_qp.c        |   13 +-
>  drivers/infiniband/hw/ipath/Makefile          |    1 +
>  drivers/infiniband/hw/ipath/ipath_dma.c       |  189 ++++++
>  drivers/infiniband/hw/ipath/ipath_driver.c    |    4 +-
>  drivers/infiniband/hw/ipath/ipath_file_ops.c  |    5 +-
>  drivers/infiniband/hw/ipath/ipath_iba6110.c   |    3 +-
>  drivers/infiniband/hw/ipath/ipath_iba6120.c   |    8 +-
>  drivers/infiniband/hw/ipath/ipath_init_chip.c |    3 +-
>  drivers/infiniband/hw/ipath/ipath_intr.c      |    3 +-
>  drivers/infiniband/hw/ipath/ipath_keys.c      |    8 +-
>  drivers/infiniband/hw/ipath/ipath_mr.c        |    7 +-
>  drivers/infiniband/hw/ipath/ipath_sysfs.c     |    3 -
>  drivers/infiniband/hw/ipath/ipath_verbs.c     |    1 +
>  drivers/infiniband/hw/ipath/ipath_verbs.h     |    2 +
>  drivers/infiniband/ulp/ipoib/ipoib.h          |    4 +-
>  drivers/infiniband/ulp/ipoib/ipoib_ib.c       |   75 +--
>  drivers/infiniband/ulp/ipoib/ipoib_main.c     |    3 +-
>  drivers/infiniband/ulp/iser/iscsi_iser.h      |    2 +-
>  drivers/infiniband/ulp/iser/iser_initiator.c  |    4 -
>  drivers/infiniband/ulp/iser/iser_memory.c     |  125 ++--
>  drivers/infiniband/ulp/srp/ib_srp.c           |   81 ++-
>  drivers/infiniband/ulp/srp/ib_srp.h           |    2 +-
>  include/rdma/ib_marshall.h                    |    5 +-
>  include/rdma/ib_verbs.h                       |  253 +++++++
>  include/rdma/rdma_cm.h                        |   62 ++-
>  include/rdma/rdma_cm_ib.h                     |    3 +
>  include/rdma/rdma_user_cm.h                   |  206 ++++++
>  36 files changed, 2146 insertions(+), 354 deletions(-)
>  create mode 100644 drivers/infiniband/core/ucma.c
>  create mode 100644 drivers/infiniband/hw/ipath/ipath_dma.c
>  create mode 100644 include/rdma/rdma_user_cm.h