Re: linux-next: manual merge of the kvm-arm tree with the kvm tree

[Marc Zyngier]

On Mon, 19 Oct 2026 17:56:39 +0100,
Paolo Bonzini <pbonzini@xxxxxxxxxx> wrote:
> 
> Il lun 19 ott 2026, 18:46 Mark Brown <broonie@xxxxxxxxxx> ha scritto:
> >
> > Hi all,
> >
> > Today's linux-next merge of the kvm-arm tree got a conflict in:
> >
> >   arch/arm64/kvm/mmu.c
> >
> > between commit:
> >
> >   dd0bc00e3e920 ("Merge branch kvm-arm64/cca-7.4 into kvmarm-master/next")
> >
> > from the kvm tree and commits:
> >
> >   b44a8c32f0116 ("KVM: arm64: Abstract out memory abort handling")
> >   892c8a0bcc8e3 ("Merge branch kvm-arm64/cca-7.4 into kvmarm-master/next")
> >
> > from the kvm-arm tree.
> 
> Hi Marc/Oliver, is this something that will be fixed on your side by rebasing?

Yes. As soon as you have a stable tag on your side, I'll remerge the
fix branches on that, and all will be forgiven.

Thanks,

	M.

-- 
Without deviation from the norm, progress is not possible.