Received-SPF: pass (google.com: domain of linux-kernel+bounces-134672-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Mon, 8 Apr 2024 09:50:51 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>,
 "H. Peter Anvin" <hpa@zytor.com>, Peter Zijlstra <peterz@infradead.org>,
 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: Re: linux-next: manual merge of the tip tree with the mm tree
Message-ID: <20240408095051.53c1cc0e@canb.auug.org.au>
In-Reply-To: <20240405115111.132053a5@canb.auug.org.au>
References: <20240405115111.132053a5@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Tr+SKGF4bRRZrZa3jP+EKeB";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/Tr+SKGF4bRRZrZa3jP+EKeB
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Fri, 5 Apr 2024 11:51:11 +1100 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>=20
>   arch/x86/mm/numa_32.c
>=20
> between commit:
>=20
>   d82a37ff6b88 ("fixup! fix missing vmalloc.h includes")
>=20
> from the mm-unstable branch of the mm tree and commit:
>=20
>   9852b1dc6a14 ("x86/numa/32: Include missing <asm/pgtable_areas.h>")
>=20
> from the tip tree.
>=20
> 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

This is now a conflict between commit

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

in Linus' tree and commit

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

from the mm-unstable branch of the mm tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/Tr+SKGF4bRRZrZa3jP+EKeB
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYTMVsACgkQAVBC80lX
0Gwlnwf/VsoaKMnW6cDikYJg7ReN0oTWe5Eqx7Afu+S//zg8M0a/i+deliAzIXuA
MfInSSmJwDT/5Z5C27EE2nzo2gTJFJUIOXVsX9sAHRaQL5UV/eLJvXqIvwjwxvfW
cppOdzM3mwR0RBSd4Xityp9WBXEOpFiia1fpxKLQjqz0LeeUu/rsVW8W2D0V+jo0
loNDji2QoH8CjNht1nPrW3MtDfKmH2uB7Wb5c4SNYR/xuW81BZ+PBGnkST0AeYZB
ShE7PzhlMe8pU1pXR+uhZ9kGxAxVVdyaZMNIEhGOc7Q4WIncNUG6sA9I6MrNXwWR
QXVAXCJmpk0DsS3ajvx7vwQ3hROBtA==
=HwbZ
-----END PGP SIGNATURE-----

--Sig_/Tr+SKGF4bRRZrZa3jP+EKeB--