From: Linus Torvalds Date: Sat, 30 Oct 2010 18:50:37 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify X-Git-Tag: v5.15~27561 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1792f17b7210280a3d7ff29da9614ba779cfcedb;p=platform%2Fkernel%2Flinux-starfive.git 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 ... --- 1792f17b7210280a3d7ff29da9614ba779cfcedb