Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Dec 2020 17:14:32 +0000 (09:14 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Dec 2020 17:14:32 +0000 (09:14 -0800)
commit33c148a4ae7dc3cd440f6c0d746ac7f0ff320682
treede78f79c6925621ab405a1ace625e55947bebd1e
parentcce622ab9284a27257dd75bb35eccdd619bf96d1
parentc0e583ab2016de8dedfb73934d4c4e8ff5bd896c
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "Fix a number of autobuild failures due to missing Kconfig
  dependencies"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: qat - add CRYPTO_AES to Kconfig dependencies
  crypto: keembay - Add dependency on HAS_IOMEM
  crypto: keembay - CRYPTO_DEV_KEEMBAY_OCS_AES_SM4 should depend on ARCH_KEEMBAY