Received-SPF: pass (google.com: domain of linux-kernel+bounces-82430-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Tue, 27 Feb 2024 10:03:37 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Huacai Chen <chenhuacai@loongson.cn>, Catalin Marinas
 <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>
Cc: Huacai Chen <chenhuacai@kernel.org>, Jamie Cunliffe
 <Jamie.Cunliffe@arm.com>, Jinyang He <hejinyang@loongson.cn>, Linux Kernel
 Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Tiezhu Yang <yangtiezhu@loongson.cn>, Youling
 Tang <tangyouling@loongson.cn>
Subject: linux-next: manual merge of the loongarch tree with the arm64 tree
Message-ID: <20240227100337.4e9b64c1@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/bBpqdYJovqmzVDa.RswQkpG";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/bBpqdYJovqmzVDa.RswQkpG
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the loongarch tree got a conflict in:

  arch/loongarch/Makefile

between commit:

  f82811e22b48 ("rust: Refactor the build target to allow the use of builti=
n targets")

from the arm64 tree and commit:

  58aeb61a338e ("LoongArch: Add ORC stack unwinder support")

from the loongarch 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/loongarch/Makefile
index fa4fb09909ae,e3bc02fb7fdc..000000000000
--- a/arch/loongarch/Makefile
+++ b/arch/loongarch/Makefile
@@@ -82,7 -92,15 +92,16 @@@ KBUILD_AFLAGS_MODULE		+=3D -Wa,-mla-globa
  KBUILD_CFLAGS_MODULE		+=3D -fplt -Wa,-mla-global-with-abs,-mla-local-with=
-abs
  endif
 =20
+ KBUILD_AFLAGS			+=3D $(call cc-option,-mno-relax) $(call cc-option,-Wa$(c=
omma)-mno-relax)
+ KBUILD_CFLAGS			+=3D $(call cc-option,-mno-relax) $(call cc-option,-Wa$(c=
omma)-mno-relax)
+ KBUILD_AFLAGS			+=3D $(call cc-option,-mthin-add-sub) $(call cc-option,-W=
a$(comma)-mthin-add-sub)
+ KBUILD_CFLAGS			+=3D $(call cc-option,-mthin-add-sub) $(call cc-option,-W=
a$(comma)-mthin-add-sub)
+=20
+ ifdef CONFIG_OBJTOOL
+ KBUILD_CFLAGS			+=3D -fno-jump-tables
+ endif
+=20
 +KBUILD_RUSTFLAGS			+=3D --target=3D$(objtree)/scripts/target.json
  KBUILD_RUSTFLAGS_MODULE		+=3D -Crelocation-model=3Dpic
 =20
  ifeq ($(CONFIG_RELOCATABLE),y)

--Sig_/bBpqdYJovqmzVDa.RswQkpG
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXdGMkACgkQAVBC80lX
0GzSNgf/bRR/GisK08NXhhejpfXnEhIPuPc16bAHR0u5RKaTtPu/opXD6NBPGDy1
HSo29bZjlsGyFyLv5X9PZ6dzxRWaca6CAf13RLGhe5L+81hl5h9zWd3zG5jwiA4L
asurjYCQHHsQGbtV6NGSYeSC00rQlI68mpRZt7qzfBuoRniu3vjJfq4W6Pqgm1Wx
WD3tDZxG5ddZfUr+wWLIOgZpgZpJlG4v/lq58+vR2lqFOIPsxdDeFL2PXNnth9uC
r09ITzA+gbz1l4p85kZQFvLcfBSUq/GwLuKN4dmmiz9FZ1pHTcYyivpAjNUMknvl
OniKBF3eLsm/tVeFYjPFjvClyFexbQ==
=paYl
-----END PGP SIGNATURE-----

--Sig_/bBpqdYJovqmzVDa.RswQkpG--