Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 15 Mar 2021 14:35:05 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Wei Liu <wei.liu@kernel.org>, Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>
Cc:     Borislav Petkov <bp@suse.de>, Juergen Gross <jgross@suse.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Michael Kelley <mikelley@microsoft.com>
Subject: linux-next: manual merge of the hyperv tree with the tip tree
Message-ID: <20210315143505.35af617b@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/7cJOdVc=GiLzO=KkM/+/Rv8";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/7cJOdVc=GiLzO=KkM/+/Rv8
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the hyperv tree got a conflict in:

  arch/x86/include/asm/mshyperv.h

between commit:

  a0e2bf7cb700 ("x86/paravirt: Switch time pvops functions to use static_ca=
ll()")

from the tip tree and commit:

  eb3e1d370b4c ("clocksource/drivers/hyper-v: Handle sched_clock difference=
s inline")

from the hyperv tree.

I fixed it up (I used the latter version of this file and then applied the
following patch) 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.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 15 Mar 2021 14:31:07 +1100
Subject: [PATCH] fix up for "x86/paravirt: Switch time pvops functions to u=
se
 static_call()"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/clocksource/hyperv_timer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clocksource/hyperv_timer.c b/drivers/clocksource/hyper=
v_timer.c
index ce94f78eb851..1348afc6efbf 100644
--- a/drivers/clocksource/hyperv_timer.c
+++ b/drivers/clocksource/hyperv_timer.c
@@ -490,7 +490,7 @@ static __always_inline void hv_setup_sched_clock(void *=
sched_clock)
 static __always_inline void hv_setup_sched_clock(void *sched_clock)
 {
 	/* We're on x86/x64 *and* using PV ops */
-	pv_ops.time.sched_clock =3D sched_clock;
+	paravirt_set_sched_clock(sched_clock);
 }
 #else /* !CONFIG_GENERIC_SCHED_CLOCK && !CONFIG_PARAVIRT */
 static __always_inline void hv_setup_sched_clock(void *sched_clock) {}
--=20
2.30.0

--=20
Cheers,
Stephen Rothwell

--Sig_/7cJOdVc=GiLzO=KkM/+/Rv8
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmBO1ekACgkQAVBC80lX
0GzSgggAjmZeWswJYv5do/8eqUgGXyRl1H6sMeYS+sH0txaKeh9+OyrmblD3OIzC
VPb++OAzStBjTZWTXk/Hqq7S3cyIqf5IKZwN/lPr05JsNTihLjrfJ/Pjy+75wVPF
iHzdmkUo1j4P9Uo1EDaTLyNq2ppye+L/NyhMg4ZJbGjlaVF7G4kDkyFg3FPJcfqt
bD8BJK4VARyG0U8p3nBjypNoyqbw2LyTaQPPOwoGIgr6s+5tyeUP7USsKLOvrVpS
L9xyXifKHJkJwQKlT0pt+2r6jiY17AWxfXRNlaww5ft2NtNesA7Tkq4wFc9BFqOK
86BfDdZiW0nNgr90k7Fp/KGIm3drSw==
=ypKE
-----END PGP SIGNATURE-----

--Sig_/7cJOdVc=GiLzO=KkM/+/Rv8--