From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 19 Oct 2024 15:32:47 +0000 (-0700)
Subject: Merge tag 'rust-fixes-6.12-2' of https://github.com/Rust-for-Linux/linux
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4e6bd4a33a6cf4d2dce9725630ada847a3947c7c;p=users%2Fdwmw2%2Flinux.git

Merge tag 'rust-fixes-6.12-2' of https://github.com/Rust-for-Linux/linux

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

   - Fix several issues with the 'rustc-option' macro. It includes a
     refactor from Masahiro of three '{cc,rust}-*' macros, which is not
     a fix but avoids repeating the same commands (which would be
     several lines in the case of 'rustc-option').

   - Fix conditions for 'CONFIG_HAVE_CFI_ICALL_NORMALIZE_INTEGERS'. It
     includes the addition of 'CONFIG_RUSTC_LLVM_VERSION', which is not
     a fix but is needed for the actual fix.

  And a trivial grammar fix"

* tag 'rust-fixes-6.12-2' of https://github.com/Rust-for-Linux/linux:
  cfi: fix conditions for HAVE_CFI_ICALL_NORMALIZE_INTEGERS
  kbuild: rust: add `CONFIG_RUSTC_LLVM_VERSION`
  kbuild: fix issues with rustc-option
  kbuild: refactor cc-option-yn, cc-disable-warning, rust-option-yn macros
  lib/Kconfig.debug: fix grammar in RUST_BUILD_ASSERT_ALLOW
---

4e6bd4a33a6cf4d2dce9725630ada847a3947c7c