Doug Ledford f5e27a203f 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: 9fd4350ba8 ("IB/rxe: avoid double kfree_skb") directly conflicts with 2e47350789 ("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>		2018-05-09 15:48:48 -04:00
..
core	Merge branch 'k.o/for-rc' into k.o/wip/dl-for-next	2018-05-09 15:48:48 -04:00
hw	Merge branch 'k.o/for-rc' into k.o/wip/dl-for-next	2018-05-09 15:48:48 -04:00
sw	Merge branch 'k.o/for-rc' into k.o/wip/dl-for-next	2018-05-09 15:48:48 -04:00
ulp	IB/ipoib: fix ipoib_start_xmit()'s return type	2018-04-27 14:07:30 -04:00
Kconfig	IB: make INFINIBAND_ADDR_TRANS configurable	2018-04-27 11:15:44 -04:00
Makefile	IB/rdmavt: Create module framework and handle driver registration	2016-03-10 20:37:04 -05:00