]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
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


Trivial merge