David S. Miller 5b79c2af66 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Lots of easy overlapping changes in the confict resolutions here. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-05-26 19:46:15 -04:00
..
core	IB/umem: Use the correct mm during ib_umem_release	2018-05-15 17:09:10 -06:00
hw	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-26 19:46:15 -04:00
sw	nvmet,rxe: defer ip datagram sending to tasklet	2018-05-09 10:39:51 -04:00
ulp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-26 19:46:15 -04:00
Kconfig	IB: make INFINIBAND_ADDR_TRANS configurable	2018-04-27 11:15:44 -04:00
Makefile