Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify

* 'for-linus' of git://git.infradead.org/users/eparis/notify:
  fsnotify: drop two useless bools in the fnsotify main loop
  fsnotify: fix list walk order
  fanotify: Return EPERM when a process is not privileged
  fanotify: resize pid and reorder structure
  fanotify: drop duplicate pr_debug statement
  fanotify: flush outstanding perm requests on group destroy
  fsnotify: fix ignored mask handling between inode and vfsmount marks
  fanotify: add MAINTAINERS entry
  fsnotify: reset used_inode and used_vfsmount on each pass
  fanotify: do not dereference inode_mark when it is unset

diff --combined MAINTAINERS
index 4523d6c,271fadb..c36f5d7
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -454,17 -454,6 +454,17 @@@ L:       linux-rdma@vger.kernel.or
  S:    Maintained
  F:    drivers/infiniband/hw/amso1100/
  
 +ANALOG DEVICES INC ASOC DRIVERS
 +L:    uclinux-dist-devel@blackfin.uclinux.org
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +W:    http://blackfin.uclinux.org/
 +S:    Supported
 +F:    sound/soc/blackfin/*
 +F:    sound/soc/codecs/ad1*
 +F:    sound/soc/codecs/adau*
 +F:    sound/soc/codecs/adav*
 +F:    sound/soc/codecs/ssm*
 +
  AOA (Apple Onboard Audio) ALSA DRIVER
  M:    Johannes Berg <johannes@sipsolutions.net>
  L:    linuxppc-dev@lists.ozlabs.org
@@@ -1676,7 -1665,8 +1676,7 @@@ F:      kernel/cgroup
  F:    mm/*cgroup*
  
  CORETEMP HARDWARE MONITORING DRIVER
 -M:    Rudolf Marek <r.marek@assembler.cz>
 -M:    Huaxu Wan <huaxu.wan@intel.com>
 +M:    Fenghua Yu <fenghua.yu@intel.com>
  L:    lm-sensors@lm-sensors.org
  S:    Maintained
  F:    Documentation/hwmon/coretemp
@@@ -2296,6 -2286,12 +2296,12 @@@ S:    Maintaine
  F:    Documentation/hwmon/f71805f
  F:    drivers/hwmon/f71805f.c
  
+ FANOTIFY
+ M:    Eric Paris <eparis@redhat.com>
+ S:    Maintained
+ F:    fs/notify/fanotify/
+ F:    include/linux/fanotify.h
+ 
  FARSYNC SYNCHRONOUS DRIVER
  M:    Kevin Curtis <kevin.curtis@farsite.co.uk>
  W:    http://www.farsite.co.uk/
@@@ -3488,7 -3484,7 +3494,7 @@@ LGUES
  M:    Rusty Russell <rusty@rustcorp.com.au>
  L:    lguest@lists.ozlabs.org
  W:    http://lguest.ozlabs.org/
 -S:    Maintained
 +S:    Odd Fixes
  F:    Documentation/lguest/
  F:    arch/x86/lguest/
  F:    drivers/lguest/