From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 4 Jun 2020 20:51:54 +0000 (-0700)
Subject: Merge tag 'fsnotify_for_v5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~3705
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=07c8f3bfef161271786f368791f5fc33c7428964;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'fsnotify_for_v5.8-rc1' of git://git./linux/kernel/git/jack/linux-fs

Pull fsnotify updates from Jan Kara:
 "Several smaller fixes and cleanups for fsnotify subsystem"

* tag 'fsnotify_for_v5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  fanotify: fix ignore mask logic for events on child and on dir
  fanotify: don't write with size under sizeof(response)
  fsnotify: Remove proc_fs.h include
  fanotify: remove reference to fill_event_metadata()
  fsnotify: add mutex destroy
  fanotify: prefix should_merge()
  fanotify: Replace zero-length array with flexible-array
  inotify: Fix error return code assignment flow.
  fsnotify: Add missing annotation for fsnotify_finish_user_wait() and for fsnotify_prepare_user_wait()
---

07c8f3bfef161271786f368791f5fc33c7428964