From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A33DC433ED for ; Thu, 22 Apr 2021 04:58:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 15329613E1 for ; Thu, 22 Apr 2021 04:58:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229655AbhDVE66 (ORCPT ); Thu, 22 Apr 2021 00:58:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229608AbhDVE66 (ORCPT ); Thu, 22 Apr 2021 00:58:58 -0400 Received: from gimli.rothwell.id.au (gimli.rothwell.id.au [IPv6:2404:9400:2:0:216:3eff:fee1:997a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E59BFC06174A; Wed, 21 Apr 2021 21:58:19 -0700 (PDT) Received: from authenticated.rothwell.id.au (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.rothwell.id.au (Postfix) with ESMTPSA id 4FQlYC01crzyNW; Thu, 22 Apr 2021 14:58:06 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rothwell.id.au; s=201702; t=1619067495; bh=5Qm9fdL9JM0MCBkB07Q8K+HFThxx2f+WkF7TA94mSyU=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=RuQr3ZIc3vMel+d1Oe+xxE34mh0NlqwIV833pKPuu4joQU/pvUB1hgyduolmtscbt Op8qq0O9MAlx1H7p371Nhis5QzKt/gRf7zAdqWd/LrOuFtbb60RqJDME0E2dnabIQB yyU064eP+ATULrrhLix+XtNxuKp60oAURPpYDNSYVfd2l2IYum55bH7DGR5i7QKR+E vBvCWtPLOHRRqkVaU0uuZeR/mAX7BvHgoCHcsre+BkVzspPvXfSqL4IlHilD+xJOxe HXWMB6PNOJx6/B7+9pIje29lHsRb5h9RioCp5jdlApRH+zbe7JaXg7nVLqemAk1Nnz Pfd3bzRurTNDg== Date: Thu, 22 Apr 2021 14:58:05 +1000 From: Stephen Rothwell To: Nadav Amit Cc: Stephen Rothwell , Paolo Bonzini , KVM , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Ingo Molnar , Linux Kernel Mailing List , Linux Next Mailing List , Wanpeng Li Subject: Re: linux-next: manual merge of the kvm tree with the tip tree Message-ID: <20210422145805.53ca36be@elm.ozlabs.ibm.com> In-Reply-To: <142AD46E-6B41-49F3-90C1-624649A20764@vmware.com> References: <20210422143056.62a3fee4@canb.auug.org.au> <142AD46E-6B41-49F3-90C1-624649A20764@vmware.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org Hi Nadav, On Thu, 22 Apr 2021 04:45:38 +0000 Nadav Amit 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