David S. Miller 13dfb3fa49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Just minor overlapping changes in the conflicts here. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-08-06 18:44:57 -07:00
..
fcoe_ctlr.c	scsi: fcoe: pass in fcoe_rport structure instead of fc_rport_priv	2019-07-29 21:13:27 -04:00
fcoe_sysfs.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 335	2019-06-05 17:37:06 +02:00
fcoe_transport.c	net: Use skb_frag_off accessors	2019-07-30 14:21:32 -07:00
fcoe.c	net: Use skb_frag_off accessors	2019-07-30 14:21:32 -07:00
fcoe.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 335	2019-06-05 17:37:06 +02:00
libfcoe.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Makefile	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00