From patchwork Thu Aug 17 02:59:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 13355928 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 B036FC41513 for ; Thu, 17 Aug 2023 03:00:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347738AbjHQDAZ (ORCPT ); Wed, 16 Aug 2023 23:00:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51676 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347737AbjHQC75 (ORCPT ); Wed, 16 Aug 2023 22:59:57 -0400 Received: from mail-qv1-xf2f.google.com (mail-qv1-xf2f.google.com [IPv6:2607:f8b0:4864:20::f2f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1C2E1FF3; Wed, 16 Aug 2023 19:59:55 -0700 (PDT) Received: by mail-qv1-xf2f.google.com with SMTP id 6a1803df08f44-6471744acb6so21631476d6.1; Wed, 16 Aug 2023 19:59:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692241194; x=1692845994; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YE/BUm2FSSisZiwalVUsZxq3GksbeB9ZKcukTp9gXFM=; b=UZY2YVXrHGTVpEhbC5mxFz06MN1nNY1gyh7KoP2ggYewVRUUkbhSsyIhi5sB4yf5Sr YXp/Unxm0pcBXp5ekpS22Ov61WGv4mX1Jtqmm35gEkixtpLg7bT7FbO+QTo93+xlU0Ts vOLD8UWlG7J9toNDv7UQ9yaH6KUyt8ZqK0rOxCXmJnJ4xdCzSDOMUw/Fqn3c27pcaUbu U0uYDusXjtk9NVzYHoUSUwvW/jsLsYgVQ+UMznrHW6mpeCVxOtXEAtmEQaGB+haCnpbH dyRNz/QiAIt6HenV7y8ywhqVmxmUKFPlvMIJGmxAwaU/5dW4ENLiWMpEcoUBQaSxPh9h vjlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692241194; x=1692845994; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YE/BUm2FSSisZiwalVUsZxq3GksbeB9ZKcukTp9gXFM=; b=TCsn+XWOeZ8iUJhw8Z9u7KXUN4Lo+6ha3023e9eS7ojOkIO4HnIy2gCgFAkqptPRZd EyDVWqwWKbcSYs4qDmJoo7EBSjLenMXB/xh02NuPr/aXgB7tg6axYMExW97wS+tub+DZ op3GpbRdpvjR6fmP7n845pKtB9IReQTbZNM7GNlpHlCZofJ4epIOgr3S64eZd5F0wg3L YVX7U6u23h6Aio8UeRQ+t844fagFBT4qWb17lyzDB/7z9tiJxwvfRgdczzhM/8FRjVLB +C9rpsz/ULvDRd/3NxwIH5cTrRF8uT1rrxwdYyFLzP9legPSpou1nSlzUyTSd5+fXueO g3cQ== X-Gm-Message-State: AOJu0YwEc2lD6SkjbJPdiS0apveC0TA1odFAUDzeQc+k24tRS50n9qte ZZ7S3RcLM8heEsGn+YjdE+byA9v+fhM= X-Google-Smtp-Source: AGHT+IECVIOcGyGWVM+fNHMcONvgzoQkkaN3K6EQ3o6DVnQup7O4owLUrKdS4yydSMgybnuA2LUQuA== X-Received: by 2002:a0c:b38c:0:b0:643:3117:b22e with SMTP id t12-20020a0cb38c000000b006433117b22emr3157248qve.27.1692241194140; Wed, 16 Aug 2023 19:59:54 -0700 (PDT) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id c16-20020a0cf2d0000000b0063d0159e1f6sm5260184qvm.109.2023.08.16.19.59.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Aug 2023 19:59:53 -0700 (PDT) From: Trevor Woerner To: linux-kernel@vger.kernel.org, Russell King , Tony Lindgren Cc: linux-arm-kernel@lists.infradead.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-omap@vger.kernel.org Subject: [PATCH v2 1/4] arch/arm/configs/*_defconfig cleanup Date: Wed, 16 Aug 2023 22:59:36 -0400 Message-ID: <20230817025942.3209-2-twoerner@gmail.com> X-Mailer: git-send-email 2.41.0.327.gaa9166bcc0ba In-Reply-To: <20230817025942.3209-1-twoerner@gmail.com> References: <20230817025942.3209-1-twoerner@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Drop CONFIG_NF_LOG_NETDEV as it was removed in commit 1510618e45cb ("netfilter: nf_log_netdev: merge with nf_log_syslog"). Drop CONFIG_NFT_COUNTER as it was removed in commit 023223dfbfb3 ("netfilter: nf_tables: make counter support built-in"). Drop CONFIG_NF_FLOW_TABLE_IPV6 and CONFIG_NF_FLOW_TABLE_IPV4 as they were removed in commit c42ba4290b21 ("netfilter: flowtable: remove ipv4/ipv6 modules"). Drop CONFIG_NF_LOG_BRIDGE as it was removed in commit 77ccee96a674 ("netfilter: nf_log_bridge: merge with nf_log_syslog"). Drop CONFIG_IP_NF_TARGET_CLUSTERIP from any remaining arm defconfigs as it was removed in commit 57f8e00d8a82 ("usb: 71 musb: Drop old unused am35x glue layer"). Drop CONFIG_USB_MUSB_AM35X as it was removed in commit 57f8e00d8a82 ("usb: musb: Drop old unused am35x glue layer"). Drop CONFIG_NFT_OBJREF as it was removed in commit d037abc2414b ("netfilter: nft_objref: make it builtin"). Signed-off-by: Trevor Woerner --- arch/arm/configs/keystone_defconfig | 1 - arch/arm/configs/multi_v7_defconfig | 1 - arch/arm/configs/omap2plus_defconfig | 8 -------- 3 files changed, 10 deletions(-) diff --git a/arch/arm/configs/keystone_defconfig b/arch/arm/configs/keystone_defconfig index 1cb145633a91..61179b75cf1f 100644 --- a/arch/arm/configs/keystone_defconfig +++ b/arch/arm/configs/keystone_defconfig @@ -98,7 +98,6 @@ CONFIG_IP_NF_MATCH_TTL=y CONFIG_IP_NF_FILTER=y CONFIG_IP_NF_TARGET_REJECT=y CONFIG_IP_NF_MANGLE=y -CONFIG_IP_NF_TARGET_CLUSTERIP=y CONFIG_IP_NF_TARGET_ECN=y CONFIG_IP_NF_TARGET_TTL=y CONFIG_IP_NF_RAW=y diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index c7b2550d706c..497274c81ea2 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -851,7 +851,6 @@ CONFIG_USB_MUSB_HDRC=m CONFIG_USB_MUSB_SUNXI=m CONFIG_USB_MUSB_TUSB6010=m CONFIG_USB_MUSB_OMAP2PLUS=m -CONFIG_USB_MUSB_AM35X=m CONFIG_USB_MUSB_DSPS=m CONFIG_USB_MUSB_UX500=m CONFIG_USB_UX500_DMA=y diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index b685018dcf54..b2f0862f4bd9 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -78,7 +78,6 @@ CONFIG_IP_PNP_BOOTP=y CONFIG_IP_PNP_RARP=y CONFIG_NETFILTER=y CONFIG_NF_CONNTRACK=m -CONFIG_NF_LOG_NETDEV=m CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CONNTRACK_EVENTS=y CONFIG_NF_CONNTRACK_TIMEOUT=y @@ -92,7 +91,6 @@ CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_NETDEV=y CONFIG_NFT_NUMGEN=m CONFIG_NFT_CT=m -CONFIG_NFT_COUNTER=m CONFIG_NFT_CONNLIMIT=m CONFIG_NFT_LOG=m CONFIG_NFT_LIMIT=m @@ -100,7 +98,6 @@ CONFIG_NFT_MASQ=m CONFIG_NFT_REDIR=m CONFIG_NFT_NAT=m CONFIG_NFT_TUNNEL=m -CONFIG_NFT_OBJREF=m CONFIG_NFT_QUEUE=m CONFIG_NFT_QUOTA=m CONFIG_NFT_REJECT=m @@ -179,7 +176,6 @@ CONFIG_NETFILTER_XT_MATCH_TIME=m CONFIG_NETFILTER_XT_MATCH_U32=m CONFIG_NFT_DUP_IPV4=m CONFIG_NFT_FIB_IPV4=m -CONFIG_NF_FLOW_TABLE_IPV4=m CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m @@ -193,14 +189,12 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_RAW=m CONFIG_IP_NF_SECURITY=m CONFIG_NFT_DUP_IPV6=m CONFIG_NFT_FIB_IPV6=m -CONFIG_NF_FLOW_TABLE_IPV6=m CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_EUI64=m @@ -225,7 +219,6 @@ CONFIG_IP6_NF_TARGET_NPT=m CONFIG_NF_TABLES_BRIDGE=m CONFIG_NFT_BRIDGE_META=m CONFIG_NFT_BRIDGE_REJECT=m -CONFIG_NF_LOG_BRIDGE=m CONFIG_BRIDGE=m CONFIG_BRIDGE_VLAN_FILTERING=y CONFIG_VLAN_8021Q=m @@ -560,7 +553,6 @@ CONFIG_USB_STORAGE=m CONFIG_USB_MUSB_HDRC=m CONFIG_USB_MUSB_TUSB6010=m CONFIG_USB_MUSB_OMAP2PLUS=m -CONFIG_USB_MUSB_AM35X=m CONFIG_USB_MUSB_DSPS=m CONFIG_USB_INVENTRA_DMA=y CONFIG_USB_TI_CPPI41_DMA=y