| Message ID | 20211209215149.2661929-1-broonie@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the kvm tree with the perf tree | expand |
diff --cc arch/arm64/kvm/Kconfig index e9761d84f982e,f1f8fc069a970..0000000000000 --- a/arch/arm64/kvm/Kconfig
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. +++ 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.