linux-next: manual merge of the akpm tree with the cgroup tree

Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in: init/Kconfig between commit: 6bf024e69333 ("cgroup: put controller Kconfig options in meaningful order") from the cgroup tree and commit: "mm: memcontrol: introduce CONFIG_MEMCG_LEGACY_KMEM" from the akpm tree. I

linux-next: manual merge of the akpm tree with the cgroup tree

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

linux-next: manual merge of the akpm tree with the cgroup tree

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: allow a memcg with kmem charges to be destructed" from the akpm tree. I fixed it up (s