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

[Paolo Bonzini]

Il mar 20 ott 2026, 14:27 Mark Brown <broonie@xxxxxxxxxx> ha scritto:
>
> Hi all,
>
> Today's linux-next merge of the kvm-x86 tree got a conflict in:
>
>   tools/testing/selftests/kvm/x86/nested_x2apic_test.c
>
> between commit:
>
>   994489f04ebbb ("Merge tag 'kvm-x86-selftests-7.4' of https://github.com/kvm-x86/linux into HEAD")
>
> from the kvm tree and commit:
>
>   8b0aa41839602 ("Merge branch 'selftests'")
>
> from the kvm-x86 tree.
>
> I fixed it up (see below) and can carry the fix as necessary.

Oops, my (harmless) mistake in solving the conflict. I will add a
fixup patch to kvm/next.

Paolo