Received-SPF: pass (google.com: domain of linux-kernel+bounces-73828-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Wed, 21 Feb 2024 10:32:00 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christian Brauner <brauner@kernel.org>, Andrew Morton
 <akpm@linux-foundation.org>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>, 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 vfs-brauner tree with the mm tree
Message-ID: <20240221103200.165d8cd5@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/J6Y5ZV4BVzCPcQ_+Y9K_ikT";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

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

  init/main.c

between commit:

  4728b74d1992 ("arm64, powerpc, riscv, s390, x86: ptdump: refactor CONFIG_=
DEBUG_WX")

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

  193d98b1d3aa ("pidfd: add pidfs")

from the vfs-brauner 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 init/main.c
index bc3b6b49b3d8,2fbf6a3114d5..000000000000
--- a/init/main.c
+++ b/init/main.c
@@@ -100,7 -99,7 +100,8 @@@
  #include <linux/init_syscalls.h>
  #include <linux/stackdepot.h>
  #include <linux/randomize_kstack.h>
 +#include <linux/ptdump.h>
+ #include <linux/pidfs.h>
  #include <net/net_namespace.h>
 =20
  #include <asm/io.h>

--Sig_/J6Y5ZV4BVzCPcQ_+Y9K_ikT
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXVNnAACgkQAVBC80lX
0GzjSwf+MzgOiyByJd3pqa1+S47TXbC1xCzpd/dD5BM9hYsgs3f6S/oyAJ8y2UV5
Ls6MQtlLKKoCVSVlgn8L4G1/eNjK5CNHVoED+YlpdhQvWmyVowIgtnxuvDWC0KVE
WmGQZvPJ3bQxJ/LyWqJXzbcvhq0TVaKj4LF/oj62OWc4dz5UyZxYfegIp+QB/RMd
Nbt8X+YYyTnpr7t9C+8mK6vSqRBckRwTzSG2v7zN4GhaYt/MftTcpJiSy1+lo/2l
Gd/jdNO/n1mvRKjoeqfXfBCu5KcPCezaPEULdF1+Z+xxb3W7U5gzPcDHU0mVhA8w
xcDQYSvgpyrbXDpkmRtz/Oh8rw9s1A==
=Jr1c
-----END PGP SIGNATURE-----

--Sig_/J6Y5ZV4BVzCPcQ_+Y9K_ikT--