The patch titled Subject: memcg-doc-clarify-global-vs-limit-reclaims-fix has been removed from the -mm tree. Its filename was memcg-doc-clarify-global-vs-limit-reclaims-fix.patch This patch was dropped because it was withdrawn ------------------------------------------------------ From: Michal Hocko <mhocko@xxxxxxx> Subject: memcg-doc-clarify-global-vs-limit-reclaims-fix update doc as per Johannes Signed-off-by: Michal Hocko <mhocko@xxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Cc: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx> Cc: Greg Thelen <gthelen@xxxxxxxxxx> Cc: Michel Lespinasse <walken@xxxxxxxxxx> Cc: Tejun Heo <tj@xxxxxxxxxx> Cc: Hugh Dickins <hughd@xxxxxxxxxx> Cc: Roman Gushchin <klamm@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- Documentation/cgroups/memory.txt | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff -puN Documentation/cgroups/memory.txt~memcg-doc-clarify-global-vs-limit-reclaims-fix Documentation/cgroups/memory.txt --- a/Documentation/cgroups/memory.txt~memcg-doc-clarify-global-vs-limit-reclaims-fix +++ a/Documentation/cgroups/memory.txt @@ -241,17 +241,9 @@ global VM. Cgroups can get reclaimed bas proportionally wrt. their LRU size in a round robin fashion - when a cgroup or its hierarchical parent (see 6. Hierarchical support) hits hard limit. If the reclaim is unsuccessful, an OOM routine is invoked - to select and kill the bulkiest task in the cgroup. (See 10. OOM Control + to select and kill the bulkiest task in the hiearchy. (See 10. OOM Control below.) -Global and hard-limit reclaims share the same code the only difference -is the objective of the reclaim. The global reclaim aims at balancing -zones' watermarks while the limit reclaim frees some memory to allow new -charges. - -NOTE: Hard limit reclaim does not work for the root cgroup, since we cannot set -any limits on the root cgroup. - Note2: When panic_on_oom is set to "2", the whole system will panic. When oom event notifier is registered, event will be delivered to the root _ Patches currently in -mm which might be from mhocko@xxxxxxx are mm-vmscanc-avoid-recording-the-original-scan-targets-in-shrink_lruvec.patch pagewalk-update-page-table-walker-core.patch pagewalk-add-walk_page_vma.patch smaps-redefine-callback-functions-for-page-table-walker.patch clear_refs-redefine-callback-functions-for-page-table-walker.patch pagemap-redefine-callback-functions-for-page-table-walker.patch numa_maps-redefine-callback-functions-for-page-table-walker.patch memcg-redefine-callback-functions-for-page-table-walker.patch arch-powerpc-mm-subpage-protc-use-walk_page_vma-instead-of-walk_page_range.patch pagewalk-remove-argument-hmask-from-hugetlb_entry.patch mempolicy-apply-page-table-walker-on-queue_pages_range.patch mm-pagewalk-remove-pgd_entry-and-pud_entry.patch mm-pagewalk-replace-mm_walk-skip-with-more-general-mm_walk-control.patch madvise-cleanup-swapin_walk_pmd_entry.patch memcg-separate-mem_cgroup_move_charge_pte_range.patch arch-powerpc-mm-subpage-protc-cleanup-subpage_walk_pmd_entry.patch mm-pagewalk-move-pmd_trans_huge_lock-from-callbacks-to-common-code.patch mincore-apply-page-table-walker-on-do_mincore.patch memcg-document-memorylow_limit_in_bytes.patch vmscan-memcg-check-whether-the-low-limit-should-be-ignored.patch memcg-deprecate-memoryforce_empty-knob.patch memcg-deprecate-memoryforce_empty-knob-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