Received-SPF: pass (google.com: domain of linux-kernel+bounces-210762-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Wed, 12 Jun 2024 11:27:46 +1000
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>,
 Andrew Morton <akpm@linux-foundation.org>
Cc: "Borislav Petkov (AMD)" <bp@alien8.de>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Tony Luck <tony.luck@intel.com>, Yury Norov
 <yury.norov@gmail.com>
Subject: linux-next: manual merge of the tip tree with the mm tree
Message-ID: <20240612112746.3130d68b@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/YOSTDTDlMN0uXKzhX+3sSTZ";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/YOSTDTDlMN0uXKzhX+3sSTZ
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:

  include/linux/cacheinfo.h

between commit:

  f6a9651bfd74 ("cpumask: make core headers including cpumask_types.h where=
 possible")

from the mm-nonmm-unstable branch of the mm tree and commit:

  685cb1674060 ("cacheinfo: Add function to get cacheinfo for a given CPU a=
nd cache level")

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 include/linux/cacheinfo.h
index 286db104e054,3dde175f4108..000000000000
--- a/include/linux/cacheinfo.h
+++ b/include/linux/cacheinfo.h
@@@ -3,7 -3,8 +3,8 @@@
  #define _LINUX_CACHEINFO_H
 =20
  #include <linux/bitops.h>
+ #include <linux/cpuhplock.h>
 -#include <linux/cpumask.h>
 +#include <linux/cpumask_types.h>
  #include <linux/smp.h>
 =20
  struct device_node;

--Sig_/YOSTDTDlMN0uXKzhX+3sSTZ
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZo+ZIACgkQAVBC80lX
0GxisQf+OmG6pg1a7Pj2fCoxVz3x2kbRExO5WJss2J8RJZWmyUs+q7NOkLb8QhA/
nakSdWLgocoJ5AwgCCZjidYIPzQtqTM54R9hQsymo5jWk51xYCLhmWTe8rEElK7P
pkH99Shjf3D4ErISee+9pQCfMp1D3vC75eb70fZIYqucaPbqJtkQ0JwjGAFflv6Q
wFn+VQAwlfiXkIiS2gUYOKTSN7KqAJZr95+VzsWCvjMP/vUUIire6WY6p+8RMu8F
PgnsHYWP79PONHrOyBcnnDau5IgFMqUgLFSerx2gxEXUFdFBKG1MEvEB5L3KiryU
L8sPSAHgeGHDJyf0KKtifnrJ2Vb1zw==
=iA/m
-----END PGP SIGNATURE-----

--Sig_/YOSTDTDlMN0uXKzhX+3sSTZ--