diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-27 15:54:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-27 15:54:10 -0700 |
| commit | fc013a58859b7cf85e53a05804a74952fe0a4117 (patch) | |
| tree | 012d671d822c281edef18f00992ec8c9ea4b0893 /fs/notify/inotify/Kconfig | |
| parent | 3a54297478e6578f96fd54bf4daa1751130aca86 (diff) | |
| parent | f44aebcc566d1d6275f7191867b9633dc11de2ee (diff) | |
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
Diffstat (limited to 'fs/notify/inotify/Kconfig')
| -rw-r--r-- | fs/notify/inotify/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/notify/inotify/Kconfig b/fs/notify/inotify/Kconfig index 5356884289a..3e56dbffe72 100644 --- a/fs/notify/inotify/Kconfig +++ b/fs/notify/inotify/Kconfig @@ -15,7 +15,7 @@ config INOTIFY config INOTIFY_USER bool "Inotify support for userspace" - depends on FSNOTIFY + select FSNOTIFY default y ---help--- Say Y here to enable inotify support for userspace, including the |