Merge tag 'for-linus-5.11-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Dec 2020 21:13:59 +0000 (13:13 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Dec 2020 21:13:59 +0000 (13:13 -0800)
Pull orangefs update from Mike Marshall:
 "Add splice file operations"

* tag 'for-linus-5.11-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
  orangefs: add splice file operations


Trivial merge