From patchwork Thu Aug 3 19:18:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 13340800 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0B1ACC00528 for ; Thu, 3 Aug 2023 19:19:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=n+9OyNrQIJAgX25zY81Swhz0nC/QobT9SWolh0LuIMg=; b=BL5vjzKollPaqX G9+B9NvJPJYI7+G3SeVvFO/x8dv4wTMR1OxU+Q1KQngQvOyRf2ajbFsCMvPZGThKpQgnvaH3wONrE F+HDQ13FSWdld+2OQrylpfxz7ij7Ltg6ud47eInxCEPSTS+LUbfW56naTVt5k9vr7plh+BEZXkeSk im9bAypUUs1zsz/xaPXPobxP7P8LFUSgQzF1VqOzTRT6zGP4cTnLnoBnkQX3Gpg1PjROlmXUSUPzc B1CfIHCoTWRTVRfyRziuRemY1qM78A+v0iEzxhOmbQkcmtXJfeCYVuGxpHGGEmka+wzu51Wpg1enB onKZnZr02ALb92lTxE6g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qRdqS-00Aj3K-2v; Thu, 03 Aug 2023 19:18:52 +0000 Received: from mail-qk1-x736.google.com ([2607:f8b0:4864:20::736]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qRdqG-00Aj0o-0W for linux-arm-kernel@lists.infradead.org; Thu, 03 Aug 2023 19:18:38 +0000 Received: by mail-qk1-x736.google.com with SMTP id af79cd13be357-7656652da3cso94404085a.1 for ; Thu, 03 Aug 2023 12:18:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691090312; x=1691695112; 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=httX/IIWnWA/Ifa1Mp/nqpXb9POjzliyFa03frntpBI=; b=IQfjxzXztfBdSdGaCyL4vc1JtDh9brHapglrlZsCrz9QxnQWBKBhiZVfVmrq8aUwpv JapAshvIJE82D2550ZYQo/eat3WjguPN4SiJdDff2gAEfPlCYxg3YxUDs2lVEstl27xa pOl71oFzkpCFTGRhfYY0mt+gvBApHh/GtLHnjWQtFErMkYZTRqpJ1fF2+rLrlkgeAMVj w7oFY/lWq2WXuGCN4u5U0/duT6YR6ja0/GirA37ANsGMmKuiWto+jSFSmNUvLpbdiPGs szKATbeoTR2C87wE03oqLUAxFn7NAkKrsVVc53RAjXCIRP2uu4i5yOZwC1R47gptUSKy gIkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691090312; x=1691695112; 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=httX/IIWnWA/Ifa1Mp/nqpXb9POjzliyFa03frntpBI=; b=DFY6s2WSXpn+2QIurWkynItual/EYyoQgxIV65FOtUGTzr5hJ1etI5lmhfzmVqEP/X RJJImvbEKVY+xOrA5u6NdGTNtlbeJs69TN6Q5hCDCQEcWVVDQTkwMWtJjBz5bJ5bICh8 RNdC5JGuAtWOaL1aaSAnXtvkRLGc/l8A7U69lkaeJGpJmxsKU/R0gswTAtuwrqUZ8ZoL KnKhXfbZ2Q5b9Rwm+ZfOz7kEOSrSE2zluoOgGTdL6bOVnozJ20J433Df0n7J1Ilg8cT6 sjxkbbeWY4rXdE6UWfXShRiVLBwDv4FoJ6VefP909gE+hqZDyFX5a87zvAnxp0Q3i3oA 8r2A== X-Gm-Message-State: ABy/qLYx8DFt7Tmy5g7N0Np9CO7hc8VcLwqSY4UMxBLQMaecoHMWA+R2 Wt/8fzuASzdyhbrkK6RshdI= X-Google-Smtp-Source: APBJJlGOFSLyw0wK4w0M55a6DSb/pQawYuqJH8tWrvjJ4AfxnoIDs7Koq2wUvb/my/L2srb85j4JmQ== X-Received: by 2002:a05:6214:5141:b0:626:16ba:539f with SMTP id kh1-20020a056214514100b0062616ba539fmr16287234qvb.5.1691090312435; Thu, 03 Aug 2023 12:18:32 -0700 (PDT) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id n20-20020a0ce494000000b0063762ab2f90sm108897qvl.83.2023.08.03.12.18.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Aug 2023 12:18:31 -0700 (PDT) From: Trevor Woerner To: linux-kernel@vger.kernel.org, Tony Lindgren , Russell King Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/4] arch/arm/configs/omap2plus_defconfig: drop removed options Date: Thu, 3 Aug 2023 15:18:15 -0400 Message-ID: <20230803191821.36793-2-twoerner@gmail.com> X-Mailer: git-send-email 2.41.0.327.gaa9166bcc0ba In-Reply-To: <20230803191821.36793-1-twoerner@gmail.com> References: <20230803191821.36793-1-twoerner@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230803_121836_222634_96316B97 X-CRM114-Status: UNSURE ( 9.91 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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"). Signed-off-by: Trevor Woerner --- arch/arm/configs/omap2plus_defconfig | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index b685018dcf54..a87d7d4001b9 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 @@ -179,7 +177,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 @@ -200,7 +197,6 @@ 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 +221,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