Skip to contentSkip to conversation

Rust fixes for 6.15 (2nd)

GIT PULL Merged Miguel Ojeda 2 participants 2 messages May 9, 2025 Rust

lore
Share & tools
lore

Miguel Ojeda

author maintainer
#0 lore raw

Hi Linus,

Please pull these fixes for Rust (second round).

All commits have been in linux-next for two rounds.

No conflicts expected.

Thanks!

Cheers,
Miguel

The following changes since commit 92a09c47464d040866cf2b4cd052bc60555185fb:

Linux 6.15-rc5 (2025-05-04 13:55:04 -0700)

are available in the Git repository at:

https://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux.git tags/rust-fixes-6.15-2

for you to fetch changes up to 5595c31c370957aabe739ac3996aedba8267603f:

x86/Kconfig: make CFI_AUTO_DEFAULT depend on !RUST or Rust >= 1.88 (2025-05-07 00:11:47 +0200)

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

Toolchain and infrastructure:

- Make CFI_AUTO_DEFAULT depend on !RUST or Rust >= 1.88.0.

- Clean Rust (and Clippy) lints for the upcoming Rust 1.87.0 and Rust 1.88.0 releases.

- Clean objtool warning for the upcoming Rust 1.87.0 release by adding one more noreturn function.

----------------------------------------------------------------
Miguel Ojeda (5):
objtool/rust: add one more noreturn Rust function for Rust 1.87.0
rust: allow Rust 1.87.0's clippy::ptr_eq lint
rust: clean Rust 1.88.0's unnecessary_transmutes lint
rust: clean Rust 1.88.0's warning about clippy::disallowed_macros configuration
rust: clean Rust 1.88.0's clippy::uninlined_format_args lint

Paweł Anikiel (1):
x86/Kconfig: make CFI_AUTO_DEFAULT depend on !RUST or Rust >= 1.88

 .clippy.toml                              |  2 +-
 arch/x86/Kconfig                          |  1 +
 drivers/gpu/nova-core/gpu.rs              |  2 +-
 init/Kconfig                              |  3 ++
 rust/bindings/lib.rs                      |  1 +
 rust/kernel/alloc/kvec.rs                 |  3 ++
 rust/kernel/list.rs                       |  3 ++
 rust/kernel/str.rs                        | 46 +++++++++++++++----------------
 rust/macros/kunit.rs                      | 13 +++------
 rust/macros/module.rs                     | 19 ++++---------
 rust/macros/paste.rs                      |  2 +-
 rust/pin-init/internal/src/pinned_drop.rs |  3 +-
 rust/uapi/lib.rs                          |  1 +
 tools/objtool/check.c                     |  1 +
 14 files changed, 49 insertions(+), 51 deletions(-)
merge bot Merged
#1 lore raw
The pull request you sent on Fri, 9 May 2025 22:14:57 +0200:

The pull request you sent on Fri, 9 May 2025 22:14:57 +0200:

Quoted 1 line

https://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux.git tags/rust-fixes-6.15-2

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/0e1329d4045ca3606f9c06a8c47f62e758a09105

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html