linux-next: manual merge of the vfs-brauner tree with the mm tree

Stephen Rothwell
2024-02-20T23:32:04Z

[-- Attachment #1: Type: text/plain, Size: 1108 bytes --]

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.

--
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>

#include <asm/io.h>