diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2025-02-15 09:54:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-02-15 09:54:46 -0800 |
| commit | 243899076c3efdf98d8e922a802896424a597580 (patch) | |
| tree | 195f3dd0c38d605b666cf72b9c2292a9d9a704e0 /rust/kernel | |
| parent | tegra210-adma: fix 32-bit x86 build (diff) | |
| parent | rust: rbtree: fix overindented list item (diff) | |
| download | wireguard-linux-243899076c3efdf98d8e922a802896424a597580.tar.xz wireguard-linux-243899076c3efdf98d8e922a802896424a597580.zip | |
Merge tag 'rust-fixes-6.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux
Pull rust fixes from Miguel Ojeda:
- Fix objtool warning due to future Rust 1.85.0 (to be released in a
few days)
- Clean future Rust 1.86.0 (to be released 2025-04-03) Clippy warning
* tag 'rust-fixes-6.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux:
rust: rbtree: fix overindented list item
objtool/rust: add one more `noreturn` Rust function
Diffstat (limited to 'rust/kernel')
| -rw-r--r-- | rust/kernel/rbtree.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rust/kernel/rbtree.rs b/rust/kernel/rbtree.rs index ee2731dad72d..0d1e75810664 100644 --- a/rust/kernel/rbtree.rs +++ b/rust/kernel/rbtree.rs @@ -1149,7 +1149,7 @@ pub struct VacantEntry<'a, K, V> { /// # Invariants /// - `parent` may be null if the new node becomes the root. /// - `child_field_of_parent` is a valid pointer to the left-child or right-child of `parent`. If `parent` is -/// null, it is a pointer to the root of the [`RBTree`]. +/// null, it is a pointer to the root of the [`RBTree`]. struct RawVacantEntry<'a, K, V> { rbtree: *mut RBTree<K, V>, /// The node that will become the parent of the new node if we insert one. |