Hello Linus,
Please pull Kbuild updates for v6.10-rc1.
You will see conflicts in 4 files.
All of them are properly resolved in linux-next.
After merging this pull request, just in case, please run
$ git grep '$(srctree)/$(src)'
If you get a hit, please replace $(srctree)/$(src) with $(src).
My commit b1992c3772e6 needs to consistently replace $(srctree)/$(src),
but I cannot touch in-flight patches merged in other subsystems.
The following are the merge conflicts I am aware of:
[1] drivers/gpu/drm/msm/Makefile
conflict between 0fddd045f88e between b1992c3772e6
addressed by:
https://lore.kernel.org/all/[email protected]/
[2] drivers/misc/lkdtm/Makefile
conflict between fb28a8862dc4 between 7f7f6f7ad654
addressed by:
https://lore.kernel.org/all/[email protected]/
[3] drivers/net/wireless/intel/iwlwifi/mvm/Makefile
conflict between 2887af4d22f9 and b1992c3772e6
addressed by:
https://lore.kernel.org/all/[email protected]/
[4] rust/Makefile
conflict between 11795ae4cc43 and b1992c3772e6
addressed by:
https://lore.kernel.org/all/[email protected]/
Thank you.
The following changes since commit ed30a4a51bb196781c8058073ea720133a65596f:
Linux 6.9-rc5 (2024-04-21 12:35:54 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git
tags/kbuild-v6.10
for you to fetch changes up to 6ffe4fdf8901dc0a15d7278531503ecd4522ae15:
kconfig: use sym_get_choice_menu() in sym_check_prop() (2024-05-16
03:18:41 +0900)
----------------------------------------------------------------
Kbuild updates for v6.10
- Avoid 'constexpr', which is a keyword in C23
- Allow 'dtbs_check' and 'dt_compatible_check' run independently of
'dt_binding_check'
- Fix weak references to avoid GOT entries in position-independent
code generation
- Convert the last use of 'optional' property in arch/sh/Kconfig
- Remove support for the 'optional' property in Kconfig
- Remove support for Clang's ThinLTO caching, which does not work with
the .incbin directive
- Change the semantics of $(src) so it always points to the source
directory, which fixes Makefile inconsistencies between upstream and
downstream
- Fix 'make tar-pkg' for RISC-V to produce a consistent package
- Provide reasonable default coverage for objtool, sanitizers, and
profilers
- Remove redundant OBJECT_FILES_NON_STANDARD, KASAN_SANITIZE, etc.
- Remove the last use of tristate choice in drivers/rapidio/Kconfig
- Various cleanups and fixes in Kconfig
----------------------------------------------------------------
Ard Biesheuvel (2):
kallsyms: Avoid weak references for kallsyms symbols
vmlinux: Avoid weak reference to notes section
Arnd Bergmann (1):
scripts/unifdef: avoid constexpr keyword
Emil Renner Berthing (1):
kbuild: buildtar: install riscv compressed images as vmlinuz
Masahiro Yamada (37):
parisc: vdso: remove unused C build rule in vdso32/Makefile
kbuild: buildtar: add comments about inconsistent package generation
kconfig: add menu_next() function and menu_for_each(_sub)_entry macros
kconfig: use menu_for_each_entry() to traverse menu tree
kconfig: remove unneeded if-conditional in conf_choice()
kbuild: buildtar: remove warning for the default case
kconfig: remove SYMBOL_CHOICE flag
sh: Convert the last use of 'optional' property in Kconfig
kconfig: remove 'optional' property support
kconfig: remove SYMBOL_NO_WRITE flag
arch: use $(obj)/ instead of $(src)/ for preprocessed linker scripts
kbuild: do not add $(srctree) or $(objtree) to header search paths
kbuild: use $(obj)/ instead of $(src)/ for common pattern rules
kbuild: use $(src) instead of $(srctree)/$(src) for source directory
kbuild: remove redundant $(wildcard ) for rm-files
kbuild: add 'private' to target-specific variables
kbuild: simplify generic vdso installation code
kconfig: gconf: update pane correctly after loading a config file
kconfig: gconf: remove debug code
kconfig: gconf: use MENU_CHANGED instead of SYMBOL_CHANGED
kconfig: use linked list in sym_set_changed()
kconfig: turn conf_choice() into void function
kconfig: turn missing prompt for choice members into error
kconfig: turn defaults and additional prompt for choice members into error
kconfig: add sym_get_choice_menu() helper
kconfig: use sym_get_choice_menu() in conf_write_defconfig()
kconfig: use menu_list_for_each_sym() in sym_check_choice_deps()
kbuild: provide reasonable defaults for tool coverage
Makefile: remove redundant tool coverage variables
kbuild: use GCOV_PROFILE and KCSAN_SANITIZE in scripts/Makefile.modfinal
kconfig: gconf: show checkbox for choice correctly
kconfig: m/nconf: remove dead code to display children of choice members
kconfig: m/nconf: remove dead code to display value of bool choice
kconfig: m/nconf: merge two item_add_str() calls
kconfig: lxdialog: remove initialization with A_NORMAL
rapidio: remove choice for enumeration
kconfig: use sym_get_choice_menu() in sym_check_prop()
Nathan Chancellor (1):
kbuild: Remove support for Clang's ThinLTO caching
Rob Herring (3):
dt-bindings: kbuild: Simplify examples target patsubst
dt-bindings: kbuild: Split targets out to separate rules
dt-bindings: kbuild: Add separate target/dependency for
processed-schema.json
Wang Yao (1):
modules: Drop the .export_symbol section from the final modules
Documentation/Makefile | 8 +--
Documentation/devicetree/bindings/Makefile | 36 ++++++----
Documentation/kbuild/kconfig-language.rst | 3 -
Documentation/kbuild/makefiles.rst | 12 ++--
Makefile | 44
+++++++-----
arch/arc/boot/dts/Makefile | 3 +-
arch/arm/Kbuild | 2 +-
arch/arm/boot/Makefile | 3 +-
arch/arm/boot/bootp/Makefile | 1 -
arch/arm/boot/compressed/Makefile | 7 --
arch/arm/mach-s3c/Makefile | 2 +-
arch/arm/plat-orion/Makefile | 2 +-
arch/arm/tools/Makefile | 2 +-
arch/arm/vdso/Makefile | 9 ---
arch/arm64/kernel/pi/Makefile | 6 --
arch/arm64/kernel/vdso/Makefile | 10 +--
arch/arm64/kernel/vdso32/Makefile | 2 +-
arch/arm64/kvm/Makefile | 4 +-
arch/arm64/kvm/hyp/Makefile | 2 +-
arch/arm64/kvm/hyp/nvhe/Makefile | 13 ----
arch/csky/boot/dts/Makefile | 4 +-
arch/csky/kernel/vdso/Makefile | 8 +--
arch/loongarch/kvm/Makefile | 2 +-
arch/loongarch/vdso/Makefile | 9 +--
arch/mips/boot/compressed/Makefile | 6 --
arch/mips/kernel/syscalls/Makefile | 2 +-
arch/mips/vdso/Makefile | 11 +--
arch/nios2/boot/dts/Makefile | 3 +-
arch/parisc/boot/compressed/Makefile | 4 --
arch/parisc/kernel/vdso32/Makefile | 9 +--
arch/parisc/kernel/vdso64/Makefile | 4 +-
arch/powerpc/boot/Makefile | 6 +-
arch/powerpc/boot/dts/Makefile | 3 +-
arch/powerpc/boot/dts/fsl/Makefile | 3 +-
arch/powerpc/kernel/vdso/Makefile | 16 ++---
arch/powerpc/purgatory/Makefile | 3 -
arch/riscv/boot/Makefile | 2 -
arch/riscv/kernel/compat_vdso/Makefile | 8 +--
arch/riscv/kernel/pi/Makefile | 6 --
arch/riscv/kernel/vdso/Makefile | 8 +--
arch/riscv/kvm/Makefile | 2 +-
arch/riscv/purgatory/Makefile | 8 ---
arch/s390/kernel/syscalls/Makefile | 4 +-
arch/s390/kernel/vdso32/Makefile | 12 +---
arch/s390/kernel/vdso64/Makefile | 12 +---
arch/s390/purgatory/Makefile | 8 ---
arch/sh/Kconfig | 6 +-
arch/sh/boot/compressed/Makefile | 3 -
arch/sh/configs/apsh4a3a_defconfig | 1 +
arch/sh/configs/apsh4ad0a_defconfig | 1 +
arch/sh/configs/edosk7705_defconfig | 1 +
arch/sh/configs/hp6xx_defconfig | 1 +
arch/sh/configs/landisk_defconfig | 1 +
arch/sh/configs/magicpanelr2_defconfig | 1 +
arch/sh/configs/rsk7264_defconfig | 1 +
arch/sh/configs/rsk7269_defconfig | 1 +
arch/sh/configs/se7619_defconfig | 1 +
arch/sh/configs/se7705_defconfig | 1 +
arch/sh/configs/se7722_defconfig | 1 +
arch/sh/configs/se7750_defconfig | 1 +
arch/sh/configs/secureedge5410_defconfig | 1 +
arch/sh/configs/sh7710voipgw_defconfig | 1 +
arch/sh/configs/sh7724_generic_defconfig | 1 +
arch/sh/configs/sh7770_generic_defconfig | 1 +
arch/sh/configs/sh7785lcr_32bit_defconfig | 1 +
arch/sh/configs/sh7785lcr_defconfig | 1 +
arch/sh/configs/urquell_defconfig | 1 +
arch/sh/kernel/vsyscall/Makefile | 4 +-
arch/sparc/vdso/Makefile | 4 +-
arch/um/kernel/Makefile | 2 +-
arch/x86/boot/Makefile | 17 +----
arch/x86/boot/compressed/Makefile | 11 ---
arch/x86/entry/vdso/Makefile | 28 +-------
arch/x86/kernel/Makefile | 2 +-
arch/x86/kernel/cpu/Makefile | 2 +-
arch/x86/mm/Makefile | 2 +-
arch/x86/purgatory/Makefile | 9 ---
arch/x86/realmode/rm/Makefile | 11 ---
arch/x86/um/vdso/Makefile | 9 +--
arch/xtensa/boot/dts/Makefile | 3 +-
certs/Makefile | 4 +-
drivers/Makefile | 5 --
drivers/crypto/intel/qat/qat_420xx/Makefile | 2 +-
drivers/crypto/intel/qat/qat_4xxx/Makefile | 2 +-
drivers/crypto/intel/qat/qat_c3xxx/Makefile | 2 +-
drivers/crypto/intel/qat/qat_c3xxxvf/Makefile | 2 +-
drivers/crypto/intel/qat/qat_c62x/Makefile | 2 +-
drivers/crypto/intel/qat/qat_c62xvf/Makefile | 2 +-
drivers/crypto/intel/qat/qat_dh895xcc/Makefile | 2 +-
drivers/crypto/intel/qat/qat_dh895xccvf/Makefile | 2 +-
drivers/firmware/efi/libstub/Makefile | 11 ---
drivers/gpu/drm/amd/amdgpu/Makefile | 2 +-
drivers/gpu/drm/arm/display/komeda/Makefile | 4 +-
drivers/gpu/drm/i915/Makefile | 4 +-
drivers/gpu/drm/imagination/Makefile | 2 +-
drivers/gpu/drm/msm/Makefile | 8 +--
drivers/gpu/drm/nouveau/Kbuild | 10 ++-
drivers/gpu/drm/xe/Makefile | 10 +--
drivers/hid/amd-sfh-hid/Makefile | 2 +-
drivers/hid/intel-ish-hid/Makefile | 2 +-
drivers/md/dm-vdo/Makefile | 2 +-
drivers/misc/lkdtm/Makefile | 4 --
drivers/net/ethernet/aquantia/atlantic/Makefile | 2 +-
drivers/net/ethernet/chelsio/libcxgb/Makefile | 2 +-
drivers/net/ethernet/fungible/funeth/Makefile | 2 +-
drivers/net/ethernet/hisilicon/hns3/Makefile | 2 +-
drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile | 4 +-
drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/Makefile | 6 +-
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/Makefile | 6 +-
drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/Makefile | 6 +-
drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile | 6 +-
drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile | 2 +-
drivers/net/wireless/intel/iwlwifi/dvm/Makefile | 2 +-
drivers/net/wireless/intel/iwlwifi/mei/Makefile | 2 +-
drivers/net/wireless/intel/iwlwifi/mvm/Makefile | 2 +-
drivers/net/wireless/intel/iwlwifi/tests/Makefile | 2 +-
drivers/net/wireless/realtek/rtl818x/rtl8180/Makefile | 2 +-
drivers/net/wireless/realtek/rtl818x/rtl8187/Makefile | 2 +-
drivers/rapidio/Kconfig | 17 +----
drivers/scsi/aic7xxx/Makefile | 12 ++--
drivers/staging/rtl8723bs/Makefile | 2 +-
fs/iomap/Makefile | 2 +-
fs/unicode/Makefile | 14 ++--
fs/xfs/Makefile | 4 +-
include/asm-generic/vmlinux.lds.h | 19 +++++
init/Makefile | 5 +-
kernel/kallsyms.c | 6 --
kernel/kallsyms_internal.h | 30 ++++----
kernel/ksysfs.c | 4 +-
lib/Makefile | 6 +-
lib/buildid.c | 4 +-
lib/raid6/Makefile | 2 +-
net/wireless/Makefile | 2 +-
rust/Makefile | 6 +-
samples/bpf/Makefile | 2 +-
samples/hid/Makefile | 2 +-
scripts/Kbuild.include | 3 +-
scripts/Makefile.asm-generic | 6 +-
scripts/Makefile.build | 36 +++++-----
scripts/Makefile.clean | 2 +-
scripts/Makefile.host | 4 +-
scripts/Makefile.lib | 34 +++++----
scripts/Makefile.modfinal | 4 +-
scripts/Makefile.modpost | 2 +-
scripts/Makefile.vdsoinst | 7 +-
scripts/Makefile.vmlinux | 3 -
scripts/dtc/Makefile | 6 +-
scripts/gdb/linux/Makefile | 2 +-
scripts/genksyms/Makefile | 4 +-
scripts/kconfig/Makefile | 8 +--
scripts/kconfig/conf.c | 16 ++---
scripts/kconfig/confdata.c | 46
++++--------
scripts/kconfig/expr.h | 6 +-
scripts/kconfig/gconf.c | 80
++++-----------------
scripts/kconfig/lexer.l | 1 -
scripts/kconfig/lkc.h | 13 ++--
scripts/kconfig/lkc_proto.h | 1 +
scripts/kconfig/lxdialog/util.c | 9 ---
scripts/kconfig/mconf.c | 104
+++++++++++----------------
scripts/kconfig/menu.c | 51
++++++-------
scripts/kconfig/nconf.c | 118
++++++++++++-------------------
scripts/kconfig/parser.y | 76
++++++++++++++------
scripts/kconfig/symbol.c | 73
++++++++++++++-----
scripts/kconfig/tests/choice/Kconfig | 26 -------
scripts/kconfig/tests/choice/__init__.py | 2 -
scripts/kconfig/tests/choice/allmod_expected_config | 4 --
scripts/kconfig/tests/choice/allyes_expected_config | 4 --
scripts/kconfig/tests/choice/oldask0_expected_stdout | 2 -
scripts/kconfig/tests/choice/oldask1_config | 1 -
scripts/kconfig/tests/choice/oldask1_expected_stdout | 6 --
scripts/mod/Makefile | 1 -
scripts/module.lds.S | 1 +
scripts/package/buildtar | 34 ++++-----
scripts/unifdef.c | 12 ++--
security/tomoyo/Makefile | 2 +-
usr/Makefile | 2 +-
usr/include/Makefile | 2 +-
177 files changed, 610 insertions(+), 945 deletions(-)
--
Best Regards
Masahiro Yamada
The pull request you sent on Fri, 17 May 2024 22:52:45 +0900:
> git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git tags/kbuild-v6.10
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/ff9a79307f89563da6d841da8b7cc4a0afceb0e2
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html