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
..
ipoib	IB/ipoib: fix ipoib_start_xmit()'s return type	2018-04-27 14:07:30 -04:00
iser	vfs: do bulk POLL* -> EPOLL* replacement	2018-02-11 14:34:03 -08:00
isert	Linux 4.15	2018-01-30 09:30:00 -07:00
opa_vnic	opa_vnic: Just use skb_get_hash instead of skb_tx_hash	2018-04-29 22:01:32 -04:00
srp	ib_srp: depend on INFINIBAND_ADDR_TRANS	2018-04-27 11:15:44 -04:00
srpt	IB: remove redundant INFINIBAND kconfig dependencies	2018-05-09 08:51:03 -04:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00