Merge branch 'work.afs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
commited61a132cbbf7cadae7b255cd5083c8fadc77f31
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 Nov 2018 17:35:52 +0000 (3 10:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 Nov 2018 17:35:52 +0000 (3 10:35 -0700)
tree2c089a675d1a5db15f9fc869bd6527c9ad5dcf21
parentaf102b333a21cc77c1834cf7a604d0359db9d54b
parent2cbfdf4df58330f6cb493500387427dae1c5551d
Merge branch 'work.afs' of git://git./linux/kernel/git/viro/vfs

Pull 9p fix from Al Viro:
 "Regression fix for net/9p handling of iov_iter; broken by braino when
  switching to iov_iter_is_kvec() et.al., spotted and fixed by Marc"

* 'work.afs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  iov_iter: Fix 9p virtio breakage
net/9p/trans_virtio.c