Merge tag 'efi-urgent' into x86/urgent