Received-SPF: pass (google.com: domain of linux-kernel+bounces-180493-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Date: Thu, 16 May 2024 09:36:41 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Palmer Dabbelt <palmer@dabbelt.com>, Paul Walmsley <paul@pwsan.com>
Cc: 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>, Masahiro Yamada <masahiroy@kernel.org>,
 Palmer Dabbelt <palmer@rivosinc.com>, Yangyu Chen <cyy@cyyself.name>
Subject: linux-next: manual merge of the risc-v tree with Linus' tree
Message-ID: <20240516093641.15695f18@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/zBiFYrER7aIM+9EzT=z+MMJ";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/zBiFYrER7aIM+9EzT=z+MMJ
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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 commits:

  3b938e231b66 ("riscv: merge two if-blocks for KBUILD_IMAGE")
  c1f59d035966 ("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.

--=20
Cheers,
Stephen Rothwell

diff --cc arch/riscv/Makefile
index 0577d34fb1a7,321c057e2bdc..000000000000
--- a/arch/riscv/Makefile
+++ b/arch/riscv/Makefile
@@@ -132,12 -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
- KBUILD_IMAGE	:=3D $(boot)/Image.gz
+ 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_ARCH_CANAAN_K210)	:=3D loader.bin
  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
@@@ -154,20 -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_v=
dso.so.dbg:../compat_vdso/compat_vdso.so
 +vdso-install-$(CONFIG_COMPAT)	+=3D arch/riscv/kernel/compat_vdso/compat_v=
dso.so.dbg
 =20
- ifneq ($(CONFIG_XIP_KERNEL),y)
- 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
- 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

--Sig_/zBiFYrER7aIM+9EzT=z+MMJ
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZFRwkACgkQAVBC80lX
0Gym4Qf/U1wWiCaSM9jRRxodXRPieDLW/xtdKEph4feEq5H+wV6czgoMRDNQFLlH
0Xai1JA2puWR+naZVOcPJ8eB/r07Tn2M3DgiJk42ItkzAQBdTci036cbE/T+/sKV
rHm5nDFYGQ1qo4Fg1L7sqHLo7nIh4dNGlsBW9PT6w/6SNMxLcY/jsc29CdYXhpRx
UxhwuyikTmuAIBezIxLPQiEhTP8VI3lvgJ6MCcv3IjPIX2Sozk/6SjXCvXBpmz2b
pS/FqTz5jQ6DR/s/IVWDK0Z0oxaCpU+HaTHKyi6WwBeS5pY4TpZ/UqEjnGigkSs4
X3EL0kQveCwS2hlcR23fWI+3LL3FcA==
=D5or
-----END PGP SIGNATURE-----

--Sig_/zBiFYrER7aIM+9EzT=z+MMJ--