Merge branch 'x86/cache' into perf/core, to pick up fixes