From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Apr 2025 19:21:44 +0000 (-0700)
Subject: Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux
X-Git-Tag: nvme-6.15-2025-04-10~21
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e8b471285262d1561feb2eb266aab6ebe7094124;p=nvme.git

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux

Pull ARM and clkdev updates from Russell King:

 - Simplify ARM_MMU_KEEP usage

 - Add Rust support for ARM architecture version 7

 - Align IPIs reported in /proc/interrupts

 - require linker to support KEEP within OVERLAY

 - add KEEP() for ARM vectors

 - add __printf() attribute for clkdev functions

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux:
  ARM: 9445/1: clkdev: Mark some functions with __printf() attribute
  ARM: 9444/1: add KEEP() keyword to ARM_VECTORS
  ARM: 9443/1: Require linker to support KEEP within OVERLAY for DCE
  ARM: 9442/1: smp: Fix IPI alignment in /proc/interrupts
  ARM: 9441/1: rust: Enable Rust support for ARMv7
  ARM: 9439/1: arm32: simplify ARM_MMU_KEEP usage
---

e8b471285262d1561feb2eb266aab6ebe7094124
diff --cc init/Kconfig
index 18717967fc8c,fc994f5cd5db..ede5a43029a9
--- a/init/Kconfig
+++ b/init/Kconfig
@@@ -129,9 -129,11 +129,14 @@@ config CC_HAS_COUNTED_B
  	# https://github.com/llvm/llvm-project/pull/112636
  	depends on !(CC_IS_CLANG && CLANG_VERSION < 190103)
  
 +config CC_HAS_MULTIDIMENSIONAL_NONSTRING
 +	def_bool $(success,echo 'char tag[][4] __attribute__((__nonstring__)) = { };' | $(CC) $(CLANG_FLAGS) -x c - -c -o /dev/null -Werror)
 +
+ config LD_CAN_USE_KEEP_IN_OVERLAY
+ 	# ld.lld prior to 21.0.0 did not support KEEP within an overlay description
+ 	# https://github.com/llvm/llvm-project/pull/130661
+ 	def_bool LD_IS_BFD || LLD_VERSION >= 210000
+ 
  config RUSTC_HAS_COERCE_POINTEE
  	def_bool RUSTC_VERSION >= 108400
  
diff --cc rust/Makefile
index 2a8342e9c5b5,5b45f760f462..99bc3eea44a6
--- a/rust/Makefile
+++ b/rust/Makefile
@@@ -275,8 -245,7 +275,9 @@@ bindgen_skip_c_flags := -mno-fp-ret-in-
  # Derived from `scripts/Makefile.clang`.
  BINDGEN_TARGET_x86	:= x86_64-linux-gnu
  BINDGEN_TARGET_arm64	:= aarch64-linux-gnu
+ BINDGEN_TARGET_arm	:= arm-linux-gnueabi
 +BINDGEN_TARGET_loongarch	:= loongarch64-linux-gnusf
 +BINDGEN_TARGET_um	:= $(BINDGEN_TARGET_$(SUBARCH))
  BINDGEN_TARGET		:= $(BINDGEN_TARGET_$(SRCARCH))
  
  # All warnings are inhibited since GCC builds are very experimental,