linux-kernel - linux-next: manual merge of the riscv-dt tree with the risc-v 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-next>] [day] [month] [year] [list]

Date: Thu, 11 Apr 2024 09:49:01 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Conor Dooley <Conor.Dooley@...rochip.com>, Palmer Dabbelt
 <palmer@...belt.com>, Paul Walmsley <paul@...an.com>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, Masahiro Yamada
 <masahiroy@...nel.org>, Palmer Dabbelt <palmer@...osinc.com>, Yangyu Chen
 <cyy@...self.name>
Subject: linux-next: manual merge of the riscv-dt tree with the risc-v tree

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.

-- 
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		:= arch/riscv/boo
  ifeq ($(CONFIG_XIP_KERNEL),y)
  KBUILD_IMAGE := $(boot)/xipImage
  else
- ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_ARCH_CANAAN),yy)
++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
  endif
  
  libs-y += arch/riscv/lib/

Content of type "application/pgp-signature" skipped