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
Date: Tue, 27 Feb 2024 10:03:37 +1100 [thread overview]
Message-ID: <20240227100337.4e9b64c1@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1678 bytes --]
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 builtin 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.
--
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 += -Wa,-mla-globa
KBUILD_CFLAGS_MODULE += -fplt -Wa,-mla-global-with-abs,-mla-local-with-abs
endif
+ KBUILD_AFLAGS += $(call cc-option,-mno-relax) $(call cc-option,-Wa$(comma)-mno-relax)
+ KBUILD_CFLAGS += $(call cc-option,-mno-relax) $(call cc-option,-Wa$(comma)-mno-relax)
+ KBUILD_AFLAGS += $(call cc-option,-mthin-add-sub) $(call cc-option,-Wa$(comma)-mthin-add-sub)
+ KBUILD_CFLAGS += $(call cc-option,-mthin-add-sub) $(call cc-option,-Wa$(comma)-mthin-add-sub)
+
+ ifdef CONFIG_OBJTOOL
+ KBUILD_CFLAGS += -fno-jump-tables
+ endif
+
+KBUILD_RUSTFLAGS += --target=$(objtree)/scripts/target.json
KBUILD_RUSTFLAGS_MODULE += -Crelocation-model=pic
ifeq ($(CONFIG_RELOCATABLE),y)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-02-26 23:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-26 23:03 Stephen Rothwell [this message]
2024-02-27 13:30 ` linux-next: manual merge of the loongarch tree with the arm64 tree Catalin Marinas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240227100337.4e9b64c1@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Jamie.Cunliffe@arm.com \
--cc=catalin.marinas@arm.com \
--cc=chenhuacai@kernel.org \
--cc=chenhuacai@loongson.cn \
--cc=hejinyang@loongson.cn \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tangyouling@loongson.cn \
--cc=will@kernel.org \
--cc=yangtiezhu@loongson.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).