From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Aug 2010 18:39:13 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify
X-Git-Tag: v2.6.36-rc1~303
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=8c8946f509a494769a8c602b5ed189df01917d39;p=~andy%2Flinux

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

* 'for-linus' of git://git.infradead.org/users/eparis/notify: (132 commits)
  fanotify: use both marks when possible
  fsnotify: pass both the vfsmount mark and inode mark
  fsnotify: walk the inode and vfsmount lists simultaneously
  fsnotify: rework ignored mark flushing
  fsnotify: remove global fsnotify groups lists
  fsnotify: remove group->mask
  fsnotify: remove the global masks
  fsnotify: cleanup should_send_event
  fanotify: use the mark in handler functions
  audit: use the mark in handler functions
  dnotify: use the mark in handler functions
  inotify: use the mark in handler functions
  fsnotify: send fsnotify_mark to groups in event handling functions
  fsnotify: Exchange list heads instead of moving elements
  fsnotify: srcu to protect read side of inode and vfsmount locks
  fsnotify: use an explicit flag to indicate fsnotify_destroy_mark has been called
  fsnotify: use _rcu functions for mark list traversal
  fsnotify: place marks on object in order of group memory address
  vfs/fsnotify: fsnotify_close can delay the final work in fput
  fsnotify: store struct file not struct path
  ...

Fix up trivial delete/modify conflict in fs/notify/inotify/inotify.c.
---

8c8946f509a494769a8c602b5ed189df01917d39
diff --cc Documentation/feature-removal-schedule.txt
index 56cee4727b1,a8188bd3dab..b16cbe4152e
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -360,16 -367,18 +360,8 @@@ When:	2.6.3
  Why:	Should be implemented in userspace, policy daemon.
  Who:	Johannes Berg <johannes@sipsolutions.net>
  
- ---------------------------
- 
- What:	CONFIG_INOTIFY
- When:	2.6.33
- Why:	last user (audit) will be converted to the newer more generic
- 	and more easily maintained fsnotify subsystem
- Who:	Eric Paris <eparis@redhat.com>
- 
  ----------------------------
  
 -What:	lock_policy_rwsem_* and unlock_policy_rwsem_* will not be
 -	exported interface anymore.
 -When:	2.6.33
 -Why:	cpu_policy_rwsem has a new cleaner definition making it local to
 -	cpufreq core and contained inside cpufreq.c. Other dependent
 -	drivers should not use it in order to safely avoid lockdep issues.
 -Who:	Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
 -
 -----------------------------
 -
  What:	sound-slot/service-* module aliases and related clutters in
  	sound/sound_core.c
  When:	August 2010
diff --cc kernel/Makefile
index c53e491e25a,202df4ece6a..0b72d1a74be
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@@ -70,14 -70,15 +70,15 @@@ obj-$(CONFIG_IKCONFIG) += configs.
  obj-$(CONFIG_RESOURCE_COUNTERS) += res_counter.o
  obj-$(CONFIG_SMP) += stop_machine.o
  obj-$(CONFIG_KPROBES_SANITY_TEST) += test_kprobes.o
- obj-$(CONFIG_AUDIT) += audit.o auditfilter.o audit_watch.o
+ obj-$(CONFIG_AUDIT) += audit.o auditfilter.o
  obj-$(CONFIG_AUDITSYSCALL) += auditsc.o
- obj-$(CONFIG_GCOV_KERNEL) += gcov/
+ obj-$(CONFIG_AUDIT_WATCH) += audit_watch.o
  obj-$(CONFIG_AUDIT_TREE) += audit_tree.o
+ obj-$(CONFIG_GCOV_KERNEL) += gcov/
  obj-$(CONFIG_KPROBES) += kprobes.o
  obj-$(CONFIG_KGDB) += debug/
 -obj-$(CONFIG_DETECT_SOFTLOCKUP) += softlockup.o
  obj-$(CONFIG_DETECT_HUNG_TASK) += hung_task.o
 +obj-$(CONFIG_LOCKUP_DETECTOR) += watchdog.o
  obj-$(CONFIG_GENERIC_HARDIRQS) += irq/
  obj-$(CONFIG_SECCOMP) += seccomp.o
  obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o