Messages in this thread | | | From | Roland Dreier <> | Subject | [GIT PULL] please pull infiniband.git | Date | Sat, 26 Jul 2008 14:02:11 -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 will get the some last RDMA/InfiniBand changes for 2.6.27. The only major thing is changes to the iw_nes connection setup handling, which fix problems with lots of connections:
Faisal Latif (1): RDMA/nes: CM connection setup/teardown rework
Jack Morgenstein (1): mlx4: Update/add Mellanox Technologies copyright lines to mlx4 driver files
Roland Dreier (5): RDMA/ucma: BKL is not needed for ucma_open() RDMA/ucm: BKL is not needed for ib_ucm_open() IPoIB/cm: Connected mode is no longer EXPERIMENTAL IPoIB: Correct help text for INFINIBAND_IPOIB_DEBUG Merge branches 'bkl-removal', 'ipoib', 'mlx4' and 'nes' into for-linus
Yevgeny Petrilin (1): mlx4_core: Add VLAN tag field to WQE control segment struct
drivers/infiniband/core/ucm.c | 10 +- drivers/infiniband/core/ucma.c | 11 +- drivers/infiniband/hw/mlx4/cq.c | 1 + drivers/infiniband/hw/mlx4/main.c | 1 + drivers/infiniband/hw/mlx4/mlx4_ib.h | 1 + drivers/infiniband/hw/mlx4/mr.c | 1 + drivers/infiniband/hw/mlx4/qp.c | 1 + drivers/infiniband/hw/mlx4/srq.c | 1 + drivers/infiniband/hw/mlx4/user.h | 1 + drivers/infiniband/hw/nes/nes.c | 4 +- drivers/infiniband/hw/nes/nes_cm.c | 2034 ++++++++++++++++++--------------- drivers/infiniband/hw/nes/nes_cm.h | 23 +- drivers/infiniband/hw/nes/nes_hw.c | 9 - drivers/infiniband/hw/nes/nes_verbs.c | 15 - drivers/infiniband/ulp/ipoib/Kconfig | 22 +- drivers/net/mlx4/alloc.c | 1 + drivers/net/mlx4/catas.c | 1 + drivers/net/mlx4/cmd.c | 2 +- drivers/net/mlx4/cq.c | 2 +- drivers/net/mlx4/eq.c | 2 +- drivers/net/mlx4/fw.c | 2 +- drivers/net/mlx4/fw.h | 2 +- drivers/net/mlx4/icm.c | 2 +- drivers/net/mlx4/icm.h | 2 +- drivers/net/mlx4/intf.c | 1 + drivers/net/mlx4/main.c | 2 +- drivers/net/mlx4/mcg.c | 1 + drivers/net/mlx4/mlx4.h | 2 +- drivers/net/mlx4/mr.c | 2 +- drivers/net/mlx4/qp.c | 2 +- drivers/net/mlx4/reset.c | 1 + drivers/net/mlx4/srq.c | 1 + include/linux/mlx4/qp.h | 4 +- 33 files changed, 1211 insertions(+), 956 deletions(-)
| |