From: Sean Christopherson <seanjc@google.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the kvm-x86 tree with the kvm-fixes tree
Date: Wed, 3 Apr 2024 06:30:30 -0700 [thread overview]
Message-ID: <Zg1Z9qs108PoXeMm@google.com> (raw)
In-Reply-To: <20240403115353.59c7b4f4@canb.auug.org.au>
On Wed, Apr 03, 2024, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kvm-x86 tree got a conflict in:
>
> tools/testing/selftests/kvm/include/x86_64/processor.h
>
> between commit:
>
> 0d1756482e66 ("Merge tag 'kvm-x86-pvunhalt-6.9' of https://github.com/kvm-x86/linux into HEAD")
>
> from the kvm-fixes tree and commit:
>
> 964d0c614c7f ("Merge branch 'hyperv'")
>
> from the kvm-x86 tree.
>
> I fixed it up (I used the former version)
Perfect, I'll drop my branch. Thanks!
next prev parent reply other threads:[~2024-04-03 13:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-03 0:53 linux-next: manual merge of the kvm-x86 tree with the kvm-fixes tree Stephen Rothwell
2024-04-03 13:30 ` Sean Christopherson [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-03-12 17:21 Mark Brown
2026-03-12 17:54 ` Paolo Bonzini
2026-03-12 17:58 ` Sean Christopherson
2026-03-12 17:58 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Zg1Z9qs108PoXeMm@google.com \
--to=seanjc@google.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox