Merge branch 'x86/urgent' into x86/cpu, to pick up dependent fix