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

Merge android16-6.12 into android16-6.12-kminext



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

It contains the following commits:

* 830a2dad ANDROID: GKI: Add empty symbol list for meizu
* 450db842 Revert "ANDROID: kconfig: Enable options needed for MTK desktop"
* 0b5aee52 ANDROID: Fix uninitialized 'done' in scmi_cpufreq
* 7392dc16 ANDROID: ABI: Update pixel symbol list
* 3e1c1717 ANDROID: kconfig: Enable options needed for MTK desktop
* 125206b4 ANDROID: GKI: update symbol list file for xiaomi
* 1d3cdeb4 ANDROID: GKI: dma-buf: add vendor hook for dma_buf_release
* affdb774 ANDROID: GKI: update symbol list file for xiaomi
* 0a675415 ANDROID: android: Export cma tracehooks
* 39b965f0 UPSTREAM: media: i2c: ov13b10: Support 2 lane mode
* 25091a3e UPSTREAM: media: i2c: ov13b10: Improve code readability
* 5b06a985 UPSTREAM: media: i2c: ov13b10: Fix h_blank calculation
* 45418317 UPSTREAM: mm: slub: only warn once when allocating slab obj extensions fails
* d59c56fc ANDROID: GKI: Add symbols to xiaomi symbol list
* 3dd71156 ANDROID: vendor_hook: customize gfp and decide whether to bypass in the large folio allocation path
* d62d9aa3 ANDROID: GKI: Add symbols to xiaomi symbol list
* 9f9a4ec9 ANDROID: vendor_hooks: add hook to modify allowable THP orders
* e17186d5 ANDROID: GKI: update symbol list file for xiaomi
* bb9c59d1 ANDROID: vendor_hook: customize gfp and orders to alloc large folio
* de2973e8 UPSTREAM: tls: always refresh the queue when reading sock
* 2b955c7a ANDROID: GKI: Update RTK STB KMI symbol list
* 735ed21f UPSTREAM: ASoC: tas2781: Fix occasional calibration failture
* b9deed55 ANDROID: GKI: update symbols for xiaomi
* d88bb320 ANDROID: ABI: Update symbol list for mtk
* 841e3592 ANDROID: GKI: Update symbol list for qcom
* f53b32f7 ANDROID: sched/scx: Add vendor hook to update task's data when switching to scx
* 1871faf4 UPSTREAM: regulator: Add of_regulator_get_optional() for pure DT regulator lookup
* 5a41bb32 ANDROID: rust_binder: rework process cleanup
* b632dc2e FROMGIT: scsi: ufs: core: Use link recovery when h8 exit fails during runtime resume
* 8ff877aa ANDROID: fix android-specific bug in ufshcd.c
* c46482c0 ANDROID: gunyah: Check for the validity of the file

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