From ddf45c7b681d4496eb358d82b9a682739cd078d8 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Fri, 14 May 2010 13:52:30 -0700
Subject: [PATCH] --- yaml --- r: 195097 b: refs/heads/master c:
 83827f6a891e20de7468b1181f2ae8a3cc72587b h: refs/heads/master i:   195095:
 8279bca9d63d7b17929fd81d549a592db232e219 v: v3

---
 [refs]                      | 2 +-
 trunk/net/netfilter/Kconfig | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 14ea0005a97b..9a346a9adef1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6df900e96c70208a931968da99f24cc982de116e
+refs/heads/master: 83827f6a891e20de7468b1181f2ae8a3cc72587b
diff --git a/trunk/net/netfilter/Kconfig b/trunk/net/netfilter/Kconfig
index e223f47b8bae..8593a77cfea9 100644
--- a/trunk/net/netfilter/Kconfig
+++ b/trunk/net/netfilter/Kconfig
@@ -506,6 +506,7 @@ config NETFILTER_XT_TARGET_TEE
 	tristate '"TEE" - packet cloning to alternate destiantion'
 	depends on NETFILTER_ADVANCED
 	depends on (IPV6 || IPV6=n)
+	depends on !NF_CONNTRACK || NF_CONNTRACK
 	---help---
 	This option adds a "TEE" target with which a packet can be cloned and
 	this clone be rerouted to another nexthop.