Received-SPF: pass (google.com: domain of linux-kernel+bounces-57371-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Thu, 8 Feb 2024 12:30:22 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>,
 "H. Peter Anvin" <hpa@zytor.com>, Peter Zijlstra <peterz@infradead.org>
Cc: Ard Biesheuvel <ardb@kernel.org>, "Borislav Petkov (AMD)"
 <bp@alien8.de>, Kevin Loughlin <kevinloughlin@google.com>, Linux Kernel
 Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Nathan Chancellor <nathan@kernel.org>, Paolo
 Bonzini <pbonzini@redhat.com>
Subject: linux-next: manual merge of the tip tree with Linus' tree
Message-ID: <20240208123022.272f57bd@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/XuVZMLCnqmZxo2P198xFIFs";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/XuVZMLCnqmZxo2P198xFIFs
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  arch/x86/include/asm/coco.h

between commit:

  e45964771007 ("x86/coco: Define cc_vendor without CONFIG_ARCH_HAS_CC_PLAT=
FORM")

from Linus' tree and commit:

  1c811d403afd ("x86/sev: Fix position dependent variable references in sta=
rtup code")

from the tip 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/include/asm/coco.h
index 76c310b19b11,21940ef8d290..000000000000
--- a/arch/x86/include/asm/coco.h
+++ b/arch/x86/include/asm/coco.h
@@@ -10,9 -11,15 +11,15 @@@ enum cc_vendor=20
  	CC_VENDOR_INTEL,
  };
 =20
 -extern enum cc_vendor cc_vendor;
+ extern u64 cc_mask;
+=20
  #ifdef CONFIG_ARCH_HAS_CC_PLATFORM
 +extern enum cc_vendor cc_vendor;
- void cc_set_mask(u64 mask);
+ static inline void cc_set_mask(u64 mask)
+ {
+ 	RIP_REL_REF(cc_mask) =3D mask;
+ }
+=20
  u64 cc_mkenc(u64 val);
  u64 cc_mkdec(u64 val);
  #else

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXELq4ACgkQAVBC80lX
0GwtfQf/RhHu9/gcivmHMxnyXeUhtCcPlPvzLuou7c7cfpbMaGLmn70w0gCN/F14
dB5I//tUDXUnQHti4rrCTOTKrGzcWDxwMH96RWNp4lFWKpyTDmEqvR6eC9pLavTq
gcGAP2qRrqRjIi9/hI3lXP9IGXdybIBWRLDjlxieUubsezjJw8CuBjjfIL1+NRJK
SicGpbresO0AmT/J7UWwo05VBElefM2PL4cTHO+SUWPIwK/X0nZHY7Uy84sXmO5t
szWTO4VmWJz09hpWMWqpyO1u+w79m00/ObdeQiw8+dILJ8NRwFtjhXpxvmOxX/fo
ir5RHaB+lRmUKvD4tugH8LwhHcSF5g==
=9k8H
-----END PGP SIGNATURE-----

--Sig_/XuVZMLCnqmZxo2P198xFIFs--