Merge branch 'linus' into locking/kcsan, to pick up fixes

author Ingo Molnar <mingo@kernel.org>

Sat, 21 Mar 2020 08:35:44 +0000 (09:35 +0100)

committer Ingo Molnar <mingo@kernel.org>

Sat, 21 Mar 2020 08:35:44 +0000 (09:35 +0100)
author Ingo Molnar <mingo@kernel.org>
Sat, 21 Mar 2020 08:35:44 +0000 (09:35 +0100)
committer Ingo Molnar <mingo@kernel.org>
Sat, 21 Mar 2020 08:35:44 +0000 (09:35 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
diff --cc init/main.c
Simple merge
diff --cc scripts/Makefile.lib
Simple merge
author	Ingo Molnar <mingo@kernel.org>
	Sat, 21 Mar 2020 08:35:44 +0000 (09:35 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Sat, 21 Mar 2020 08:35:44 +0000 (09:35 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
init/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/Makefile.lib	patch \|	diff1 \|	diff2 \|	blob \| history