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
..
alpha	locking/atomic: Move ATOMIC_INIT into linux/types.h	2020-07-29 16:14:18 +02:00
arc	Merge branch 'locking/header'	2020-07-29 16:14:21 +02:00
arm	Merge branch 'linus' into locking/core, to resolve conflict	2020-07-31 12:16:09 +02:00
arm64	Merge branch 'linus' into locking/core, to resolve conflict	2020-07-31 12:16:09 +02:00
c6x	This time around we have 4 lines of diff in the core framework, removing a	2020-06-10 11:42:19 -07:00
csky	maccess: rename probe_kernel_{read,write} to copy_{from,to}_kernel_nofault	2020-06-17 10:57:41 -07:00
h8300	locking/atomic: Move ATOMIC_INIT into linux/types.h	2020-07-29 16:14:18 +02:00
hexagon	locking/atomic: Move ATOMIC_INIT into linux/types.h	2020-07-29 16:14:18 +02:00
ia64	Merge branch 'locking/header'	2020-07-29 16:14:21 +02:00
m68k	Merge branch 'locking/header'	2020-07-29 16:14:21 +02:00
microblaze	mmap locking API: convert mmap_sem comments	2020-06-09 09:39:14 -07:00
mips	Merge branch 'locking/header'	2020-07-29 16:14:21 +02:00
nds32	maccess: rename probe_kernel_{read,write} to copy_{from,to}_kernel_nofault	2020-06-17 10:57:41 -07:00
nios2	nios2 update for v5.8-rc1	2020-06-12 11:55:11 -07:00
openrisc	openrisc: fix boot oops when DEBUG_VM is enabled	2020-06-26 00:27:36 -07:00
parisc	Merge branch 'linus' into locking/core, to resolve conflict	2020-07-31 12:16:09 +02:00
powerpc	Merge branch 'locking/header'	2020-07-29 16:14:21 +02:00
riscv	Merge branch 'linus' into locking/core, to resolve conflict	2020-07-31 12:16:09 +02:00
s390	Merge branch 'linus' into locking/core, to resolve conflict	2020-07-31 12:16:09 +02:00
sh	Merge branch 'linus' into locking/core, to resolve conflict	2020-07-31 12:16:09 +02:00
sparc	Merge branch 'locking/header'	2020-07-29 16:14:21 +02:00
um	maccess: rename probe_kernel_{read,write} to copy_{from,to}_kernel_nofault	2020-06-17 10:57:41 -07:00
unicore32	This time around we have 4 lines of diff in the core framework, removing a	2020-06-10 11:42:19 -07:00
x86	Merge branch 'linus' into locking/core, to resolve conflict	2020-07-31 12:16:09 +02:00
xtensa	Merge branch 'linus' into locking/core, to resolve conflict	2020-07-31 12:16:09 +02:00
.gitignore
Kconfig	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00