]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge tag 'nfsd-5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 22 Sep 2021 16:21:02 +0000 (09:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 22 Sep 2021 16:21:02 +0000 (09:21 -0700)
Pull nfsd fixes from Chuck Lever:
 "Critical bug fixes:

   - Fix crash in NLM TEST procedure

   - NFSv4.1+ backchannel not restored after PATH_DOWN"

* tag 'nfsd-5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
  nfsd: back channel stuck in SEQ4_STATUS_CB_PATH_DOWN
  NLM: Fix svcxdr_encode_owner()

1  2 
fs/nfsd/nfs4state.c

Simple merge