The patch titled Subject: memcg-kmem-deprecate-kmemlimit_in_bytes-fix has been added to the -mm tree. Its filename is memcg-kmem-deprecate-kmemlimit_in_bytes-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/memcg-kmem-deprecate-kmemlimit_in_bytes-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/memcg-kmem-deprecate-kmemlimit_in_bytes-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: memcg-kmem-deprecate-kmemlimit_in_bytes-fix tweak documentation text Cc: Michal Hocko <mhocko@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- Documentation/admin-guide/cgroup-v1/memory.rst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) --- a/Documentation/admin-guide/cgroup-v1/memory.rst~memcg-kmem-deprecate-kmemlimit_in_bytes-fix +++ a/Documentation/admin-guide/cgroup-v1/memory.rst @@ -85,11 +85,10 @@ Brief summary of control files. memory.oom_control set/show oom controls. memory.numa_stat show the number of memory usage per numa node - memory.kmem.limit_in_bytes set/show hard limit for kernel memory - This knob is deprecated it shouldn't be - used. It is planned to be removed in - a foreseeable future. + This knob is deprecated and shouldn't be + used. It is planned that this be removed in + the foreseeable future. memory.kmem.usage_in_bytes show current kernel memory allocation memory.kmem.failcnt show the number of kernel memory usage hits limits _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch fs-ocfs2-fix-possible-null-pointer-dereferences-in-ocfs2_xa_prepare_entry-fix.patch mm.patch mm-kmemleak-use-the-memory-pool-for-early-allocations-checkpatch-fixes.patch mm-kmemleak-use-the-memory-pool-for-early-allocations-checkpatch-fixes-fix.patch lib-test_kasan-add-roundtrip-tests-checkpatch-fixes.patch mm-introduce-page_shift-fix.patch mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix.patch mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix-fix.patch mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix-fix-fix.patch mm-memory_hotplug-remove-move_pfn_range-fix.patch mm-memory_hotplug-make-sure-the-pfn-is-aligned-to-the-order-when-onlining-fix.patch mm-vmalloc-move-area-pages-after-if-statement-fix.patch mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone-fix-fix.patch mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone-fix-2-fix.patch mm-oom-avoid-printk-iteration-under-rcu-fix.patch mm-oom_killer-add-task-uid-to-info-message-on-an-oom-kill-fix.patch memcg-kmem-deprecate-kmemlimit_in_bytes-fix.patch psi-annotate-refault-stalls-from-io-submission-fix.patch psi-annotate-refault-stalls-from-io-submission-fix-2.patch mm-mmapc-refine-find_vma_prev-with-rb_last-fix.patch linux-next-rejects.patch diff-sucks.patch mm-introduce-madv_cold-fix.patch mm-introduce-madv_pageout-fix-fix.patch drivers-tty-serial-sh-scic-suppress-warning.patch kernel-forkc-export-kernel_thread-to-modules.patch