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

Roland Dreier rdreier at cisco.com
Sun Jun 14 13:47:59 PDT 2009


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 the main batch of InfiniBand/RDMA changes for 2.6.31; sorry
for being so late in the merge cycle but the whole family was sick
with the stomach flu for the past week and, well, merge requests
weren't a top priority.

Anyway, this has been a slow cycle for my tree for whatever reason, so
there's not much here; everything has been in -next for a while except
for my two IRQ double-free patches, which fix a just-reported bug (and
are tiny and have been tested).

Anton Blanchard (1):
      IB/ehca: Replace vmalloc() with kmalloc() for queue allocation

Eli Cohen (2):
      IB/mthca: Add module parameter for number of MTTs per segment
      mlx4_core: Add module parameter for number of MTTs per segment

Jack Morgenstein (1):
      IB/mlx4: Add strong ordering to local inval and fast reg work requests

Jack Stone (1):
      infiniband: Remove void casts

Joachim Fenkes (1):
      IB/ehca: Remove superfluous bitmasks from QP control block

Roel Kluin (1):
      RDMA/nes: Fix off-by-one bugs in reset_adapter_ne020() and init_serdes()

Roland Dreier (3):
      IB/mthca: Don't double-free IRQs when falling back from MSI-X to INTx
      mlx4_core: Don't double-free IRQs when falling back from MSI-X to INTx
      Merge branches 'cxgb3', 'ehca', 'misc', 'mlx4', 'mthca' and 'nes' into for-linus

Stefan Roscher (3):
      IB/ehca: Fall back to vmalloc() for big allocations
      IB/ehca: Remove unnecessary memory operations for userspace queue pairs
      IB/ehca: Increment version number

Steve Wise (2):
      RDMA/cxgb3: Report correct port state and MTU
      RDMA/cxgb3: Limit fast register size based on T3 limitations

 drivers/infiniband/hw/amso1100/c2_cq.c            |    4 +-
 drivers/infiniband/hw/cxgb3/cxio_wr.h             |    2 +-
 drivers/infiniband/hw/cxgb3/iwch_provider.c       |   32 ++++++-
 drivers/infiniband/hw/ehca/ehca_classes_pSeries.h |   28 -----
 drivers/infiniband/hw/ehca/ehca_irq.c             |    9 +-
 drivers/infiniband/hw/ehca/ehca_main.c            |    2 +-
 drivers/infiniband/hw/ehca/ehca_qp.c              |  112 +++++++++++----------
 drivers/infiniband/hw/ehca/hcp_if.c               |    6 +-
 drivers/infiniband/hw/ehca/hcp_if.h               |    2 +-
 drivers/infiniband/hw/ehca/hcp_phyp.c             |   11 ++-
 drivers/infiniband/hw/ehca/hcp_phyp.h             |    2 +-
 drivers/infiniband/hw/ehca/ipz_pt_fn.c            |   19 +++-
 drivers/infiniband/hw/mlx4/qp.c                   |    4 +
 drivers/infiniband/hw/mthca/mthca_cmd.c           |    2 +-
 drivers/infiniband/hw/mthca/mthca_dev.h           |    1 +
 drivers/infiniband/hw/mthca/mthca_eq.c            |    4 +-
 drivers/infiniband/hw/mthca/mthca_main.c          |   17 +++-
 drivers/infiniband/hw/mthca/mthca_mr.c            |   16 ++--
 drivers/infiniband/hw/mthca/mthca_profile.c       |    4 +-
 drivers/infiniband/hw/nes/nes_hw.c                |   14 ++--
 drivers/net/mlx4/eq.c                             |    4 +-
 drivers/net/mlx4/main.c                           |   14 ++-
 drivers/net/mlx4/mr.c                             |    6 +-
 drivers/net/mlx4/profile.c                        |    2 +-
 include/linux/mlx4/device.h                       |    1 +
 include/linux/mlx4/qp.h                           |    1 +
 26 files changed, 183 insertions(+), 136 deletions(-)



More information about the general mailing list