projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3acdb84 b7052cd)
Merge tag 'nfsd-4.5-1' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Feb 2016 03:31:01 +0000 (19:31 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Feb 2016 03:31:01 +0000 (19:31 -0800)
Pull nfsd bugfix from Bruce Fields:
 "One fix for a bug that could cause a NULL write past the end of a
  buffer in case of unusually long writes to some system interfaces used
  by mountd and other nfs support utilities"

* tag 'nfsd-4.5-1' of git://linux-nfs.org/~bfields/linux:
  sunrpc/cache: fix off-by-one in qword_get()


Trivial merge