From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 31 Aug 2024 18:55:47 +0000 (+1200)
Subject: Merge tag 'nfsd-6.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
X-Git-Tag: ceph-for-6.12-rc2~314
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6a2fcc51a7a1e92984350e7dd94122db5b8927f2;p=ceph-client.git

Merge tag 'nfsd-6.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux

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
---

6a2fcc51a7a1e92984350e7dd94122db5b8927f2