[PATCH v4 00/61] arm64: Add support for LPA2 at stage1 and WXN

[Catalin Marinas]

Hi Oliver,

On Tue, Oct 24, 2023 at 05:42:52PM +0100, Catalin Marinas wrote:
> On Tue, Oct 24, 2023 at 06:54:24AM +0000, Oliver Upton wrote:
> > On Mon, Oct 23, 2023 at 09:44:41PM +0100, Catalin Marinas wrote:
> > > > > So Marc, Oliver, if you want to avoid this, you could merge the
> > > > > lpa2-stage1 branch into the KVM tree once I freeze it.
> > > > 
> > > > Yeah, that's probably best (though this looks pretty minor). I'll let
> > > > Oliver decide on it, as he's in charge this time around.
> > > 
> > > For some reason git manages to resolve it now without any problem. Not
> > > sure what happened when I tried this last week. Let's see if Stephen
> > > reports any conflicts.
> > 
> > I accidentally dropped Marc's vtcr patch, which accounts for some of the
> > conflicts. Looks like Stephen did hit a conflict after all, I may as
> > well pull the branch once it is stable.
> 
> The arm64 for-next/lpa2-stage1 branch is stable now. I may add stuff on
> top but wouldn't be rebased. I pushed a fix and some minor cleanups on
> top since yesterday together with your (and Marc's) Ack for the kvm
> bits. If you see any conflicts, feel free to merge it into the kvm-arm
> tree.

If you haven't pulled this branch already, just hold a bit as we've seen
some CI reports since last night. Not sure what caused this but Ard's
series was the main change.

-- 
Catalin