Merge branch 'x86/cpu' into perf/core, to pick up revert
authorIngo Molnar <mingo@kernel.org>
Thu, 4 Jul 2019 08:36:20 +0000 (10:36 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 4 Jul 2019 08:36:20 +0000 (10:36 +0200)
perf/core has an earlier version of the x86/cpu tree merged, to avoid
conflicts, and due to this we want to pick up this ABI impacting
revert as well:

  049331f277fe: ("x86/fsgsbase: Revert FSGSBASE support")

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
arch/x86/kernel/cpu/common.c

Simple merge