Merge tag 'for-linus-5.14-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 Jul 2021 18:12:42 +0000 (11:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 Jul 2021 18:12:42 +0000 (11:12 -0700)
commit729437e334a9d9e079e2be9a42629316bee8a17e
tree65f371c6c96feb5c597cdab6875eecec9ea46c57
parent7a5e9a17b2d8905e368ddfb33ddd40ef57f2d7cc
parent0fdec1b3c9fbb5e856a40db5993c9eaf91c74a83
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