The patch titled
Subject: linux-next-git-rejects
has been removed from the -mm tree. Its filename was
linux-next-git-rejects.patch
This patch was dropped because it is obsolete
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: linux-next-git-rejects
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
Documentation/admin-guide/cgroup-v2.rst | 8 --------
1 file changed, 8 deletions(-)
--- a/Documentation/admin-guide/cgroup-v2.rst~linux-next-git-rejects
+++ a/Documentation/admin-guide/cgroup-v2.rst
@@ -1120,16 +1120,8 @@ PAGE_SIZE multiple when read back.
Best-effort memory protection. If the memory usage of a
cgroup is within its effective low boundary, the cgroup's
-<<<<<<< HEAD
- memory won't be reclaimed unless memory can be reclaimed
- from unprotected cgroups. Above the effective low boundary (or
- effective min boundary if it is higher), pages are reclaimed
- proportionally to the overage, reducing reclaim pressure for
- smaller overages.
-=======
memory won't be reclaimed unless there is no reclaimable
memory available in unprotected cgroups.
->>>>>>> linux-next/akpm-base
Effective low boundary is limited by memory.low values of
all ancestor cgroups. If there is memory.low overcommitment
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-slub-fix-a-deadlock-in-show_slab_objects-fix.patch
ocfs2-protect-extent-tree-in-the-ocfs2_prepare_inode_for_write-checkpatch-fixes.patch
mm.patch
mm-pgmap-use-correct-alignment-when-looking-at-first-pfn-from-a-region-checkpatch-fixes.patch
mm-rmapc-reuse-mergeable-anon_vma-as-parent-when-fork-fix.patch
mm-oom-avoid-printk-iteration-under-rcu-fix.patch
hugetlb-remove-duplicated-code-checkpatch-fixes.patch
hugetlb-remove-unused-hstate-in-hugetlb_fault_mutex_hash-fix.patch
diff-sucks.patch
samples-watch_queue-watch_test-fix-build.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
