From b26a2dc7c5aeb10c98542670efa397e8ad257002 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Thu, 17 Nov 2011 10:23:55 -0800
Subject: [PATCH] --- yaml --- r: 305991 b: refs/heads/master c:
 5673a94c14574d7c6495c320c6b0e480673d54bd h: refs/heads/master i:   305989:
 50eb4e04528a88776571c1fb76ea34da39b863c2   305987:
 83aa86402c322737e4ccb4de12d8e777040e6930   305983:
 e919b40a9fdc9ec69ba9fe0ce7406133c1e6a2cc v: v3

---
 [refs]                       |  2 +-
 trunk/include/linux/uidgid.h |  2 +-
 trunk/init/Kconfig           | 12 +++++++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c299f9db44fd..799764a781e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a4e7408c5cadb240e068a662251754a562355e3
+refs/heads/master: 5673a94c14574d7c6495c320c6b0e480673d54bd
diff --git a/trunk/include/linux/uidgid.h b/trunk/include/linux/uidgid.h
index a0addb8e5889..539856829caf 100644
--- a/trunk/include/linux/uidgid.h
+++ b/trunk/include/linux/uidgid.h
@@ -17,7 +17,7 @@
 struct user_namespace;
 extern struct user_namespace init_user_ns;
 
-#if defined(NOTYET)
+#ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
 
 typedef struct {
 	uid_t val;
diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
index 72f33faca44f..86cf760893b3 100644
--- a/trunk/init/Kconfig
+++ b/trunk/init/Kconfig
@@ -828,7 +828,8 @@ config IPC_NS
 config USER_NS
 	bool "User namespace (EXPERIMENTAL)"
 	depends on EXPERIMENTAL
-	default y
+	select UIDGID_STRICT_TYPE_CHECKS
+	default n
 	help
 	  This allows containers, i.e. vservers, to use user namespaces
 	  to provide different user info for different servers.
@@ -852,6 +853,15 @@ config NET_NS
 
 endif # NAMESPACES
 
+config UIDGID_STRICT_TYPE_CHECKS
+	bool "Require conversions between uid/gids and their internal representation"
+	default n
+	help
+	 While the nececessary conversions are being added to all subsystems this option allows
+	 the code to continue to build for unconverted subsystems.
+
+	 Say Y here if you want the strict type checking enabled
+
 config SCHED_AUTOGROUP
 	bool "Automatic process group scheduling"
 	select EVENTFD