From 68fe1d0afda657194362558d5a0852f2f1c494da Mon Sep 17 00:00:00 2001
From: Masahide NAKAMURA <nakam@linux-ipv6.org>
Date: Wed, 23 Aug 2006 22:38:14 -0700
Subject: [PATCH] --- yaml --- r: 34595 b: refs/heads/master c:
 c11f1a15c522ddd3bbd2c32b5ce3e0b1831b22f2 h: refs/heads/master i:   34593:
 96705c38cebcbce7b181ee97ebbb45455ece76c8   34591:
 4095a9bcdf00bca785b193b518180d51b4cab5f0 v: v3

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

diff --git a/[refs] b/[refs]
index a98423990fed..ecb388388a3c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01be8e5d59d7e6da5c425a31b43709c2a4a69b5d
+refs/heads/master: c11f1a15c522ddd3bbd2c32b5ce3e0b1831b22f2
diff --git a/trunk/net/xfrm/Kconfig b/trunk/net/xfrm/Kconfig
index 43228f7fd3a0..0faab6332586 100644
--- a/trunk/net/xfrm/Kconfig
+++ b/trunk/net/xfrm/Kconfig
@@ -14,6 +14,16 @@ config XFRM_USER
 
 	  If unsure, say Y.
 
+config XFRM_SUB_POLICY
+	bool "Transformation sub policy support (EXPERIMENTAL)"
+	depends on XFRM && EXPERIMENTAL
+	---help---
+	  Support sub policy for developers. By using sub policy with main
+	  one, two policies can be applied to the same packet at once.
+	  Policy which lives shorter time in kernel should be a sub.
+
+	  If unsure, say N.
+
 config NET_KEY
 	tristate "PF_KEY sockets"
 	select XFRM