Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fab907f authored Jan 16, 2017 by Olof Johansson

Merge tag 'samsung-fixes-4.10' of...

Merge tag 'samsung-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into fixes

Samsung fixes for v4.10:
1. Update maintainers entry with Patchwork address.
2. Fix invalid values for NF_CT_PROTO_* in s3c2410 defconfig (these options
   cannot be modules anymore).

* tag 'samsung-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux

:
  ARM: s3c2410_defconfig: Fix invalid values for NF_CT_PROTO_*
  MAINTAINERS: Add Patchwork URL to Samsung Exynos entry

Signed-off-by: Olof Johansson <olof@lixom.net>

parents 927867a4 3ef01c96

MAINTAINERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -1689,6 +1689,7 @@ M: Krzysztof Kozlowski <krzk@kernel.org>
		R: Javier Martinez Canillas <javier@osg.samsung.com>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
		Q: https://patchwork.kernel.org/project/linux-samsung-soc/list/
		S: Maintained
		F: arch/arm/boot/dts/s3c*
		F: arch/arm/boot/dts/s5p*

arch/arm/configs/s3c2410_defconfig

+3 −3

Original line number	Diff line number	Diff line
		@@ -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