From: broonie@kernel•org
To: Paolo Bonzini <pbonzini@redhat•com>, KVM <kvm@vger•kernel.org>
Cc: Mark Brown <broonie@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
"Maciej S . Szmigiero" <maciej.szmigiero@oracle•com>,
Peter Zijlstra <peterz@infradead•org>,
Sean Christopherson <seanjc@google•com>
Subject: linux-next: manual merge of the kvm tree with the perf tree
Date: Thu, 9 Dec 2021 21:51:49 +0000 [thread overview]
Message-ID: <20211209215149.2661929-1-broonie@kernel.org> (raw)
From: Mark Brown <broonie@kernel•org>
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/arm64/kvm/Kconfig
between commit:
2aef6f306b39b ("perf: Force architectures to opt-in to guest callbacks")
from the perf tree and commit:
ed922739c9199 ("KVM: Use interval tree to do fast hva lookup in memslots")
from the kvm 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.
diff --cc arch/arm64/kvm/Kconfig
index e9761d84f982e,f1f8fc069a970..0000000000000
--- a/arch/arm64/kvm/Kconfig
+++ b/arch/arm64/kvm/Kconfig
@@@ -39,7 -39,7 +39,8 @@@ menuconfig KV
select HAVE_KVM_IRQ_BYPASS
select HAVE_KVM_VCPU_RUN_PID_CHANGE
select SCHED_INFO
+ select GUEST_PERF_EVENTS if PERF_EVENTS
+ select INTERVAL_TREE
help
Support hosting virtualized guest machines.
reply other threads:[~2021-12-09 21:52 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20211209215149.2661929-1-broonie@kernel.org \
--to=broonie@kernel$(echo .)org \
--cc=kvm@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maciej.szmigiero@oracle$(echo .)com \
--cc=pbonzini@redhat$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=seanjc@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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