Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp675826pxb; Mon, 25 Oct 2021 16:27:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/AGqPaxjMpjw4ZUlGhK932+jntsWLYhlpbepPc6igCft2c2DLr/0ZpoVDoSkRiwArNrG+ X-Received: by 2002:a17:907:1b16:: with SMTP id mp22mr26290456ejc.487.1635204424623; Mon, 25 Oct 2021 16:27:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635204424; cv=none; d=google.com; s=arc-20160816; b=IIsH5oBxQAn9mjhjb5yFHPo9sKIK60FlNeQUDvJ8G4ONqTDxBiSqJMjJUmDjdLQ2CU kE56QhQboo5+cLVi+UIfyiLCP4wEAeCm1NilDqqBrP2KmbvixhyAT6gSF2YLR/uGbsUP X72gRqE7sT80bXtyeqV9p8N+AwbGzqxpxpEPopEc2GJqBg6x/PttbnX7WFDKmXTnhWsh LyUUztG7Fnu/UTu8H3/S9a5nWs5IlFMUK4/M3dKcYHImteh1eNpKpP/NIMZZqg61HzTo ezyyQ1T6+VbxV3ocWQDoLK54D9JAMTs9UPbDX3b41RggQ+U8Uosx3pRcGqVgK4AjN5zA 3yow== 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=YV7fwqNFrNz9Sf6kXBiAOvm7kKeqellcreVERpGEOC4=; b=Y4uiC7XiGMOdry/eT5Yy8reUQZOwiq8B9nBMnOnC+4o3uEfwf4MR5QC5QiVwzRYoBt lZkR30Z2Yuyk9yw5AWpfQ7ch0Ts/yV5d4KR4dhnj4viVxS3WzEqaL1m2ZZg/DbiQTt6k AC9z2g32ylCcTvUov1akYjBfRBn2DN/89Uq1rGM6VZpSootv8qMqyS/Jv2+jLvPLgCSy IwIQsSx8zTxLyZn1+kBnRaY9UjN/7/wI2HR+Gk0D6VkwJwHhuWu5xy5H5DZ6euULLlmU JgqKL2kCycCupK6TlD3kTDZnKfCKlLqnNzv+8ajib4tTfP/Dj/qIdsWy2W/2lkkWuP24 EofA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=rYorQu9f; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s1si703807ejn.125.2021.10.25.16.26.41; Mon, 25 Oct 2021 16:27:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=rYorQu9f; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S234837AbhJYTZU (ORCPT + 99 others); Mon, 25 Oct 2021 15:25:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:40978 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233279AbhJYTWR (ORCPT ); Mon, 25 Oct 2021 15:22:17 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 14ABF610A0; Mon, 25 Oct 2021 19:19:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1635189594; bh=XBilodXs1qGvHQ83vr+QcmNve4/cRJo7udaLG1IAI78=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rYorQu9fJlc73aAEULOibNmDACQ9C912zA90nh+KaRdKPes1DFDtbCC4XMbqiYMC4 0qqoQEp/jRG+lRM59xTgXd/yqd+8+MRqANHRs8M6sUxOiUig8Yq0ZRqM7+yHeliOkk kQOzbrHolHDaoOcvQOxrTQZdimJp6ZCNkfAleEZ8= 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 4.9 42/50] netfilter: Kconfig: use default y instead of m for bool config option Date: Mon, 25 Oct 2021 21:14:29 +0200 Message-Id: <20211025190940.378647476@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211025190932.542632625@linuxfoundation.org> References: <20211025190932.542632625@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 @@ -71,7 +71,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