]> git.ipfire.org Git - people/ms/linux.git/commitdiff
projects / people / ms / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 80e78fc 00801cd)
Merge tag 'nfsd-6.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 12 Sep 2022 21:14:38 +0000 (17:14 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 12 Sep 2022 21:14:38 +0000 (17:14 -0400)
Pull nfsd fix from Chuck Lever:
 "Address an NFSD regression introduced during the 6.0 merge window"

* tag 'nfsd-6.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
  NFSD: fix regression with setting ACLs.


Trivial merge
Michael's Linux tree.