Merge branch 'x86/topology' into perf/core, to prepare for new patches