Subject: [folded-merged] memcg-use-css_get-put-when-charging-uncharging-kmem-fix-fix-fix.patch removed from -mm tree To: akpm@xxxxxxxxxxxxxxxxxxxx,fengguang.wu@xxxxxxxxx,lizefan@xxxxxxxxxx,mhocko@xxxxxxx,sedat.dilek@xxxxxxxxx,sfr@xxxxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Mon, 08 Jul 2013 15:28:06 -0700 The patch titled Subject: memcg-use-css_get-put-when-charging-uncharging-kmem-fix-fix-fix has been removed from the -mm tree. Its filename was memcg-use-css_get-put-when-charging-uncharging-kmem-fix-fix-fix.patch This patch was dropped because it was folded into memcg-use-css_get-put-when-charging-uncharging-kmem.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: memcg-use-css_get-put-when-charging-uncharging-kmem-fix-fix-fix Cc: Fengguang Wu <fengguang.wu@xxxxxxxxx> Cc: Li Zefan <lizefan@xxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxx> Cc: Sedat Dilek <sedat.dilek@xxxxxxxxx> Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memcontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN mm/memcontrol.c~memcg-use-css_get-put-when-charging-uncharging-kmem-fix-fix-fix mm/memcontrol.c --- a/mm/memcontrol.c~memcg-use-css_get-put-when-charging-uncharging-kmem-fix-fix-fix +++ a/mm/memcontrol.c @@ -6409,7 +6409,7 @@ static void mem_cgroup_css_free(struct c struct mem_cgroup *memcg = mem_cgroup_from_cont(cont); memcg_destroy_kmem(memcg); - mem_cgroup_put(memcg); + __mem_cgroup_free(memcg); } #ifdef CONFIG_MMU _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch drivers-iommu-msm_iommu_devc-fix-leak-and-clean-up-error-paths.patch mm-remove-duplicated-call-of-get_pfn_range_for_nid.patch memcg-use-css_get-put-when-charging-uncharging-kmem.patch panic-add-cpu-pid-to-warn_slowpath_common-in-warning-printks-fix.patch shm-fix-null-pointer-deref-when-userspace-specifies-invalid-hugepage-size-fix.patch ipc-utilc-ipc_rcu_alloc-cacheline-align-allocation-checkpatch-fixes.patch partitions-add-aix-lvm-partition-support-files-checkpatch-fixes.patch reboot-arm-change-reboot_mode-to-use-enum-reboot_mode-fix.patch reboot-arm-change-reboot_mode-to-use-enum-reboot_mode-fix-fix.patch lib-add-lz4-compressor-module-fix.patch crypto-add-lz4-cryptographic-api-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html