This small patchset does some cleanup in fs/notify branch especially in fanotify. Fabian Frederick (9): fanotify: prefix should_merge() fanotify: fanotify_encode_fid(): variable init notify: explicit shutdown initialization notify: add mutex destroy fanotify: remove reference to fill_event_metadata() fsnotify/fdinfo: remove proc_fs.h inclusion fanotify: don't write with zero size fanotify: clarify mark type extraction fsnotify: fsnotify_clear_marks_by_group() massage fs/notify/fanotify/fanotify.c | 11 ++++----- fs/notify/fanotify/fanotify_user.c | 5 +++- fs/notify/fdinfo.c | 1 - fs/notify/group.c | 2 ++ fs/notify/mark.c | 37 +++++++++++++++--------------- include/uapi/linux/fanotify.h | 7 +++++- 6 files changed, 35 insertions(+), 28 deletions(-) -- 2.26.2