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

diff --cc fs/cachefiles/namei.c
Simple merge

diff --cc fs/nfsd/vfs.c
index fd0acca5370a5da699fe62a5d94d0b6e81f67b78,5f30270ae644d7b64a870460fe2fb7378c23392c..9c7ef668f6b1f303f065610af13f2b640d25a00e
--- 1/fs/nfsd/vfs.c
--- 2/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@@ -904,9 -923,9 +903,8 @@@ nfsd_vfs_read(struct svc_rqst *rqstp, s
                nfsdstats.io_read += host_err;
                *count = host_err;
                err = 0;
-               fsnotify_access(file);
        } else 
                err = nfserrno(host_err);
 -out:
        return err;
  }
  

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

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

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

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