From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 22 Feb 2026 16:43:31 +0000 (-0800)
Subject: Merge tag 'rust-fixes-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda... 
X-Git-Tag: v7.0-rc1~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1dd419145d090f8fdf149cbb39dea6d968659dd2;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'rust-fixes-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux

Pull rust fixes from Miguel Ojeda:
 "Toolchain and infrastructure:

   - Pass '-Zunstable-options' flag required by the future Rust 1.95.0

   - Fix 'objtool' warning for Rust 1.84.0

  'kernel' crate:

   - 'irq' module: add missing bound detected by the future Rust 1.95.0

   - 'list' module: add missing 'unsafe' blocks and placeholder safety
     comments to macros (an issue for future callers within the crate)

  'pin-init' crate:

   - Clean Clippy warning that changed behavior in the future Rust
     1.95.0"

* tag 'rust-fixes-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux:
  rust: list: Add unsafe blocks for container_of and safety comments
  rust: pin-init: replace clippy `expect` with `allow`
  rust: irq: add `'static` bounds to irq callbacks
  objtool/rust: add one more `noreturn` Rust function
  rust: kbuild: pass `-Zunstable-options` for Rust 1.95.0
---

1dd419145d090f8fdf149cbb39dea6d968659dd2
diff --cc rust/Makefile
index 757974551359d,725158740fc6f..629b3bdd2b206
--- a/rust/Makefile
+++ b/rust/Makefile
@@@ -565,11 -548,12 +565,13 @@@ $(obj)/$(libmacros_name): $(src)/macros
      $(obj)/libquote.rlib $(obj)/libsyn.rlib FORCE
  	+$(call if_changed_dep,rustc_procmacro)
  
 -$(obj)/$(libpin_init_internal_name): private rustc_target_flags = --cfg kernel
 -$(obj)/$(libpin_init_internal_name): $(src)/pin-init/internal/src/lib.rs FORCE
 +$(obj)/$(libpin_init_internal_name): private rustc_target_flags = $(pin_init_internal-flags)
 +$(obj)/$(libpin_init_internal_name): $(src)/pin-init/internal/src/lib.rs \
 +    $(obj)/libproc_macro2.rlib $(obj)/libquote.rlib $(obj)/libsyn.rlib FORCE
  	+$(call if_changed_dep,rustc_procmacro)
  
+ # `rustc` requires `-Zunstable-options` to use custom target specifications
+ # since Rust 1.95.0 (https://github.com/rust-lang/rust/pull/151534).
  quiet_cmd_rustc_library = $(if $(skip_clippy),RUSTC,$(RUSTC_OR_CLIPPY_QUIET)) L $@
        cmd_rustc_library = \
  	OBJTREE=$(abspath $(objtree)) \