Merge branch 'k.o/for-4.13-rc' into k.o/for-next
authorDoug Ledford <dledford@redhat.com>
Fri, 18 Aug 2017 18:12:04 +0000 (14:12 -0400)
committerDoug Ledford <dledford@redhat.com>
Fri, 18 Aug 2017 18:12:04 +0000 (14:12 -0400)
commitb0e32e20e3c63778d8c20a40d8bec8b18baffecb
tree2e0c3311c53889473b94d49132fe5b7cdee71d51
parentd3cf4d9915c4fb60aeef580973aa77420e600746
parent870201f95fcbd19538aef630393fe9d583eff82e
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>
drivers/infiniband/core/addr.c
drivers/infiniband/core/device.c
drivers/infiniband/core/uverbs_cmd.c
drivers/infiniband/core/verbs.c
drivers/infiniband/hw/hns/hns_roce_hw_v1.c
drivers/infiniband/hw/i40iw/i40iw_puda.c
drivers/infiniband/ulp/ipoib/ipoib.h
drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
drivers/infiniband/ulp/ipoib/ipoib_main.c