From: Linus Torvalds Date: Mon, 27 Jul 2009 22:54:10 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify X-Git-Tag: Ubuntu-5.10.0-12.13~32034 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=fc013a58859b7cf85e53a05804a74952fe0a4117;p=mirror_ubuntu-hirsute-kernel.git Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify * 'for-linus' of git://git.infradead.org/users/eparis/notify: inotify: use GFP_NOFS under potential memory pressure fsnotify: fix inotify tail drop check with path entries inotify: check filename before dropping repeat events fsnotify: use def_bool in kconfig instead of letting the user choose inotify: fix error paths in inotify_update_watch inotify: do not leak inode marks in inotify_add_watch inotify: drop user watch count when a watch is removed --- fc013a58859b7cf85e53a05804a74952fe0a4117