diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-30 11:50:37 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-30 11:50:37 -0700 |
commit | 1792f17b7210280a3d7ff29da9614ba779cfcedb (patch) | |
tree | e45797137b7fc4877dd60b289d6fb75c6bdcdcf0 /net/Makefile | |
parent | f02a38d86a14b6e544e218d806ffb0442785f62b (diff) | |
parent | 6bff7eccb0d9bdef4123aad5399e73cbc26683a6 (diff) | |
download | linux-3.10-1792f17b7210280a3d7ff29da9614ba779cfcedb.tar.gz linux-3.10-1792f17b7210280a3d7ff29da9614ba779cfcedb.tar.bz2 linux-3.10-1792f17b7210280a3d7ff29da9614ba779cfcedb.zip |
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify
* 'for-linus' of git://git.infradead.org/users/eparis/notify: (22 commits)
Ensure FMODE_NONOTIFY is not set by userspace
make fanotify_read() restartable across signals
fsnotify: remove alignment padding from fsnotify_mark on 64 bit builds
fs/notify/fanotify/fanotify_user.c: fix warnings
fanotify: Fix FAN_CLOSE comments
fanotify: do not recalculate the mask if the ignored mask changed
fanotify: ignore events on directories unless specifically requested
fsnotify: rename FS_IN_ISDIR to FS_ISDIR
fanotify: do not send events for irregular files
fanotify: limit number of listeners per user
fanotify: allow userspace to override max marks
fanotify: limit the number of marks in a single fanotify group
fanotify: allow userspace to override max queue depth
fsnotify: implement a default maximum queue depth
fanotify: ignore fanotify ignore marks if open writers
fanotify: allow userspace to flush all marks
fsnotify: call fsnotify_parent in perm events
fsnotify: correctly handle return codes from listeners
fanotify: use __aligned_u64 in fanotify userspace metadata
fanotify: implement fanotify listener ordering
...
Diffstat (limited to 'net/Makefile')
0 files changed, 0 insertions, 0 deletions