From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Jonathan Corbet <corbet@lwn•net>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Jon Haslam <jonhaslam@fb•com>, Chris Down <chris@chrisdown•name>
Subject: linux-next: manual merge of the akpm-current tree with the jc_docs tree
Date: Wed, 2 Oct 2019 13:18:35 +1000 [thread overview]
Message-ID: <20191002131835.51809ea9@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1909 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
Documentation/admin-guide/cgroup-v2.rst
between commit:
6ee0fac199e1 ("docs: fix memory.low description in cgroup-v2.rst")
from the jc_docs tree and commit:
3968bb6dec48 ("mm, memcg: proportional memory.{low,min} reclaim")
from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc Documentation/admin-guide/cgroup-v2.rst
index 26d1cde6b34a,5361ebec3361..000000000000
--- a/Documentation/admin-guide/cgroup-v2.rst
+++ b/Documentation/admin-guide/cgroup-v2.rst
@@@ -1117,8 -1120,11 +1120,11 @@@ 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
- 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.
++ memory available in 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.
Effective low boundary is limited by memory.low values of
all ancestor cgroups. If there is memory.low overcommitment
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-10-02 3:18 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-02 3:18 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-07-14 8:19 linux-next: manual merge of the akpm-current tree with the jc_docs tree Stephen Rothwell
2020-04-22 6:01 Stephen Rothwell
2020-03-11 7:11 Stephen Rothwell
2018-05-09 10:25 Stephen Rothwell
2018-05-09 13:28 ` Andrea Parri
2018-05-09 13:30 ` Andrea Parri
2018-05-09 14:59 ` Jonathan Corbet
2018-05-09 16:53 ` Andrea Parri
2018-05-09 17:11 ` Jonathan Corbet
2018-05-09 17:35 ` Andrea Parri
2016-12-14 3:42 Stephen Rothwell
2015-12-31 10:58 Stephen Rothwell
2015-12-31 10:43 Stephen Rothwell
2015-12-31 17:47 ` Elliott, Robert (Persistent Memory)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191002131835.51809ea9@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=chris@chrisdown$(echo .)name \
--cc=corbet@lwn$(echo .)net \
--cc=jonhaslam@fb$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox