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

Merge android14-5.15 into android14-5.15-lts



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

It contains the following commits:

* b784e328 ANDROID: GKI: Update symbol list for Amlogic
* 157f357d UPSTREAM: posix-cpu-timers: fix race between handle_posix_cpu_timers() and posix_cpu_timer_del()
* 612eb672 ANDROID: GKI: update mtktv symbol
* fbfba325 ANDROID: BACKPORT: KVM: arm64: Always unmap the pvmfw region at stage-2
* b6f5ba46 ANDROID: GKI: update protected exports
* 1ca5e834 ANDROID: GKI: add final newline to protected exports file

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