Merge remote-tracking branches 'vfs/vfs-7.2.casefold', 'vfs/vfs-7.2.directory.delegat...

diff --cc MAINTAINERS
Simple merge

diff --cc fs/nfsd/xdr4.h
Simple merge

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

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

diff --cc fs/smb/client/cifsfs.c
Simple merge

diff --cc fs/smb/server/smb2pdu.c
Simple merge

diff --cc include/linux/fsnotify_backend.h
index e5cde39d6e85d6c2310283cea7073a8bfe3851e7,95985400d3d8e2bcfe84387a13b01a1769112e44,f8c8fb7f34ae0096ed24e3341d02e191eee35c06,95985400d3d8e2bcfe84387a13b01a1769112e44..618eed4d6d724ab85e5f01d6ecc2f7de8c676c87
--- 1/include/linux/fsnotify_backend.h
--- 2/include/linux/fsnotify_backend.h
--- 3/include/linux/fsnotify_backend.h
--- 4/include/linux/fsnotify_backend.h
+++ b/include/linux/fsnotify_backend.h
@@@@@ -915,9 -915,8 -935,9 -915,8 +935,10 @@@@@ extern void fsnotify_clear_marks_by_gro
                                          unsigned int obj_type);
    extern void fsnotify_get_mark(struct fsnotify_mark *mark);
    extern void fsnotify_put_mark(struct fsnotify_mark *mark);
 +++struct fsnotify_mark *fsnotify_next_mark(struct fsnotify_mark *mark);
    extern void fsnotify_finish_user_wait(struct fsnotify_iter_info *iter_info);
    extern bool fsnotify_prepare_user_wait(struct fsnotify_iter_info *iter_info);
++ +extern void fsnotify_modify_mark_mask(struct fsnotify_mark *mark, u32 set, u32 clear);
    
    static inline void fsnotify_init_event(struct fsnotify_event *event)
    {

diff --cc tools/perf/trace/beauty/include/uapi/linux/fs.h
Simple merge