Ingo Molnar 28cff52eae Merge branch 'linus' into locking/core, to resolve conflict ... Conflicts: arch/arm/include/asm/percpu.h As Stephen Rothwell noted, there's a conflict between this commit in locking/core: a21ee6055c ("lockdep: Change hardirq{s_enabled,_context} to per-cpu variables") and this fresh upstream commit: aa54ea903a ("ARM: percpu.h: fix build error") a21ee6055c is a simpler solution to the dependency problem and doesn't further increase header hell - so this conflict resolution effectively reverts aa54ea903a and uses the a21ee6055c solution. Signed-off-by: Ingo Molnar <mingo@kernel.org>		2020-07-31 12:16:09 +02:00
..
boot	ARM: SoC DT fixes for v5.8	2020-07-28 11:44:44 -07:00
configs	arm64: defconfig: Enable CONFIG_PCIE_RCAR_HOST	2020-07-13 10:45:50 +02:00
crypto	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2020-06-01 12:00:10 -07:00
include	Merge branch 'locking/header'	2020-07-29 16:14:21 +02:00
kernel	arm64 fix for -rc7	2020-07-24 14:16:12 -07:00
kvm	KVM: arm64: Stop clobbering x0 for HVC_SOFT_RESTART	2020-07-06 11:47:02 +01:00
lib	Merge branch 'rwonce/rework' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux	2020-06-10 14:46:54 -07:00
mm	arm64: mm: reserve hugetlb CMA after numa_init	2020-06-18 10:39:15 +01:00
net	Merge branch 'for-next/bti' into for-next/core	2020-05-28 18:00:51 +01:00
xen	arm64: xen: Use modern annotations for assembly functions	2020-01-09 16:09:42 +00:00
Kbuild	arm64: add arch/arm64/Kbuild	2019-08-21 18:47:15 +01:00
Kconfig	arm64 fixes for -rc3	2020-06-27 08:47:18 -07:00
Kconfig.debug	arm64: remove TEXT_OFFSET randomization	2020-06-15 13:10:59 +01:00
Kconfig.platforms	This time around we have 4 lines of diff in the core framework, removing a	2020-06-10 11:42:19 -07:00
Makefile	Various EFI fixes:	2020-07-25 13:18:42 -07:00