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
again...

Change-Id: If08d5063d461dad8f94d88e87564fe93a67fdcb3
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

...

This commit is contained in:

Greg Kroah-Hartman

2025-04-07 12:47:22 +00:00

committed by Lee Jones

parent 0aa0e7b741 1ef4cf5f98

commit 4b79b7b488

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available