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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 29 Apr 2020 11:09:19 +1000

Hi all,

Today's linux-next merge of the jc_docs tree got a conflict in:

  Documentation/arm64/booting.rst

between commit:

  e24e03aa00f0 ("arm64: docs: Mandate that the I-cache doesn't hold stale kernel text")

from the arm64 tree and commit:

  877a37d31e0f ("docs: arm64: booting.rst: get rid of some warnings")

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/booting.rst
index d063c05d5fb0,e50186092948..000000000000
--- a/Documentation/arm64/booting.rst
+++ b/Documentation/arm64/booting.rst
@@@ -173,8 -173,9 +173,10 @@@ Before jumping into the kernel, the fol
  - Caches, MMUs
  
    The MMU must be off.
+ 
 -  Instruction cache may be on or off.
 +  The instruction cache may be on or off, and must not hold any stale
 +  entries corresponding to the loaded kernel image.
+ 
    The address range corresponding to the loaded kernel image must be
    cleaned to the PoC. In the presence of a system cache or other
    coherent masters with caches enabled, this will typically require