From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Nathan Chancellor <nathan@kernel•org>,
Nicolas Schier <nsc@kernel•org>,
KBuild Mailing List <linux-kbuild@vger•kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Paul Walmsley <pjw@kernel•org>
Subject: linux-next: manual merge of the kbuild tree with Lnus' tree
Date: Mon, 8 Sep 2025 13:49:13 +1000 [thread overview]
Message-ID: <20250908134913.68778b7b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1544 bytes --]
Hi all,
Today's linux-next merge of the kbuild tree got a conflict in:
arch/riscv/Kconfig
between commit:
41f9049cff32 ("riscv: Only allow LTO with CMODEL_MEDANY")
from Lnus' tree and commit:
6578a1ff6aa4 ("riscv: Remove version check for LTO_CLANG selects")
from the kbuild tree.
I fixed it up (I think - 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/Kconfig
index 51dcd8eaa243,850ba4b4b534..000000000000
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -64,9 -64,8 +64,8 @@@ config RISC
select ARCH_SUPPORTS_DEBUG_PAGEALLOC if MMU
select ARCH_SUPPORTS_HUGE_PFNMAP if TRANSPARENT_HUGEPAGE
select ARCH_SUPPORTS_HUGETLBFS if MMU
- # LLD >= 14: https://github.com/llvm/llvm-project/issues/50505
- select ARCH_SUPPORTS_LTO_CLANG if LLD_VERSION >= 140000 && CMODEL_MEDANY
- select ARCH_SUPPORTS_LTO_CLANG_THIN if LLD_VERSION >= 140000
- select ARCH_SUPPORTS_LTO_CLANG
++ select ARCH_SUPPORTS_LTO_CLANG if CMODEL_MEDANY
+ select ARCH_SUPPORTS_LTO_CLANG_THIN
select ARCH_SUPPORTS_MSEAL_SYSTEM_MAPPINGS if 64BIT && MMU
select ARCH_SUPPORTS_PAGE_TABLE_CHECK if MMU
select ARCH_SUPPORTS_PER_VMA_LOCK if MMU
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-09-08 3:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-08 3:49 Stephen Rothwell [this message]
2025-09-08 15:34 ` linux-next: manual merge of the kbuild tree with Lnus' tree Nathan Chancellor
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=20250908134913.68778b7b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kbuild@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nathan@kernel$(echo .)org \
--cc=nsc@kernel$(echo .)org \
--cc=pjw@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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