> On Apr 21, 2021, at 9:30 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Hi all,
>
> Today's linux-next merge of the kvm tree got a conflict in:
>
> arch/x86/kernel/kvm.c
>
> between commit:
>
> 4ce94eabac16 ("x86/mm/tlb: Flush remote and local TLBs concurrently")
>
> from the tip tree and commit:
>
> 2b519b5797d4 ("x86/kvm: Don't bother __pv_cpu_mask when !CONFIG_SMP")
>
> from the kvm tree.
Thank you and sorry for that.
> static void __init kvm_smp_prepare_boot_cpu(void)
> {
> /*
> @@@ -655,15 -668,9 +673,9 @@@ static void __init kvm_guest_init(void
>
> if (kvm_para_has_feature(KVM_FEATURE_STEAL_TIME)) {
> has_steal_clock = 1;
> - pv_ops.time.steal_clock = kvm_steal_clock;
> + static_call_update(pv_steal_clock, kvm_steal_clock);
I do not understand how this line ended in the merge fix though.
Not that it is correct or wrong, but it is not part of either of
these 2 patches AFAIK.
