From: Eric Paris Date: Fri, 18 Dec 2009 02:24:34 +0000 (-0500) Subject: fanotify: use merge argument to determine actual event added to queue X-Git-Tag: v2.6.36-rc1~303^2~43 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43ed7e16a8b47059d7f6ff67ba76f383a2421de3;p=pandora-kernel.git fanotify: use merge argument to determine actual event added to queue fanotify needs to know the actual event added to queues so it can be correctly checked for return values from userspace. To do this we need to pass that information from the merger code back to the main even handling routine. Currently that information is unused, but it will be. Signed-off-by: Eric Paris --- Reading git-diff-tree failed