From: Mark Brown <broonie@kernel•org>
To: Jens Axboe <axboe@kernel•dk>
Cc: Christian Brauner <brauner@kernel•org>,
John Garry <john.g.garry@oracle•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Prasad Singamsetty <prasad.singamsetty@oracle•com>
Subject: linux-next: manual merge of the block tree with the vfs-brauner tree
Date: Fri, 28 Jun 2024 18:59:56 +0100 [thread overview]
Message-ID: <Zn76HPyBbHbnmGmw@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1392 bytes --]
Hi all,
Today's linux-next merge of the block tree got a conflict in:
include/linux/fs.h
between commit:
1bc6d4452d5c9 ("fs: new helper vfs_empty_path()")
from the vfs-brauner tree and commit:
c34fc6f26ab86 ("fs: Initial atomic write support")
from the block 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 --cc include/linux/fs.h
index dc9f9c4b2572d,db26b4a70c628..0000000000000
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -3626,21 -3627,6 +3640,23 @@@ extern int vfs_fadvise(struct file *fil
extern int generic_fadvise(struct file *file, loff_t offset, loff_t len,
int advice);
+static inline bool vfs_empty_path(int dfd, const char __user *path)
+{
+ char c;
+
+ if (dfd < 0)
+ return false;
+
+ /* We now allow NULL to be used for empty path. */
+ if (!path)
+ return true;
+
+ if (unlikely(get_user(c, path)))
+ return false;
+
+ return !c;
+}
+
+ bool generic_atomic_write_valid(struct iov_iter *iter, loff_t pos);
+
#endif /* _LINUX_FS_H */
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-06-28 18:00 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-28 17:59 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-03-05 13:44 linux-next: manual merge of the block tree with the vfs-brauner tree Mark Brown
2026-03-05 14:54 ` Christoph Hellwig
2026-03-05 15:18 ` Mark Brown
2026-03-05 17:34 ` Keith Busch
2026-03-06 14:22 ` Christoph Hellwig
2026-03-09 13:45 ` Jens Axboe
2026-03-09 13:48 ` Jens Axboe
2026-03-09 13:54 ` Jens Axboe
2026-03-10 6:26 ` Christoph Hellwig
2025-11-17 3:32 Stephen Rothwell
2024-06-28 17:59 Mark Brown
2024-06-29 10:05 ` Christian Brauner
2024-06-29 14:28 ` Jens Axboe
2024-05-08 3:02 Stephen Rothwell
2024-05-08 6:46 ` Christoph Hellwig
2024-04-02 0:21 Stephen Rothwell
2024-02-06 1:48 Stephen Rothwell
2024-02-06 16:37 ` Jens Axboe
2024-02-07 9:27 ` Christian Brauner
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=Zn76HPyBbHbnmGmw@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=axboe@kernel$(echo .)dk \
--cc=brauner@kernel$(echo .)org \
--cc=john.g.garry@oracle$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=prasad.singamsetty@oracle$(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