projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 32d43cd 68ef3bc)
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)
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


Trivial merge
John Crispins staging tree