Subject: linux-next: manual merge of the sh tree with the parisc-hd tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 24 Mar 2023 11:15:14 +1100

Hi all,

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

  Documentation/kbuild/kbuild.rst

between commit:

  49deed336ef9 ("parisc: update kbuild doc. aliases for parisc64")

from the parisc-hd tree and commit:

  644a9cf0d2a8 ("sh: remove sh5/sh64 last fragments")

from the sh 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/kbuild/kbuild.rst
index 84b2d2dc8f78,e22621f4af0b..000000000000
--- a/Documentation/kbuild/kbuild.rst
+++ b/Documentation/kbuild/kbuild.rst
@@@ -160,8 -160,6 +160,7 @@@ directory name found in the arch/ direc
  But some architectures such as x86 and sparc have aliases.
  
  - x86: i386 for 32 bit, x86_64 for 64 bit
 +- parisc: parisc64 for 64 bit
- - sh: sh for 32 bit, sh64 for 64 bit
  - sparc: sparc32 for 32 bit, sparc64 for 64 bit
  
  CROSS_COMPILE