* linux-next: manual merge of the vfs-brauner tree with the fuse tree
@ 2024-03-06 23:23 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2024-03-06 23:23 UTC (permalink / raw)
To: Christian Brauner, Miklos Szeredi
Cc: Jeff Layton, Jiachen Zhang, Linux Kernel Mailing List,
Linux Next Mailing List, Miklos Szeredi
[-- Attachment #1: Type: text/plain, Size: 765 bytes --]
Hi all,
Today's linux-next merge of the vfs-brauner tree got a conflict in:
fs/fuse/file.c
between commit:
8a5fb1864313 ("fuse: remove an unnecessary if statement")
from the fuse tree and commit:
9a7eec48c971 ("fuse: adapt to breakup of struct file_lock")
from the vfs-brauner tree.
I fixed it up (the former removed a statement updated by the latter) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-03-06 23:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-06 23:23 linux-next: manual merge of the vfs-brauner tree with the fuse tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).