The patch titled Subject: mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix has been removed from the -mm tree. Its filename was mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch This patch was dropped because it was folded into mm-oom-docs-describe-the-cgroup-aware-oom-killer.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix tweak text, fix typo Cc: David Rientjes <rientjes@xxxxxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxxx> Cc: Roman Gushchin <guro@xxxxxx> Cc: Tejun Heo <tj@xxxxxxxxxx> Cc: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx> Cc: Vladimir Davydov <vdavydov.dev@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- Documentation/admin-guide/cgroup-v2.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) --- a/Documentation/admin-guide/cgroup-v2.rst~mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix +++ a/Documentation/admin-guide/cgroup-v2.rst @@ -1349,13 +1349,13 @@ of the OOM'ing cgroup. Leaf cgroups and cgroups with oom_group option set are compared based on their cumulative memory usage. The root cgroup is treated as a -leaf memory cgroup as well, so it's compared with other leaf memory +leaf memory cgroup as well, so it is compared with other leaf memory cgroups. Due to internal implementation restrictions the size of -the root cgroup is a cumulative sum of oom_badness of all its tasks +the root cgroup is the cumulative sum of oom_badness of all its tasks (in other words oom_score_adj of each task is obeyed). Relying on -oom_score_adj (appart from OOM_SCORE_ADJ_MIN) can lead to over or -underestimating of the root cgroup consumption and it is therefore -discouraged. This might change in the future, though. +oom_score_adj (apart from OOM_SCORE_ADJ_MIN) can lead to over- or +underestimation of the root cgroup consumption and it is therefore +discouraged. This might change in the future, however. If there are no cgroups with the enabled memory controller, the OOM killer is using the "traditional" process-based approach. _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are i-need-old-gcc.patch arm-arch-arm-include-asm-pageh-needs-personalityh.patch ocfs2-return-erofs-when-filesystem-becomes-read-only-checkpatch-fixes.patch mm.patch tools-modifying-page-types-to-include-shared-map-counts-checkpatch-fixes.patch tools-modifying-page-types-to-include-shared-map-counts-fix-checkpatch-fixes.patch tools-adding-support-for-idle-page-tracking-to-tool-fix.patch mm-drop-vm_bug_on-from-__get_free_pages-fix.patch mm-list_lruc-fold-__list_lru_count_one-into-its-caller.patch mm-fadvise-fix-signed-overflow-ubsan-complaint-fix.patch mm-sparsemem-defer-the-ms-section_mem_map-clearing-fix.patch mm-sparse-optimize-memmap-allocation-during-sparse_init-checkpatch-fixes.patch mm-sparse-abstract-sparse-buffer-allocations-fix.patch mm-sparse-abstract-sparse-buffer-allocations-fix-fix.patch mm-soft-offline-close-the-race-against-page-allocation-fix.patch mm-oom-distinguish-blockable-mode-for-mmu-notifiers-checkpatch-fixes.patch mm-oom-distinguish-blockable-mode-for-mmu-notifiers-fix.patch mm-zero-out-the-vma-in-vma_init.patch mm-calculate-deferred-pages-after-skipping-mirrored-memory-fix.patch list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch mm-oom-docs-describe-the-cgroup-aware-oom-killer.patch proc-kcore-hold-lock-during-read-fix.patch kernel-hung_taskc-allow-to-set-checking-interval-separately-from-timeout-fix.patch fs-epoll-robustify-irq-safety-with-lockdep_assert_irqs_enabled-fix.patch checkpatch-check-for-if-0-if-1-fix.patch checkpatch-warn-when-a-patch-doesnt-have-a-description-fix.patch fs-epoll-simply-config_net_rx_busy_poll-ifdefery-fix.patch linux-next-rejects.patch mm-change-return-type-int-to-vm_fault_t-for-fault-handlers-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch slab-leaks3-default-y.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