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)
commite37b12e4bb21e7c81732370b0a2b34bd196f380b
tree7f0894d73040ed9a5e5a1f3fade9938cf3142a75
parent582888130702b86daa44ff6bfee585e4d4050ba0
parentc1048828c3dbd96c7e371fae658e5f40e6a45e99
Merge tag 'for-linus-5.11-ofs1' of git://git./linux/kernel/git/hubcap/linux

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