Received: by 2002:a05:6358:45e:b0:b5:b6eb:e1f9 with SMTP id 30csp1978438rwe; Fri, 2 Sep 2022 06:55:03 -0700 (PDT) X-Google-Smtp-Source: AA6agR4SUaCe9cTVeL6TfwluyqP6aCEXX7+eAShJP3RLaRbaIK9BR1I6/b1EgBTS1A7ZmfauthJG X-Received: by 2002:a63:784f:0:b0:42b:4c9d:79ee with SMTP id t76-20020a63784f000000b0042b4c9d79eemr30051330pgc.65.1662126902852; Fri, 02 Sep 2022 06:55:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662126902; cv=none; d=google.com; s=arc-20160816; b=Cd9bh7UD8oHfR7BWhoeaah3a9Hw7JPgmSGuQjwICcnq+CUMl2TkcnPfke1trM+qxZQ uQk+zNeWObcCRQ+4gxlng5STBLaiP7gkyUzGiluypux+VHV17HySqCFmPkB6/bQJVJZB 7xTk73ljh6J533lorMZCaiowYcxPmDEMRE9qxdWQWPZ81KeAzIqYBwIYsD0qZVHGacnZ Utjr1H+wnbMcbIOV705id193e7rgw6YBaK0xJZhAiM4DQ0+f2pUXeaZcNoJiRBJEP6lf b7YNQaYK1+kfHgbHZDDbhduzXGTiM3xiuba6JjsW5eJ/mPbhxWhoInSCJgdlI3qN77HN f4Fw== 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=bDfhT6yf47WFPvuqTtgIiw1O/5bH8zSI6VgFIxnIGGw=; b=W58eqOUsUzj80flBlyVv7/BatWlzqTB6C4ge7RwmRG2+oOhAxj50J1rURZLu6JhDFI gU85vy5/AVOf3+IH6l2sAmp6yK8lV7fFbc2TkPk+JQdzOPXTVvXaiL5Jk4dv+Im9IL9G VH4zIfTmVsA+zZ8vT8gEkZ2t0kaabyRNWewAp2RCj/zttIQPW8UL+ANx6E+t8vZs4f9M hRSlSHwJXobaR2F4RRoL+3K/3gEO1gUoGA2vo6kChz3pfG29rF2CP9LazIWMzeEhmuAf Fr6pu/IIyfYyULIIpRdGNo54jhJ2VcTHbWiK/TVc+JsvCEDJVI2Z/PAJX+/0zwLLS33E gWSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=IIPsjh3B; 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 mp19-20020a17090b191300b001fd81aebb48si7176928pjb.167.2022.09.02.06.54.51; Fri, 02 Sep 2022 06:55:02 -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=IIPsjh3B; 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 S236224AbiIBMW6 (ORCPT + 99 others); Fri, 2 Sep 2022 08:22:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235509AbiIBMVS (ORCPT ); Fri, 2 Sep 2022 08:21:18 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C2FA5F126; Fri, 2 Sep 2022 05:21:17 -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 F036F620C5; Fri, 2 Sep 2022 12:21:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E7231C433C1; Fri, 2 Sep 2022 12:21:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1662121276; bh=1joMZukgXquhe1JldLqq3I638jPaO+RsxpsC/BmR6iE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IIPsjh3BYMekfTaYmaItSjQlUncF7yCz9YMnxs64T4lCVvjY93BQksgGi1i5fK6eq u2i21RwGNC1mOl6e/nywG0GbfFOPmZLuM5JdAOhR+dtnmIV9DJ5zvYVXjbc+Byo00i Dj7i2IUa9OamtINOaqH86hR3f9fKh/O4iT2aVYmg= 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 4.9 29/31] netfilter: conntrack: NF_CONNTRACK_PROCFS should no longer default to y Date: Fri, 2 Sep 2022 14:18:55 +0200 Message-Id: <20220902121357.800280384@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220902121356.732130937@linuxfoundation.org> References: <20220902121356.732130937@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 dacd2d34a790b..f7cc20641b09f 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -96,7 +96,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