Merge branch 'x86/urgent'