Merge remote-tracking branch 'tip/x86/efi-mixed' into efi-for-mingo