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

[Paolo Bonzini]

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?

Paolo