Merge branch '9p-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Nov 2017 06:17:54 +0000 (20:17 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Nov 2017 06:17:54 +0000 (20:17 -1000)
commitd18bee424b129aa4755268feeeb1ee16cbde6afa
tree6a35fc4eceed28dbdd828e9f641f9f3d9495262b
parent0c86a6bd85ff0629cd2c5141027fc1c8bb6cde9c
parent61b272c3aa170b3e461b8df636407b29f35f98eb
Merge branch '9p-fixes' of git://git./linux/kernel/git/viro/vfs

Pull 9p filesystemfixes from Al Viro:
 "Several 9p fixes"

* '9p-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  9p: Fix missing commas in mount options
  net/9p: Switch to wait_event_killable()
  fs/9p: Compare qid.path in v9fs_test_inode