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>

diff --cc drivers/infiniband/core/core_priv.h
Simple merge

diff --cc drivers/infiniband/core/device.c
Simple merge

diff --cc drivers/infiniband/core/nldev.c
Simple merge

diff --cc drivers/infiniband/ulp/ipoib/ipoib_main.c
Simple merge