Merge tag 'nfsd-5.0-2' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 17 Feb 2019 01:38:01 +0000 (17:38 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 17 Feb 2019 01:38:01 +0000 (17:38 -0800)
commit88fe73cb804abc3d209a06f6221a7108d89ff04f
treeb324831eb8becb9dbcb36c2cdf69417570a64375
parent55638c520bb7b92999b6f0867ba135b6aeafc8d7
parente7afe6c1d486b516ed586dcc10b3e7e3e85a9c2b
Merge tag 'nfsd-5.0-2' of git://linux-nfs.org/~bfields/linux

Pull more nfsd fixes from Bruce Fields:
 "Two small fixes, one for crashes using nfs/krb5 with older enctypes,
  one that could prevent clients from reclaiming state after a kernel
  upgrade"

* tag 'nfsd-5.0-2' of git://linux-nfs.org/~bfields/linux:
  sunrpc: fix 4 more call sites that were using stack memory with a scatterlist
  Revert "nfsd4: return default lease period"