Merge tag 'nfsd-4.16-1' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Mar 2018 23:10:26 +0000 (16:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Mar 2018 23:10:26 +0000 (16:10 -0700)
commit645102eac15eaeb3da79576a9f8816d6e66cec0d
treec5915f89dce590dc56a3d696c7a6de3ee2bc9da4
parent32d43cd391bacb5f0814c2624399a5dad3501d09
parent68ef3bc3166468678d5e1fdd216628c35bd1186f
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