Merge branch 'x86/boot' into x86/mm, to pick up interacting changes
authorIngo Molnar <mingo@kernel.org>
Tue, 18 Jul 2017 09:36:53 +0000 (11:36 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 18 Jul 2017 09:36:53 +0000 (11:36 +0200)
commit1ed7d32763857fbdc8e406352404538e41050d22
treef97c5d8f548141bf7cdec0a9d7f22adb61da6efc
parent660da7c9228f685b2ebe664f9fd69aaddcc420b5
parent27aac20574110abfd594175a668dc58b23b2b14a
Merge branch 'x86/boot' into x86/mm, to pick up interacting changes

The SME patches we are about to apply add some E820 logic, so merge in
pending E820 code changes first, to have a single code base.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
Documentation/admin-guide/kernel-parameters.txt
arch/x86/xen/enlighten_pv.c
arch/x86/xen/mmu_pv.c
drivers/idle/intel_idle.c