From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christian Brauner <brauner@kernel•org>,
Miklos Szeredi <miklos@szeredi•hu>
Cc: Jeff Layton <jlayton@kernel•org>,
Jiachen Zhang <zhangjiachen.jaycee@bytedance•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Miklos Szeredi <mszeredi@redhat•com>
Subject: linux-next: manual merge of the vfs-brauner tree with the fuse tree
Date: Thu, 7 Mar 2024 10:23:32 +1100 [thread overview]
Message-ID: <20240307102332.6793fbc7@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2024-03-06 23:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-06 23:23 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-09-01 23:34 linux-next: manual merge of the vfs-brauner tree with the fuse tree Stephen Rothwell
2025-02-27 23:46 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240307102332.6793fbc7@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=brauner@kernel$(echo .)org \
--cc=jlayton@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=miklos@szeredi$(echo .)hu \
--cc=mszeredi@redhat$(echo .)com \
--cc=zhangjiachen.jaycee@bytedance$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox