Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: mlx4: Update/add Mellanox Technologies copyright lines to mlx4 driver files mlx4_core: Add VLAN tag field to WQE control segment struct RDMA/nes: CM connection setup/teardown rework IPoIB: Correct help text for INFINIBAND_IPOIB_DEBUG IPoIB/cm: Connected mode is no longer EXPERIMENTAL RDMA/ucm: BKL is not needed for ib_ucm_open() RDMA/ucma: BKL is not needed for ucma_open()
Showing
- drivers/infiniband/core/ucm.c 8 additions, 2 deletionsdrivers/infiniband/core/ucm.c
- drivers/infiniband/core/ucma.c 8 additions, 3 deletionsdrivers/infiniband/core/ucma.c
- drivers/infiniband/hw/mlx4/cq.c 1 addition, 0 deletionsdrivers/infiniband/hw/mlx4/cq.c
- drivers/infiniband/hw/mlx4/main.c 1 addition, 0 deletionsdrivers/infiniband/hw/mlx4/main.c
- drivers/infiniband/hw/mlx4/mlx4_ib.h 1 addition, 0 deletionsdrivers/infiniband/hw/mlx4/mlx4_ib.h
- drivers/infiniband/hw/mlx4/mr.c 1 addition, 0 deletionsdrivers/infiniband/hw/mlx4/mr.c
- drivers/infiniband/hw/mlx4/qp.c 1 addition, 0 deletionsdrivers/infiniband/hw/mlx4/qp.c
- drivers/infiniband/hw/mlx4/srq.c 1 addition, 0 deletionsdrivers/infiniband/hw/mlx4/srq.c
- drivers/infiniband/hw/mlx4/user.h 1 addition, 0 deletionsdrivers/infiniband/hw/mlx4/user.h
- drivers/infiniband/hw/nes/nes.c 1 addition, 3 deletionsdrivers/infiniband/hw/nes/nes.c
- drivers/infiniband/hw/nes/nes_cm.c 1135 additions, 899 deletionsdrivers/infiniband/hw/nes/nes_cm.c
- drivers/infiniband/hw/nes/nes_cm.h 20 additions, 3 deletionsdrivers/infiniband/hw/nes/nes_cm.h
- drivers/infiniband/hw/nes/nes_hw.c 0 additions, 9 deletionsdrivers/infiniband/hw/nes/nes_hw.c
- drivers/infiniband/hw/nes/nes_verbs.c 0 additions, 15 deletionsdrivers/infiniband/hw/nes/nes_verbs.c
- drivers/infiniband/ulp/ipoib/Kconfig 12 additions, 10 deletionsdrivers/infiniband/ulp/ipoib/Kconfig
- drivers/net/mlx4/alloc.c 1 addition, 0 deletionsdrivers/net/mlx4/alloc.c
- drivers/net/mlx4/catas.c 1 addition, 0 deletionsdrivers/net/mlx4/catas.c
- drivers/net/mlx4/cmd.c 1 addition, 1 deletiondrivers/net/mlx4/cmd.c
- drivers/net/mlx4/cq.c 1 addition, 1 deletiondrivers/net/mlx4/cq.c
- drivers/net/mlx4/eq.c 1 addition, 1 deletiondrivers/net/mlx4/eq.c
Loading
Please register or sign in to comment