projects / platform / kernel / linux-amlogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0efdc09 40927f3)
Merge tag 'nfsd-6.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 31 Aug 2024 18:55:47 +0000 (06:55 +1200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 31 Aug 2024 18:55:47 +0000 (06:55 +1200)
Pull nfsd fix from Chuck Lever:

 - One more write delegation fix

* tag 'nfsd-6.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
  nfsd: fix nfsd4_deleg_getattr_conflict in presence of third party lease


Trivial merge
Domain: System / Kernel;