On Fri, Nov 25, 2022 at 12:22:16PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the efi tree got a conflict in:
>
> arch/x86/boot/compressed/efi_thunk_64.S
>
> between commit:
>
> cb8bda8ad443 ("x86/boot/compressed: Rename efi_thunk_64.S to efi-mixed.S")
>
> from the tip tree and commit:
>
> a61962d8e7d3 ("efi: libstub: Permit mixed mode return types other than efi_status_t")
>
> from the efi tree.
>
> I fixed it up (I remofved the file and applied the following patch) and
> can carry the fix as necessary. This is now fixed as far as linux-next
> is concerned, but any non trivial conflicts should be mentioned to your
> upstream maintainer when your tree is submitted for merging. You may
> also want to consider cooperating with the maintainer of the conflicting
> tree to minimise any particularly complex conflicts.
>
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Fri, 25 Nov 2022 12:15:58 +1100
> Subject: [PATCH] fix up for "efi: libstub: Permit mixed mode return types other than efi_status_t"
>
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> ---
> arch/x86/boot/compressed/efi_mixed.S | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/arch/x86/boot/compressed/efi_mixed.S b/arch/x86/boot/compressed/efi_mixed.S
> index 8b02e507d3bb..4ca70bf93dc0 100644
> --- a/arch/x86/boot/compressed/efi_mixed.S
> +++ b/arch/x86/boot/compressed/efi_mixed.S
> @@ -132,12 +132,6 @@ SYM_FUNC_START(__efi64_thunk)
> movl %ebx, %fs
> movl %ebx, %gs
>
> - /*
> - * Convert 32-bit status code into 64-bit.
> - */
> - roll $1, %eax
> - rorq $1, %rax
> -
> pop %rbx
> pop %rbp
> RET
> --
LGTM, thanks Stephen.
We'll keep that in mind when sending the pull requests later.
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
