From: Ingo Molnar <mingo@kernel.org>
Date: Mon, 25 Nov 2019 08:09:27 +0000 (+0100)
Subject: Merge branch 'x86/core' into perf/core, to resolve conflicts and to pick up completed... 
X-Git-Tag: v5.5-rc1~152^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=ceb9e77324fa661b1001a0ae66f061b5fcb4e4e6;hp=--cc;p=linux.git

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

Conflicts:
	tools/perf/check-headers.sh

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

ceb9e77324fa661b1001a0ae66f061b5fcb4e4e6
diff --cc tools/perf/check-headers.sh
index 48290a0c917c,499235a41162..a1dc16724352
--- a/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