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
..
Kconfig	net: mvpp2: finally add the PPv2.2 compatible string	2017-03-09 10:12:11 -08:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
mv643xx_eth.c	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
mvmdio.c	net: mvmdio: disable/unprepare clocks in EPROBE_DEFER case	2017-12-07 13:40:23 -05:00
mvneta.c	net: mvneta: eliminate wrong call to handle rx descriptor error	2017-12-20 12:24:12 -05:00
mvneta_bm.c	net: mvneta: Fix lacking spinlock initialization	2016-05-25 12:35:08 -07:00
mvneta_bm.h	net: mvneta: use IS_ENABLED() instead of checking for built-in or module	2016-09-12 20:27:59 -07:00
mvpp2.c	net: mvpp2: adjust the coalescing parameters	2017-12-13 11:16:51 -05:00
pxa168_eth.c	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
skge.c	skge: remove redundunt free_irq under spinlock	2017-12-13 15:47:00 -05:00
skge.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
sky2.c	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
sky2.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00