From: Linus Torvalds Date: Thu, 17 Dec 2020 18:56:27 +0000 (-0800) Subject: Merge tag 'fsnotify_for_v5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v5.15~2140 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=14bd41e41899cbd1de4bb5ddfa46c85b08091a69;p=platform%2Fkernel%2Flinux-starfive.git Merge tag 'fsnotify_for_v5.11-rc1' of git://git./linux/kernel/git/jack/linux-fs Pull fsnotify updates from Jan Kara: "A few fsnotify fixes from Amir fixing fallout from big fsnotify overhaul a few months back and an improvement of defaults limiting maximum number of inotify watches from Waiman" * tag 'fsnotify_for_v5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: fsnotify: fix events reported to watching parent and child inotify: convert to handle_inode_event() interface fsnotify: generalize handle_inode_event() inotify: Increase default inotify.max_user_watches limit to 1048576 --- 14bd41e41899cbd1de4bb5ddfa46c85b08091a69