David S. Miller 5ca114400d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... en_rx_am.c was deleted in 'net-next' but had a bug fixed in it in 'net'. The esp{4,6}_offload.c conflicts were overlapping changes. The 'out' label is removed so we just return ERR_PTR(-EINVAL) directly. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-01-23 13:51:56 -05:00
..
boot	arm64: dts: socfpga: add missing interrupt-parent	2018-01-11 17:55:58 -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	KVM/ARM Fixes for v4.15, Round 3 (v2)	2018-01-17 14:59:27 +01: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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next	2018-01-20 22:03:46 -05: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