From mboxrd@z Thu Jan 1 00:00:00 1970 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 2835BC6498F for ; Thu, 25 Aug 2022 01:47:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236621AbiHYBrZ (ORCPT ); Wed, 24 Aug 2022 21:47:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237676AbiHYBqI (ORCPT ); Wed, 24 Aug 2022 21:46:08 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2CB959E8B4; Wed, 24 Aug 2022 18:41:08 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 68F5661AED; Thu, 25 Aug 2022 01:40:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7D0D1C43141; Thu, 25 Aug 2022 01:40:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1661391630; bh=qLkpsiE096ATdfX5je244y3ZRqLFcn4VDU0d1xZWDhI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NmThZg42Be1U06F3o7MM7wSDZ4fNWR2sxgQvRTinPbd4Me+JLLkjxvXkxT78bZJWi 2x5TYxkHPIu2X/w/6064X0+AEHMuwDKXrqrWJB+iKjuthXRNwVC1HS3GxGqZSxzLH7 WyFiHBhyzKrvQb8kXDbohObhPV3n0aOxxpmMJZvVUipRb803c4oy5SDOv6rdo47ii8 FP+5oWwZc//QoXdfm9QEc8fJyhlXbPUwYA3MZ1oh46/9ElotnJSw8inR/BX7RdffIA +p1mQIIz86JJoAwzs98jT1qrxFLok3H8nhBnZNj/ZGtGbTSvEsA00QaaYzgDka4ZlN HttBf4IWzOHOg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Geert Uytterhoeven , Florian Westphal , Sasha Levin , pablo@netfilter.org, kadlec@netfilter.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 3/4] netfilter: conntrack: NF_CONNTRACK_PROCFS should no longer default to y Date: Wed, 24 Aug 2022 21:40:17 -0400 Message-Id: <20220825014020.24088-3-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220825014020.24088-1-sashal@kernel.org> References: <20220825014020.24088-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Geert Uytterhoeven [ Upstream commit aa5762c34213aba7a72dc58e70601370805fa794 ] NF_CONNTRACK_PROCFS was marked obsolete in commit 54b07dca68557b09 ("netfilter: provide config option to disable ancient procfs parts") in v3.3. Signed-off-by: Geert Uytterhoeven Signed-off-by: Florian Westphal Signed-off-by: Sasha Levin --- net/netfilter/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index 1b302d9fd0a0..19d6821b0ffd 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -100,7 +100,6 @@ config NF_CONNTRACK_ZONES config NF_CONNTRACK_PROCFS bool "Supply CT list in procfs (OBSOLETE)" - default y depends on PROC_FS ---help--- This option enables for the list of known conntrack entries -- 2.35.1