From: Mark Brown <broonie@kernel.org>
To: Christian Brauner <brauner@kernel.org>
Cc: Jori Koolstra <jkoolstra@xs4all.nl>,
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 vfs-brauner-fixes tree
Date: Fri, 20 Nov 2026 14:38:47 +0000 [thread overview]
Message-ID: <awBbd8nN6VxxArGV@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 2405 bytes --]
Hi all,
Today's linux-next merge of the vfs-brauner tree got a conflict in:
include/linux/fs/super_types.h
between commit:
1e026a4556f68 ("fs: reintroduce SB_I_MULTIROOT")
from the vfs-brauner-fixes tree and commits:
30f726feea9bd ("vfs: add O_CREAT|O_DIRECTORY to open*(2)")
bfd7be31a5a75 ("fs: add SB_I_PSEUDO")
1e05d7077d1ea ("fs: add a generic emergency read-only state")
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.
diff --cc include/linux/fs/super_types.h
index b09e8b2087252,4454e3574b2cc..0000000000000
--- a/include/linux/fs/super_types.h
+++ b/include/linux/fs/super_types.h
@@@ -359,6 -362,23 +362,24 @@@ struct super_block
#define SB_I_NOIDMAP 0x00002000 /* No idmapped mounts on this superblock */
#define SB_I_ALLOW_HSM 0x00004000 /* Allow HSM events on this superblock */
#define SB_I_NO_DATA_INTEGRITY 0x00008000 /* fs cannot guarantee data persistence on sync */
-#define SB_I_NO_ATOMIC_MKDIR 0x00010000 /* no O_CREAT|O_DIRECTORY on this fs */
-#define SB_I_PSEUDO 0x00020000 /* regular files are kernel interfaces, not storage */
+#define SB_I_MULTIROOT 0x00010000 /* Multiple roots to the dentry tree */
++#define SB_I_NO_ATOMIC_MKDIR 0x00020000 /* no O_CREAT|O_DIRECTORY on this fs */
++#define SB_I_PSEUDO 0x00040000 /* regular files are kernel interfaces, not storage */
+
+ /*
+ * sb->s_state bit numbers. Set with set_bit() from any context without
+ * s_umount and never cleared, so they can be tested without any ordering
+ * against the setter. Unlike SB_RDONLY which only changes under s_umount in
+ * reconfigure_super().
+ */
+ enum sb_state_bits {
+ /*
+ * An error made the filesystem read-only. The VFS refuses modifications
+ * with EROFS, a remount to read-write and a new freeze until umount and
+ * doesn't sync the superblock anymore. The filesystem still has to
+ * refuse what doesn't pass through the VFS, see sb_emergency_ro().
+ */
+ SB_STATE_EMERGENCY_RO = 0,
+ };
#endif /* _LINUX_FS_SUPER_TYPES_H */
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-11-20 14:38 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-20 14:38 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-11-16 15:05 Mark Brown
2026-10-29 14:17 Mark Brown
2026-03-25 13:29 Mark Brown
2026-03-25 15:13 ` Darrick J. Wong
2026-03-26 13:24 ` Christian Brauner
2026-03-26 13:29 ` Mark Brown
2026-03-26 5:19 ` Christoph Hellwig
2024-06-20 11:34 Mark Brown
2024-06-20 12:50 ` Mark Brown
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=awBbd8nN6VxxArGV@sirena.org.uk \
--to=broonie@kernel.org \
--cc=brauner@kernel.org \
--cc=jkoolstra@xs4all.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®