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: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Vincenzo Frascino <vincenzo.frascino@arm.com>,
Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Subject: linux-next: manual merge of the jc_docs tree with the arm64 tree
Date: Mon, 6 Jul 2020 10:34:27 +1000 [thread overview]
Message-ID: <20200706103427.16470171@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1122 bytes --]
Hi all,
Today's linux-next merge of the jc_docs tree got a conflict in:
Documentation/arm64/index.rst
between commit:
5c5a8ac9b27b ("arm64: mte: Add Memory Tagging Extension documentation")
from the arm64 tree and commit:
86de78d2c5f4 ("docs: arm64: convert perf.txt to ReST format")
from the jc_docs 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/arm64/index.rst
index 4cd0e696f064,d9665d83c53a..000000000000
--- a/Documentation/arm64/index.rst
+++ b/Documentation/arm64/index.rst
@@@ -14,7 -14,7 +14,8 @@@ ARM64 Architectur
hugetlbpage
legacy_instructions
memory
+ memory-tagging-extension
+ perf
pointer-authentication
silicon-errata
sve
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-07-06 0:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-06 0:34 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-06-22 1:07 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=20200706103427.16470171@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=catalin.marinas@arm.com \
--cc=corbet@lwn.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab+huawei@kernel.org \
--cc=vincenzo.frascino@arm.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).