From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 2 Nov 2024 01:59:46 +0000 (-1000)
Subject: Merge tag 'rust-fixes-6.12-3' of https://github.com/Rust-for-Linux/linux
X-Git-Tag: v6.12-rc6~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7292c0934a848a3fc52c0926203417b5613c69c;p=thirdparty%2Flinux.git

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

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

   - Avoid build errors with old 'rustc's without LLVM patch version
     (important since it impacts people that do not even enable Rust)

   - Update LLVM version for 'HAVE_CFI_ICALL_NORMALIZE_INTEGERS' in
     'depends on' condition (the fix was eventually backported rather
     than land in LLVM 19)"

* tag 'rust-fixes-6.12-3' of https://github.com/Rust-for-Linux/linux:
  cfi: tweak llvm version for HAVE_CFI_ICALL_NORMALIZE_INTEGERS
  kbuild: rust: avoid errors with old `rustc`s without LLVM patch version
---

f7292c0934a848a3fc52c0926203417b5613c69c