Merge branch 'efi/next' into efi/urgent