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	parisc: use -fno-strict-aliasing for decompressor	2020-05-10 22:46:19 +02:00
configs	parisc: Regenerate parisc defconfigs	2020-02-03 22:38:12 +01:00
include	Merge branch 'linus' into locking/core, to resolve conflict	2020-07-31 12:16:09 +02:00
kernel	maccess: make get_kernel_nofault() check for minimal type compatibility	2020-06-18 12:10:37 -07:00
lib	parisc: add support for cmpxchg on u8 pointers	2020-07-21 08:11:12 +02:00
math-emu	Makefile: Convert -Wimplicit-fallthrough=3 to just -Wimplicit-fallthrough for clang	2019-08-10 12:45:37 -07:00
mm	mmap locking API: convert mmap_sem API comments	2020-06-09 09:39:14 -07:00
oprofile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
defpalo.conf	parisc: switch to gzip-compressed vmlinuz kernel	2013-07-09 22:09:20 +02:00
install.sh	parisc: make "make install" not depend on vmlinux	2013-11-07 22:28:06 +01:00
Kconfig	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
Kconfig.debug	Kconfig: consolidate the "Kernel hacking" menu	2018-08-02 08:06:48 +09:00
Makefile	kbuild: fix broken builds because of GZIP,BZIP2,LZOP variables	2020-06-11 20:14:41 +09:00
nm