Subject: linux-next: manual merge of the jc_docs tree with the arm64 tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 6 Jul 2020 10:34:27 +1000

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