Merge remote-tracking branch 'fsnotify/for-next'

Conflicts:
	kernel/audit_tree.c

diff --cc fs/notify/fanotify/fanotify_user.c
Simple merge

diff --cc fs/notify/inotify/inotify_user.c
Simple merge

diff --cc fs/notify/notification.c
Simple merge

diff --cc include/linux/fsnotify_backend.h
Simple merge

diff --cc kernel/audit_tree.c
index ed206fd88cca76e75a0d8866ab703a7f6fdf38d6,9cedf310e23bfb044470f8538be0616a5fca5711..e81175ef25f82d129dbe4c3b5df70f718d59d782
--- 1/kernel/audit_tree.c
--- 2/kernel/audit_tree.c
+++ b/kernel/audit_tree.c
@@@ -249,7 -249,8 +249,7 @@@ static void untag_chunk(struct node *p
                list_del_rcu(&chunk->hash);
                spin_unlock(&hash_lock);
                spin_unlock(&entry->lock);
-               fsnotify_destroy_mark(entry);
+               fsnotify_destroy_mark(entry, audit_tree_group);
 -              fsnotify_put_mark(entry);
                goto out;
        }
  
@@@ -291,8 -292,8 +291,8 @@@
                owner->root = new;
        spin_unlock(&hash_lock);
        spin_unlock(&entry->lock);
-       fsnotify_destroy_mark(entry);
+       fsnotify_destroy_mark(entry, audit_tree_group);
 -      fsnotify_put_mark(entry);
 +      fsnotify_put_mark(&new->mark);  /* drop initial reference */
        goto out;
  
  Fallback:
@@@ -443,9 -443,9 +443,9 @@@ static int tag_chunk(struct inode *inod
        spin_unlock(&hash_lock);
        spin_unlock(&chunk_entry->lock);
        spin_unlock(&old_entry->lock);
-       fsnotify_destroy_mark(old_entry);
+       fsnotify_destroy_mark(old_entry, audit_tree_group);
 +      fsnotify_put_mark(chunk_entry); /* drop initial reference */
        fsnotify_put_mark(old_entry); /* pair to fsnotify_find mark_entry */
 -      fsnotify_put_mark(old_entry); /* and kill it */
        return 0;
  }
  

diff --cc kernel/audit_watch.c
Simple merge