From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christian Brauner <brauner@kernel•org>, Jan Kara <jack@suse•cz>
Cc: Jeff Layton <jlayton@kernel•org>,
Josef Bacik <josef@toxicpanda•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the vfs-brauner tree with the ext3 tree
Date: Fri, 6 Sep 2024 08:53:49 +1000 [thread overview]
Message-ID: <20240906085349.4531d454@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1575 bytes --]
Hi all,
Today's linux-next merge of the vfs-brauner tree got a conflict in:
include/linux/fs.h
between commit:
77b863655092 ("fs: add a flag to indicate the fs supports pre-content events")
from the ext3 tree and commit:
a037d5e7f81b ("fs: add infrastructure for multigrain timestamps")
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.
--
Cheers,
Stephen Rothwell
diff --cc include/linux/fs.h
index 6f3a50c0a958,a6b2addd80db..000000000000
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -2501,7 -2542,7 +2543,8 @@@ struct file_system_type
#define FS_USERNS_MOUNT 8 /* Can be mounted by userns root */
#define FS_DISALLOW_NOTIFY_PERM 16 /* Disable fanotify permission events */
#define FS_ALLOW_IDMAP 32 /* FS has been updated to handle vfs idmappings. */
-#define FS_MGTIME 64 /* FS uses multigrain timestamps */
+#define FS_ALLOW_HSM 64 /* FS can handle fanotify pre-content events. */
++#define FS_MGTIME 128 /* FS uses multigrain timestamps */
#define FS_RENAME_DOES_D_MOVE 32768 /* FS will handle d_move() during rename() internally. */
int (*init_fs_context)(struct fs_context *);
const struct fs_parameter_spec *parameters;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-09-05 22:53 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-05 22:53 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-09-22 8:37 linux-next: manual merge of the vfs-brauner tree with the ext3 tree Mark Brown
2024-09-05 22:50 Stephen Rothwell
2024-09-05 22:32 Stephen Rothwell
2024-09-05 22:27 Stephen Rothwell
2023-10-26 23:43 Stephen Rothwell
2023-10-31 0:26 ` 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=20240906085349.4531d454@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=brauner@kernel$(echo .)org \
--cc=jack@suse$(echo .)cz \
--cc=jlayton@kernel$(echo .)org \
--cc=josef@toxicpanda$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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