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>,
Mike Rapoport <rppt@kernel•org>,
Mike Rapoport <rppt@linux•ibm.com>,
Yanteng Si <siyanteng@loongson•cn>
Subject: linux-next: manual merge of the mm-stable tree with the jc_docs tree
Date: Tue, 28 Jun 2022 16:54:19 +1000 [thread overview]
Message-ID: <20220628165419.0bbe7b0f@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2022-06-28 6:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-28 6:54 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-07-08 8:39 linux-next: manual merge of the mm-stable tree with the jc_docs tree Stephen Rothwell
2023-02-09 2:12 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=20220628165419.0bbe7b0f@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=rppt@kernel$(echo .)org \
--cc=rppt@linux$(echo .)ibm.com \
--cc=siyanteng@loongson$(echo .)cn \
/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