Received-SPF: pass (google.com: domain of linux-kernel+bounces-3020-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Mon, 18 Dec 2023 17:00:15 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kent Overstreet <kent.overstreet@linux.dev>, Thomas Gleixner
 <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin"
 <hpa@zytor.com>, Peter Zijlstra <peterz@infradead.org>
Cc: "Borislav Petkov (AMD)" <bp@alien8.de>, Juergen Gross <jgross@suse.com>,
 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next
 Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the header_cleanup tree with the tip
 tree
Message-ID: <20231218170015.6018162e@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/nPPOMwgmSfm/LbKeF6n452q";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

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

  arch/x86/include/asm/paravirt_types.h

between commit:

  f7af6977621a ("x86/paravirt: Remove no longer needed paravirt patching co=
de")

from the tip tree and commit:

  9483c05522c6 ("arch/x86: fix missing includes/forward declarations")

from the header_cleanup tree.

I fixed it up (I think, 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/paravirt_types.h
index d8e85d2cf8d5,3cfcd5db083b..000000000000
--- a/arch/x86/include/asm/paravirt_types.h
+++ b/arch/x86/include/asm/paravirt_types.h
@@@ -5,6 -5,17 +5,7 @@@
  #ifdef CONFIG_PARAVIRT
 =20
  #ifndef __ASSEMBLY__
++#include <linux/types.h>
 =20
  #include <asm/desc_defs.h>
  #include <asm/pgtable_types.h>

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmV/3+8ACgkQAVBC80lX
0Gw8MAf/Xa63Bhoc8aqZn00ZlXzZrxSoDI7pz5CU51atXl7kvUKkMqHJ/6iREtwi
RqMMSJJf+B+IliVb7x17ahfrFGGQvUCFvrSuEMmYtwUxMmGMSTAJo3hQK3xSZiU5
QJs2Qx7qdbyGEQt1F89CckNpgyvgy12/LzRuOf9SPum7hCcSDYhaFw5Bts6X0Ub8
xTjN3eHPWtTV40wvuTprAyvV0JWIcc+KhBooEBdurMeHW7Fber/BupOe5CbMCAlm
DXo0w1dHSZfLdRiy5eSUZSNp16IxvxPkEe8V7OqNbYb7IZ04OpqQ/QBPPxKnbXSk
t0Ql9CiY2McCeQNDx29RNfA3PifUlw==
=H5bB
-----END PGP SIGNATURE-----

--Sig_/nPPOMwgmSfm/LbKeF6n452q--