Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: IPoIB/cm: Drain cq in ipoib_cm_dev_stop() IPoIB/cm: Fix timeout check in ipoib_cm_dev_stop() IB/ehca: Fix number of send WRs reported for new QP IB/mlx4: Initialize send queue entry ownership bits IB/mlx4: Don't allocate RQ doorbell if using SRQ
Showing
- drivers/infiniband/hw/ehca/hcp_if.c 1 addition, 1 deletiondrivers/infiniband/hw/ehca/hcp_if.c
- drivers/infiniband/hw/mlx4/qp.c 37 additions, 22 deletionsdrivers/infiniband/hw/mlx4/qp.c
- drivers/infiniband/ulp/ipoib/ipoib.h 1 addition, 0 deletionsdrivers/infiniband/ulp/ipoib/ipoib.h
- drivers/infiniband/ulp/ipoib/ipoib_cm.c 2 additions, 1 deletiondrivers/infiniband/ulp/ipoib/ipoib_cm.c
- drivers/infiniband/ulp/ipoib/ipoib_ib.c 19 additions, 12 deletionsdrivers/infiniband/ulp/ipoib/ipoib_ib.c
Loading
Please register or sign in to comment