From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 23 Apr 2019 20:40:55 +0000 (-0700)
Subject: Merge tag 'nfsd-5.1-1' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v5.1-rc7~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12a54b150fb5b6c2f3da932dc0e665355f8a5a48;p=thirdparty%2Fkernel%2Fstable.git

Merge tag 'nfsd-5.1-1' of git://linux-nfs.org/~bfields/linux

Pull nfsd bugfixes from Bruce Fields:
 "Fix miscellaneous nfsd bugs, in NFSv4.1 callbacks, NFSv4.1
  lock-notification callbacks, NFSv3 readdir encoding, and the
  cache/upcall code"

* tag 'nfsd-5.1-1' of git://linux-nfs.org/~bfields/linux:
  nfsd: wake blocked file lock waiters before sending callback
  nfsd: wake waiters blocked on file_lock before deleting it
  nfsd: Don't release the callback slot unless it was actually held
  nfsd/nfsd3_proc_readdir: fix buffer count and page pointers
  sunrpc: don't mark uninitialised items as VALID.
---

12a54b150fb5b6c2f3da932dc0e665355f8a5a48