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

[Like Xu]

On 10/1/2022 10:16 am, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kvm tree got a conflict in:
>
>    arch/x86/kvm/pmu.c
>
> between commits:
>
>    b9f5621c9547 ("perf/core: Rework guest callbacks to prepare for static_call support")
>    73cd107b9685 ("KVM: x86: Drop current_vcpu for kvm_running_vcpu + kvm_arch_vcpu variable")
>
> from the tip tree and commit:
>
>    40ccb96d5483 ("KVM: x86/pmu: Add pmc->intr to refactor kvm_perf_overflow{_intr}()")
>
> 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.

The fix looks good to me. Thank you and please move on.