Commit 0dcf60d0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'asm-generic-fixes-5.15' of...

Merge tag 'asm-generic-fixes-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

Pull asm-generic fixes from Arnd Bergmann:
 "There is one build fix for Arm platforms that ended up impacting most
  architectures because of the way the drivers/firmware Kconfig file is
  wired up:

  The CONFIG_QCOM_SCM dependency have caused a number of randconfig
  regressions over time, and some still remain in v5.15-rc4. The fix we
  agreed on in the end is to make this symbol selected by any driver
  using it, and then building it even for non-Arm platforms with
  CONFIG_COMPILE_TEST.

  To make this work on all architectures, the drivers/firmware/Kconfig
  file needs to be included for all architectures to make the symbol
  itself visible.

  In a separate discussion, we found that a sound driver patch that is
  pending for v5.16 needs the same change to include this Kconfig file,
  so the easiest solution seems to have my Kconfig rework included in
  v5.15.

  Finally, the branch also includes a small unrelated build fix for
  NOMMU architectures"

Link: https://lore.kernel.org/all/20210928153508.101208f8@canb.auug.org.au/
Link: https://lore.kernel.org/all/20210928075216.4193128-1-arnd@kernel.org/
Link: https://lore.kernel.org/all/20211007151010.333516-1-arnd@kernel.org/

* tag 'asm-generic-fixes-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  asm-generic/io.h: give stub iounmap() on !MMU same prototype as elsewhere
  qcom_scm: hide Kconfig symbol
  firmware: include drivers/firmware/Kconfig unconditionally
parents cdc726fb 2fbc3499
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -1989,8 +1989,6 @@ config ARCH_HIBERNATION_POSSIBLE

endmenu

source "drivers/firmware/Kconfig"

if CRYPTO
source "arch/arm/crypto/Kconfig"
endif
+0 −2
Original line number Diff line number Diff line
@@ -1931,8 +1931,6 @@ source "drivers/cpufreq/Kconfig"

endmenu

source "drivers/firmware/Kconfig"

source "drivers/acpi/Kconfig"

source "arch/arm64/kvm/Kconfig"
+0 −2
Original line number Diff line number Diff line
@@ -388,8 +388,6 @@ config CRASH_DUMP
	  help
	    Generate crash dump after being started by kexec.

source "drivers/firmware/Kconfig"

endmenu

menu "Power management and ACPI options"
+0 −2
Original line number Diff line number Diff line
@@ -3316,8 +3316,6 @@ source "drivers/cpuidle/Kconfig"

endmenu

source "drivers/firmware/Kconfig"

source "arch/mips/kvm/Kconfig"

source "arch/mips/vdso/Kconfig"
+0 −2
Original line number Diff line number Diff line
@@ -384,6 +384,4 @@ config KEXEC_FILE

endmenu

source "drivers/firmware/Kconfig"

source "drivers/parisc/Kconfig"
Loading