Skip to content
Commit f5e27a20 authored by Doug Ledford's avatar Doug Ledford
Browse files

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:

9fd4350b ("IB/rxe: avoid double kfree_skb") directly conflicts with
2e473507

 ("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: default avatarDoug Ledford <dledford@redhat.com>
parents 064e5262 9aa16921
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment