Merge branch 'x86/core' into perf/core, to resolve conflicts and to pick up completed...
authorIngo Molnar <mingo@kernel.org>
Mon, 25 Nov 2019 08:09:27 +0000 (09:09 +0100)
committerIngo Molnar <mingo@kernel.org>
Mon, 25 Nov 2019 08:09:27 +0000 (09:09 +0100)
Conflicts:
tools/perf/check-headers.sh

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
arch/x86/kvm/x86.c
tools/perf/check-headers.sh

Simple merge
@@@ -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