diff options
| author | Doug Ledford <dledford@redhat.com> | 2018-05-09 15:48:48 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2018-05-09 15:48:48 -0400 |
| commit | f5e27a203f4cd7406bc7d3589d86aa318f68d276 (patch) | |
| tree | e04b972f4296780daf4b73e5702fb093041f6a43 /drivers/infiniband/hw/hfi1/chip.h | |
| parent | 064e526247070c79aa3063d93384db378649a640 (diff) | |
| parent | 9aa169213d1166d30ae357a44abbeae93459339d (diff) | |
| download | linux-f5e27a203f4cd7406bc7d3589d86aa318f68d276.tar.gz linux-f5e27a203f4cd7406bc7d3589d86aa318f68d276.tar.bz2 linux-f5e27a203f4cd7406bc7d3589d86aa318f68d276.zip | |
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>
Diffstat (limited to 'drivers/infiniband/hw/hfi1/chip.h')
0 files changed, 0 insertions, 0 deletions