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
..
appldata	s390 updates for the 5.8 merge window	2020-06-08 12:05:31 -07:00
boot	mm: reorder includes after introduction of linux/pgtable.h	2020-06-09 09:39:13 -07:00
configs	s390: update defconfigs	2020-07-01 20:02:38 +02:00
crypto	s390/crypto: use scnprintf() instead of snprintf()	2020-06-16 13:44:05 +02:00
hypfs	fs_parse: fold fs_parameter_desc/fs_parameter_spec	2020-02-07 14:48:37 -05:00
include	Merge branch 'locking/header'	2020-07-29 16:14:21 +02:00
kernel	s390/cpum_cf,perf: change DFLT_CCERROR counter name	2020-07-21 13:53:56 +02:00
kvm	Kbuild updates for v5.8 (2nd)	2020-06-13 13:29:16 -07:00
lib	s390 updates for the 5.8 merge window	2020-06-08 12:05:31 -07:00
mm	- Update email addresses in MAINTAINERS file and add .mailmap entries	2020-07-10 08:39:33 -07:00
net	s390/bpf: Use bcr 0,%0 as tail call nop filler	2020-06-02 21:04:04 +02:00
numa	s390/mm: remove fake numa support	2020-02-27 16:02:21 +01:00
oprofile	s390/unwind: introduce stack unwind API	2019-05-02 13:54:11 +02:00
pci	s390/pci: fix enabling a reserved PCI function	2020-06-29 16:26:28 +02:00
purgatory	.gitignore: add SPDX License Identifier	2020-03-25 11:50:48 +01:00
scripts	s390/build: use size command to perform empty .bss check	2019-08-08 14:36:53 +02:00
tools	.gitignore: add SPDX License Identifier	2020-03-25 11:50:48 +01:00
Kbuild	s390/kexec_file: Add purgatory	2018-04-16 09:10:22 +02:00
Kconfig	s390/numa: let NODES_SHIFT depend on NEED_MULTIPLE_NODES	2020-06-16 13:44:05 +02:00
Kconfig.debug	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
Makefile	s390: make 'install' not depend on vmlinux	2020-02-17 18:01:58 +01:00