tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 1ef4cf5f98 ("rust: alloc: update module comment of alloc.rs") into android16-6.12

Browse Source 
Steps on the way to 6.12.18

Resolves merge conflicts in:
	rust/kernel/types.rs
	scripts/Makefile.build

Change-Id: I1a0d7a30074e2532f53b9c9d4cf0e8346d57ffef
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
[Re-resolved rust/kernel/types.rs <mmaurer@google.com>]
Signed-off-by: Matthew Maurer <mmaurer@google.com>
This commit is contained in:
Greg Kroah-Hartman
2025-04-01 16:33:46 +00:00
parent 2419132b8c
commit dfed1574cd
49 changed files with 2351 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rust/kernel/sync/arc/std_vendor.rs
+2
View File
@@ -1,5 +1,7 @@
// SPDX-License-Identifier: Apache-2.0 OR MIT
//! Rust standard library vendored code.
//!
//! The contents of this file come from the Rust standard library, hosted in
//! the <https://github.com/rust-lang/rust> repository, licensed under
//! "Apache-2.0 OR MIT" and adapted for kernel use. For copyright details,