Received-SPF: pass (google.com: domain of linux-kernel+bounces-125130-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Precedence: bulk
MIME-Version: 1.0
References: <20240327120810.2825990-1-sashal@kernel.org> <CAMj1kXGNneD2E=iGM18DMrAqKySi6JdDF-f-Sd+Vs036-_RL2g@mail.gmail.com>
 <2024032916-statue-skyrocket-af59@gregkh>
In-Reply-To: <2024032916-statue-skyrocket-af59@gregkh>
From: Ard Biesheuvel <ardb@kernel.org>
Date: Fri, 29 Mar 2024 17:25:35 +0200
Message-ID: <CAMj1kXEtH5NdRL2Ya3+h0wJqsLwQudNmfxepsw5x4hcS2K1T-Q@mail.gmail.com>
Subject: Re: FAILED: Patch "x86/sev: Fix position dependent variable
 references in startup code" failed to apply to 6.8-stable tree
To: Greg KH <gregkh@linuxfoundation.org>
Cc: Sasha Levin <sashal@kernel.org>, stable@vger.kernel.org, 
	Kevin Loughlin <kevinloughlin@google.com>, Borislav Petkov <bp@alien8.de>, stable@kernel.org, 
	linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"

On Fri, 29 Mar 2024 at 13:56, Greg KH <gregkh@linuxfoundation.org> wrote:
>
> On Wed, Mar 27, 2024 at 04:39:20PM +0200, Ard Biesheuvel wrote:
> > On Wed, 27 Mar 2024 at 14:08, 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>.
> > >
> >
> > I will send the v6.8 backport separately right away.
> >
> > v6.7 and v6.6 can take this patch unmodified but will need to take
> > 29956748339aa8757a7e2f927a8679dd08f24bb6 as a prerequisite first.
>
> Now done, thanks.
>
> > (v6.8 no longer applies because of the way Linus fixed up a merge
> > conflict in the 6.8 cycle)
>
> I fixed this up by hand, hopefully got it right :)
>

Thanks - I will double check once the patches are sent out.

> > v6.1 and older need separate backports so i will send those out later.
>
> Wonderful, thanks!
>

I sent this out on Wednesday but I don't see them in lore. Please let
me know if I should resend these.

[PATCH -stable-6.1 1/4] x86/coco: Export cc_vendor
[PATCH -stable-6.1 2/4] x86/coco: Get rid of accessor functions
[PATCH -stable-6.1 3/4] x86/Kconfig: Remove
CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT
[PATCH -stable-6.1 4/4] x86/sev: Fix position dependent variable
references in startup code