From: Borislav Petkov <bp@alien8•de>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Ard Biesheuvel <ardb@kernel•org>,
Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@redhat•com>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the efi tree with the tip tree
Date: Fri, 25 Nov 2022 11:29:39 +0100 [thread overview]
Message-ID: <Y4CZEysC8Ls9qt7R@zn.tnic> (raw)
In-Reply-To: <20221125122216.07eae5c6@canb.auug.org.au>
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@canb•auug.org.au>
> 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@canb•auug.org.au>
> ---
> 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
next prev parent reply other threads:[~2022-11-25 10:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-25 1:22 linux-next: manual merge of the efi tree with the tip tree Stephen Rothwell
2022-11-25 10:29 ` Borislav Petkov [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-06-07 2:08 Stephen Rothwell
2022-04-26 6:16 Stephen Rothwell
2022-04-14 2:54 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y4CZEysC8Ls9qt7R@zn.tnic \
--to=bp@alien8$(echo .)de \
--cc=ardb@kernel$(echo .)org \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@redhat$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox