From: Sean Christopherson <seanjc@google.com>
To: Mark Brown <broonie@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Paolo Bonzini <pbonzini@redhat.com>,
Wei Wang <wei.w.wang@intel.com>
Subject: Re: linux-next: manual merge of the kvm-x86 tree with the origin tree
Date: Fri, 21 Jun 2024 16:09:55 -0700 [thread overview]
Message-ID: <ZnYIQ9swzOjU1DuU@google.com> (raw)
In-Reply-To: <ZnW2kD1V0EoViS7i@sirena.org.uk>
On Fri, Jun 21, 2024, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the kvm-x86 tree got a conflict in:
>
> arch/x86/kvm/x86.c
>
> between commit:
>
> f3ced000a2df5 ("KVM: x86: Always sync PIR to IRR prior to scanning I/O APIC routes")
>
> from the origin tree and commit:
>
> aebed32e4985a ("KVM: x86: Introduce kvm_x86_call() to simplify static calls of kvm_x86_ops")
>
> 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 for the heads up! This (and possibily similar conflicts in the future)
is expected. I'll rebase kvm-x86/static_calls next week to resolve the conflict
in kvm-x86/next.
prev parent reply other threads:[~2024-06-21 23:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-21 17:21 linux-next: manual merge of the kvm-x86 tree with the origin tree Mark Brown
2024-06-21 23:09 ` Sean Christopherson [this message]
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=ZnYIQ9swzOjU1DuU@google.com \
--to=seanjc@google.com \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=wei.w.wang@intel.com \
/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;
as well as URLs for NNTP newsgroup(s).