Received: by 2002:a05:6358:45e:b0:b5:b6eb:e1f9 with SMTP id 30csp1967804rwe; Fri, 2 Sep 2022 06:44:56 -0700 (PDT) X-Google-Smtp-Source: AA6agR4PSYnbJgKqhDaS4jf1QlV//x8jFkmJ7bb6hA+aR9Qr8+bjIOYi50KF7sOE0WY1Z6WyeypE X-Received: by 2002:a17:902:8f8a:b0:16f:975e:7c6e with SMTP id z10-20020a1709028f8a00b0016f975e7c6emr36171338plo.136.1662126295822; Fri, 02 Sep 2022 06:44:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662126295; cv=none; d=google.com; s=arc-20160816; b=vALIH9tnCcE4nZME7qroLJySGrYMpTnf0WaKNjGzGLsNqz62GqDmGzEt4jZgkrP6cG 7sznopo2YjzhlyfMD7VRjZ4zVn9usLyLUv2BkvyxDiH2GGi2dG4mws6UGAPE186cC2yh L1gAn9170MB4RJaVTpO8gcThEZD8n2ww2G/j7+f73o6H9UhhXUKuA8mAG0QR6QrkGRUM 03IU6hVRs4VGFc3YXROCgp6NsKprKvK898t/yUzqxktPNFMpLPtaB80C2ofB35yQxIXA iqTY+GUidNTYxsAJvYAZkopaEBBJRmfU/z1A12AOxmpboOoCmNegyOxeDeQtUZW/Bghk Uk5A== 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=LJitbnIHSsRI/xIIjoCRnxX5iUc8pS8YCL0BsMyAcDo=; b=onNn5nwc255os/GgejcK3Fi8iZLk43UvWe1LIMvL+g4k7tRt/1Lq86f+EPzluHMy7O cihNNKhQvqmXmCerTQ7QAyI/fNQqMn9iIKMUXBPLeIUY3FG4vjW3O767GCAS371Z17zn kd8FpShXI3D6ptvJ0r9DjptIs+9/pPkekG0pcDz2V6+eV0TnrcYInjyI3Ie5/mmw2NgO QWIl0Z7uuE9aSC2zD415VEGB1DJCGqCCtV8j0e5CzZbcv1/RV7sw86P+U8M30LSj3+JW OlFGXS6aBypgUXRUbd4bPsZEIE4xDK86NrQFEQa0QFPx0dtWcc8AN1UTMulkaNMsnWQe D5BQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=dRaEsTj+; 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 s3-20020a634503000000b0042bb0453c2esi1839552pga.532.2022.09.02.06.44.44; Fri, 02 Sep 2022 06:44:55 -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=dRaEsTj+; 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 S237443AbiIBMqS (ORCPT + 99 others); Fri, 2 Sep 2022 08:46:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56272 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237498AbiIBMnr (ORCPT ); Fri, 2 Sep 2022 08:43:47 -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 94461E86BA; Fri, 2 Sep 2022 05:32:36 -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 4CE56620E1; Fri, 2 Sep 2022 12:30:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 53B60C433C1; Fri, 2 Sep 2022 12:30:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1662121801; bh=h9Omd5d/MFc2Q3U8UrgU16es4Zq80YP3MfGWfzDOvkk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dRaEsTj+msdUe/LW381pD0uNMUdvTpFAfMqpmu7LNKzVLAhU4Q+Ada95zveWF6hHA rDFDDyQfdiwyFYPuoZ4BCNnddtYTjppyVo04TC1HsNVta1Hz3+JKZwqN31+QgOqbae Duj378V70XSog+/EW+ajESF61x0Spsff9HzUZmHc= 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.4 70/77] netfilter: conntrack: NF_CONNTRACK_PROCFS should no longer default to y Date: Fri, 2 Sep 2022 14:19:19 +0200 Message-Id: <20220902121406.003382579@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220902121403.569927325@linuxfoundation.org> References: <20220902121403.569927325@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 ef72819d9d315..d569915da003c 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -118,7 +118,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