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)
commitf584dd32edc5d4400d7ceb92111a89f0c1f6651f
treee31ee9615fc9f07e8791fca0e77cd35f2dd1041a
parenta328a259ced0c0fa5aabcd29238779a536335884
parent049331f277fef1c3f2527c2c9afa1d285e9a1247
Merge branch 'x86/cpu' into perf/core, to pick up revert

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>
arch/x86/kernel/cpu/common.c