Doug Ledford 894b82c427 Merge branch 'timer_setup' into for-next ... Conflicts: drivers/infiniband/hw/cxgb4/cm.c drivers/infiniband/hw/qib/qib_driver.c drivers/infiniband/hw/qib/qib_mad.c There were minor fixups needed in these files. Just minor context diffs due to patches from independent sources touching the same basic area. Signed-off-by: Doug Ledford <dledford@redhat.com>		2017-10-18 13:12:09 -04:00
..
ipoib	Merge branch 'timer_setup' into for-next	2017-10-18 13:12:09 -04:00
iser	Merge branch 'for-next-early' into for-next	2017-10-18 13:07:13 -04:00
isert	RDMA/isert: Suppress gcc 7 fall-through complaints	2017-10-14 20:47:05 -04:00
opa_vnic	IB/opa_vnic: Add routing control information	2017-09-27 11:21:57 -04:00
srp	IB/srp: Make CM timeout dependent on subnet timeout	2017-10-18 10:49:54 -04:00
srpt	IB/srpt: Change default behavior from using SRQ to using RC	2017-10-18 10:49:54 -04:00
Makefile	IB/opa-vnic: Virtual Network Interface Controller (VNIC) netdev	2017-04-20 12:01:38 -04:00