From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 5 Apr 2025 22:46:50 +0000 (-0700)
Subject: Merge tag 'kbuild-v6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy... 
X-Git-Tag: v6.15-rc1~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f4d2ef48250ad057e4f00087967b5ff366da9f39;p=thirdparty%2Flinux.git

Merge tag 'kbuild-v6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild updates from Masahiro Yamada:

 - Improve performance in gendwarfksyms

 - Remove deprecated EXTRA_*FLAGS and KBUILD_ENABLE_EXTRA_GCC_CHECKS

 - Support CONFIG_HEADERS_INSTALL for ARCH=um

 - Use more relative paths to sources files for better reproducibility

 - Support the loong64 Debian architecture

 - Add Kbuild bash completion

 - Introduce intermediate vmlinux.unstripped for architectures that need
   static relocations to be stripped from the final vmlinux

 - Fix versioning in Debian packages for -rc releases

 - Treat missing MODULE_DESCRIPTION() as an error

 - Convert Nios2 Makefiles to use the generic rule for built-in DTB

 - Add debuginfo support to the RPM package

* tag 'kbuild-v6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (40 commits)
  kbuild: rpm-pkg: build a debuginfo RPM
  kconfig: merge_config: use an empty file as initfile
  nios2: migrate to the generic rule for built-in DTB
  rust: kbuild: skip `--remap-path-prefix` for `rustdoc`
  kbuild: pacman-pkg: hardcode module installation path
  kbuild: deb-pkg: don't set KBUILD_BUILD_VERSION unconditionally
  modpost: require a MODULE_DESCRIPTION()
  kbuild: make all file references relative to source root
  x86: drop unnecessary prefix map configuration
  kbuild: deb-pkg: add comment about future removal of KDEB_COMPRESS
  kbuild: Add a help message for "headers"
  kbuild: deb-pkg: remove "version" variable in mkdebian
  kbuild: deb-pkg: fix versioning for -rc releases
  Documentation/kbuild: Fix indentation in modules.rst example
  x86: Get rid of Makefile.postlink
  kbuild: Create intermediate vmlinux build with relocations preserved
  kbuild: Introduce Kconfig symbol for linking vmlinux with relocations
  kbuild: link-vmlinux.sh: Make output file name configurable
  kbuild: do not generate .tmp_vmlinux*.map when CONFIG_VMLINUX_MAP=y
  Revert "kheaders: Ignore silly-rename files"
  ...
---

f4d2ef48250ad057e4f00087967b5ff366da9f39
diff --cc arch/riscv/Kconfig
index 1fd197afd2f73,6f58001144162..bbec87b793099
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -1106,8 -1075,9 +1106,9 @@@ config PARAVIRT_TIME_ACCOUNTIN
  
  config RELOCATABLE
  	bool "Build a relocatable kernel"
 -	depends on MMU && 64BIT && !XIP_KERNEL
 +	depends on !XIP_KERNEL
  	select MODULE_SECTIONS if MODULES
+ 	select ARCH_VMLINUX_NEEDS_RELOCS
  	help
            This builds a kernel as a Position Independent Executable (PIE),
            which retains all relocation metadata required to relocate the
diff --cc arch/s390/Makefile
index fd3b70d9aab15,d5f4be4408790..b06dc53bfed54
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@@ -15,7 -15,7 +15,7 @@@ KBUILD_CFLAGS_MODULE += -fPI
  KBUILD_AFLAGS	+= -m64
  KBUILD_CFLAGS	+= -m64
  KBUILD_CFLAGS	+= -fPIC
- LDFLAGS_vmlinux	:= $(call ld-option,-no-pie) --emit-relocs --discard-none
 -LDFLAGS_vmlinux	:= -no-pie
++LDFLAGS_vmlinux	:= $(call ld-option,-no-pie)
  extra_tools	:= relocs
  aflags_dwarf	:= -Wa,-gdwarf-2
  KBUILD_AFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -D__ASSEMBLY__
diff --cc rust/Makefile
index 99bc3eea44a6b,089473a89d469..fa0eea8a9eca2
--- a/rust/Makefile
+++ b/rust/Makefile
@@@ -199,9 -175,9 +203,9 @@@ quiet_cmd_rustdoc_test_kernel = RUSTDO
  	rm -rf $(objtree)/$(obj)/test/doctests/kernel; \
  	mkdir -p $(objtree)/$(obj)/test/doctests/kernel; \
  	OBJTREE=$(abspath $(objtree)) \
- 	$(RUSTDOC) --test $(rust_flags) \
+ 	$(RUSTDOC) --test $(filter-out --remap-path-prefix=%,$(rust_flags)) \
 -		-L$(objtree)/$(obj) --extern ffi --extern kernel \
 -		--extern build_error --extern macros \
 +		-L$(objtree)/$(obj) --extern ffi --extern pin_init \
 +		--extern kernel --extern build_error --extern macros \
  		--extern bindings --extern uapi \
  		--no-run --crate-name kernel -Zunstable-options \
  		--sysroot=/dev/null \