diff mbox series

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

Message ID 20240221103200.165d8cd5@canb.auug.org.au
State New
Headers
Series linux-next: manual merge of the vfs-brauner tree with the mm tree |

Commit Message

Stephen Rothwell Feb. 20, 2024, 11:32 p.m. UTC 
  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.
diff mbox series

Patch

diff --cc init/main.c
index bc3b6b49b3d8,2fbf6a3114d5..000000000000
--- a/init/main.c