Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Jul 2017 17:50:54 +0000 (10:50 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Jul 2017 17:50:54 +0000 (10:50 -0700)
Pull misc filesystem updates from Al Viro:
 "Assorted normal VFS / filesystems stuff..."

* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  dentry name snapshots
  Make statfs properly return read-only state after emergency remount
  fs/dcache: init in_lookup_hashtable
  minix: Deinline get_block, save 2691 bytes
  fs: Reorder inode_owner_or_capable() to avoid needless
  fs: warn in case userspace lied about modprobe return

1  2 
fs/dcache.c
fs/debugfs/inode.c
fs/inode.c
fs/namei.c
fs/statfs.c

diff --cc fs/dcache.c
Simple merge
Simple merge
diff --cc fs/inode.c
Simple merge
diff --cc fs/namei.c
Simple merge
diff --cc fs/statfs.c
Simple merge