Today's linux-next merge of the cgroup tree got a conflict in: mm/memcontrol.c I fixed it up (see below). Please check if the resolution looks correct. Thanks, Thierry --- diff --cc mm/memcontrol.c index 1c52ddb,65a46ef..84dcc5c --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@@ -6203,9 -5979,6 +6216,8 @@@ static void __mem_cgroup_free(struct me int node; size_t size = memcg_size(); + mem_cgroup_remove_from_trees(memcg); - free_css_id(&mem_cgroup_subsys, &memcg->css); + for_each_node(node) free_mem_cgroup_per_zone_info(memcg, node); -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
