Received-SPF: pass (google.com: domain of linux-kernel+bounces-124180-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Precedence: bulk
MIME-Version: 1.0
References: <20240327120643.2824712-1-sashal@kernel.org> <CAMj1kXH8n4-8VHSVygUyEc4Zne-4gE0uijAkDe-Ufu6hUnFU+g@mail.gmail.com>
In-Reply-To: <CAMj1kXH8n4-8VHSVygUyEc4Zne-4gE0uijAkDe-Ufu6hUnFU+g@mail.gmail.com>
From: Ard Biesheuvel <ardb@kernel.org>
Date: Fri, 29 Mar 2024 08:13:36 +0200
Message-ID: <CAMj1kXG5bywFpNpMRTXsnaQ6gr4aOBTO7PZ9Op-JV37JT9StKw@mail.gmail.com>
Subject: Re: FAILED: Patch "x86/efistub: Call mixed mode boot services on the
 firmware's stack" failed to apply to 6.8-stable tree
To: Sasha Levin <sashal@kernel.org>
Cc: stable@vger.kernel.org, stable@kernel.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"

On Wed, 27 Mar 2024 at 15:46, Ard Biesheuvel <ardb@kernel.org> wrote:
>
> On Wed, 27 Mar 2024 at 14:06, Sasha Levin <sashal@kernel.org> wrote:
> >
> > The patch below does not apply to the 6.8-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>.
> >
>
> This applies fine on top of 6.8.2, 6.7.11 and 6.6.23.
>
> On 6.1.83, it gave me a warning
>
>   Auto-merging arch/x86/boot/compressed/efi_mixed.S
>
> but the change still applied without problems.
>
> Not sure what is going on here .....
>

Ping?