Messages in this thread | | | Date | Wed, 25 Sep 2013 13:57:43 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm-current tree with the cgroup tree |
| |
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in mm/memcontrol.c between commit b86278359484 ("memcg: stop using css id") from the cgroup tree and commit 4c34cae8f277 ("revert "memcg: get rid of soft-limit tree infrastructure"") from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc mm/memcontrol.c index 65a46ef,7dda769..0000000 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@@ -5979,6 -6196,9 +6209,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); [unhandled content-type:application/pgp-signature] | |