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 is the second batch of merges for 2.6.22 -- mostly fixes, but also the conversion of IPoIB to use NAPI: Ishai Rabinovitz (1): IB/srp: Add orig_dgid sysfs attribute to scsi_host Michael S. Tsirkin (4): IB/mthca: Work around kernel QP starvation IPoIB/cm: Fix error handling in ipoib_cm_dev_open() IPoIB/cm: Don't crash if remote side uses one QP for both directions IB: Add CQ comp_vector support Ralph Campbell (4): IB/ipath: Don't call spin_lock_irq() from interrupt context IB/ipath: Don't put QP in timeout queue if waiting to send IB/ipath: Fix two more spin lock problems IB/ipath: Fix a race condition when generating ACKs Robert Walsh (1): IB/ipath: Don't corrupt pending mmap list when unmapped objects are freed Roland Dreier (4): IB/srp: Set proc_name IB/fmr_pool: Add prefix to all printks IB: Return "maybe missed event" hint from ib_req_notify_cq() IPoIB: Convert to NAPI Steve Wise (4): RDMA/cxgb3: Fix TERM codes RDMA/cxgb3: Fail qp creation if the requested max_inline is too large RDMA/cxgb3: Initialize cpu_idx field in cpl_close_listserv_req message RDMA/cxgb3: Support for new abort logic drivers/infiniband/core/fmr_pool.c | 32 +++++---- drivers/infiniband/core/mad.c | 2 +- drivers/infiniband/core/uverbs_cmd.c | 1 + drivers/infiniband/core/uverbs_main.c | 2 +- drivers/infiniband/core/verbs.c | 4 +- drivers/infiniband/hw/amso1100/c2.h | 2 +- drivers/infiniband/hw/amso1100/c2_cq.c | 16 ++++- drivers/infiniband/hw/amso1100/c2_provider.c | 3 +- drivers/infiniband/hw/cxgb3/cxio_hal.c | 3 + drivers/infiniband/hw/cxgb3/cxio_wr.h | 1 + drivers/infiniband/hw/cxgb3/iwch_cm.c | 19 ++++++ drivers/infiniband/hw/cxgb3/iwch_cm.h | 6 ++ drivers/infiniband/hw/cxgb3/iwch_provider.c | 14 +++- drivers/infiniband/hw/cxgb3/iwch_qp.c | 69 +++++++++++--------- drivers/infiniband/hw/ehca/ehca_cq.c | 2 +- drivers/infiniband/hw/ehca/ehca_iverbs.h | 4 +- drivers/infiniband/hw/ehca/ehca_main.c | 3 +- drivers/infiniband/hw/ehca/ehca_reqs.c | 14 +++- drivers/infiniband/hw/ehca/ipz_pt_fn.h | 8 ++ drivers/infiniband/hw/ipath/ipath_cq.c | 68 ++++++++++---------- drivers/infiniband/hw/ipath/ipath_mmap.c | 64 +++++++++++++++++-- drivers/infiniband/hw/ipath/ipath_qp.c | 52 +++++++++------ drivers/infiniband/hw/ipath/ipath_rc.c | 55 ++++++++-------- drivers/infiniband/hw/ipath/ipath_srq.c | 55 ++++++++-------- drivers/infiniband/hw/ipath/ipath_verbs.c | 4 + drivers/infiniband/hw/ipath/ipath_verbs.h | 24 +++++-- drivers/infiniband/hw/mthca/mthca_cq.c | 12 ++-- drivers/infiniband/hw/mthca/mthca_dev.h | 4 +- drivers/infiniband/hw/mthca/mthca_provider.c | 2 + drivers/infiniband/hw/mthca/mthca_qp.c | 13 ++++ drivers/infiniband/ulp/ipoib/ipoib.h | 1 + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 14 +++-- drivers/infiniband/ulp/ipoib/ipoib_ib.c | 89 ++++++++++++++++++++------ drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 + drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 2 +- drivers/infiniband/ulp/iser/iser_verbs.c | 2 +- drivers/infiniband/ulp/srp/ib_srp.c | 27 +++++++- drivers/infiniband/ulp/srp/ib_srp.h | 1 + drivers/net/cxgb3/version.h | 4 +- include/rdma/ib_verbs.h | 47 +++++++++++--- 40 files changed, 508 insertions(+), 239 deletions(-) - 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/