From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 23 Dec 2024 20:16:15 +0000 (-0800)
Subject: Merge tag 'nfsd-6.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
X-Git-Tag: v6.13-rc5~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f07044dd0df0c9d0ad177c3098b62ccddb735a2d;p=thirdparty%2Flinux.git

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

Pull nfsd fixes from Chuck Lever::

 - Revert one v6.13 fix at the author's request (to be done differently)

 - Fix a minor problem with recent NFSv4.2 COPY enhancements

 - Fix an NFSv4.0 callback bug introduced in the v6.13 merge window

* tag 'nfsd-6.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
  nfsd: restore callback functionality for NFSv4.0
  NFSD: fix management of pending async copies
  nfsd: Revert "nfsd: release svc_expkey/svc_export with rcu_work"
---

f07044dd0df0c9d0ad177c3098b62ccddb735a2d