Merge tag '9p-for-5.10-rc7' of git://github.com/martinetd/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Dec 2020 19:47:13 +0000 (11:47 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Dec 2020 19:47:13 +0000 (11:47 -0800)
commitc82a505c007fb754af144d5157e05fa7fd858157
treeed4fa78ab7aab0cfa1087580ddbdf5c1a406e2d2
parent72d1249e2ffdbc344e465031ec5335fa3489d62e
parent960f4f8a4e60da610af73c1264673f71f5a36efd
Merge tag '9p-for-5.10-rc7' of git://github.com/martinetd/linux

Pull 9p fixes from Dominique Martinet:
 "Restore splice functionality for 9p"

* tag '9p-for-5.10-rc7' of git://github.com/martinetd/linux:
  fs: 9p: add generic splice_write file operation
  fs: 9p: add generic splice_read file operations