Skip to contentSkip to conversation

please pull infiniband.git

GIT PULL Roland Dreier 1 participant 1 message Jan 16, 2009

lore
Share & tools
lore
#0 lore raw

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

Some fixes to go into 2.6.29-rc3. Nothing too urgent so if this takes a long time due to LCA, it's not a big deal. The bulk of things are for the ehca driver, to fix warning spew caused by the powerpc u64 transition from long to long long.

Andrew Morton (1):
mlx4_core: Fix min() warning

Roland Dreier (4):
IPoIB: Fix hang in napi_disable() if P_Key is never found
IPoIB: Fix deadlock between ipoib_open() and child interface create IB/mlx4: Fix memory ordering problem when posting LSO sends Merge branches 'ehca', 'ipoib' and 'mlx4' into for-linus

Stephen Rothwell (2):
IB/ehca: Fix printk format warnings from u64 type change IB/ehca: Use consistent types for ehca_plpar_hcall9()

Yossi Etigin (1):
IPoIB: Do not print error messages for multicast join retries

 drivers/infiniband/hw/ehca/ehca_cq.c           |   16 ++--
 drivers/infiniband/hw/ehca/ehca_hca.c          |    2 +-
 drivers/infiniband/hw/ehca/ehca_irq.c          |   18 ++--
 drivers/infiniband/hw/ehca/ehca_main.c         |    6 +-
 drivers/infiniband/hw/ehca/ehca_mcast.c        |    4 +-
 drivers/infiniband/hw/ehca/ehca_mrmw.c         |  144 ++++++++++++------------
 drivers/infiniband/hw/ehca/ehca_qp.c           |   32 +++---
 drivers/infiniband/hw/ehca/ehca_reqs.c         |    2 +-
 drivers/infiniband/hw/ehca/ehca_sqp.c          |    2 +-
 drivers/infiniband/hw/ehca/ehca_tools.h        |    2 +-
 drivers/infiniband/hw/ehca/ehca_uverbs.c       |    2 +-
 drivers/infiniband/hw/ehca/hcp_if.c            |   56 +++++-----
 drivers/infiniband/hw/mlx4/qp.c                |   28 +++--
 drivers/infiniband/ulp/ipoib/ipoib_main.c      |   27 +++--
 drivers/infiniband/ulp/ipoib/ipoib_multicast.c |    2 +-
 drivers/infiniband/ulp/ipoib/ipoib_vlan.c      |   11 ++-
 drivers/net/mlx4/profile.c                     |    6 +-
 17 files changed, 189 insertions(+), 171 deletions(-)