Hi Nadav,
On Thu, 22 Apr 2021 04:45:38 +0000 Nadav Amit <namit@xxxxxxxxxx> wrote:
>
> > 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.
It came from another patch that did not cause a conflict but ended up
in the diff output.
--
Cheers,
Stephen Rothwell
