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)
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>
1  2 
Documentation/admin-guide/kernel-parameters.txt
arch/x86/xen/enlighten_pv.c
arch/x86/xen/mmu_pv.c
drivers/idle/intel_idle.c

Simple merge
Simple merge
Simple merge