Merge commit 'upstream-x86-entry' into WIP.x86/mm

Pull in a minimal set of v4.15 entry code changes, for a base for the MM isolation patches.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc Makefile
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/Kconfig.debug
Simple merge

diff --cc arch/x86/entry/calling.h
Simple merge

diff --cc arch/x86/entry/entry_64.S
Simple merge

diff --cc arch/x86/entry/entry_64_compat.S
Simple merge

diff --cc arch/x86/include/asm/bitops.h
Simple merge

diff --cc arch/x86/include/asm/compat.h
Simple merge

diff --cc arch/x86/include/asm/cpufeature.h
Simple merge

diff --cc arch/x86/include/asm/cpufeatures.h
Simple merge

diff --cc arch/x86/include/asm/module.h
Simple merge

diff --cc arch/x86/include/asm/paravirt.h
Simple merge

diff --cc arch/x86/include/asm/paravirt_types.h
Simple merge

diff --cc arch/x86/include/asm/percpu.h
Simple merge

diff --cc arch/x86/include/asm/processor.h
Simple merge

diff --cc arch/x86/include/asm/ptrace.h
Simple merge

diff --cc arch/x86/include/asm/rmwcc.h
Simple merge

diff --cc arch/x86/include/asm/switch_to.h
Simple merge

diff --cc arch/x86/include/asm/trace/fpu.h
Simple merge

diff --cc arch/x86/include/asm/traps.h
Simple merge

diff --cc arch/x86/include/asm/unwind.h
Simple merge

diff --cc arch/x86/include/uapi/asm/processor-flags.h
Simple merge

diff --cc arch/x86/kernel/Makefile
Simple merge

diff --cc arch/x86/kernel/cpu/Makefile
Simple merge

diff --cc arch/x86/kernel/head_32.S
Simple merge

diff --cc arch/x86/kernel/head_64.S
Simple merge

diff --cc arch/x86/kernel/ldt.c
Simple merge

diff --cc arch/x86/kernel/process.c
Simple merge

diff --cc arch/x86/kernel/smpboot.c
Simple merge

diff --cc arch/x86/kernel/traps.c
Simple merge

diff --cc arch/x86/kernel/vm86_32.c
Simple merge

diff --cc arch/x86/mm/fault.c
Simple merge

diff --cc arch/x86/xen/enlighten_pv.c
Simple merge

diff --cc arch/x86/xen/smp_pv.c
Simple merge

diff --cc arch/x86/xen/xen-asm_64.S
Simple merge

diff --cc arch/x86/xen/xen-head.S
Simple merge

diff --cc include/linux/bitops.h
Simple merge

diff --cc scripts/Makefile.build
Simple merge