Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull more vfs updates from Al Viro:
 "Assorted cleanups and fixes.

  In the "trivial API change" department - ->d_compare() losing 'parent'
  argument"

* 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  cachefiles: Fix race between inactivating and culling a cache object
  9p: use clone_fid()
  9p: fix braino introduced in "9p: new helper - v9fs_parent_fid()"
  vfs: make dentry_needs_remove_privs() internal
  vfs: remove file_needs_remove_privs()
  vfs: fix deadlock in file_remove_privs() on overlayfs
  get rid of 'parent' argument of ->d_compare()
  cifs, msdos, vfat, hfs+: don't bother with parent in ->d_compare()
  affs ->d_compare(): don't bother with ->d_inode
  fold _d_rehash() and __d_rehash() together
  fold dentry_rcuwalk_invalidate() into its only remaining caller

diff --cc fs/adfs/dir.c
Simple merge

diff --cc fs/dcache.c
Simple merge

diff --cc fs/fat/namei_vfat.c
Simple merge

diff --cc fs/hfs/hfs_fs.h
Simple merge

diff --cc fs/hfsplus/hfsplus_fs.h
Simple merge

diff --cc fs/inode.c
Simple merge

diff --cc fs/proc/proc_sysctl.c
Simple merge

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

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