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

diff --cc fs/notify/fanotify/fanotify_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
Simple merge

diff --cc kernel/audit_watch.c
Simple merge