| commit | 33c148a4ae7dc3cd440f6c0d746ac7f0ff320682 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Dec 27 09:14:32 2020 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Dec 27 09:14:32 2020 -0800 |
| tree | de78f79c6925621ab405a1ace625e55947bebd1e | |
| parent | cce622ab9284a27257dd75bb35eccdd619bf96d1 [diff] | |
| parent | c0e583ab2016de8dedfb73934d4c4e8ff5bd896c [diff] |
Merge branch 'linus' of git://git.kernel.org/pub/scm/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