David S. Miller c4c5551df1 Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux ... All conflicts were trivial overlapping changes, so reasonably easy to resolve. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-07-20 21:17:12 -07:00
..
core	RDMA/uverbs: Don't fail in creation of multiple flows	2018-07-03 14:08:00 -06:00
hw	Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux	2018-07-20 21:17:12 -07:00
sw	4.18-rc	2018-06-21 07:22:30 +09:00
ulp	net: allow ndo_select_queue to pass netdev	2018-07-09 13:41:34 -07:00
Kconfig	RDMA/ucm: Mark UCM interface as BROKEN	2018-05-24 09:39:25 -06:00
Makefile	IB/rdmavt: Create module framework and handle driver registration	2016-03-10 20:37:04 -05:00