diff --git a/[refs] b/[refs]
index f1ae3dfbf2fb..1dc100874e0c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 689c96cca7ec3d2ba7fba00481810f99f1803c63
+refs/heads/master: acda074390270ca9e28f2a9729f7b835e2ad6da4
diff --git a/trunk/net/netfilter/Kconfig b/trunk/net/netfilter/Kconfig
index 881203c4a142..cb3ad741ebf8 100644
--- a/trunk/net/netfilter/Kconfig
+++ b/trunk/net/netfilter/Kconfig
@@ -837,6 +837,7 @@ config NETFILTER_XT_MATCH_SOCKET
 	depends on NETFILTER_TPROXY
 	depends on NETFILTER_XTABLES
 	depends on NETFILTER_ADVANCED
+	depends on !NF_CONNTRACK || NF_CONNTRACK
 	select NF_DEFRAG_IPV4
 	help
 	  This option adds a `socket' match, which can be used to match