Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 Feb 2020 19:40:23 +0000 (11:40 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 Feb 2020 19:40:23 +0000 (11:40 -0800)
commit7031ecffab86199c2c688f7a723d03dfa6910fa6
tree9e96a5ed577131f1e8814a8b12593d9c7b01ca74
parentbc570c14b260946a66e13882eace862dc6eb16f8
parentc9cc0517bba9f0213f1e55172feceb99e5512daf
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This fixes a Kconfig-related build error and an integer overflow in
  chacha20poly1305"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: chacha20poly1305 - prevent integer overflow on large input
  tee: amdtee: amdtee depends on CRYPTO_DEV_CCP_DD