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

Merge android14-6.1 into android14-6.1-lts



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

It contains the following commits:

* 2ff414a0 Merge tag 'android14-6.1.145_r00' into android14-6.1
* 96160a0e UPSTREAM: net: fix udp gso skb_segment after pull from frag_list
* de932537 ANDROID: ABI: Update the symbol list for mtk
* 2dbfabb0 ANDROID: ABI: Update the symbol list for mtk
* 145c7fad ANDROID: gki_defconfig: Enable CONFIG_UDMABUF
* e2deb0b4 ANDROID: GKI: Update rockchip symbols for drm driver.
* fa7e0538 ANDROID: GKI: Update the symbol list for mtk
* 7011769d ANDROID: virt: gunyah: Replace arm_smccc_1_1_smc with arm_smccc_1_1_invoke
* a71768f6 ANDROID: GKI: Add symbol list for Nothing
* 1bf1aa36 UPSTREAM: posix-cpu-timers: fix race between handle_posix_cpu_timers() and posix_cpu_timer_del()
* 36d69f6a ANDROID: 16K: Use vma_area slab cache for pad VMA
* d56a28cb ANDROID: 16K: Add VMA padding size to smaps output
* 1b1265db ANDROID: 16K: Don't copy data vma for maps/smaps output
* 44c8456c ANDROID: BACKPORT: KVM: arm64: Always unmap the pvmfw region at stage-2
* d93f9569 ANDROID: GKI: add final newline to protected exports file

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