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

Commit a820922f authored Jun 23, 2015 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Jun 23, 2015

Merge "defconfig: arm64: msm: Enable netfilter matching by QTAGUID"

parents d9889219 90a5e5ee

arch/arm64/configs/msm-perf_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -82,6 +82,7 @@ CONFIG_IPV6_MIP6=y
		CONFIG_IPV6_MULTIPLE_TABLES=y
		CONFIG_IPV6_SUBTREES=y
		CONFIG_NETFILTER=y
		CONFIG_NETFILTER_XT_MATCH_QTAGUID=y
		CONFIG_NF_CONNTRACK=y
		CONFIG_NF_CONNTRACK_SECMARK=y
		CONFIG_NF_CONNTRACK_EVENTS=y

arch/arm64/configs/msm_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -81,6 +81,7 @@ CONFIG_IPV6_MIP6=y
		CONFIG_IPV6_MULTIPLE_TABLES=y
		CONFIG_IPV6_SUBTREES=y
		CONFIG_NETFILTER=y
		CONFIG_NETFILTER_XT_MATCH_QTAGUID=y
		CONFIG_NF_CONNTRACK=y
		CONFIG_NF_CONNTRACK_SECMARK=y
		CONFIG_NF_CONNTRACK_EVENTS=y