Commit 7e40c210 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-fixes-v6.9' of... 

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

Pull Kbuild fixes from Masahiro Yamada:

 - Deduplicate Kconfig entries for CONFIG_CXL_PMU

 - Fix unselectable choice entry in MIPS Kconfig, and forbid this
   structure

 - Remove unused include/asm-generic/export.h

 - Fix a NULL pointer dereference bug in modpost

 - Enable -Woverride-init warning consistently with W=1

 - Drop KCSAN flags from *.mod.c files

* tag 'kbuild-fixes-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kconfig: Fix typo HEIGTH to HEIGHT
  Documentation/llvm: Note s390 LLVM=1 support with LLVM 18.1.0 and newer
  kbuild: Disable KCSAN for autogenerated *.mod.c intermediaries
  kbuild: make -Woverride-init warnings more consistent
  modpost: do not make find_tosym() return NULL
  export.h: remove include/asm-generic/export.h
  kconfig: do not reparent the menu inside a choice block
  MIPS: move unselectable FIT_IMAGE_FDT_EPM5 out of the "System type" choice
  cxl: remove CONFIG_CXL_PMU entry in drivers/cxl/Kconfig
parents 18737353 89e5462b

Documentation/kbuild/llvm.rst

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ yet. Bug reports are always welcome at the issue tracker below! 
     - ``LLVM=1``

   * - s390

     - Maintained

     - ``CC=clang``

     - ``LLVM=1`` (LLVM >= 18.1.0), ``CC=clang`` (LLVM < 18.1.0)

   * - um (User Mode)

     - Maintained

     - ``LLVM=1``

arch/mips/Kconfig

+9 −9
Original line number Diff line number Diff line
@@ -619,15 +619,6 @@ config MACH_EYEQ5 


	bool



config FIT_IMAGE_FDT_EPM5

	bool "Include FDT for Mobileye EyeQ5 development platforms"

	depends on MACH_EYEQ5

	default n

	help

	  Enable this to include the FDT for the EyeQ5 development platforms

	  from Mobileye in the FIT kernel image.

	  This requires u-boot on the platform.



config MACH_NINTENDO64

	bool "Nintendo 64 console"

	select CEVT_R4K
@@ -1011,6 +1002,15 @@ config CAVIUM_OCTEON_SOC 


endchoice



config FIT_IMAGE_FDT_EPM5

	bool "Include FDT for Mobileye EyeQ5 development platforms"

	depends on MACH_EYEQ5

	default n

	help

	  Enable this to include the FDT for the EyeQ5 development platforms

	  from Mobileye in the FIT kernel image.

	  This requires u-boot on the platform.



source "arch/mips/alchemy/Kconfig"

source "arch/mips/ath25/Kconfig"

source "arch/mips/ath79/Kconfig"

drivers/cxl/Kconfig

+0 −13
Original line number Diff line number Diff line
@@ -144,17 +144,4 @@ config CXL_REGION_INVALIDATION_TEST 
	  If unsure, or if this kernel is meant for production environments,

	  say N.



config CXL_PMU

	tristate "CXL Performance Monitoring Unit"

	default CXL_BUS

	depends on PERF_EVENTS

	help

	  Support performance monitoring as defined in CXL rev 3.0

	  section 13.2: Performance Monitoring. CXL components may have

	  one or more CXL Performance Monitoring Units (CPMUs).



	  Say 'y/m' to enable a driver that will attach to performance

	  monitoring units and provide standard perf based interfaces.



	  If unsure say 'm'.

endif

drivers/gpu/drm/amd/display/dc/dce110/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
# Makefile for the 'controller' sub-component of DAL.

# It provides the control and status of HW CRTC block.



CFLAGS_$(AMDDALPATH)/dc/dce110/dce110_resource.o = $(call cc-disable-warning, override-init)

CFLAGS_$(AMDDALPATH)/dc/dce110/dce110_resource.o = -Wno-override-init



DCE110 = dce110_timing_generator.o \

dce110_compressor.o dce110_opp_regamma_v.o \

drivers/gpu/drm/amd/display/dc/dce112/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
# Makefile for the 'controller' sub-component of DAL.

# It provides the control and status of HW CRTC block.



CFLAGS_$(AMDDALPATH)/dc/dce112/dce112_resource.o = $(call cc-disable-warning, override-init)

CFLAGS_$(AMDDALPATH)/dc/dce112/dce112_resource.o = -Wno-override-init



DCE112 = dce112_compressor.o