]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit38d6ad5baa4334374106659e7f0d5e2273d393e0
treee31ee9615fc9f07e8791fca0e77cd35f2dd1041a
parent62d5fd72d0846a922e570eae1d4c9d66b0af0e51
parentce6ced631ce47e2d8434b52230cc4d2b489a749b
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:

  ce6ced631ce4: ("x86/fsgsbase: Revert FSGSBASE support")

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