Received: by 2002:a05:6358:45e:b0:b5:b6eb:e1f9 with SMTP id 30csp2077585rwe; Fri, 2 Sep 2022 08:11:09 -0700 (PDT) X-Google-Smtp-Source: AA6agR4Xy7YGCJvT2yNU4OepFeF4sP0qBSVyg0ILT4JCO4J0ii9SGlC85p53IplWsu74LF4QJjAE X-Received: by 2002:a17:906:4fd0:b0:73d:be5b:291b with SMTP id i16-20020a1709064fd000b0073dbe5b291bmr27662916ejw.157.1662131469451; Fri, 02 Sep 2022 08:11:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662131469; cv=none; d=google.com; s=arc-20160816; b=Wo5RYBS9bRk1pLnOaNio8Rl8WXtuvqOQDz5ZZPV0YNk0zlV40e4trKRYIUGUgkSl/O OuxdO5qdXOvW0W1eJ9uUepTaOhKEbMB2vd+yReUzpzsiNArjePyOys+rw3XpjoKvsD3W gfcV+7nJK0ymUDcpWNokSG2rDF5AxqA6J0Y7kTT/1zmOith+9TGWLU3yNXS34mYUuO/U G7XC1YggKROG2rNea1SXcZcyh4xehC5Oxx1XFqG+8zRUYUWq8n7fFTr+1pIbfTG1L/5V oMuFGPrtkXYUspM9GBMx/uVIYQUQZ4R4Jj6UWgBl1bCsfstGCa/H4ZRgtqatom7RCHsu DCuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=SZwMhHUrGhTzCe8IXdQKjE+3v4KRTSRa/0Ho9bKXCw4=; b=ighk6T8QA8wiFUsc4d8SZwck7nfzf09puWb87bclZIyV2khpKros5DcKy7mqz/AvRd VwFYifht8JrgxpTWWtnjcJXvjbTedyRRbisVU+Znz+w4fLSeuK2FC7UxB/q2Q91KQjOK DWxk39sys903qLo+KQBU5FGRs+DwKyNIG3W6KF+zlf6FnZFKcBpBgiW8Du4RwgMp61eX 2+9y99nVXXYUGyuYT6JZMxivf5HbfOKDiNA/VqaS5BrtmG92TxxYPmLi9uYQLqPtoS32 9cYJWK/hdlvlNo2gW5lx9xDXq3Cpm5W8QAnq4azMeYq19lA9cDw7tR0Vf5LDjEb8Kmm1 ZZhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=vmKG1Fhp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z1-20020a056402274100b004486d3bcacdsi2194769edd.5.2022.09.02.08.10.18; Fri, 02 Sep 2022 08:11:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=vmKG1Fhp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235287AbiIBOt0 (ORCPT + 99 others); Fri, 2 Sep 2022 10:49:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237264AbiIBOst (ORCPT ); Fri, 2 Sep 2022 10:48:49 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D793B4A4; Fri, 2 Sep 2022 07:10:02 -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 ams.source.kernel.org (Postfix) with ESMTPS id 35743B82AA5; Fri, 2 Sep 2022 12:34:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A252BC433B5; Fri, 2 Sep 2022 12:34:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1662122069; bh=ngG15JejDqqcJ9SlXbwYiQ/bNv4YoNx9fC8TWrz6c3Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vmKG1FhpJKcIEeHXo1UP2m8abQwI2tqs0qKXLVuNL5MNY806AZU0ecoZWpIPaW74j QJACl700Hmc2vSOhooyu30tUKnon+gnxJp/W79rpeV7CbpXtgnoh4Zg4lliI8GSYuF 0Kggt4tomIO9VLJIMy1QdQ02qlMie9W1ETrjLz40= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Geert Uytterhoeven , Florian Westphal , Sasha Levin Subject: [PATCH 5.15 64/73] netfilter: conntrack: NF_CONNTRACK_PROCFS should no longer default to y Date: Fri, 2 Sep 2022 14:19:28 +0200 Message-Id: <20220902121406.522493900@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220902121404.435662285@linuxfoundation.org> References: <20220902121404.435662285@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 92a747896f808..4f645d51c2573 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -133,7 +133,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