From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 20 Mar 2018 23:10:26 +0000 (-0700)
Subject: Merge tag 'nfsd-4.16-1' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v4.16-rc7~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=645102eac15eaeb3da79576a9f8816d6e66cec0d;p=thirdparty%2Fkernel%2Flinux.git

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

Pull nfsd fix from Bruce Fields:
 "Just one fix for an occasional panic from Jeff Layton"

* tag 'nfsd-4.16-1' of git://linux-nfs.org/~bfields/linux:
  nfsd: remove blocked locks on client teardown
---

645102eac15eaeb3da79576a9f8816d6e66cec0d