Skip to contentSkip to conversation

Rust fixes for 6.9

GIT PULL Merged Miguel Ojeda 2 participants 2 messages Apr 27, 2024 Rust

lore
Share & tools
lore

Miguel Ojeda

author maintainer
#0 lore raw

Hi Linus,

Please pull these fixes for Rust.

There are a few that I am not sure if they should count as fixes (trivial docs rendering, macro example and CONSTRUCTORS), so if you prefer to see them in the merge window instead, please let me know.

The spike you will see in the diffstat is due to indentation changes, added comments and moved lines -- the actual change is small.

Most have been in linux-next for more than a week, but the last ones have been there only for a couple linux-next tags, and I reworded one of those a couple days ago to add a tag (no changes otherwise -- the original commits can be found starting at 56b70b91a161 in linux-next).

No conflicts expected. No changes to the C side.

Cheers,
Miguel

The following changes since commit 4cece764965020c22cff7665b18a012006359095:

Linux 6.9-rc1 (2024-03-24 14:10:05 -0700)

are available in the Git repository at:

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

for you to fetch changes up to 19843452dca40e28d6d3f4793d998b681d505c7f:

rust: remove params from module macro example (2024-04-25 17:34:33 +0200)

----------------------------------------------------------------
Rust fixes for v6.9

- Soundness: make internal functions generated by the 'module!' macro inaccessible, do not implement 'Zeroable' for 'Infallible' and require 'Send' for the 'Module' trait.

- Build: avoid errors with "empty" files and workaround 'rustdoc' ICE.

- Kconfig: depend on '!CFI_CLANG' and avoid selecting 'CONSTRUCTORS'.

- Code docs: remove non-existing key from 'module!' macro example.

- Docs: trivial rendering fix in arch table.

----------------------------------------------------------------
Alice Ryhl (1):
rust: don't select CONSTRUCTORS

Aswin Unnikrishnan (1):
rust: remove params from module macro example

Benno Lossin (1):
rust: macros: fix soundness issue in module! macro

Bo-Wei Chen (1):
docs: rust: fix improper rendering in Arch Support page

Conor Dooley (1):
rust: make mutually exclusive with CFI_CLANG

Laine Taffin Altman (1):
rust: init: remove impl Zeroable for Infallible

Miguel Ojeda (2):
kbuild: rust: remove unneeded @rustc_cfg to avoid ICE
kbuild: rust: force alloc extern to allow "empty" Rust files

Wedson Almeida Filho (2):
rust: phy: implement Send for Registration
rust: kernel: require Send for Module implementations

 Documentation/rust/arch-support.rst |   2 +-
 init/Kconfig                        |   2 +-
 rust/Makefile                       |   1 -
 rust/kernel/init.rs                 |  11 ++-
 rust/kernel/lib.rs                  |   2 +-
 rust/kernel/net/phy.rs              |   4 +
 rust/macros/lib.rs                  |  12 ---
 rust/macros/module.rs               | 190 ++++++++++++++++++++++--------------
 scripts/Makefile.build              |   2 +-
 9 files changed, 132 insertions(+), 94 deletions(-)