Commit 048b4929 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Treehugger Robot
Browse files

Merge 298be04c ("kbuild: rust: remove the `alloc` crate and `GlobalAlloc`") into android16-6.12 



Steps on the way to 6.12.19

Resolves merge conflicts in:
	rust/Makefile
	scripts/Makefile.build

Change-Id: Ic32d8ad7549e09c530493d59c194092b74c31f8b
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 16079def 298be04c
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment