Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 4 Mar 2017 05:44:35 +0000 (21:44 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 4 Mar 2017 05:44:35 +0000 (21:44 -0800)
Pull misc final vfs updates from Al Viro:
 "A few unrelated patches that got beating in -next.

  Everything else will have to go into the next window ;-/"

* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  hfs: fix hfs_readdir()
  selftest for default_file_splice_read() infoleak
  9p: constify ->d_name handling

1  2 
fs/9p/vfs_inode.c
fs/9p/vfs_inode_dotl.c
net/9p/client.c
tools/testing/selftests/Makefile

Simple merge
Simple merge
diff --cc net/9p/client.c
Simple merge
Simple merge