David S. Miller 6b0a7f84ea Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflict resolution of af_smc.c from Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-04-17 11:26:25 -07:00
..
core	ipv4: Prepare rtable for IPv6 gateway	2019-04-08 15:22:40 -07:00
hw	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-04-17 11:26:25 -07:00
sw	IB/rdmavt: Fix concurrency panics in QP post_send and modify to error	2019-03-04 15:47:23 -04:00
ulp	net: remove 'fallback' argument from dev->ndo_select_queue()	2019-03-20 11:18:55 -07:00
Kconfig	IB/{core,uverbs}: Move ib_umem_xxx functions from ib_core to ib_uverbs	2019-01-10 17:06:44 -07:00
Makefile	IB/rdmavt: Create module framework and handle driver registration	2016-03-10 20:37:04 -05:00