Commit 64e5459c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 7468bd2c ("mm/page_alloc: explicitly record high-order atomic...


Merge 7468bd2c ("mm/page_alloc: explicitly record high-order atomic allocations in alloc_flags") into android14-6.1-lts

Steps on the way to 6.1.116

Resolves merge conflicts in:
	mm/page_alloc.c

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