diff -urNpd linux-3.14.29-vs2.3.6.14/include/linux/uidgid.h linux-3.14.29-vs2.3.6.14-pidns-userns/include/linux/uidgid.h
--- linux-3.14.29-vs2.3.6.14/include/linux/uidgid.h	2015-01-16 23:53:24.000000000 -0600
+++ linux-3.14.29-vs2.3.6.14-pidns-userns/include/linux/uidgid.h	2015-01-23 20:41:13.000000000 -0600
@@ -130,7 +130,7 @@ static inline bool tag_valid(ktag_t tag)

 extern kuid_t make_kuid(struct user_namespace *from, uid_t uid);
 extern kgid_t make_kgid(struct user_namespace *from, gid_t gid);
-extern krag_t make_ktag(struct user_namespace *from, gid_t gid);
+extern ktag_t make_ktag(struct user_namespace *from, vtag_t tag);

 extern uid_t from_kuid(struct user_namespace *to, kuid_t uid);
 extern gid_t from_kgid(struct user_namespace *to, kgid_t gid);
diff -urNpd linux-3.14.29-vs2.3.6.14/kernel/user_namespace.c linux-3.14.29-vs2.3.6.14-pidns-userns/kernel/user_namespace.c
--- linux-3.14.29-vs2.3.6.14/kernel/user_namespace.c	2015-01-16 23:53:24.000000000 -0600
+++ linux-3.14.29-vs2.3.6.14-pidns-userns/kernel/user_namespace.c	2015-01-23 20:44:47.000000000 -0600
@@ -358,6 +358,18 @@ gid_t from_kgid_munged(struct user_names
 }
 EXPORT_SYMBOL(from_kgid_munged);

+ktag_t make_ktag(struct user_namespace *from, vtag_t tag)
+{
+	return KTAGT_INIT(tag);
+}
+EXPORT_SYMBOL(make_ktag);
+
+vtag_t from_ktag(struct user_namespace *to, ktag_t tag)
+{
+	return __ktag_val(tag);
+}
+EXPORT_SYMBOL(from_ktag);
+
 /**
  *	make_kprojid - Map a user-namespace projid pair into a kprojid.
  *	@ns:  User namespace that the projid is in
diff -urNpd linux-3.14.29-vs2.3.6.14/kernel/vserver/space.c linux-3.14.29-vs2.3.6.14-pidns-userns/kernel/vserver/space.c
--- linux-3.14.29-vs2.3.6.14/kernel/vserver/space.c	2015-01-16 23:53:24.000000000 -0600
+++ linux-3.14.29-vs2.3.6.14-pidns-userns/kernel/vserver/space.c	2015-01-23 20:47:10.000000000 -0600
@@ -88,7 +88,7 @@ static const struct vcmd_space_mask_v1 d
 		CLONE_NEWIPC |
 #endif
 #ifdef	CONFIG_USER_NS
-		CLONE_NEWUSER |
+//		CLONE_NEWUSER |
 #endif
 #ifdef	CONFIG_PID_NS
 //		CLONE_NEWPID |
diff -urNpd linux-3.14.29-vs2.3.6.14/Makefile linux-3.14.29-vs2.3.6.14-pidns-userns/Makefile
--- linux-3.14.29-vs2.3.6.14/Makefile	2015-01-16 23:53:35.000000000 -0600
+++ linux-3.14.29-vs2.3.6.14-pidns-userns/Makefile	2015-01-23 20:52:13.000000000 -0600
@@ -1,7 +1,7 @@
 VERSION = 3
 PATCHLEVEL = 14
 SUBLEVEL = 29
-EXTRAVERSION = -vs2.3.6.14
+EXTRAVERSION = -vs2.3.6.14-pidns-userns
 NAME = Remembering Coco

 # *DOCUMENTATION*