From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 24 Feb 2020 19:40:23 +0000 (-0800)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v5.15~4417
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7031ecffab86199c2c688f7a723d03dfa6910fa6;p=platform%2Fkernel%2Flinux-starfive.git

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
---

7031ecffab86199c2c688f7a723d03dfa6910fa6