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

Merge android16-6.12 into android16-6.12-lts



This merges the android16-6.12 branch into the -lts branch, catching
it up with the latest changes in there.

Resolves merge conflicts in:
	kernel/sched/core.c

It contains the following commits:

* 2bd1f363 ANDROID: gunyah: Add new VM status to handle reset failure
* e740e8d9 ANDROID: Sync proxy-exec logic to v19 (from v18)
* 7d6f7afb UPSTREAM: perf/core: Clean up perf_try_init_event()
* 3f5de817 ANDROID: GKI: Update xiaomi symbol list.
* 5d3d6f75 BACKPORT: hung_task: show the blocker task if the task is hung on mutex
* 6b4fffd5 FROMGIT: pinmux: fix race causing mux_owner NULL with active mux_usecount
* 9f514cf3 ANDROID: GKI: add GKI symbol list for Exynosauto SoC

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