diff mbox series

linux-next: manual merge of the vfs tree with Linus' tree

Message ID 20240102093617.0b3a0907@canb.auug.org.au
State New
Headers
Series linux-next: manual merge of the vfs tree with Linus' tree |

Commit Message

Stephen Rothwell Jan. 1, 2024, 10:36 p.m. UTC 
  Hi all,

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

  fs/tracefs/inode.c

between commit:

  7e8358edf503 ("eventfs: Fix file and directory uid and gid ownership")

from Linus' tree and commit:

  da549bdd15c2 ("dentry: switch the lists of children to hlist")

from the vfs 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 fs/tracefs/inode.c
index 62524b20964e,61ca5fcf10f9..000000000000
--- a/fs/tracefs/inode.c