Merge branch 'bart-srpt-for-next' into k.o/wip/dl-for-next
authorDoug Ledford <dledford@redhat.com>
Mon, 8 Jan 2018 21:06:20 +0000 (16:06 -0500)
committerDoug Ledford <dledford@redhat.com>
Mon, 8 Jan 2018 21:06:20 +0000 (16:06 -0500)
commitf8457d5832d882d8a74fe41a6ce70313a31b3e0e
treec5d080c599c0f2aa8bd2ce522698242a540e6b88
parentc4b76d8d95600d143f4d75f1bd700eb5d378099f
parent2d67017cc78f1607bac5347ce0c5258734796faf
Merge branch 'bart-srpt-for-next' into k.o/wip/dl-for-next

Merging in 12 patch series from Bart that required changes in the
current for-rc branch in order to apply cleanly.

Signed-off-by: Doug Ledford <dledford@redhat.com>
drivers/infiniband/core/core_priv.h
drivers/infiniband/core/device.c
drivers/infiniband/core/nldev.c
drivers/infiniband/ulp/ipoib/ipoib_main.c