From nobody Sat Apr 11 06:32:07 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8B319C25B0E for ; Mon, 15 Aug 2022 10:32:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230399AbiHOKci (ORCPT ); Mon, 15 Aug 2022 06:32:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229752AbiHOKcf (ORCPT ); Mon, 15 Aug 2022 06:32:35 -0400 Received: from albert.telenet-ops.be (albert.telenet-ops.be [IPv6:2a02:1800:110:4::f00:1a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3257D2181E for ; Mon, 15 Aug 2022 03:32:34 -0700 (PDT) Received: from ramsan.of.borg ([84.195.186.194]) by albert.telenet-ops.be with bizsmtp id 7mYX2800T4C55Sk06mYXFx; Mon, 15 Aug 2022 12:32:31 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1oNXOZ-0019aL-78; Mon, 15 Aug 2022 12:32:31 +0200 Received: from geert by rox.of.borg with local (Exim 4.93) (envelope-from ) id 1oNXOY-00C0OL-IA; Mon, 15 Aug 2022 12:32:30 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH] m68k: defconfig: Update defconfigs for v6.0-rc1 Date: Mon, 15 Aug 2022 12:32:29 +0200 Message-Id: <01a6abf7bc23a478d6a6c6801c6812ae96714620.1660559393.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" - Enable modular build of the new HCTR2 and ARIA crypto algorithms, - Drop CONFIG_CRYPTO_BLAKE2S=3Dm (removed in commit 2d16803c562ecc64 ("crypto blake2s - remove shash module")). Signed-off-by: Geert Uytterhoeven --- To be queued in the m68k for-v6.1 branch. arch/m68k/configs/amiga_defconfig | 3 ++- arch/m68k/configs/apollo_defconfig | 3 ++- arch/m68k/configs/atari_defconfig | 3 ++- arch/m68k/configs/bvme6000_defconfig | 3 ++- arch/m68k/configs/hp300_defconfig | 3 ++- arch/m68k/configs/mac_defconfig | 3 ++- arch/m68k/configs/multi_defconfig | 3 ++- arch/m68k/configs/mvme147_defconfig | 3 ++- arch/m68k/configs/mvme16x_defconfig | 3 ++- arch/m68k/configs/q40_defconfig | 3 ++- arch/m68k/configs/sun3_defconfig | 3 ++- arch/m68k/configs/sun3x_defconfig | 3 ++- 12 files changed, 24 insertions(+), 12 deletions(-) diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_de= fconfig index a6a886a89be28382..1e545592ece66309 100644 --- a/arch/m68k/configs/amiga_defconfig +++ b/arch/m68k/configs/amiga_defconfig @@ -573,9 +573,9 @@ CONFIG_CRYPTO_PCBC=3Dm CONFIG_CRYPTO_XTS=3Dm CONFIG_CRYPTO_KEYWRAP=3Dm CONFIG_CRYPTO_ADIANTUM=3Dm +CONFIG_CRYPTO_HCTR2=3Dm CONFIG_CRYPTO_XCBC=3Dm CONFIG_CRYPTO_VMAC=3Dm -CONFIG_CRYPTO_BLAKE2S=3Dm CONFIG_CRYPTO_MD4=3Dm CONFIG_CRYPTO_MICHAEL_MIC=3Dm CONFIG_CRYPTO_RMD160=3Dm @@ -594,6 +594,7 @@ CONFIG_CRYPTO_DES=3Dm CONFIG_CRYPTO_FCRYPT=3Dm CONFIG_CRYPTO_KHAZAD=3Dm CONFIG_CRYPTO_SEED=3Dm +CONFIG_CRYPTO_ARIA=3Dm CONFIG_CRYPTO_SERPENT=3Dm CONFIG_CRYPTO_SM4_GENERIC=3Dm CONFIG_CRYPTO_TEA=3Dm diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_= defconfig index bffd24c2755e7117..8b3c02455f13e1c3 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_defconfig @@ -530,9 +530,9 @@ CONFIG_CRYPTO_PCBC=3Dm CONFIG_CRYPTO_XTS=3Dm CONFIG_CRYPTO_KEYWRAP=3Dm CONFIG_CRYPTO_ADIANTUM=3Dm +CONFIG_CRYPTO_HCTR2=3Dm CONFIG_CRYPTO_XCBC=3Dm CONFIG_CRYPTO_VMAC=3Dm -CONFIG_CRYPTO_BLAKE2S=3Dm CONFIG_CRYPTO_MD4=3Dm CONFIG_CRYPTO_MICHAEL_MIC=3Dm CONFIG_CRYPTO_RMD160=3Dm @@ -551,6 +551,7 @@ CONFIG_CRYPTO_DES=3Dm CONFIG_CRYPTO_FCRYPT=3Dm CONFIG_CRYPTO_KHAZAD=3Dm CONFIG_CRYPTO_SEED=3Dm +CONFIG_CRYPTO_ARIA=3Dm CONFIG_CRYPTO_SERPENT=3Dm CONFIG_CRYPTO_SM4_GENERIC=3Dm CONFIG_CRYPTO_TEA=3Dm diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_de= fconfig index 97a6df6822f0f23f..217e286c2a760607 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_defconfig @@ -561,9 +561,9 @@ CONFIG_CRYPTO_PCBC=3Dm CONFIG_CRYPTO_XTS=3Dm CONFIG_CRYPTO_KEYWRAP=3Dm CONFIG_CRYPTO_ADIANTUM=3Dm +CONFIG_CRYPTO_HCTR2=3Dm CONFIG_CRYPTO_XCBC=3Dm CONFIG_CRYPTO_VMAC=3Dm -CONFIG_CRYPTO_BLAKE2S=3Dm CONFIG_CRYPTO_MD4=3Dm CONFIG_CRYPTO_MICHAEL_MIC=3Dm CONFIG_CRYPTO_RMD160=3Dm @@ -582,6 +582,7 @@ CONFIG_CRYPTO_DES=3Dm CONFIG_CRYPTO_FCRYPT=3Dm CONFIG_CRYPTO_KHAZAD=3Dm CONFIG_CRYPTO_SEED=3Dm +CONFIG_CRYPTO_ARIA=3Dm CONFIG_CRYPTO_SERPENT=3Dm CONFIG_CRYPTO_SM4_GENERIC=3Dm CONFIG_CRYPTO_TEA=3Dm diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6= 000_defconfig index 42d969697f7f0352..083cbb179e708e1b 100644 --- a/arch/m68k/configs/bvme6000_defconfig +++ b/arch/m68k/configs/bvme6000_defconfig @@ -522,9 +522,9 @@ CONFIG_CRYPTO_PCBC=3Dm CONFIG_CRYPTO_XTS=3Dm CONFIG_CRYPTO_KEYWRAP=3Dm CONFIG_CRYPTO_ADIANTUM=3Dm +CONFIG_CRYPTO_HCTR2=3Dm CONFIG_CRYPTO_XCBC=3Dm CONFIG_CRYPTO_VMAC=3Dm -CONFIG_CRYPTO_BLAKE2S=3Dm CONFIG_CRYPTO_MD4=3Dm CONFIG_CRYPTO_MICHAEL_MIC=3Dm CONFIG_CRYPTO_RMD160=3Dm @@ -543,6 +543,7 @@ CONFIG_CRYPTO_DES=3Dm CONFIG_CRYPTO_FCRYPT=3Dm CONFIG_CRYPTO_KHAZAD=3Dm CONFIG_CRYPTO_SEED=3Dm +CONFIG_CRYPTO_ARIA=3Dm CONFIG_CRYPTO_SERPENT=3Dm CONFIG_CRYPTO_SM4_GENERIC=3Dm CONFIG_CRYPTO_TEA=3Dm diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_de= fconfig index 97d6d9acb39520ab..291e250d843deefe 100644 --- a/arch/m68k/configs/hp300_defconfig +++ b/arch/m68k/configs/hp300_defconfig @@ -532,9 +532,9 @@ CONFIG_CRYPTO_PCBC=3Dm CONFIG_CRYPTO_XTS=3Dm CONFIG_CRYPTO_KEYWRAP=3Dm CONFIG_CRYPTO_ADIANTUM=3Dm +CONFIG_CRYPTO_HCTR2=3Dm CONFIG_CRYPTO_XCBC=3Dm CONFIG_CRYPTO_VMAC=3Dm -CONFIG_CRYPTO_BLAKE2S=3Dm CONFIG_CRYPTO_MD4=3Dm CONFIG_CRYPTO_MICHAEL_MIC=3Dm CONFIG_CRYPTO_RMD160=3Dm @@ -553,6 +553,7 @@ CONFIG_CRYPTO_DES=3Dm CONFIG_CRYPTO_FCRYPT=3Dm CONFIG_CRYPTO_KHAZAD=3Dm CONFIG_CRYPTO_SEED=3Dm +CONFIG_CRYPTO_ARIA=3Dm CONFIG_CRYPTO_SERPENT=3Dm CONFIG_CRYPTO_SM4_GENERIC=3Dm CONFIG_CRYPTO_TEA=3Dm diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defcon= fig index 8cbfc1c659a311b6..815ff8d9a65e4240 100644 --- a/arch/m68k/configs/mac_defconfig +++ b/arch/m68k/configs/mac_defconfig @@ -552,9 +552,9 @@ CONFIG_CRYPTO_PCBC=3Dm CONFIG_CRYPTO_XTS=3Dm CONFIG_CRYPTO_KEYWRAP=3Dm CONFIG_CRYPTO_ADIANTUM=3Dm +CONFIG_CRYPTO_HCTR2=3Dm CONFIG_CRYPTO_XCBC=3Dm CONFIG_CRYPTO_VMAC=3Dm -CONFIG_CRYPTO_BLAKE2S=3Dm CONFIG_CRYPTO_MD4=3Dm CONFIG_CRYPTO_MICHAEL_MIC=3Dm CONFIG_CRYPTO_RMD160=3Dm @@ -573,6 +573,7 @@ CONFIG_CRYPTO_DES=3Dm CONFIG_CRYPTO_FCRYPT=3Dm CONFIG_CRYPTO_KHAZAD=3Dm CONFIG_CRYPTO_SEED=3Dm +CONFIG_CRYPTO_ARIA=3Dm CONFIG_CRYPTO_SERPENT=3Dm CONFIG_CRYPTO_SM4_GENERIC=3Dm CONFIG_CRYPTO_TEA=3Dm diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_de= fconfig index 9f45fe60757fab1c..5c84db94f9e11153 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_defconfig @@ -638,9 +638,9 @@ CONFIG_CRYPTO_PCBC=3Dm CONFIG_CRYPTO_XTS=3Dm CONFIG_CRYPTO_KEYWRAP=3Dm CONFIG_CRYPTO_ADIANTUM=3Dm +CONFIG_CRYPTO_HCTR2=3Dm CONFIG_CRYPTO_XCBC=3Dm CONFIG_CRYPTO_VMAC=3Dm -CONFIG_CRYPTO_BLAKE2S=3Dm CONFIG_CRYPTO_MD4=3Dm CONFIG_CRYPTO_MICHAEL_MIC=3Dm CONFIG_CRYPTO_RMD160=3Dm @@ -659,6 +659,7 @@ CONFIG_CRYPTO_DES=3Dm CONFIG_CRYPTO_FCRYPT=3Dm CONFIG_CRYPTO_KHAZAD=3Dm CONFIG_CRYPTO_SEED=3Dm +CONFIG_CRYPTO_ARIA=3Dm CONFIG_CRYPTO_SERPENT=3Dm CONFIG_CRYPTO_SM4_GENERIC=3Dm CONFIG_CRYPTO_TEA=3Dm diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme14= 7_defconfig index 4736cfacf6a2801c..0a2df9102b8e8404 100644 --- a/arch/m68k/configs/mvme147_defconfig +++ b/arch/m68k/configs/mvme147_defconfig @@ -521,9 +521,9 @@ CONFIG_CRYPTO_PCBC=3Dm CONFIG_CRYPTO_XTS=3Dm CONFIG_CRYPTO_KEYWRAP=3Dm CONFIG_CRYPTO_ADIANTUM=3Dm +CONFIG_CRYPTO_HCTR2=3Dm CONFIG_CRYPTO_XCBC=3Dm CONFIG_CRYPTO_VMAC=3Dm -CONFIG_CRYPTO_BLAKE2S=3Dm CONFIG_CRYPTO_MD4=3Dm CONFIG_CRYPTO_MICHAEL_MIC=3Dm CONFIG_CRYPTO_RMD160=3Dm @@ -542,6 +542,7 @@ CONFIG_CRYPTO_DES=3Dm CONFIG_CRYPTO_FCRYPT=3Dm CONFIG_CRYPTO_KHAZAD=3Dm CONFIG_CRYPTO_SEED=3Dm +CONFIG_CRYPTO_ARIA=3Dm CONFIG_CRYPTO_SERPENT=3Dm CONFIG_CRYPTO_SM4_GENERIC=3Dm CONFIG_CRYPTO_TEA=3Dm diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16= x_defconfig index 638cd38aa7d27303..951d37effb0cedff 100644 --- a/arch/m68k/configs/mvme16x_defconfig +++ b/arch/m68k/configs/mvme16x_defconfig @@ -522,9 +522,9 @@ CONFIG_CRYPTO_PCBC=3Dm CONFIG_CRYPTO_XTS=3Dm CONFIG_CRYPTO_KEYWRAP=3Dm CONFIG_CRYPTO_ADIANTUM=3Dm +CONFIG_CRYPTO_HCTR2=3Dm CONFIG_CRYPTO_XCBC=3Dm CONFIG_CRYPTO_VMAC=3Dm -CONFIG_CRYPTO_BLAKE2S=3Dm CONFIG_CRYPTO_MD4=3Dm CONFIG_CRYPTO_MICHAEL_MIC=3Dm CONFIG_CRYPTO_RMD160=3Dm @@ -543,6 +543,7 @@ CONFIG_CRYPTO_DES=3Dm CONFIG_CRYPTO_FCRYPT=3Dm CONFIG_CRYPTO_KHAZAD=3Dm CONFIG_CRYPTO_SEED=3Dm +CONFIG_CRYPTO_ARIA=3Dm CONFIG_CRYPTO_SERPENT=3Dm CONFIG_CRYPTO_SM4_GENERIC=3Dm CONFIG_CRYPTO_TEA=3Dm diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defcon= fig index ec8b6bb70ebdcaf3..258001e059baac3a 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_defconfig @@ -539,9 +539,9 @@ CONFIG_CRYPTO_PCBC=3Dm CONFIG_CRYPTO_XTS=3Dm CONFIG_CRYPTO_KEYWRAP=3Dm CONFIG_CRYPTO_ADIANTUM=3Dm +CONFIG_CRYPTO_HCTR2=3Dm CONFIG_CRYPTO_XCBC=3Dm CONFIG_CRYPTO_VMAC=3Dm -CONFIG_CRYPTO_BLAKE2S=3Dm CONFIG_CRYPTO_MD4=3Dm CONFIG_CRYPTO_MICHAEL_MIC=3Dm CONFIG_CRYPTO_RMD160=3Dm @@ -560,6 +560,7 @@ CONFIG_CRYPTO_DES=3Dm CONFIG_CRYPTO_FCRYPT=3Dm CONFIG_CRYPTO_KHAZAD=3Dm CONFIG_CRYPTO_SEED=3Dm +CONFIG_CRYPTO_ARIA=3Dm CONFIG_CRYPTO_SERPENT=3Dm CONFIG_CRYPTO_SM4_GENERIC=3Dm CONFIG_CRYPTO_TEA=3Dm diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defc= onfig index 7d8dc578d59c6ffb..eea582f0e4dc57f1 100644 --- a/arch/m68k/configs/sun3_defconfig +++ b/arch/m68k/configs/sun3_defconfig @@ -521,9 +521,9 @@ CONFIG_CRYPTO_PCBC=3Dm CONFIG_CRYPTO_XTS=3Dm CONFIG_CRYPTO_KEYWRAP=3Dm CONFIG_CRYPTO_ADIANTUM=3Dm +CONFIG_CRYPTO_HCTR2=3Dm CONFIG_CRYPTO_XCBC=3Dm CONFIG_CRYPTO_VMAC=3Dm -CONFIG_CRYPTO_BLAKE2S=3Dm CONFIG_CRYPTO_MD4=3Dm CONFIG_CRYPTO_MICHAEL_MIC=3Dm CONFIG_CRYPTO_RMD160=3Dm @@ -542,6 +542,7 @@ CONFIG_CRYPTO_DES=3Dm CONFIG_CRYPTO_FCRYPT=3Dm CONFIG_CRYPTO_KHAZAD=3Dm CONFIG_CRYPTO_SEED=3Dm +CONFIG_CRYPTO_ARIA=3Dm CONFIG_CRYPTO_SERPENT=3Dm CONFIG_CRYPTO_SM4_GENERIC=3Dm CONFIG_CRYPTO_TEA=3Dm diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_de= fconfig index 96290aee530211e3..d2c857cf74b8c99f 100644 --- a/arch/m68k/configs/sun3x_defconfig +++ b/arch/m68k/configs/sun3x_defconfig @@ -520,9 +520,9 @@ CONFIG_CRYPTO_PCBC=3Dm CONFIG_CRYPTO_XTS=3Dm CONFIG_CRYPTO_KEYWRAP=3Dm CONFIG_CRYPTO_ADIANTUM=3Dm +CONFIG_CRYPTO_HCTR2=3Dm CONFIG_CRYPTO_XCBC=3Dm CONFIG_CRYPTO_VMAC=3Dm -CONFIG_CRYPTO_BLAKE2S=3Dm CONFIG_CRYPTO_MD4=3Dm CONFIG_CRYPTO_MICHAEL_MIC=3Dm CONFIG_CRYPTO_RMD160=3Dm @@ -541,6 +541,7 @@ CONFIG_CRYPTO_DES=3Dm CONFIG_CRYPTO_FCRYPT=3Dm CONFIG_CRYPTO_KHAZAD=3Dm CONFIG_CRYPTO_SEED=3Dm +CONFIG_CRYPTO_ARIA=3Dm CONFIG_CRYPTO_SERPENT=3Dm CONFIG_CRYPTO_SM4_GENERIC=3Dm CONFIG_CRYPTO_TEA=3Dm --=20 2.25.1