public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
	Jonathan Corbet <corbet@lwn•net>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	Linux Next Mailing List <linux-next@vger•kernel.org>,
	Mauro Carvalho Chehab <mchehab@kernel•org>,
	Mike Rapoport <rppt@kernel•org>,
	Mike Rapoport <rppt@linux•ibm.com>
Subject: linux-next: manual merge of the mm-stable tree with the jc_docs tree
Date: Fri, 8 Jul 2022 18:39:55 +1000	[thread overview]
Message-ID: <20220708183955.34212f5e@canb.auug.org.au> (raw)

[-- 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 --]

next             reply	other threads:[~2022-07-08  8:40 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-08  8:39 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-02-09  2:12 linux-next: manual merge of the mm-stable tree with the jc_docs tree Stephen Rothwell
2022-06-28  6:54 Stephen Rothwell

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=20220708183955.34212f5e@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=mchehab@kernel$(echo .)org \
    --cc=rppt@kernel$(echo .)org \
    --cc=rppt@linux$(echo .)ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox