OSDN Git Service

(root) / android-x86 / kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3e5de27 5789163)
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 5 Dec 2016 17:16:10 +0000 (09:16 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 5 Dec 2016 17:16:10 +0000 (09:16 -0800)
Pull crypto fixes from Herbert Xu:
 "This fixes the following issues:

   - Intermittent build failure in RSA

   - Memory corruption in chelsio crypto driver

   - Regression in DRBG due to vmalloced stack"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: rsa - Add Makefile dependencies to fix parallel builds
  crypto: chcr - Fix memory corruption
  crypto: drbg - prevent invalid SG mappings


Trivial merge
kernel
About OSDN
Find Software
Develop Software
Help