Skip to contentSkip to conversation

Rust fixes for 6.12 (2nd)

GIT PULL Merged Miguel Ojeda 2 participants 2 messages Oct 18, 2024 – Oct 19, 2024 Rust

lore
Share & tools
lore

Miguel Ojeda

author maintainer
#0 lore raw

Hi Linus,

Please pull these fixes for Rust (second round).

They have all been in linux-next for a week.

No conflicts expected.

Thanks!

Cheers,
Miguel

The following changes since commit 8cf0b93919e13d1e8d4466eb4080a4c4d9d66d7b:

Linux 6.12-rc2 (2024-10-06 15:32:27 -0700)

are available in the Git repository at:

https://github.com/Rust-for-Linux/linux.git tags/rust-fixes-6.12-2

for you to fetch changes up to 8b8ca9c25fe69c2162e3235c7d6c341127abeed6:

cfi: fix conditions for HAVE_CFI_ICALL_NORMALIZE_INTEGERS (2024-10-13 22:23:13 +0200)

----------------------------------------------------------------
Rust fixes for v6.12 (2nd)

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.

----------------------------------------------------------------
Alice Ryhl (2):
kbuild: fix issues with rustc-option
cfi: fix conditions for HAVE_CFI_ICALL_NORMALIZE_INTEGERS

Gary Guo (1):
kbuild: rust: add CONFIG_RUSTC_LLVM_VERSION

Masahiro Yamada (1):
kbuild: refactor cc-option-yn, cc-disable-warning, rust-option-yn macros

Timo Grautstueck (1):
lib/Kconfig.debug: fix grammar in RUST_BUILD_ASSERT_ALLOW

 arch/Kconfig                  | 26 ++++++++++++--------------
 init/Kconfig                  |  8 ++++++--
 lib/Kconfig.debug             |  2 +-
 scripts/Kconfig.include       |  3 +++
 scripts/Makefile.compiler     | 14 +++++++-------
 scripts/rustc-llvm-version.sh | 22 ++++++++++++++++++++++
 6 files changed, 51 insertions(+), 24 deletions(-)
 create mode 100755 scripts/rustc-llvm-version.sh