tree 640cf71ae612ea28b5dd91a2a9d6a005f50a7345
parent 3e5de27e940d00d8d504dfb96625fb654f641509
parent 57891633eeef60e732e045731cf20e50ee80acb4
author Linus Torvalds <torvalds@linux-foundation.org> 1480958170 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1480958170 -0800

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

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