David S. Miller a2d6d7ae59 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

The ungrafting from PRIO bug fixes in net, when merged into net-next,
merge cleanly but create a build failure.  The resolution used here is
from Petr Machata.

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

2020-01-09 12:13:43 -08:00

..

boot

arm64: dts: ls1028a: fix reboot node

2019-12-12 09:59:38 +08:00

configs

arm64: defconfig: re-run savedefconfig

2019-12-05 13:20:17 -08:00

crypto

crypto: arch - conditionalize crypto api in arch glue for lib code

2019-11-27 13:08:49 +08:00

include

arm64: Revert support for execute-only user mappings

2020-01-06 10:10:07 -08:00

kernel

arm64: cpu_errata: Add Hisilicon TSV110 to spectre-v2 safe list

2019-12-20 17:57:22 +00:00

kvm

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

2019-12-22 10:26:59 -08:00

lib

arm64: uaccess: Remove uaccess_*_not_uao asm macros

2019-11-20 18:51:54 +00:00

mm

arm64: Revert support for execute-only user mappings

2020-01-06 10:10:07 -08:00

net

arm64: bpf: optimize modulo operation

2019-09-03 15:44:40 +02:00

xen

xen/efi: have a common runtime setup function

2019-10-02 10:31:07 -04:00

Kbuild

arm64: add arch/arm64/Kbuild

2019-08-21 18:47:15 +01:00

Kconfig

bpf, x86, arm64: Enable jit by default when not built as always-on

2019-12-11 16:16:01 -08:00

Kconfig.debug

treewide: Add SPDX license identifier - Makefile/Kconfig

2019-05-21 10:50:46 +02:00

Kconfig.platforms

Merge tag 'imx-soc-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/soc

2019-11-06 07:46:42 -08:00

Makefile

arm64: implement ftrace with regs

2019-11-06 14:17:35 +00:00