From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 12 Aug 2020 00:08:11 +0000 (-0700)
Subject: Merge tag 'for-linus-5.9-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubca... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d668e848293fb57826771a0375a97a6cd1970a63;p=linux.git

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

Pull orangefs updates from Mike Marshall:
 "A fix and a cleanup...

  The fix: Al Viro pointed out that I had broken some acl functionality
  with one of my previous patches.

  And the cleanup: Jing Xiangfeng found and removed a needless variable
  assignment"

* tag 'for-linus-5.9-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
  orangefs: remove unnecessary assignment to variable ret
  orangefs: posix acl fix...
---

d668e848293fb57826771a0375a97a6cd1970a63