Messages in this thread | | | Subject | [GIT PULL] please pull infiniband.git | From | Roland Dreier <> | Date | Mon, 05 Feb 2007 02:15:25 -0800 |
| |
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 my first merge for 2.6.21:
Hoang-Nam Nguyen (2): IB/ehca: Remove use of do_mmap() IB/ehca: Remove obsolete prototypes
Ishai Rabinovitz (1): IB/srp: Don't wait for response when QP is in error state.
Jason Gunthorpe (1): IB: Make sure struct ib_user_mad.data is aligned
Michael S. Tsirkin (2): IB: Include <linux/kref.h> explicitly in <rdma/ib_verbs.h> IB: Return qp pointer as part of ib_wc
Steve Wise (1): RDMA/addr: Handle ethernet neighbour updates during route resolution
drivers/infiniband/core/addr.c | 3 +- drivers/infiniband/core/mad.c | 11 +- drivers/infiniband/core/uverbs_cmd.c | 2 +- drivers/infiniband/hw/amso1100/c2_cq.c | 2 +- drivers/infiniband/hw/ehca/ehca_classes.h | 29 +-- drivers/infiniband/hw/ehca/ehca_cq.c | 65 ++---- drivers/infiniband/hw/ehca/ehca_iverbs.h | 8 - drivers/infiniband/hw/ehca/ehca_main.c | 6 +- drivers/infiniband/hw/ehca/ehca_qp.c | 78 +----- drivers/infiniband/hw/ehca/ehca_reqs.c | 2 +- drivers/infiniband/hw/ehca/ehca_uverbs.c | 395 ++++++++++++----------------- drivers/infiniband/hw/ipath/ipath_qp.c | 2 +- drivers/infiniband/hw/ipath/ipath_rc.c | 8 +- drivers/infiniband/hw/ipath/ipath_ruc.c | 8 +- drivers/infiniband/hw/ipath/ipath_uc.c | 4 +- drivers/infiniband/hw/ipath/ipath_ud.c | 8 +- drivers/infiniband/hw/mthca/mthca_cmd.c | 2 +- drivers/infiniband/hw/mthca/mthca_cq.c | 2 +- drivers/infiniband/ulp/srp/ib_srp.c | 7 + drivers/infiniband/ulp/srp/ib_srp.h | 1 + include/rdma/ib_user_mad.h | 2 +- include/rdma/ib_verbs.h | 3 +- 22 files changed, 243 insertions(+), 405 deletions(-) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |