Received-SPF: pass (google.com: domain of linux-kernel+bounces-139547-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Thu, 11 Apr 2024 09:49:01 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Conor Dooley <Conor.Dooley@microchip.com>, Palmer Dabbelt
 <palmer@dabbelt.com>, Paul Walmsley <paul@pwsan.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next
 Mailing List <linux-next@vger.kernel.org>, Masahiro Yamada
 <masahiroy@kernel.org>, Palmer Dabbelt <palmer@rivosinc.com>, Yangyu Chen
 <cyy@cyyself.name>
Subject: linux-next: manual merge of the riscv-dt tree with the risc-v tree
Message-ID: <20240411094901.2130c36e@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/u25e+1GLC0Gc1=nCrtry.dG";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/u25e+1GLC0Gc1=nCrtry.dG
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  arch/riscv/Makefile

between commit:

  3b938e231b66 ("riscv: merge two if-blocks for KBUILD_IMAGE")

from the risc-v tree and commit:

  ef10bdf9c3e6 ("riscv: Kconfig.socs: Split ARCH_CANAAN and SOC_CANAAN_K210=
")

from the riscv-dt 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.

--=20
Cheers,
Stephen Rothwell

diff --cc arch/riscv/Makefile
index 7c60bbe1f785,fa6c389c3986..000000000000
--- a/arch/riscv/Makefile
+++ b/arch/riscv/Makefile
@@@ -143,15 -133,7 +143,15 @@@ boot		:=3D arch/riscv/boo
  ifeq ($(CONFIG_XIP_KERNEL),y)
  KBUILD_IMAGE :=3D $(boot)/xipImage
  else
- ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_ARCH_CANAAN),yy)
++ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_SOC_CANAAN_K210),yy)
 +KBUILD_IMAGE :=3D $(boot)/loader.bin
 +else
 +ifeq ($(CONFIG_EFI_ZBOOT),)
  KBUILD_IMAGE	:=3D $(boot)/Image.gz
 +else
 +KBUILD_IMAGE :=3D $(boot)/vmlinuz.efi
 +endif
 +endif
  endif
 =20
  libs-y +=3D arch/riscv/lib/

--Sig_/u25e+1GLC0Gc1=nCrtry.dG
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYXJW0ACgkQAVBC80lX
0GwXvQf/aN6FskG7ANxR1bq2ycfganuAm/PIG9a8zJnnObUrHU568QJLE0Cl8Etq
uejr91xwyCwTpeGoSXicTnTmwX9G/FpcuSUXmVdPWPLB5+rF05sN5LV33EiPoyhO
Q9WVrcyNLrLrgT8znahwWKxDfkqaZmEBqYaa3fSMwx9NFU2c05Nu/Xt8wvJvtLSs
j4kzX4TxhAKE95WuaRHmXau9Wq/6kcXvICygFiJomwzqPLzhGgYJNS1HMK12GsGW
yoLTQYaVXlrXUR9AQ680Xk7BXiBduTPv0Koj/n+wx11qIqsLodNbY5C7S9yPqhFC
oC5/xyTYZuriEi6yd1ApWJ3sdOMcbQ==
=KHuq
-----END PGP SIGNATURE-----

--Sig_/u25e+1GLC0Gc1=nCrtry.dG--