From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 6 Jul 2021 18:12:42 +0000 (-0700)
Subject: Merge tag 'for-linus-5.14-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~786
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=729437e334a9d9e079e2be9a42629316bee8a17e;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'for-linus-5.14-ofs1' of git://git./linux/kernel/git/hubcap/linux

Pull orangefs updates from Mike Marshall:
 "A read-ahead adjustment and a fix.

  The readahead adjustment was suggested by Matthew Wilcox and looks
  like how I should have written it in the first place... the "df fix"
  was suggested by Walt Ligon, some Orangefs users have been complaining
  about whacky df output..."

* tag 'for-linus-5.14-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
  orangefs: fix orangefs df output.
  orangefs: readahead adjustment
---

729437e334a9d9e079e2be9a42629316bee8a17e