Commit 67e62b61 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge d69cd64b ("maple_tree: fix MA_STATE_PREALLOC flag in...


Merge d69cd64b ("maple_tree: fix MA_STATE_PREALLOC flag in mas_preallocate()") into android14-6.1-lts

Steps on the way to 6.1.146

Resolves merge conflicts in:
	lib/maple_tree.c

Change-Id: I79c524881e076fef790626eb0fde43ad25649e6d
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 92a87015 d69cd64b
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment