Merge branch 'linus' into x86/urgent, to pick up dependent changes

author Ingo Molnar <mingo@kernel.org>

Thu, 16 May 2019 07:04:48 +0000 (09:04 +0200)

committer Ingo Molnar <mingo@kernel.org>

Thu, 16 May 2019 07:04:48 +0000 (09:04 +0200)
author Ingo Molnar <mingo@kernel.org>
Thu, 16 May 2019 07:04:48 +0000 (09:04 +0200)
committer Ingo Molnar <mingo@kernel.org>
Thu, 16 May 2019 07:04:48 +0000 (09:04 +0200)
diff --cc arch/x86/Kconfig
Simple merge
diff --cc arch/x86/mm/init_64.c
Simple merge
author	Ingo Molnar <mingo@kernel.org>
	Thu, 16 May 2019 07:04:48 +0000 (09:04 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Thu, 16 May 2019 07:04:48 +0000 (09:04 +0200)
		1	2
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_64.c	patch \|	diff1 \|	diff2 \|	blob \| history