Commit 9212df98 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 0a09d56e ("memcg: fix soft lockup in the OOM process") into android14-6.1-lts 



Steps on the way to 6.1.130

Resolves merge conflicts in:
	mm/oom_kill.c

Change-Id: Ie3ed449d29a900921d671f9338017da73ea61dc0
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 1bc4f0dc 0a09d56e
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