Merge remote-tracking branch 'cgroup/for-next'

Conflicts:
	mm/memcontrol.c

diff --cc mm/memcontrol.c
index 9c9c685e4ddca665c11b878bd5a19ed1199f8eca,65a46eff5c3dd3932deb8c70595d64b1ea388089..f0d58afefacca103a3cb1a0d23a8d795fc24b230
--- 1/mm/memcontrol.c
--- 2/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@@ -6170,9 -5979,6 +6183,8 @@@ static void __mem_cgroup_free(struct me
        int node;
        size_t size = memcg_size();
  
-       free_css_id(&mem_cgroup_subsys, &memcg->css);
 +      mem_cgroup_remove_from_trees(memcg);
 +
        for_each_node(node)
                free_mem_cgroup_per_zone_info(memcg, node);