Received-SPF: pass (google.com: domain of linux-kernel+bounces-132298-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Fri, 5 Apr 2024 11:51:11 +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>,
 Andrew Morton <akpm@linux-foundation.org>
Cc: Arnd Bergmann <arnd@arndb.de>, Ingo Molnar <mingo@kernel.org>, Linux
 Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Suren Baghdasaryan <surenb@google.com>
Subject: linux-next: manual merge of the tip tree with the mm tree
Message-ID: <20240405115111.132053a5@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/tVck7d_9CMMHvmaGVlfnBdx";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/tVck7d_9CMMHvmaGVlfnBdx
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/mm/numa_32.c

between commit:

  d82a37ff6b88 ("fixup! fix missing vmalloc.h includes")

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

  9852b1dc6a14 ("x86/numa/32: Include missing <asm/pgtable_areas.h>")

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/mm/numa_32.c
index e25e08ba4531,025fd7ea5d69..000000000000
--- a/arch/x86/mm/numa_32.c
+++ b/arch/x86/mm/numa_32.c
@@@ -24,7 -24,7 +24,8 @@@
 =20
  #include <linux/memblock.h>
  #include <linux/init.h>
 +#include <linux/vmalloc.h>
+ #include <asm/pgtable_areas.h>
 =20
  #include "numa_internal.h"
 =20

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYPSv8ACgkQAVBC80lX
0GyTcQgApTZIaZ8GULdnEH+9OBQSVde20ZMDYE+UstexmVJ90uVTy5mCzoZtjkSH
lY33730MOjVAI0QW//WT9KWg8eZ/uu6z/0HhwZRMgilJGC5XselLGRf7hdF4wf/h
Y+UX3IgZjA13uFAuIqHtjA1zOxVGqEqWnJ24xzCX4ckVDk3vgyQPg1jFvMFyW5Gc
XAoCd/zLlfDPnUR3C3FHV2G1kOuDwwhHDQ4NHqxIUxOGaRF6o0IwLvalEkmhFiRq
nbc2xWCpcZLehGZN7Tj2fWG3BLUZgm2ucP2OGeJM3PF3sjrsHF+VzlYkL5Or34Qa
y0G3n9RYJYtCErIdjFxyeMF0FU2hXQ==
=1zT6
-----END PGP SIGNATURE-----

--Sig_/tVck7d_9CMMHvmaGVlfnBdx--