linux-next: manual merge of the akpm-current tree with the jc_docs tree

[Stephen Rothwell]

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: pgpj6kn9eeyUU.pgp
Description: OpenPGP digital signature