From: Linus Torvalds Date: Wed, 21 Oct 2009 23:28:28 +0000 (+0900) Subject: Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=d995053d045d777e78ba7eba71a6a0733f3aa726;p=deliverable%2Flinux.git Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify * 'for-linus' of git://git.infradead.org/users/eparis/notify: dnotify: ignore FS_EVENT_ON_CHILD inotify: fix coalesce duplicate events into a single event in special case inotify: deprecate the inotify kernel interface fsnotify: do not set group for a mark before it is on the i_list --- d995053d045d777e78ba7eba71a6a0733f3aa726