Commit 36d179fd6bea for kernel

commit 36d179fd6bea35698d53444b7bd3025fa3788266
Merge: c1f49dea2b8f d644a698de12
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Apr 20 10:44:02 2026 -0700

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

    Pull nfsd updates from Chuck Lever:

     - filehandle signing to defend against filehandle-guessing attacks
       (Benjamin Coddington)

       The server now appends a SipHash-2-4 MAC to each filehandle when
       the new "sign_fh" export option is enabled. NFSD then verifies
       filehandles received from clients against the expected MAC;
       mismatches return NFS error STALE

     - convert the entire NLMv4 server-side XDR layer from hand-written C to
       xdrgen-generated code, spanning roughly thirty patches (Chuck Lever)

       XDR functions are generally boilerplate code and are easy to get
       wrong. The goals of this conversion are improved memory safety, lower
       maintenance burden, and groundwork for eventual Rust code generation
       for these functions.

     - improve pNFS block/SCSI layout robustness with two related changes
       (Dai Ngo)

       SCSI persistent reservation fencing is now tracked per client and
       per device via an xarray, to avoid both redundant preempt operations
       on devices already fenced and a potential NFSD deadlock when all nfsd
       threads are waiting for a layout return.

     - scalability and infrastructure improvements

       Sincere thanks to all contributors, reviewers, testers, and bug
       reporters who participated in the v7.1 NFSD development cycle.

    * tag 'nfsd-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux: (83 commits)
      NFSD: Docs: clean up pnfs server timeout docs
      nfsd: fix comment typo in nfsxdr
      nfsd: fix comment typo in nfs3xdr
      NFSD: convert callback RPC program to per-net namespace
      NFSD: use per-operation statidx for callback procedures
      svcrdma: Use contiguous pages for RDMA Read sink buffers
      SUNRPC: Add svc_rqst_page_release() helper
      SUNRPC: xdr.h: fix all kernel-doc warnings
      svcrdma: Factor out WR chain linking into helper
      svcrdma: Add Write chunk WRs to the RPC's Send WR chain
      svcrdma: Clean up use of rdma->sc_pd->device
      svcrdma: Clean up use of rdma->sc_pd->device in Receive paths
      svcrdma: Add fair queuing for Send Queue access
      SUNRPC: Optimize rq_respages allocation in svc_alloc_arg
      SUNRPC: Track consumed rq_pages entries
      svcrdma: preserve rq_next_page in svc_rdma_save_io_pages
      SUNRPC: Handle NULL entries in svc_rqst_release_pages
      SUNRPC: Allocate a separate Reply page array
      SUNRPC: Tighten bounds checking in svc_rqst_replace_page
      NFSD: Sign filehandles
      ...

diff --cc fs/nfs/sysfs.c
index 1da4f707f9ef,051da37770d8..3a197252a132
--- a/fs/nfs/sysfs.c
+++ b/fs/nfs/sysfs.c
@@@ -11,9 -11,8 +11,9 @@@
  #include <linux/netdevice.h>
  #include <linux/string.h>
  #include <linux/nfs_fs.h>
 +#include <net/net_namespace.h>
  #include <linux/rcupdate.h>
- #include <linux/lockd/lockd.h>
+ #include <linux/lockd/bind.h>

  #include "internal.h"
  #include "nfs4_fs.h"