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:   Tue, 26 Oct 2021 17:22:51 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Wei Liu <wei.liu@kernel.org>, Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>
Cc:     Borislav Petkov <bp@suse.de>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Tianyu Lan <Tianyu.Lan@microsoft.com>,
        Tom Lendacky <thomas.lendacky@amd.com>
Subject: linux-next: manual merge of the hyperv tree with the tip tree
Message-ID: <20211026172251.0f655709@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/l7P5XwJqpsfbtmFPXdxUtNv";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/l7P5XwJqpsfbtmFPXdxUtNv
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/mm/pat/set_memory.c

between commit:

  e9d1d2bb75b2 ("treewide: Replace the use of mem_encrypt_active() with cc_=
platform_has()")

from the tip tree and commit:

  cf90c4532b92 ("x86/hyperv: Add new hvcall guest address host visibility s=
upport")

from the hyperv 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.

--=20
Cheers,
Stephen Rothwell

diff --cc arch/x86/mm/pat/set_memory.c
index 527957586f3c,525f682ab150..000000000000
--- a/arch/x86/mm/pat/set_memory.c
+++ b/arch/x86/mm/pat/set_memory.c
@@@ -2024,6 -2025,17 +2026,17 @@@ static int __set_memory_enc_pgtable(uns
  	return ret;
  }
 =20
+ static int __set_memory_enc_dec(unsigned long addr, int numpages, bool en=
c)
+ {
+ 	if (hv_is_isolation_supported())
+ 		return hv_set_mem_host_visibility(addr, numpages, !enc);
+=20
 -	if (mem_encrypt_active())
++	if (cc_platform_has(CC_ATTR_MEM_ENCRYPT))
+ 		return __set_memory_enc_pgtable(addr, numpages, enc);
+=20
+ 	return 0;
+ }
+=20
  int set_memory_encrypted(unsigned long addr, int numpages)
  {
  	return __set_memory_enc_dec(addr, numpages, true);

--Sig_/l7P5XwJqpsfbtmFPXdxUtNv
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmF3nrsACgkQAVBC80lX
0GwHuAf+P9tcZbWKVWXq2vmdhRFyI+E9a5LrbnP7qTWpCZkcxV2lBDf5qTk9LyYZ
/Qzo1AxOcMHelB+eZByBaCz1FAgZO3AIaLRomKtuciAcA4v9HRTCCjzguVnEwIDz
f8D0fULGaDWIRpCCpmoXrAFffC+xYZB0UK15Mopi9vBQuDi7ULJRXq6ZnE0rvXYU
2oyl+v6VXD49PeEgPIX0S/ihqSeIcyWAgJmwzU3j1oyElLW9zfIwBf8h3TpZq2xy
XufPfRszQbqgfbquBKxV3mZ+aTTE9QvDukWtuKO5IiqJ/jhib3+c6HYgaSTLLreF
VIzs4pNT73icEaX/rNE7s0vlNU28Rg==
=0Pb2
-----END PGP SIGNATURE-----

--Sig_/l7P5XwJqpsfbtmFPXdxUtNv--