Merge branch 'k.o/for-rc' into k.o/wip/dl-for-next
authorDoug Ledford <dledford@redhat.com>
Wed, 9 May 2018 19:48:48 +0000 (15:48 -0400)
committerDoug Ledford <dledford@redhat.com>
Wed, 9 May 2018 19:48:48 +0000 (15:48 -0400)
commitf5e27a203f4cd7406bc7d3589d86aa318f68d276
treee04b972f4296780daf4b73e5702fb093041f6a43
parent064e526247070c79aa3063d93384db378649a640
parent9aa169213d1166d30ae357a44abbeae93459339d
Merge branch 'k.o/for-rc' into k.o/wip/dl-for-next

Several items of conflict have arisen between the RDMA stack's for-rc
branch and upcoming for-next work:

9fd4350ba895 ("IB/rxe: avoid double kfree_skb") directly conflicts with
2e47350789eb ("IB/rxe: optimize the function duplicate_request")

Patches already submitted by Intel for the hfi1 driver will fail to
apply cleanly without this merge

Other people on the mailing list have notified that their upcoming
patches also fail to apply cleanly without this merge

Signed-off-by: Doug Ledford <dledford@redhat.com>
drivers/infiniband/core/cache.c
drivers/infiniband/core/cma.c
drivers/infiniband/hw/cxgb4/iw_cxgb4.h
drivers/infiniband/hw/cxgb4/qp.c
drivers/infiniband/hw/mlx5/qp.c
drivers/infiniband/sw/rxe/rxe_req.c
drivers/infiniband/sw/rxe/rxe_resp.c