linux-next: manual merge of the mm-stable tree with the jc_docs tree

linux-next: manual merge of the mm-stable tree with the jc_docs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1152 bytes --]

Hi all,

Today's linux-next merge of the mm-stable tree got a conflict in:

  Documentation/admin-guide/mm/numaperf.rst

between commit:

  00cba6b60fed ("docs/admin-guide/mm: remove useless markup")

from the jc_docs tree and commit:

  6c364edc194e ("Docs/admin-guide/mm/numaperf: increase depth of subsections")

from the mm-stable 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/mm/numaperf.rst
index 24e63e740420,544a6d16c801..000000000000
--- a/Documentation/admin-guide/mm/numaperf.rst
+++ b/Documentation/admin-guide/mm/numaperf.rst
@@@ -1,4 -1,9 +1,7 @@@
- =============
 -.. _numaperf:
 -
+ =======================
+ NUMA Memory Performance
+ =======================
+ 
  NUMA Locality
  =============
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the mm-stable tree with the jc_docs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2821 bytes --]

Hi all,

Today's linux-next merge of the mm-stable tree got conflicts in:

  Documentation/translations/zh_CN/mm/free_page_reporting.rst
  Documentation/translations/zh_CN/mm/frontswap.rst
  Documentation/translations/zh_CN/mm/page_frags.rst
  Documentation/translations/zh_CN/mm/zsmalloc.rst

between commits:

  5fe84fe446d8 ("docs: zh_CN: page_frags.rst: fix a broken reference")
  36395fb365df ("docs: zh_CN/vm: fix a typo for page reporting ReST file")
  97e937dec70d ("docs: zh_CN/vm/zsmalloc.rst: fix a typo")

from the jc_docs tree and commit:

  ee65728e103b ("docs: rename Documentation/vm to Documentation/mm")

from the mm-stable 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/translations/zh_CN/mm/free_page_reporting.rst
index 14336a3aa5f4,83b14cce9adf..000000000000
--- a/Documentation/translations/zh_CN/mm/free_page_reporting.rst
+++ b/Documentation/translations/zh_CN/mm/free_page_reporting.rst
@@@ -1,6 -1,6 +1,6 @@@
  .. include:: ../disclaimer-zh_CN.rst
  
- :Original: Documentation/vm/free_page_reporting.rst
 -:Original: Documentation/mm/_free_page_reporting.rst
++:Original: Documentation/mm/free_page_reporting.rst
  
  :翻译:
  
diff --cc Documentation/translations/zh_CN/mm/frontswap.rst
index 98aa6f581ea7,5c18ea2be04f..000000000000
--- a/Documentation/translations/zh_CN/mm/frontswap.rst
+++ b/Documentation/translations/zh_CN/mm/frontswap.rst
@@@ -1,4 -1,4 +1,4 @@@
- :Original: Documentation/vm/free_page_reporting.rst
 -:Original: Documentation/mm/_free_page_reporting.rst
++:Original: Documentation/mm/free_page_reporting.rst
  
  :翻译:
  
diff --cc Documentation/translations/zh_CN/mm/page_frags.rst
index 38ecddb9e1c0,320952ca93af..000000000000
--- a/Documentation/translations/zh_CN/mm/page_frags.rst
+++ b/Documentation/translations/zh_CN/mm/page_frags.rst
@@@ -1,4 -1,4 +1,4 @@@
- :Original: Documentation/vm/page_frags.rst
 -:Original: Documentation/mm/page_frag.rst
++:Original: Documentation/mm/page_frags.rst
  
  :翻译:
  
diff --cc Documentation/translations/zh_CN/mm/zsmalloc.rst
index 45a9b7ab2a51,b5596ea08ae4..000000000000
--- a/Documentation/translations/zh_CN/mm/zsmalloc.rst
+++ b/Documentation/translations/zh_CN/mm/zsmalloc.rst
@@@ -1,4 -1,4 +1,4 @@@
- :Original: Documentation/vm/zsmalloc.rst
 -:Original: Documentation/mm/zs_malloc.rst
++:Original: Documentation/mm/zsmalloc.rst
  
  :翻译:
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the mm-stable tree with the jc_docs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 948 bytes --]

Hi all,

Today's linux-next merge of the mm-stable tree got a conflict in:

  Documentation/translations/zh_CN/vm/page_migration.rst
  Documentation/translations/zh_CN/vm/vmalloced-kernel-stacks.rst

between commits:

  3f39b3d70fcd ("docs/zh_CN: add vm page_migration translation")
  17c260504f6f ("docs/zh_CN: add vm vmalloced-kernel-stacks translation")

from the jc_docs tree and commit:

  ee65728e103b ("docs: rename Documentation/vm to Documentation/mm")

from the mm-stable tree.

I fixed it up (I moved the files into the "mm" directory) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]