From: Mark Brown <broonie@kernel•org>
To: Nathan Chancellor <nathan@kernel•org>,
Nicolas Schier <nsc@kernel•org>,
KBuild Mailing List <linux-kbuild@vger•kernel.org>
Cc: Andrew Morton <akpm@linux-foundation•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Petr Pavlu <petr.pavlu@suse•com>, Sasha Levin <sashal@kernel•org>
Subject: linux-next: manual merge of the kbuild tree with the origin tree
Date: Mon, 18 May 2026 17:11:02 +0100 [thread overview]
Message-ID: <ags6FtowWAeGPoEN@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 2150 bytes --]
Hi all,
Today's linux-next merge of the kbuild tree got a conflict in:
scripts/Makefile.modfinal
between commit:
dc1f85a9637cc ("kallsyms: extend lineinfo to loadable modules")
from the origin tree and commit:
7abef41afad05 ("kbuild/btf: Remove broken module relinking exclusion")
from the kbuild 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.
diff --cc scripts/Makefile.modfinal
index 3941cf624526b,01a37ec872b90..0000000000000
--- a/scripts/Makefile.modfinal
+++ b/scripts/Makefile.modfinal
@@@ -46,25 -46,11 +46,17 @@@ quiet_cmd_btf_ko = BTF [M] $
$(CONFIG_SHELL) $(srctree)/scripts/gen-btf.sh --btf_base $(objtree)/vmlinux $@; \
fi;
+quiet_cmd_lineinfo_ko = LINEINFO [M] $@
+ cmd_lineinfo_ko = $(CONFIG_SHELL) $(srctree)/scripts/gen-mod-lineinfo.sh $@
+
- # Same as newer-prereqs, but allows to exclude specified extra dependencies
- newer_prereqs_except = $(filter-out $(PHONY) $(1),$?)
-
- # Same as if_changed, but allows to exclude specified extra dependencies
- if_changed_except = $(if $(call newer_prereqs_except,$(2))$(cmd-check), \
- $(cmd); \
- printf '%s\n' 'savedcmd_$@ := $(make-cmd)' > $(dot-target).cmd, @:)
-
# Re-generate module BTFs if either module's .ko or vmlinux changed
%.ko: %.o %.mod.o .module-common.o $(objtree)/scripts/module.lds $(and $(CONFIG_DEBUG_INFO_BTF_MODULES),$(KBUILD_BUILTIN),$(objtree)/vmlinux) FORCE
- +$(call if_changed_except,ld_ko_o,$(objtree)/vmlinux)
+ +$(call if_changed,ld_ko_o)
ifdef CONFIG_DEBUG_INFO_BTF_MODULES
+$(if $(newer-prereqs),$(call cmd,btf_ko))
+endif
+ifdef CONFIG_KALLSYMS_LINEINFO_MODULES
+ +$(if $(newer-prereqs),$(call cmd,lineinfo_ko))
endif
+$(call cmd,check_tracepoint)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-05-18 16:11 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-18 16:11 Mark Brown [this message]
2026-05-18 19:13 ` linux-next: manual merge of the kbuild tree with the origin tree Nathan Chancellor
2026-05-18 19:28 ` Nathan Chancellor
2026-05-18 19:55 ` Andrew Morton
2026-05-19 7:37 ` Mark Brown
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=ags6FtowWAeGPoEN@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=akpm@linux-foundation$(echo .)org \
--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=petr.pavlu@suse$(echo .)com \
--cc=sashal@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