Received-SPF: pass (google.com: domain of linux-kernel+bounces-187066-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Message-ID: <tencent_98572A2633C4B01197EF4F10513BD9F10D05@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 risc-v tree with Linus' tree
From: Yangyu Chen <cyy@cyyself.name>
In-Reply-To: <20240523091729.71a9017f@canb.auug.org.au>
Date: Thu, 23 May 2024 14:54:28 +0800
Cc: Palmer Dabbelt <palmer@dabbelt.com>,
 Paul Walmsley <paul@pwsan.com>,
 Conor Dooley <conor.dooley@microchip.com>,
 Emil Renner Berthing <emil.renner.berthing@canonical.com>,
 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 Linux Next Mailing List <linux-next@vger.kernel.org>,
 Palmer Dabbelt <palmer@rivosinc.com>
Content-Transfer-Encoding: quoted-printable
References: <20240523091729.71a9017f@canb.auug.org.au>
To: Stephen Rothwell <sfr@canb.auug.org.au>


> On May 23, 2024, at 07:17, Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>=20
> Hi all,
>=20
> Today's linux-next merge of the risc-v tree got a conflict in:
>=20
>  arch/riscv/Makefile
>=20
> between commit:
>=20
>  ef10bdf9c3e6 ("riscv: Kconfig.socs: Split ARCH_CANAAN and =
SOC_CANAAN_K210")
>=20
> from Linus' tree and commit:
>=20
>  d944d47b77cd ("riscv: make image compression configurable")
>=20
> from the risc-v 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 ec47787acd89,321c057e2bdc..000000000000
> --- a/arch/riscv/Makefile
> +++ b/arch/riscv/Makefile
> @@@ -139,20 -136,20 +139,20 @@@ endi
>  CHECKFLAGS +=3D -D__riscv -D__riscv_xlen=3D$(BITS)
>=20
>  # Default target when executing plain make
> - boot :=3D arch/riscv/boot
> - ifeq ($(CONFIG_XIP_KERNEL),y)
> - KBUILD_IMAGE :=3D $(boot)/xipImage
> - else
> - 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
> + boot :=3D arch/riscv/boot
> + boot-image-y :=3D Image
> + boot-image-$(CONFIG_KERNEL_BZIP2) :=3D Image.bz2
> + boot-image-$(CONFIG_KERNEL_GZIP) :=3D Image.gz
> + boot-image-$(CONFIG_KERNEL_LZ4) :=3D Image.lz4
> + boot-image-$(CONFIG_KERNEL_LZMA) :=3D Image.lzma
> + boot-image-$(CONFIG_KERNEL_LZO) :=3D Image.lzo
> + boot-image-$(CONFIG_KERNEL_ZSTD) :=3D Image.zst
> + ifdef CONFIG_RISCV_M_MODE
> -boot-image-$(CONFIG_ARCH_CANAAN) :=3D loader.bin
> ++boot-image-$(CONFIG_SOC_CANAAN_K210) :=3D loader.bin

Looks good to me.

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

>  endif
> + boot-image-$(CONFIG_EFI_ZBOOT) :=3D vmlinuz.efi
> + boot-image-$(CONFIG_XIP_KERNEL) :=3D xipImage
> + KBUILD_IMAGE :=3D $(boot)/$(boot-image-y)
>=20
>  libs-y +=3D arch/riscv/lib/
>  libs-$(CONFIG_EFI_STUB) +=3D =
$(objtree)/drivers/firmware/efi/libstub/lib.a
> @@@ -169,9 -166,9 +169,9 @@@ endi
>  endif
>=20
>  vdso-install-y +=3D arch/riscv/kernel/vdso/vdso.so.dbg
> -vdso-install-$(CONFIG_COMPAT) +=3D =
arch/riscv/kernel/compat_vdso/compat_vdso.so.dbg:../compat_vdso/compat_vds=
o.so
> +vdso-install-$(CONFIG_COMPAT) +=3D =
arch/riscv/kernel/compat_vdso/compat_vdso.so.dbg
>=20
> - BOOT_TARGETS :=3D Image Image.gz loader loader.bin xipImage =
vmlinuz.efi
> + BOOT_TARGETS :=3D Image Image.gz Image.bz2 Image.lz4 Image.lzma =
Image.lzo Image.zst loader loader.bin xipImage vmlinuz.efi
>=20
>  all: $(notdir $(KBUILD_IMAGE))
>=20