From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 17 Feb 2019 01:38:01 +0000 (-0800)
Subject: Merge tag 'nfsd-5.0-2' of git://linux-nfs.org/~bfields/linux
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=88fe73cb804abc3d209a06f6221a7108d89ff04f;p=linux.git

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"
---

88fe73cb804abc3d209a06f6221a7108d89ff04f