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

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>

2025-04-07 05:41:55 -07:00

25 KiB

Raw Permalink Blame History

View Raw