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>,
Randy Dunlap <rdunlap@infradead•org>,
Michal Hocko <mhocko@suse•com>
Subject: linux-next: manual merge of the akpm-current tree with the jc_docs tree
Date: Tue, 14 Jul 2020 18:19:34 +1000 [thread overview]
Message-ID: <20200714181934.58fc201c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1558 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
Documentation/filesystems/proc.rst
between commit:
059db4341303 ("Documentation/filesystems/proc.rst: copy-editing cleanup")
from the jc_docs tree and commit:
7079aa70a489 ("doc, mm: clarify /proc/<pid>/oom_score value range")
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/filesystems/proc.rst
index e024a9efffd8,78a0dec323a3..000000000000
--- a/Documentation/filesystems/proc.rst
+++ b/Documentation/filesystems/proc.rst
@@@ -1680,7 -1673,10 +1672,10 @@@ requires CAP_SYS_RESOURCE
3.2 /proc/<pid>/oom_score - Display current oom-killer score
-------------------------------------------------------------
+ Please note that the exported value includes oom_score_adj so it is effectively
+ in range [0,2000].
+
-This file can be used to check the current score used by the oom-killer is for
+This file can be used to check the current score used by the oom-killer for
any given <pid>. Use it together with /proc/<pid>/oom_score_adj to tune which
process should be killed in an out-of-memory situation.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-07-14 8:19 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-14 8:19 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-04-22 6:01 linux-next: manual merge of the akpm-current tree with the jc_docs tree Stephen Rothwell
2020-03-11 7:11 Stephen Rothwell
2019-10-02 3:18 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=20200714181934.58fc201c@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=corbet@lwn$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mhocko@suse$(echo .)com \
--cc=rdunlap@infradead$(echo .)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