From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 28 Oct 2025 19:13:20 +0000 (-0700)
Subject: Merge tag 'nfsd-6.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
X-Git-Tag: v6.18-rc4~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8eefed8f65cc17c31fdf4ab32292b794b34893ad;p=thirdparty%2Fkernel%2Flinux.git

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

Pull nfsd fixes from Chuck Lever:
 "Regression fixes:

   - Revert the patch that removed the cap on MAX_OPS_PER_COMPOUND

   - Address a kernel build issue

  Stable fixes:

   - Fix crash when a client queries new attributes on forechannel

   - Fix rare NFSD crash when tracing is enabled"

* tag 'nfsd-6.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
  Revert "NFSD: Remove the cap on number of operations per NFSv4 COMPOUND"
  nfsd: Avoid strlen conflict in nfsd4_encode_components_esc()
  NFSD: Fix crash in nfsd4_read_release()
  NFSD: Define actions for the new time_deleg FATTR4 attributes
---

8eefed8f65cc17c31fdf4ab32292b794b34893ad