Merge branch 'x86/urgent' into core/efi, to pick up a pending EFI fix