Messages in this thread | | | From | Roland Dreier <> | Subject | [GIT PULL] please pull infiniband.git | Date | Tue, 23 Jun 2009 10:39:51 -0700 |
| |
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 has a few more fixes for 2.6.31-rc1; however everything here should be a fix appropriate for -rc2 as well, so if this misses the end of the merge window then I think it should still be OK to pull.
Alexander Schmidt (1): IB/ehca: Bump version number
Faisal Latif (2): RDMA/nes: Fix max_qp_init_rd_atom returned from query device RDMA/nes: Fix FIN state handling under error conditions
Hannes Hering (1): IB/ehca: Tolerate dynamic memory operations before driver load
Peter Huewe (1): RDMA: Add __init/__exit macros to addr.c and cma.c
Roel Kluin (1): IB/ehca: Ensure that guid_entry index is not negative
Roland Dreier (3): IB/mthca: Replace dma_sync_single() use with proper functions mlx4_core: Fix dma_sync_single_for_cpu() with matching for_device() calls Merge branches 'ehca', 'misc', 'mlx4', 'mthca' and 'nes' into for-linus
drivers/infiniband/core/addr.c | 4 +- drivers/infiniband/core/cma.c | 4 +- drivers/infiniband/hw/ehca/ehca_hca.c | 2 +- drivers/infiniband/hw/ehca/ehca_main.c | 20 +- drivers/infiniband/hw/ehca/ehca_mrmw.c | 508 +++++++++++++++++++++++++++++++- drivers/infiniband/hw/ehca/ehca_mrmw.h | 13 +- drivers/infiniband/hw/mthca/mthca_mr.c | 13 +- drivers/infiniband/hw/nes/nes_cm.c | 8 +- drivers/infiniband/hw/nes/nes_verbs.c | 2 +- drivers/net/mlx4/mr.c | 14 +- 10 files changed, 554 insertions(+), 34 deletions(-)
| |