From nobody Tue Jun 30 06:26:17 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 6E631C433EF for ; Sun, 23 Jan 2022 12:55:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236355AbiAWMzw (ORCPT ); Sun, 23 Jan 2022 07:55:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232712AbiAWMzv (ORCPT ); Sun, 23 Jan 2022 07:55:51 -0500 Received: from xavier.telenet-ops.be (xavier.telenet-ops.be [IPv6:2a02:1800:120:4::f00:14]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C28BCC06173D for ; Sun, 23 Jan 2022 04:55:50 -0800 (PST) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:20cc:b383:efc8:c1b8]) by xavier.telenet-ops.be with bizsmtp id mCvl2600U4688xB01Cvl6g; Sun, 23 Jan 2022 13:55:46 +0100 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 1nBcPJ-00B8r2-Aj; Sun, 23 Jan 2022 13:55:45 +0100 Received: from geert by rox.of.borg with local (Exim 4.93) (envelope-from ) id 1nBcPI-00B9aw-Mh; Sun, 23 Jan 2022 13:55:44 +0100 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 v5.17-rc1 Date: Sun, 23 Jan 2022 13:55:43 +0100 Message-Id: <20220123125543.2658445-1-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" - Drop CONFIG_NFT_COUNTER=3Dm (removed in commit 023223dfbfb34fcc ("netfilter: nf_tables: make counter support built-in")), - Drop CONFIG_NF_FLOW_TABLE_IPV4=3Dm and CONFIG_NF_FLOW_TABLE_IPV6=3Dm (can no longer be enabled since commit c42ba4290b2147aa ("netfilter: flowtable: remove ipv4/ipv6 modules")), - Drop CONFIG_TEST_HASH=3Dm (replaced by auto-modular HASH_KUNIT_TEST in commit 0acc968f352336a4 ("test_hash.c: refactor into kunit")), - Enable modular build of the new siphash selftest. Signed-off-by: Geert Uytterhoeven --- To be queued in the m68k for-v5.18 branch. arch/m68k/configs/amiga_defconfig | 5 +---- arch/m68k/configs/apollo_defconfig | 5 +---- arch/m68k/configs/atari_defconfig | 5 +---- arch/m68k/configs/bvme6000_defconfig | 5 +---- arch/m68k/configs/hp300_defconfig | 5 +---- arch/m68k/configs/mac_defconfig | 5 +---- arch/m68k/configs/multi_defconfig | 5 +---- arch/m68k/configs/mvme147_defconfig | 5 +---- arch/m68k/configs/mvme16x_defconfig | 5 +---- arch/m68k/configs/q40_defconfig | 5 +---- arch/m68k/configs/sun3_defconfig | 5 +---- arch/m68k/configs/sun3x_defconfig | 5 +---- 12 files changed, 12 insertions(+), 48 deletions(-) diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_de= fconfig index bc9952f8be6675d7..eb930b9633602aff 100644 --- a/arch/m68k/configs/amiga_defconfig +++ b/arch/m68k/configs/amiga_defconfig @@ -104,7 +104,6 @@ CONFIG_NF_TABLES_NETDEV=3Dy CONFIG_NFT_NUMGEN=3Dm CONFIG_NFT_CT=3Dm CONFIG_NFT_FLOW_OFFLOAD=3Dm -CONFIG_NFT_COUNTER=3Dm CONFIG_NFT_CONNLIMIT=3Dm CONFIG_NFT_LOG=3Dm CONFIG_NFT_LIMIT=3Dm @@ -204,7 +203,6 @@ CONFIG_IP_SET_LIST_SET=3Dm CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy -CONFIG_NF_FLOW_TABLE_IPV4=3Dm CONFIG_NF_LOG_ARP=3Dm CONFIG_NF_LOG_IPV4=3Dm CONFIG_IP_NF_IPTABLES=3Dm @@ -229,7 +227,6 @@ CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm CONFIG_NFT_DUP_IPV6=3Dm CONFIG_NFT_FIB_IPV6=3Dm -CONFIG_NF_FLOW_TABLE_IPV6=3Dm CONFIG_IP6_NF_IPTABLES=3Dm CONFIG_IP6_NF_MATCH_AH=3Dm CONFIG_IP6_NF_MATCH_EUI64=3Dm @@ -643,7 +640,7 @@ CONFIG_TEST_UUID=3Dm CONFIG_TEST_XARRAY=3Dm CONFIG_TEST_OVERFLOW=3Dm CONFIG_TEST_RHASHTABLE=3Dm -CONFIG_TEST_HASH=3Dm +CONFIG_TEST_SIPHASH=3Dm CONFIG_TEST_IDA=3Dm CONFIG_TEST_BITOPS=3Dm CONFIG_TEST_VMALLOC=3Dm diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_= defconfig index a77269c6e5bacfc1..5acd495c83ceb756 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_defconfig @@ -100,7 +100,6 @@ CONFIG_NF_TABLES_NETDEV=3Dy CONFIG_NFT_NUMGEN=3Dm CONFIG_NFT_CT=3Dm CONFIG_NFT_FLOW_OFFLOAD=3Dm -CONFIG_NFT_COUNTER=3Dm CONFIG_NFT_CONNLIMIT=3Dm CONFIG_NFT_LOG=3Dm CONFIG_NFT_LIMIT=3Dm @@ -200,7 +199,6 @@ CONFIG_IP_SET_LIST_SET=3Dm CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy -CONFIG_NF_FLOW_TABLE_IPV4=3Dm CONFIG_NF_LOG_ARP=3Dm CONFIG_NF_LOG_IPV4=3Dm CONFIG_IP_NF_IPTABLES=3Dm @@ -225,7 +223,6 @@ CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm CONFIG_NFT_DUP_IPV6=3Dm CONFIG_NFT_FIB_IPV6=3Dm -CONFIG_NF_FLOW_TABLE_IPV6=3Dm CONFIG_IP6_NF_IPTABLES=3Dm CONFIG_IP6_NF_MATCH_AH=3Dm CONFIG_IP6_NF_MATCH_EUI64=3Dm @@ -599,7 +596,7 @@ CONFIG_TEST_UUID=3Dm CONFIG_TEST_XARRAY=3Dm CONFIG_TEST_OVERFLOW=3Dm CONFIG_TEST_RHASHTABLE=3Dm -CONFIG_TEST_HASH=3Dm +CONFIG_TEST_SIPHASH=3Dm CONFIG_TEST_IDA=3Dm CONFIG_TEST_BITOPS=3Dm CONFIG_TEST_VMALLOC=3Dm diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_de= fconfig index 4a570c3c307f02e9..95016ccea1fc25db 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_defconfig @@ -107,7 +107,6 @@ CONFIG_NF_TABLES_NETDEV=3Dy CONFIG_NFT_NUMGEN=3Dm CONFIG_NFT_CT=3Dm CONFIG_NFT_FLOW_OFFLOAD=3Dm -CONFIG_NFT_COUNTER=3Dm CONFIG_NFT_CONNLIMIT=3Dm CONFIG_NFT_LOG=3Dm CONFIG_NFT_LIMIT=3Dm @@ -207,7 +206,6 @@ CONFIG_IP_SET_LIST_SET=3Dm CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy -CONFIG_NF_FLOW_TABLE_IPV4=3Dm CONFIG_NF_LOG_ARP=3Dm CONFIG_NF_LOG_IPV4=3Dm CONFIG_IP_NF_IPTABLES=3Dm @@ -232,7 +230,6 @@ CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm CONFIG_NFT_DUP_IPV6=3Dm CONFIG_NFT_FIB_IPV6=3Dm -CONFIG_NF_FLOW_TABLE_IPV6=3Dm CONFIG_IP6_NF_IPTABLES=3Dm CONFIG_IP6_NF_MATCH_AH=3Dm CONFIG_IP6_NF_MATCH_EUI64=3Dm @@ -632,7 +629,7 @@ CONFIG_TEST_UUID=3Dm CONFIG_TEST_XARRAY=3Dm CONFIG_TEST_OVERFLOW=3Dm CONFIG_TEST_RHASHTABLE=3Dm -CONFIG_TEST_HASH=3Dm +CONFIG_TEST_SIPHASH=3Dm CONFIG_TEST_IDA=3Dm CONFIG_TEST_BITOPS=3Dm CONFIG_TEST_VMALLOC=3Dm diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6= 000_defconfig index a5323bf2eb3336a8..e6de6b4dff86eddb 100644 --- a/arch/m68k/configs/bvme6000_defconfig +++ b/arch/m68k/configs/bvme6000_defconfig @@ -97,7 +97,6 @@ CONFIG_NF_TABLES_NETDEV=3Dy CONFIG_NFT_NUMGEN=3Dm CONFIG_NFT_CT=3Dm CONFIG_NFT_FLOW_OFFLOAD=3Dm -CONFIG_NFT_COUNTER=3Dm CONFIG_NFT_CONNLIMIT=3Dm CONFIG_NFT_LOG=3Dm CONFIG_NFT_LIMIT=3Dm @@ -197,7 +196,6 @@ CONFIG_IP_SET_LIST_SET=3Dm CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy -CONFIG_NF_FLOW_TABLE_IPV4=3Dm CONFIG_NF_LOG_ARP=3Dm CONFIG_NF_LOG_IPV4=3Dm CONFIG_IP_NF_IPTABLES=3Dm @@ -222,7 +220,6 @@ CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm CONFIG_NFT_DUP_IPV6=3Dm CONFIG_NFT_FIB_IPV6=3Dm -CONFIG_NF_FLOW_TABLE_IPV6=3Dm CONFIG_IP6_NF_IPTABLES=3Dm CONFIG_IP6_NF_MATCH_AH=3Dm CONFIG_IP6_NF_MATCH_EUI64=3Dm @@ -592,7 +589,7 @@ CONFIG_TEST_UUID=3Dm CONFIG_TEST_XARRAY=3Dm CONFIG_TEST_OVERFLOW=3Dm CONFIG_TEST_RHASHTABLE=3Dm -CONFIG_TEST_HASH=3Dm +CONFIG_TEST_SIPHASH=3Dm CONFIG_TEST_IDA=3Dm CONFIG_TEST_BITOPS=3Dm CONFIG_TEST_VMALLOC=3Dm diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_de= fconfig index 5e80aa0869d54109..89dd800e7ad24354 100644 --- a/arch/m68k/configs/hp300_defconfig +++ b/arch/m68k/configs/hp300_defconfig @@ -99,7 +99,6 @@ CONFIG_NF_TABLES_NETDEV=3Dy CONFIG_NFT_NUMGEN=3Dm CONFIG_NFT_CT=3Dm CONFIG_NFT_FLOW_OFFLOAD=3Dm -CONFIG_NFT_COUNTER=3Dm CONFIG_NFT_CONNLIMIT=3Dm CONFIG_NFT_LOG=3Dm CONFIG_NFT_LIMIT=3Dm @@ -199,7 +198,6 @@ CONFIG_IP_SET_LIST_SET=3Dm CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy -CONFIG_NF_FLOW_TABLE_IPV4=3Dm CONFIG_NF_LOG_ARP=3Dm CONFIG_NF_LOG_IPV4=3Dm CONFIG_IP_NF_IPTABLES=3Dm @@ -224,7 +222,6 @@ CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm CONFIG_NFT_DUP_IPV6=3Dm CONFIG_NFT_FIB_IPV6=3Dm -CONFIG_NF_FLOW_TABLE_IPV6=3Dm CONFIG_IP6_NF_IPTABLES=3Dm CONFIG_IP6_NF_MATCH_AH=3Dm CONFIG_IP6_NF_MATCH_EUI64=3Dm @@ -601,7 +598,7 @@ CONFIG_TEST_UUID=3Dm CONFIG_TEST_XARRAY=3Dm CONFIG_TEST_OVERFLOW=3Dm CONFIG_TEST_RHASHTABLE=3Dm -CONFIG_TEST_HASH=3Dm +CONFIG_TEST_SIPHASH=3Dm CONFIG_TEST_IDA=3Dm CONFIG_TEST_BITOPS=3Dm CONFIG_TEST_VMALLOC=3Dm diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defcon= fig index e84326a3f62db53c..4e5b32ba00dfcedc 100644 --- a/arch/m68k/configs/mac_defconfig +++ b/arch/m68k/configs/mac_defconfig @@ -98,7 +98,6 @@ CONFIG_NF_TABLES_NETDEV=3Dy CONFIG_NFT_NUMGEN=3Dm CONFIG_NFT_CT=3Dm CONFIG_NFT_FLOW_OFFLOAD=3Dm -CONFIG_NFT_COUNTER=3Dm CONFIG_NFT_CONNLIMIT=3Dm CONFIG_NFT_LOG=3Dm CONFIG_NFT_LIMIT=3Dm @@ -198,7 +197,6 @@ CONFIG_IP_SET_LIST_SET=3Dm CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy -CONFIG_NF_FLOW_TABLE_IPV4=3Dm CONFIG_NF_LOG_ARP=3Dm CONFIG_NF_LOG_IPV4=3Dm CONFIG_IP_NF_IPTABLES=3Dm @@ -223,7 +221,6 @@ CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm CONFIG_NFT_DUP_IPV6=3Dm CONFIG_NFT_FIB_IPV6=3Dm -CONFIG_NF_FLOW_TABLE_IPV6=3Dm CONFIG_IP6_NF_IPTABLES=3Dm CONFIG_IP6_NF_MATCH_AH=3Dm CONFIG_IP6_NF_MATCH_EUI64=3Dm @@ -623,7 +620,7 @@ CONFIG_TEST_UUID=3Dm CONFIG_TEST_XARRAY=3Dm CONFIG_TEST_OVERFLOW=3Dm CONFIG_TEST_RHASHTABLE=3Dm -CONFIG_TEST_HASH=3Dm +CONFIG_TEST_SIPHASH=3Dm CONFIG_TEST_IDA=3Dm CONFIG_TEST_BITOPS=3Dm CONFIG_TEST_VMALLOC=3Dm diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_de= fconfig index 337552f433390aae..00757de800b62c90 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_defconfig @@ -118,7 +118,6 @@ CONFIG_NF_TABLES_NETDEV=3Dy CONFIG_NFT_NUMGEN=3Dm CONFIG_NFT_CT=3Dm CONFIG_NFT_FLOW_OFFLOAD=3Dm -CONFIG_NFT_COUNTER=3Dm CONFIG_NFT_CONNLIMIT=3Dm CONFIG_NFT_LOG=3Dm CONFIG_NFT_LIMIT=3Dm @@ -218,7 +217,6 @@ CONFIG_IP_SET_LIST_SET=3Dm CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy -CONFIG_NF_FLOW_TABLE_IPV4=3Dm CONFIG_NF_LOG_ARP=3Dm CONFIG_NF_LOG_IPV4=3Dm CONFIG_IP_NF_IPTABLES=3Dm @@ -243,7 +241,6 @@ CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm CONFIG_NFT_DUP_IPV6=3Dm CONFIG_NFT_FIB_IPV6=3Dm -CONFIG_NF_FLOW_TABLE_IPV6=3Dm CONFIG_IP6_NF_IPTABLES=3Dm CONFIG_IP6_NF_MATCH_AH=3Dm CONFIG_IP6_NF_MATCH_EUI64=3Dm @@ -708,7 +705,7 @@ CONFIG_TEST_UUID=3Dm CONFIG_TEST_XARRAY=3Dm CONFIG_TEST_OVERFLOW=3Dm CONFIG_TEST_RHASHTABLE=3Dm -CONFIG_TEST_HASH=3Dm +CONFIG_TEST_SIPHASH=3Dm CONFIG_TEST_IDA=3Dm CONFIG_TEST_BITOPS=3Dm CONFIG_TEST_VMALLOC=3Dm diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme14= 7_defconfig index 7b688f7d272a2980..80922fe80d9dec66 100644 --- a/arch/m68k/configs/mvme147_defconfig +++ b/arch/m68k/configs/mvme147_defconfig @@ -96,7 +96,6 @@ CONFIG_NF_TABLES_NETDEV=3Dy CONFIG_NFT_NUMGEN=3Dm CONFIG_NFT_CT=3Dm CONFIG_NFT_FLOW_OFFLOAD=3Dm -CONFIG_NFT_COUNTER=3Dm CONFIG_NFT_CONNLIMIT=3Dm CONFIG_NFT_LOG=3Dm CONFIG_NFT_LIMIT=3Dm @@ -196,7 +195,6 @@ CONFIG_IP_SET_LIST_SET=3Dm CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy -CONFIG_NF_FLOW_TABLE_IPV4=3Dm CONFIG_NF_LOG_ARP=3Dm CONFIG_NF_LOG_IPV4=3Dm CONFIG_IP_NF_IPTABLES=3Dm @@ -221,7 +219,6 @@ CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm CONFIG_NFT_DUP_IPV6=3Dm CONFIG_NFT_FIB_IPV6=3Dm -CONFIG_NF_FLOW_TABLE_IPV6=3Dm CONFIG_IP6_NF_IPTABLES=3Dm CONFIG_IP6_NF_MATCH_AH=3Dm CONFIG_IP6_NF_MATCH_EUI64=3Dm @@ -591,7 +588,7 @@ CONFIG_TEST_UUID=3Dm CONFIG_TEST_XARRAY=3Dm CONFIG_TEST_OVERFLOW=3Dm CONFIG_TEST_RHASHTABLE=3Dm -CONFIG_TEST_HASH=3Dm +CONFIG_TEST_SIPHASH=3Dm CONFIG_TEST_IDA=3Dm CONFIG_TEST_BITOPS=3Dm CONFIG_TEST_VMALLOC=3Dm diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16= x_defconfig index 7c2cb31d63dd8ebb..530c4cf7c59ba6d9 100644 --- a/arch/m68k/configs/mvme16x_defconfig +++ b/arch/m68k/configs/mvme16x_defconfig @@ -97,7 +97,6 @@ CONFIG_NF_TABLES_NETDEV=3Dy CONFIG_NFT_NUMGEN=3Dm CONFIG_NFT_CT=3Dm CONFIG_NFT_FLOW_OFFLOAD=3Dm -CONFIG_NFT_COUNTER=3Dm CONFIG_NFT_CONNLIMIT=3Dm CONFIG_NFT_LOG=3Dm CONFIG_NFT_LIMIT=3Dm @@ -197,7 +196,6 @@ CONFIG_IP_SET_LIST_SET=3Dm CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy -CONFIG_NF_FLOW_TABLE_IPV4=3Dm CONFIG_NF_LOG_ARP=3Dm CONFIG_NF_LOG_IPV4=3Dm CONFIG_IP_NF_IPTABLES=3Dm @@ -222,7 +220,6 @@ CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm CONFIG_NFT_DUP_IPV6=3Dm CONFIG_NFT_FIB_IPV6=3Dm -CONFIG_NF_FLOW_TABLE_IPV6=3Dm CONFIG_IP6_NF_IPTABLES=3Dm CONFIG_IP6_NF_MATCH_AH=3Dm CONFIG_IP6_NF_MATCH_EUI64=3Dm @@ -592,7 +589,7 @@ CONFIG_TEST_UUID=3Dm CONFIG_TEST_XARRAY=3Dm CONFIG_TEST_OVERFLOW=3Dm CONFIG_TEST_RHASHTABLE=3Dm -CONFIG_TEST_HASH=3Dm +CONFIG_TEST_SIPHASH=3Dm CONFIG_TEST_IDA=3Dm CONFIG_TEST_BITOPS=3Dm CONFIG_TEST_VMALLOC=3Dm diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defcon= fig index ca43897af26de2c8..d3f371e490ec058a 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_defconfig @@ -98,7 +98,6 @@ CONFIG_NF_TABLES_NETDEV=3Dy CONFIG_NFT_NUMGEN=3Dm CONFIG_NFT_CT=3Dm CONFIG_NFT_FLOW_OFFLOAD=3Dm -CONFIG_NFT_COUNTER=3Dm CONFIG_NFT_CONNLIMIT=3Dm CONFIG_NFT_LOG=3Dm CONFIG_NFT_LIMIT=3Dm @@ -198,7 +197,6 @@ CONFIG_IP_SET_LIST_SET=3Dm CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy -CONFIG_NF_FLOW_TABLE_IPV4=3Dm CONFIG_NF_LOG_ARP=3Dm CONFIG_NF_LOG_IPV4=3Dm CONFIG_IP_NF_IPTABLES=3Dm @@ -223,7 +221,6 @@ CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm CONFIG_NFT_DUP_IPV6=3Dm CONFIG_NFT_FIB_IPV6=3Dm -CONFIG_NF_FLOW_TABLE_IPV6=3Dm CONFIG_IP6_NF_IPTABLES=3Dm CONFIG_IP6_NF_MATCH_AH=3Dm CONFIG_IP6_NF_MATCH_EUI64=3Dm @@ -610,7 +607,7 @@ CONFIG_TEST_UUID=3Dm CONFIG_TEST_XARRAY=3Dm CONFIG_TEST_OVERFLOW=3Dm CONFIG_TEST_RHASHTABLE=3Dm -CONFIG_TEST_HASH=3Dm +CONFIG_TEST_SIPHASH=3Dm CONFIG_TEST_IDA=3Dm CONFIG_TEST_BITOPS=3Dm CONFIG_TEST_VMALLOC=3Dm diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defc= onfig index e3d515f37144aa33..f214f277c55a18a1 100644 --- a/arch/m68k/configs/sun3_defconfig +++ b/arch/m68k/configs/sun3_defconfig @@ -94,7 +94,6 @@ CONFIG_NF_TABLES_NETDEV=3Dy CONFIG_NFT_NUMGEN=3Dm CONFIG_NFT_CT=3Dm CONFIG_NFT_FLOW_OFFLOAD=3Dm -CONFIG_NFT_COUNTER=3Dm CONFIG_NFT_CONNLIMIT=3Dm CONFIG_NFT_LOG=3Dm CONFIG_NFT_LIMIT=3Dm @@ -194,7 +193,6 @@ CONFIG_IP_SET_LIST_SET=3Dm CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy -CONFIG_NF_FLOW_TABLE_IPV4=3Dm CONFIG_NF_LOG_ARP=3Dm CONFIG_NF_LOG_IPV4=3Dm CONFIG_IP_NF_IPTABLES=3Dm @@ -219,7 +217,6 @@ CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm CONFIG_NFT_DUP_IPV6=3Dm CONFIG_NFT_FIB_IPV6=3Dm -CONFIG_NF_FLOW_TABLE_IPV6=3Dm CONFIG_IP6_NF_IPTABLES=3Dm CONFIG_IP6_NF_MATCH_AH=3Dm CONFIG_IP6_NF_MATCH_EUI64=3Dm @@ -593,7 +590,7 @@ CONFIG_TEST_UUID=3Dm CONFIG_TEST_XARRAY=3Dm CONFIG_TEST_OVERFLOW=3Dm CONFIG_TEST_RHASHTABLE=3Dm -CONFIG_TEST_HASH=3Dm +CONFIG_TEST_SIPHASH=3Dm CONFIG_TEST_IDA=3Dm CONFIG_TEST_BITOPS=3Dm CONFIG_TEST_VMALLOC=3Dm diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_de= fconfig index d601606c969b894e..73b4c61394a2a306 100644 --- a/arch/m68k/configs/sun3x_defconfig +++ b/arch/m68k/configs/sun3x_defconfig @@ -94,7 +94,6 @@ CONFIG_NF_TABLES_NETDEV=3Dy CONFIG_NFT_NUMGEN=3Dm CONFIG_NFT_CT=3Dm CONFIG_NFT_FLOW_OFFLOAD=3Dm -CONFIG_NFT_COUNTER=3Dm CONFIG_NFT_CONNLIMIT=3Dm CONFIG_NFT_LOG=3Dm CONFIG_NFT_LIMIT=3Dm @@ -194,7 +193,6 @@ CONFIG_IP_SET_LIST_SET=3Dm CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy -CONFIG_NF_FLOW_TABLE_IPV4=3Dm CONFIG_NF_LOG_ARP=3Dm CONFIG_NF_LOG_IPV4=3Dm CONFIG_IP_NF_IPTABLES=3Dm @@ -219,7 +217,6 @@ CONFIG_IP_NF_ARPFILTER=3Dm CONFIG_IP_NF_ARP_MANGLE=3Dm CONFIG_NFT_DUP_IPV6=3Dm CONFIG_NFT_FIB_IPV6=3Dm -CONFIG_NF_FLOW_TABLE_IPV6=3Dm CONFIG_IP6_NF_IPTABLES=3Dm CONFIG_IP6_NF_MATCH_AH=3Dm CONFIG_IP6_NF_MATCH_EUI64=3Dm @@ -593,7 +590,7 @@ CONFIG_TEST_UUID=3Dm CONFIG_TEST_XARRAY=3Dm CONFIG_TEST_OVERFLOW=3Dm CONFIG_TEST_RHASHTABLE=3Dm -CONFIG_TEST_HASH=3Dm +CONFIG_TEST_SIPHASH=3Dm CONFIG_TEST_IDA=3Dm CONFIG_TEST_BITOPS=3Dm CONFIG_TEST_VMALLOC=3Dm --=20 2.25.1