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

..

boards

clk: Allow the common clk framework to be selectable

2020-05-05 12:34:11 -07:00

boot

sh: remove sh5 support

2020-06-01 14:48:52 -04:00

cchips

treewide: replace '---help---' in Kconfig files with 'help'

2020-06-14 01:57:21 +09:00

configs

sh: configs: Cleanup old Kconfig IO scheduler options

2020-06-01 14:48:48 -04:00

drivers

sh: remove sh5 support

2020-06-01 14:48:52 -04:00

include

Merge branch 'linus' into locking/core, to resolve conflict

2020-07-31 12:16:09 +02:00

kernel

sh: Fix validation of system call number

2020-07-27 16:12:49 -04:00

lib

sh: add missing EXPORT_SYMBOL() for __delay

2020-06-01 14:48:51 -04:00

math-emu

Merge branch 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

2019-07-08 21:48:15 -07:00

mm

treewide: replace '---help---' in Kconfig files with 'help'

2020-06-14 01:57:21 +09:00

oprofile

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500

2019-06-19 17:09:55 +02:00

tools

kbuild: remove redundant target cleaning on failure

2019-01-06 09:46:51 +09:00

Kconfig

treewide: replace '---help---' in Kconfig files with 'help'

2020-06-14 01:57:21 +09:00

Kconfig.cpu

sh: remove sh5 support

2020-06-01 14:48:52 -04:00

Kconfig.debug

sh: remove sh5 support

2020-06-01 14:48:52 -04:00

Makefile

sh: remove sh5 support

2020-06-01 14:48:52 -04:00