Merge tag 'nfsd-4.10-2' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Feb 2017 20:49:58 +0000 (12:49 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Feb 2017 20:49:58 +0000 (12:49 -0800)
commit1fc576b82b96d9bb033ff0098e1c0bf68de282b2
treec4f8cb6640de3dff75ad7c33de0eedae4e230613
parente4178c75049c581114998a850ecdfa5a2811cde6
parent034dd34ff4916ec1f8f74e39ca3efb04eab2f791
Merge tag 'nfsd-4.10-2' of git://linux-nfs.org/~bfields/linux

Pull nfsd fixes from Bruce Fields:
 "Three more miscellaneous nfsd bugfixes"

* tag 'nfsd-4.10-2' of git://linux-nfs.org/~bfields/linux:
  svcrpc: fix oops in absence of krb5 module
  nfsd: special case truncates some more
  NFSD: Fix a null reference case in find_or_create_lock_stateid()