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


Trivial merge
John Crispins staging tree