David S. Miller 8565d26bcb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

The BPF verifier conflict was some minor contextual issue.

The TUN conflict was less trivial.  Cong Wang fixed a memory leak of
tfile->tx_array in 'net'.  This is an skb_array.  But meanwhile in
net-next tun changed tfile->tx_arry into tfile->tx_ring which is a
ptr_ring.

Signed-off-by: David S. Miller <davem@davemloft.net>

2018-01-19 22:59:33 -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

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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2018-01-19 22:59:33 -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