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 last batch of InfiniBand/RDMA merges for 2.6.25, mostly preparation for enabling stateless offloads for IP-over-InfiniBand. Eli Cohen (3): IPoIB: Add high DMA feature flag IPoIB: Add send gather support IB/core: Add IP checksum offload support Jack Morgenstein (2): mlx4_core: For 64-bit systems, vmap() kernel queue buffers IB/mlx4: Use multiple WQ blocks to post smaller send WQEs Roland Dreier (3): IB/mlx4: Consolidate code to get an entry from a struct mlx4_buf mlx4_core: Clean up struct mlx4_buf IB/core: Remove unused struct ib_device.flags member drivers/infiniband/hw/mlx4/cq.c | 20 ++-- drivers/infiniband/hw/mlx4/mlx4_ib.h | 2 + drivers/infiniband/hw/mlx4/qp.c | 216 +++++++++++++++++++++++----- drivers/infiniband/hw/mlx4/srq.c | 8 +- drivers/infiniband/ulp/ipoib/ipoib.h | 4 +- drivers/infiniband/ulp/ipoib/ipoib_cm.c | 10 +- drivers/infiniband/ulp/ipoib/ipoib_ib.c | 89 +++++++++--- drivers/infiniband/ulp/ipoib/ipoib_main.c | 4 +- drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 10 +- drivers/net/mlx4/alloc.c | 48 ++++-- drivers/net/mlx4/mr.c | 4 +- include/linux/mlx4/device.h | 19 ++- include/linux/mlx4/qp.h | 4 + include/rdma/ib_verbs.h | 16 ++- 14 files changed, 342 insertions(+), 112 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/