Merge branch 'for-next-early' into for-next
The early for-next branch was based on v4.14-rc2, while the shared pull
request I got from Mellanox used a v4.14-rc4 base. I'm making the
branch that was the shared Mellanox pull request the new for-next branch
and merging the early for-next branch into it.
Signed-off-by:
Doug Ledford <dledford@redhat.com>
Showing
- MAINTAINERS 1 addition, 0 deletionsMAINTAINERS
- drivers/infiniband/Kconfig 1 addition, 1 deletiondrivers/infiniband/Kconfig
- drivers/infiniband/core/cm.c 13 additions, 14 deletionsdrivers/infiniband/core/cm.c
- drivers/infiniband/core/cma.c 7 additions, 4 deletionsdrivers/infiniband/core/cma.c
- drivers/infiniband/core/iwcm.c 0 additions, 3 deletionsdrivers/infiniband/core/iwcm.c
- drivers/infiniband/core/rw.c 10 additions, 14 deletionsdrivers/infiniband/core/rw.c
- drivers/infiniband/core/user_mad.c 10 additions, 1 deletiondrivers/infiniband/core/user_mad.c
- drivers/infiniband/core/uverbs.h 21 additions, 14 deletionsdrivers/infiniband/core/uverbs.h
- drivers/infiniband/core/uverbs_cmd.c 53 additions, 72 deletionsdrivers/infiniband/core/uverbs_cmd.c
- drivers/infiniband/core/uverbs_ioctl.c 3 additions, 10 deletionsdrivers/infiniband/core/uverbs_ioctl.c
- drivers/infiniband/core/uverbs_ioctl_merge.c 1 addition, 1 deletiondrivers/infiniband/core/uverbs_ioctl_merge.c
- drivers/infiniband/core/uverbs_main.c 10 additions, 12 deletionsdrivers/infiniband/core/uverbs_main.c
- drivers/infiniband/core/uverbs_marshall.c 5 additions, 5 deletionsdrivers/infiniband/core/uverbs_marshall.c
- drivers/infiniband/core/uverbs_std_types.c 2 additions, 1 deletiondrivers/infiniband/core/uverbs_std_types.c
- drivers/infiniband/hw/bnxt_re/ib_verbs.c 5 additions, 7 deletionsdrivers/infiniband/hw/bnxt_re/ib_verbs.c
- drivers/infiniband/hw/bnxt_re/main.c 3 additions, 2 deletionsdrivers/infiniband/hw/bnxt_re/main.c
- drivers/infiniband/hw/bnxt_re/qplib_fp.c 1 addition, 6 deletionsdrivers/infiniband/hw/bnxt_re/qplib_fp.c
- drivers/infiniband/hw/bnxt_re/qplib_rcfw.c 4 additions, 8 deletionsdrivers/infiniband/hw/bnxt_re/qplib_rcfw.c
- drivers/infiniband/hw/bnxt_re/qplib_rcfw.h 3 additions, 3 deletionsdrivers/infiniband/hw/bnxt_re/qplib_rcfw.h
- drivers/infiniband/hw/bnxt_re/qplib_res.h 1 addition, 1 deletiondrivers/infiniband/hw/bnxt_re/qplib_res.h
Loading
Please register or sign in to comment