diff --git a/[refs] b/[refs]
index 7296426dc8ef..da4a976a1027 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1bbb3095a5912be4b9c90397ef2182a5a328865b
+refs/heads/master: ea1fd7776e7ed41ee4ddcff32104db5c7b372309
diff --git a/trunk/fs/xattr_acl.c b/trunk/fs/xattr_acl.c
index 11efd830b5f5..9fbea87fdb6e 100644
--- a/trunk/fs/xattr_acl.c
+++ b/trunk/fs/xattr_acl.c
@@ -45,7 +45,7 @@ static void posix_acl_fix_xattr_userns(
 			break;
 		case ACL_GROUP:
 			gid = make_kgid(from, le32_to_cpu(entry->e_id));
-			entry->e_id = cpu_to_le32(from_kuid(to, uid));
+			entry->e_id = cpu_to_le32(from_kgid(to, gid));
 			break;
 		default:
 			break;