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
..
boot	Amlogic fixes for v4.15-rc	2017-12-09 20:23:29 -08:00
configs	arm64: defconfig: enable CONFIG_GPIO_UNIPHIER	2017-10-30 14:41:54 +01:00
crypto	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
include	arm64/sve: Report SVE to userspace via CPUID only if supported	2017-12-14 15:14:30 +00:00
kernel	arm64: fpsimd: Fix copying of FP state from signal frame into task struct	2017-12-15 16:12:35 +00:00
kvm	ARM fixes:	2017-12-21 10:44:13 -08:00
lib	arm64 updates for 4.15	2017-11-15 10:56:56 -08:00
mm	arm64: fix CONFIG_DEBUG_WX address reporting	2017-12-14 10:18:23 +00:00
net	bpf: arm64: add JIT support for multi-function programs	2017-12-17 20:34:36 +01:00
xen	xen/privcmd: Add IOCTL_PRIVCMD_DM_OP	2017-02-14 15:13:43 -05:00
Kconfig	arm64: Add software workaround for Falkor erratum 1041	2017-12-12 11:45:19 +00:00
Kconfig.debug	arm64: relocation testing module	2017-04-04 17:03:32 +01:00
Kconfig.platforms	ARM: SoC driver updates for v4.15	2017-11-16 16:05:01 -08:00
Makefile	arm64: ftrace: emit ftrace-mod.o contents through code	2017-12-01 13:04:59 +00:00