The patch titled memcg: fix typo in the soft_limit stats. has been removed from the -mm tree. Its filename was memcg-add-stats-to-monitor-soft_limit-reclaim-v2-fix-3.patch This patch was dropped because it was folded into memcg-add-stats-to-monitor-soft_limit-reclaim.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: memcg: fix typo in the soft_limit stats. From: Ying Han <yinghan@xxxxxxxxxx> This fixes the typo in the memory.stat including the following two stats: $ cat /dev/cgroup/memory/A/memory.stat total_soft_steal 0 total_soft_scan 0 And change it to: $ cat /dev/cgroup/memory/A/memory.stat total_soft_kswapd_steal 0 total_soft_kswapd_scan 0 Signed-off-by: Ying Han <yinghan@xxxxxxxxxx> Cc: Balbir Singh <balbir@xxxxxxxxxx> Cc: Daisuke Nishimura <nishimura@xxxxxxxxxxxxxxxxx> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Cc: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx> Cc: Mel Gorman <mel@xxxxxxxxx> Cc: Minchan Kim <minchan.kim@xxxxxxxxx> Cc: Rik van Riel <riel@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memcontrol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN mm/memcontrol.c~memcg-add-stats-to-monitor-soft_limit-reclaim-v2-fix-3 mm/memcontrol.c --- a/mm/memcontrol.c~memcg-add-stats-to-monitor-soft_limit-reclaim-v2-fix-3 +++ a/mm/memcontrol.c @@ -3850,8 +3850,8 @@ struct { {"pgpgin", "total_pgpgin"}, {"pgpgout", "total_pgpgout"}, {"swap", "total_swap"}, - {"soft_kswapd_steal", "total_soft_steal"}, - {"soft_kswapd_scan", "total_soft_scan"}, + {"soft_kswapd_steal", "total_soft_kswapd_steal"}, + {"soft_kswapd_scan", "total_soft_kswapd_scan"}, {"soft_direct_steal", "total_soft_direct_steal"}, {"soft_direct_scan", "total_soft_direct_scan"}, {"inactive_anon", "total_inactive_anon"}, _ Patches currently in -mm which might be from yinghan@xxxxxxxxxx are vmscan-change-shrink_slab-interfaces-by-passing-shrink_control.patch vmscan-change-shrink_slab-interfaces-by-passing-shrink_control-fix.patch vmscan-change-shrink_slab-interfaces-by-passing-shrink_control-fix-2.patch vmscan-change-shrinker-api-by-passing-shrink_control-struct.patch vmscan-change-shrinker-api-by-passing-shrink_control-struct-fix.patch vmscan-change-shrinker-api-by-passing-shrink_control-struct-fix-2.patch mm-move-enum-vm_event_item-into-a-standalone-header-file.patch memcg-count-the-soft_limit-reclaim-in-global-background-reclaim.patch memcg-add-the-soft_limit-reclaim-in-global-direct-reclaim.patch memcg-add-stats-to-monitor-soft_limit-reclaim.patch add-the-pagefault-count-into-memcg-stats.patch add-the-pagefault-count-into-memcg-stats-fix.patch add-the-pagefault-count-into-memcg-stats-shmem-fix.patch memcg-reclaim-memory-from-nodes-in-round-robin-order.patch memcg-reclaim-memory-from-nodes-in-round-robin-fix.patch memcg-reclaim-memory-from-nodes-in-round-robin-fix-2.patch memcg-fix-get_scan_count-for-small-targets.patch memcg-remove-unused-retry-signal-from-reclaim.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