Merge branch 'x86/cpu' into perf/core, to pick up revert