Subject: [folded-merged] memcg-use-css_get-put-when-charging-uncharging-kmem-fix.patch removed from -mm tree To: akpm@xxxxxxxxxxxxxxxxxxxx,glommer@xxxxxxxxxx,hannes@xxxxxxxxxxx,kamezawa.hiroyu@xxxxxxxxxxxxxx,lizefan@xxxxxxxxxx,mhocko@xxxxxxx,tj@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Mon, 08 Jul 2013 15:28:02 -0700 The patch titled Subject: memcg-use-css_get-put-when-charging-uncharging-kmem-fix has been removed from the -mm tree. Its filename was memcg-use-css_get-put-when-charging-uncharging-kmem-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 tweak comment Cc: Glauber Costa <glommer@xxxxxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Cc: Li Zefan <lizefan@xxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxx> Cc: Tejun Heo <tj@xxxxxxxxxx> 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 mm/memcontrol.c --- a/mm/memcontrol.c~memcg-use-css_get-put-when-charging-uncharging-kmem-fix +++ a/mm/memcontrol.c @@ -407,7 +407,7 @@ static void memcg_kmem_clear_activated(s static void memcg_kmem_mark_dead(struct mem_cgroup *memcg) { /* - * We need to call css_get() first, because memcg_uncharge_kmem() + * Our caller must use css_get() first, because memcg_uncharge_kmem() * will call css_put() if it sees the memcg is dead. */ smp_wmb(); _ 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 memcg-use-css_get-put-when-charging-uncharging-kmem-fix-fix-fix.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