From: Eric Paris <eparis@redhat.com>
Date: Fri, 18 Dec 2009 02:24:21 +0000 (-0500)
Subject: fsnotify: per group notification queue merge types
X-Git-Tag: v2.6.36-rc1~303^2~109
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74766bbfa99adf8cb8119df6121851edba21c9d9;p=pandora-kernel.git

fsnotify: per group notification queue merge types

inotify only wishes to merge a new event with the last event on the
notification fifo.  fanotify is willing to merge any events including by
means of bitwise OR masks of multiple events together.  This patch moves
the inotify event merging logic out of the generic fsnotify notification.c
and into the inotify code.  This allows each use of fsnotify to provide
their own merge functionality.

Signed-off-by: Eric Paris <eparis@redhat.com>
---

Reading git-diff-tree failed