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

Merge 5ce1264b ("sched: Add wrapper for get_wchan() to keep task blocked")...


Merge 5ce1264b ("sched: Add wrapper for get_wchan() to keep task blocked") into android14-5.15-lts

Steps on the way to 5.15.190

Resolves merge conflicts in:
	arch/arm64/kernel/process.c

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