David S. Miller fba961ab29 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Lots of overlapping changes. Also on the net-next side the XDP state management is handled more in the generic layers so undo the 'net' nfp fix which isn't applicable in net-next. Include a necessary change by Jakub Kicinski, with log message: ==================== cls_bpf no longer takes care of offload tracking. Make sure netdevsim performs necessary checks. This fixes a warning caused by TC trying to remove a filter it has not added. Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com> ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2017-12-22 11:16:31 -05:00
..
appletalk	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-04 09:26:51 +09:00
arcnet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-04 09:26:51 +09:00
bonding	net: bonding: Replace mac address parsing	2017-12-20 12:47:29 -05:00
caif	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
can	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-09 22:09:55 -05:00
cris	drivers/net: cris: Convert timers to use timer_setup()	2017-11-21 15:46:44 -08:00
dsa	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-16 22:11:55 -05:00
ethernet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-22 11:16:31 -05:00
fddi	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
fjes
hamradio	treewide: Remove TIMER_FUNC_TYPE and TIMER_DATA_TYPE casts	2017-11-21 16:35:54 -08:00
hippi	hippi: Fix a Fix a possible sleep-in-atomic bug in rr_close	2017-12-13 14:52:57 -05:00
hyperv	hv_netvsc: empty current transmit aggregation if flow blocked	2017-12-13 15:57:39 -05:00
ieee802154	net: ieee802154: adf7242: Rework IRQ and packet handling	2017-11-29 16:49:41 +01:00
ipvlan	ipvlan: remove excessive packet scrubbing	2017-12-15 11:36:53 -05:00
netdevsim	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-22 11:16:31 -05:00
phy	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-22 11:16:31 -05:00
plip	net: plip: mark expected switch fall-throughs	2017-11-05 22:19:00 +09:00
ppp	ppp: exit_net cleanup checks added	2017-11-14 15:46:17 +09:00
slip	slip: sl_alloc(): remove unused parameter "dev_t line"	2017-12-08 14:41:02 -05:00
team	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-04 09:26:51 +09:00
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-16 22:11:55 -05:00
vmxnet3	vmxnet3: increase default rx ring sizes	2017-11-30 14:06:58 -05:00
wan	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-29 13:10:25 -08:00
wimax	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-22 11:16:31 -05:00
xen-netback	xen-netback: Fix logging message with spurious period after newline	2017-12-06 15:10:32 -05:00
dummy.c	net: dummy: remove fake SR-IOV functionality	2017-12-03 00:27:58 +01:00
eql.c	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
geneve.c	geneve: speedup geneve tunnels dismantle	2017-12-19 10:59:44 -05:00
gtp.c
ifb.c
Kconfig	netdevsim: add software driver for testing offloads	2017-12-03 00:27:57 +01:00
LICENSE.SRC
loopback.c
macsec.c	genetlink: fix genlmsg_nlhdr()	2017-11-16 10:49:00 +09:00
macvlan.c
macvtap.c
Makefile	netdevsim: add software driver for testing offloads	2017-12-03 00:27:57 +01:00
mdio.c
mii.c
netconsole.c
nlmon.c
ntb_netdev.c
rionet.c
sb1000.c
Space.c
sungem_phy.c
tap.c	tap: free skb if flags error	2017-12-02 21:31:03 -05:00
thunderbolt.c	net: thunderbolt: Stop using zero to mean no valid DMA mapping	2017-11-25 23:56:02 +09:00
tun.c	tuntap: fix possible deadlock when fail to register netdev	2017-12-08 10:44:27 -05:00
veth.c	veth: set peer GSO values	2017-12-08 14:22:59 -05:00
virtio_net.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-09 22:09:55 -05:00
vrf.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-04 09:26:51 +09:00
vsockmon.c
vxlan.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-22 11:16:31 -05:00
xen-netfront.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-29 13:10:25 -08:00