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

[Sean Christopherson]

On Tue, Aug 25, 2026, Paolo Bonzini wrote:
> On Tue, Aug 25, 2026 at 3:33 PM Mark Brown <broonie@xxxxxxxxxx> wrote:
> >
> > Hi all,
> >
> > Today's linux-next merge of the kvm-x86 tree got a conflict in:
> >
> >   tools/testing/selftests/kvm/steal_time.c
> >
> > between commit:
> >
> >   15a9a2ba0c546 ("Merge tag 'kvm-x86-selftests2-7.3' of https://github.com/kvm-x86/linux into HEAD")
> >
> > from the kvm tree and commit:
> >
> >   12c2a7f18f579 ("Merge branch 'selftests2'")
> >
> > from the kvm-x86 tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging.  You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.
> 
> Thanks, this is just a small difference in how I fixed the conflict
> between multiple kvm-x86 pull requests. Either version is fine, and
> Sean will force-push to Linus's tree at some point anyway.

I force-pushed using kvm/next, so this should go away.  Thanks!