Merge branch 'x86/asm' into perf/x86, to avoid conflicts with upcoming patches