Merge branch 'vfs-6.15.mount' into vfs.all

diff --cc fs/internal.h
index 1cb85a62c07fe87390430a5878ee017a7f7fa8e0,db6094d5cb0b62b554646e638bbf7144e23d0ccc..3d05a989e4fa694f4c1243a49596d882508b3605
--- 1/fs/internal.h
--- 2/fs/internal.h
+++ b/fs/internal.h
@@@ -338,4 -338,4 +338,5 @@@ static inline bool path_mounted(const s
        return path->mnt->mnt_root == path->dentry;
  }
  void file_f_owner_release(struct file *file);
 +bool file_seek_cur_needs_f_lock(struct file *file);
+ int statmount_mnt_idmap(struct mnt_idmap *idmap, struct seq_file *seq, bool uid_map);

diff --cc fs/namespace.c
index 8f1000f9f3df16ee9f8aa4a74bad3dc6e1bad5dc,01fb1074c4c93dc3c35e3a4423c9b5d71b11e267..ee97f82c52bb0d05c891ef2665b861d4c2af795a
--- 1/fs/namespace.c
--- 2/fs/namespace.c
+++ b/fs/namespace.c
@@@ -5228,9 -5424,17 +5429,17 @@@ static int statmount_string(struct ksta
                statmount_fs_subtype(s, seq);
                break;
        case STATMOUNT_SB_SOURCE:
 -              sm->sb_source = start;
 +              offp = &sm->sb_source;
                ret = statmount_sb_source(s, seq);
                break;
+       case STATMOUNT_MNT_UIDMAP:
+               sm->mnt_uidmap = start;
+               ret = statmount_mnt_uidmap(s, seq);
+               break;
+       case STATMOUNT_MNT_GIDMAP:
+               sm->mnt_gidmap = start;
+               ret = statmount_mnt_gidmap(s, seq);
+               break;
        default:
                WARN_ON_ONCE(true);
                return -EINVAL;

diff --cc fs/notify/fsnotify.c
Simple merge

diff --cc include/linux/fsnotify.h
Simple merge

diff --cc include/linux/syscalls.h
Simple merge