From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 20 Dec 2020 21:13:59 +0000 (-0800)
Subject: Merge tag 'for-linus-5.11-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=e37b12e4bb21e7c81732370b0a2b34bd196f380b;p=kernel.git

Merge tag 'for-linus-5.11-ofs1' of git://git.kernel.org/pub/scm/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
---

e37b12e4bb21e7c81732370b0a2b34bd196f380b