The following commit has been merged into the x86/build branch of tip: Commit-ID: 6526b12de07588253a52577f42ec99fc7ca26a1f Gitweb: https://git.kernel.org/tip/6526b12de07588253a52577f42ec99fc7ca26a1f Author: Sedat Dilek <sedat.dilek@xxxxxxxxx> AuthorDate: Thu, 23 Jul 2020 19:11:14 +02:00 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Fri, 24 Jul 2020 14:55:55 +02:00 x86/defconfigs: Remove CONFIG_CRYPTO_AES_586 from i386_defconfig Initially CONFIG_CRYPTO_AES_586=y was added to the i386_defconfig file in: c1b362e3b4d3: ("x86: update defconfigs") The code and Kconfig for CONFIG_CRYPTO_AES_586 was removed in: 1d2c3279311e: ("crypto: x86/aes - drop scalar assembler implementations") Remove the leftover from the i386_defconfig file as well. Signed-off-by: Sedat Dilek <sedat.dilek@xxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> Acked-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20200723171119.9881-1-sedat.dilek@xxxxxxxxx --- arch/x86/configs/i386_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig index 5509045..3a2a898 100644 --- a/arch/x86/configs/i386_defconfig +++ b/arch/x86/configs/i386_defconfig @@ -290,7 +290,6 @@ CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_DISABLE=y -CONFIG_CRYPTO_AES_586=y # CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_EFI_STUB=y CONFIG_ACPI_BGRT=y