Merge branch 'x86/core' into perf/core, to resolve conflicts and to pick up completed...

Conflicts:
	tools/perf/check-headers.sh

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

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc tools/perf/check-headers.sh
index 48290a0c917cf714a89f27835e59b80ce88b746d,499235a411628db34a6b24854c409c86ab355a34..a1dc1672435201513b3e3ad3a7bbbab59b4a32ec
--- 1/tools/perf/check-headers.sh
--- 2/tools/perf/check-headers.sh
+++ b/tools/perf/check-headers.sh
@@@ -28,8 -28,7 +28,9 @@@ arch/x86/include/asm/disabled-features.
  arch/x86/include/asm/required-features.h
  arch/x86/include/asm/cpufeatures.h
  arch/x86/include/asm/inat_types.h
+ arch/x86/include/asm/emulate_prefix.h
 +arch/x86/include/asm/irq_vectors.h
 +arch/x86/include/asm/msr-index.h
  arch/x86/include/uapi/asm/prctl.h
  arch/x86/lib/x86-opcode-map.txt
  arch/x86/tools/gen-insn-attr-x86.awk