Received-SPF: pass (google.com: domain of linux-kernel+bounces-141789-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Message-ID: <tencent_3EC60EBE4F410FED19C726DCA218AA10E707@qq.com>
Content-Type: text/plain;
	charset=us-ascii
Precedence: bulk
Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.500.171.1.1\))
Subject: Re: linux-next: manual merge of the riscv-dt tree with the risc-v
 tree
From: Yangyu Chen <cyy@cyyself.name>
In-Reply-To: <20240411094901.2130c36e@canb.auug.org.au>
Date: Fri, 12 Apr 2024 09:49:58 +0800
Cc: Conor Dooley <Conor.Dooley@microchip.com>,
 Palmer Dabbelt <palmer@dabbelt.com>,
 Paul Walmsley <paul@pwsan.com>,
 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>
Content-Transfer-Encoding: quoted-printable
References: <20240411094901.2130c36e@canb.auug.org.au>
To: Stephen Rothwell <sfr@canb.auug.org.au>


> On Apr 11, 2024, at 07:49, Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>=20
> Hi all,
>=20
> Today's linux-next merge of the riscv-dt tree got a conflict in:
>=20
>  arch/riscv/Makefile
>=20
> between commit:
>=20
>  3b938e231b66 ("riscv: merge two if-blocks for KBUILD_IMAGE")
>=20
> from the risc-v tree and commit:
>=20
>  ef10bdf9c3e6 ("riscv: Kconfig.socs: Split ARCH_CANAAN and =
SOC_CANAAN_K210")
>=20

I am the author of this commit. I just renamed CONFIG_ARCH_CANAAN to
CONFIG_SOC_CANAAN_K210 in arch/riscv/Makefile.

> from the riscv-dt tree.
>=20
> 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
> --=20
> Cheers,
> Stephen Rothwell
>=20
> 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)

I reviewed commit 3b938e231b66 ("riscv: merge two if-blocks for
KBUILD_IMAGE"). Your change only replaces the ARCH_CANAAN symbol with
SOC_CANAAN_K210 here. My intention for ef10bdf9c3e6 ("riscv: =
Kconfig.socs:
Split ARCH_CANAAN and SOC_CANAAN_K210") is to use loader.bin only for
Canaan K210 SoC but not for other Canaan SoCs. So I think that's the =
right
way to resolve merge conflict.

Reviewed-by: Yangyu Chen <cyy@cyyself.name>

> +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/