Patch "ARM: s3c2410_defconfig: Fix invalid values for NF_CT_PROTO_*" has been added to the 4.9-stable tree

Patch "ARM: s3c2410_defconfig: Fix invalid values for NF_CT_PROTO_*" has been added to the 4.9-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    ARM: s3c2410_defconfig: Fix invalid values for NF_CT_PROTO_*

to the 4.9-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     arm-s3c2410_defconfig-fix-invalid-values-for-nf_ct_proto_.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From foo@baz Fri Aug  4 15:15:01 PDT 2017
From: Krzysztof Kozlowski <krzk@kernel.org>
Date: Thu, 29 Dec 2016 14:41:05 +0200
Subject: ARM: s3c2410_defconfig: Fix invalid values for NF_CT_PROTO_*

From: Krzysztof Kozlowski <krzk@kernel.org>


[ Upstream commit 3ef01c968fbfb21c2f16281445d30a865ee4412c ]

NF_CT_PROTO_DCCP/SCTP/UDPLITE were switched from tristate to boolean so
defconfig needs to be adjusted to silence warnings:
	warning: symbol value 'm' invalid for NF_CT_PROTO_DCCP
	warning: symbol value 'm' invalid for NF_CT_PROTO_SCTP
	warning: symbol value 'm' invalid for NF_CT_PROTO_UDPLITE

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 arch/arm/configs/s3c2410_defconfig |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- a/arch/arm/configs/s3c2410_defconfig
+++ b/arch/arm/configs/s3c2410_defconfig
@@ -86,9 +86,9 @@ CONFIG_IPV6_TUNNEL=m
 CONFIG_NETFILTER=y
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m


Patches currently in stable-queue which might be from krzk@kernel.org are

queue-4.9/arm-s3c2410_defconfig-fix-invalid-values-for-nf_ct_proto_.patch