From: Tejun Heo <tj@kernel.org>
Date: Thu, 26 Jan 2017 21:47:42 +0000 (-0500)
Subject: Merge branch 'for-4.10-fixes' into for-4.11
X-Git-Tag: v4.11-rc1~61^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bdf3d06bedebd31539b68b4a744054f994ecc2e1;p=thirdparty%2Flinux.git

Merge branch 'for-4.10-fixes' into for-4.11
---

bdf3d06bedebd31539b68b4a744054f994ecc2e1
diff --cc kernel/cgroup/cgroup.c
index 69ad5b3de0c1b,688dd02af9857..0dcc4c7e935ee
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@@ -4150,12 -5300,10 +4150,9 @@@ out_cancel_ref
  out_free_cgrp:
  	kfree(cgrp);
  	return ERR_PTR(ret);
- out_destroy:
- 	cgroup_destroy_locked(cgrp);
- 	return ERR_PTR(ret);
  }
  
 -static int cgroup_mkdir(struct kernfs_node *parent_kn, const char *name,
 -			umode_t mode)
 +int cgroup_mkdir(struct kernfs_node *parent_kn, const char *name, umode_t mode)
  {
  	struct cgroup *parent, *cgrp;
  	struct kernfs_node *kn;