Merge branch 'locking/nmi' into locking/core, to pick up completed topic branch

author Ingo Molnar <[email protected]>

Mon, 3 Aug 2020 11:00:27 +0000 (13:00 +0200)

committer Ingo Molnar <[email protected]>

Mon, 3 Aug 2020 11:00:27 +0000 (13:00 +0200)
author Ingo Molnar <[email protected]>
Mon, 3 Aug 2020 11:00:27 +0000 (13:00 +0200)
committer Ingo Molnar <[email protected]>
Mon, 3 Aug 2020 11:00:27 +0000 (13:00 +0200)
diff --cc kernel/locking/lockdep.c
Simple merge
diff --cc lib/Kconfig.debug
Simple merge
author	Ingo Molnar <[email protected]>
	Mon, 3 Aug 2020 11:00:27 +0000 (13:00 +0200)
committer	Ingo Molnar <[email protected]>
	Mon, 3 Aug 2020 11:00:27 +0000 (13:00 +0200)
		1	2
kernel/locking/lockdep.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	patch \|	diff1 \|	diff2 \|	blob \| history