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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27FF8C433EF for ; Mon, 25 Oct 2021 19:35:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 12EFC61152 for ; Mon, 25 Oct 2021 19:35:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236266AbhJYTiE (ORCPT ); Mon, 25 Oct 2021 15:38:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:48434 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235037AbhJYTbl (ORCPT ); Mon, 25 Oct 2021 15:31:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5FEC6610D2; Mon, 25 Oct 2021 19:27:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1635190073; bh=rAPVWK/ctba25aFhxtjqoTOEQ7TqCHXv5BXQ05DtXaw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2tfZ1IT4PxFWJLa50jOQlm3vKS9qEJnaUM7QcFD2IoMVSohiXQqjgG8Wb5NXJ/sHU RkbO+oiGRvN8r5fAxPuocabaFkDjCW48DjllK5Qdqe+TPda/yfuDVjo/R4U1HVS0FH IlRtgraahjQ/Dhak4tlMyTrL+z00PV3C3IIUhyok= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vegard Nossum , Pablo Neira Ayuso Subject: [PATCH 5.4 43/58] netfilter: Kconfig: use default y instead of m for bool config option Date: Mon, 25 Oct 2021 21:15:00 +0200 Message-Id: <20211025190944.412724931@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211025190937.555108060@linuxfoundation.org> References: <20211025190937.555108060@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vegard Nossum commit 77076934afdcd46516caf18ed88b2f88025c9ddb upstream. This option, NF_CONNTRACK_SECMARK, is a bool, so it can never be 'm'. Fixes: 33b8e77605620 ("[NETFILTER]: Add CONFIG_NETFILTER_ADVANCED option") Signed-off-by: Vegard Nossum Signed-off-by: Pablo Neira Ayuso Signed-off-by: Greg Kroah-Hartman --- net/netfilter/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -94,7 +94,7 @@ config NF_CONNTRACK_MARK config NF_CONNTRACK_SECMARK bool 'Connection tracking security mark support' depends on NETWORK_SECMARK - default m if NETFILTER_ADVANCED=n + default y if NETFILTER_ADVANCED=n help This option enables security markings to be applied to connections. Typically they are copied to connections from