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

diff --cc kernel/cgroup/cgroup.c
index 69ad5b3,688dd02..0dcc4c7
--- 1/kernel/cgroup/cgroup.c
--- 2/kernel/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;