Merge branch 'k.o/for-4.13-rc' into k.o/for-next

Merging our (hopefully) final -rc pull branch into our for-next branch
because some of our pending patches won't apply cleanly without having
the -rc patches in our tree.

Signed-off-by: Doug Ledford <dledford@redhat.com>

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

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

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

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

diff --cc drivers/infiniband/hw/hns/hns_roce_hw_v1.c
Simple merge

diff --cc drivers/infiniband/hw/i40iw/i40iw_puda.c
Simple merge

diff --cc drivers/infiniband/ulp/ipoib/ipoib.h
Simple merge

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

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