This small patchset does some cleanup in fs/notify branch especially in fanotify. V2: Apply Amir Goldstein suggestions: -Remove patch 2, 7 and 9 -Patch "fanotify: don't write with zero size" -> "fanotify: don't write with size under sizeof(response)" Fabian Frederick (6): fanotify: prefix should_merge() 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 size under sizeof(response) fs/notify/fanotify/fanotify.c | 4 ++-- fs/notify/fanotify/fanotify_user.c | 8 +++++--- fs/notify/fdinfo.c | 1 - fs/notify/group.c | 2 ++ 4 files changed, 9 insertions(+), 6 deletions(-) -- 2.26.2