From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jonathan Corbet <corbet@lwn•net>,
Catalin Marinas <catalin.marinas@arm•com>,
Will Deacon <will@kernel•org>
Cc: Baoquan He <bhe@redhat•com>,
Chaitanya S Prakash <chaitanyas.prakash@arm•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the jc_docs tree with the arm64 tree
Date: Thu, 22 Jun 2023 11:07:25 +1000 [thread overview]
Message-ID: <20230622110725.4a1e791d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 912 bytes --]
Hi all,
Today's linux-next merge of the jc_docs tree got conflicts in:
Documentation/arm64/kdump.rst
Documentation/arm64/ptdump.rst
between commits:
03dc0e05407f ("Documentation: add kdump.rst to present crashkernel reservation on arm64")
a0238ada560f ("Documentation/arm64: Add ptdump documentation")
from the arm64 tree and commit:
e4624435f38b ("docs: arm64: Move arm64 documentation under Documentation/arch/")
from the jc_docs tree.
I fixed it up (I added the files in the new 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:[~2023-06-22 1:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-22 1:07 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-07-06 0:34 linux-next: manual merge of the jc_docs tree with the arm64 tree Stephen Rothwell
2020-04-29 1:09 Stephen Rothwell
2020-03-18 1:40 Stephen Rothwell
2020-03-18 8:49 ` Catalin Marinas
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=20230622110725.4a1e791d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bhe@redhat$(echo .)com \
--cc=catalin.marinas@arm$(echo .)com \
--cc=chaitanyas.prakash@arm$(echo .)com \
--cc=corbet@lwn$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=will@kernel$(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