diff --git a/[refs] b/[refs]
index e8786ec5be61..91c69fce976e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e4a36ece652908276bc4abb4324ec56292453e1
+refs/heads/master: 65cc5a17ad3388f89ddc3d68226a09242656809b
diff --git a/trunk/kernel/capability.c b/trunk/kernel/capability.c
index cc5f0718215d..493d97259484 100644
--- a/trunk/kernel/capability.c
+++ b/trunk/kernel/capability.c
@@ -429,12 +429,14 @@ bool nsown_capable(int cap)
  * targeted at it's own user namespace and that the given inode is owned
  * by the current user namespace or a child namespace.
  *
- * Currently inodes can only be owned by the initial user namespace.
+ * Currently we check to see if an inode is owned by the current
+ * user namespace by seeing if the inode's owner maps into the
+ * current user namespace.
  *
  */
 bool inode_capable(const struct inode *inode, int cap)
 {
 	struct user_namespace *ns = current_user_ns();
 
-	return ns_capable(ns, cap) && (ns == &init_user_ns);
+	return ns_capable(ns, cap) && kuid_has_mapping(ns, inode->i_uid);
 }