Re: FAILED: patch "[PATCH] efi/x86: Free EFI memory map only when installing a new one." failed to apply to 6.1-stable tree

[Greg KH <gregkh@linuxfoundation.org>]

On Sat, Jun 29, 2024 at 04:50:50PM +0200, Ard Biesheuvel wrote:
> On Mon, 24 Jun 2024 at 18:41, <gregkh@linuxfoundation.org> wrote:
> >
> >
> > The patch below does not apply to the 6.1-stable tree.
> > If someone wants it applied there, or to any other stable or longterm
> > tree, then please email the backport, including the original git commit
> > id to <stable@vger.kernel.org>.
> >
> > To reproduce the conflict and resubmit, you may use the following commands:
> >
> > git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
> > git checkout FETCH_HEAD
> > git cherry-pick -x 75dde792d6f6c2d0af50278bd374bf0c512fe196
> > # <resolve conflicts, build, test, etc.>
> > git commit -s
> > git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2024062442-bonfire-detonator-1b17@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
> >
> > Possible dependencies:
> >
> > 75dde792d6f6 ("efi/x86: Free EFI memory map only when installing a new one.")
> > d85e3e349407 ("efi: xen: Set EFI_PARAVIRT for Xen dom0 boot on all architectures")
> > fdc6d38d64a2 ("efi: memmap: Move manipulation routines into x86 arch tree")
> >
> 
> Please apply these dependencies (in reverse order) as stable
> prerequisites. I build and boot tested the result, and it works as
> expected.

That worked, thanks!

greg k-h