Merge branch 'x86/urgent' into x86/asm, to resolve conflict