linux/drivers/infiniband/sw
Doug Ledford d3cf4d9915 Merge branch 'misc' into k.o/for-next
Conflicts:
	drivers/infiniband/core/iwcm.c - The rdma_netlink patches in
	HEAD and the iwarp cm workqueue fix (don't use WQ_MEM_RECLAIM,
	we aren't safe for that context) touched the same code.

Signed-off-by: Doug Ledford <dledford@redhat.com>
2017-08-18 14:10:23 -04:00
..
rdmavt Merge branches '32bit_lid' and 'irq_affinity' into k.o/merge-test 2017-08-10 14:31:29 -04:00
rxe Merge branch 'misc' into k.o/for-next 2017-08-18 14:10:23 -04:00
Makefile Soft RoCE driver 2016-08-04 11:13:12 -04:00