linux-kernel - Re: linux-next: manual merge of the risc-v tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <tencent_98572A2633C4B01197EF4F10513BD9F10D05@qq.com>
Date: Thu, 23 May 2024 14:54:28 +0800
From: Yangyu Chen <cyy@...self.name>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Palmer Dabbelt <palmer@...belt.com>,
 Paul Walmsley <paul@...an.com>,
 Conor Dooley <conor.dooley@...rochip.com>,
 Emil Renner Berthing <emil.renner.berthing@...onical.com>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
 Linux Next Mailing List <linux-next@...r.kernel.org>,
 Palmer Dabbelt <palmer@...osinc.com>
Subject: Re: linux-next: manual merge of the risc-v tree with Linus' tree



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

Looks good to me.

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

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