Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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>
Olof Johansson 8 years ago
parent
927867a4b7 3ef01c968f
commit
9fab907f3d
2 changed files with 4 additions and 3 deletions
Split View Show Diff Stats
  1. 1 0
      MAINTAINERS
  2. 3 3
      arch/arm/configs/s3c2410_defconfig

+ 1 - 0
MAINTAINERS
View File 

@@ -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*

+ 3 - 3
arch/arm/configs/s3c2410_defconfig
View File 

@@ -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