Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in mm/memcontrol.c between commit ab5196c202c6 ("memcg: make mem_cgroup_reparent_charges non failing") from the cgroup tree and commit "memcg: destroy memcg caches" from the akpm tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell s...@canb.auug.org.au diff --cc mm/memcontrol.c index a38e9fb,b650e09..0000000 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@@ -5946,11 -6034,17 +6008,12 @@@ free_out return ERR_PTR(error); } -static int mem_cgroup_pre_destroy(struct cgroup *cont) +static void mem_cgroup_pre_destroy(struct cgroup *cont) { struct mem_cgroup *memcg = mem_cgroup_from_cont(cont); - int ret; - css_get(&memcg->css); - ret = mem_cgroup_reparent_charges(memcg); + mem_cgroup_reparent_charges(memcg); + mem_cgroup_destroy_all_caches(memcg); - css_put(&memcg->css); - - return ret; } static void mem_cgroup_destroy(struct cgroup *cont)
pgpISPTKAMBAu.pgp
Description: PGP signature