From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 29 Apr 2021 18:06:13 +0000 (-0700)
Subject: Merge tag 'fsnotify_for_v5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: io_uring-5.13-2021-05-07~13
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=3644286f6cbcea86f6fa4d308e7ac06bf2a3715a;p=linux-block.git

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

Pull fsnotify updates from Jan Kara:

 - support for limited fanotify functionality for unpriviledged users

 - faster merging of fanotify events

 - a few smaller fsnotify improvements

* tag 'fsnotify_for_v5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  shmem: allow reporting fanotify events with file handles on tmpfs
  fs: introduce a wrapper uuid_to_fsid()
  fanotify_user: use upper_32_bits() to verify mask
  fanotify: support limited functionality for unprivileged users
  fanotify: configurable limits via sysfs
  fanotify: limit number of event merge attempts
  fsnotify: use hash table for faster events merge
  fanotify: mix event info and pid into merge key hash
  fanotify: reduce event objectid to 29-bit hash
  fsnotify: allow fsnotify_{peek,remove}_first_event with empty queue
---

3644286f6cbcea86f6fa4d308e7ac06bf2a3715a