]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge tag 'nfsd-6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Mar 2024 21:35:32 +0000 (14:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Mar 2024 21:35:32 +0000 (14:35 -0700)
Pull nfsd fixes from Chuck Lever:

 - Address three recently introduced regressions

* tag 'nfsd-6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
  NFSD: CREATE_SESSION must never cache NFS4ERR_DELAY replies
  SUNRPC: Revert 561141dd494382217bace4d1a51d08168420eace
  nfsd: Fix error cleanup path in nfsd_rename()

1  2 
fs/nfsd/nfs4state.c
fs/nfsd/vfs.c

Simple merge
diff --cc fs/nfsd/vfs.c
Simple merge