Skip to content
Snippets Groups Projects
Commit 1bdac13d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android15-6.6' into android15-6.6-lts


Catch the -lts branch up with recent changes and abi updates done in the
non-lts branch.  Changes in here include the following:

* 14bff9b9 ANDROID: Update symbol list for virtual device
* 1b41f35c ANDROID: Add snd-aloop.ko symbols to abi_gki_aarch64_virtual_device
* 05869b82 ANDROID: ABI: update symbol list for honor
* c6058890 ANDROID: GKI: net: add vendor hook to check if out of order occurs
* 7c12a8c0 ANDROID: ABI: Update pixel symbol list
* cf57490a ANDROID: GKI: enable CONFIG_USB_XHCI_SIDEBAND
* b0e595da UPSTREAM: USB: media: uvcvideo: Skip parsing frames of type UVC_VS_UNDEFINED in uvc_parse_format
* d7929503 ANDROID: KVM: arm64: Protect the hypervisor memcaches with the allocator lock on refill
* 7bfa7157 FROMGIT: block: add partition uuid into uevent as "PARTUUID"
* a8b3b5da FROMLIST: input: fix generic desktop D-Pad controls
* 931594bd Reapply "input: Add support for "Do Not Disturb""
* eb18258e ANDROID: USB: add symbols for new vendor hook
* 1586d3cd ANDROID: USB: add vendor hook functions for USB
* 5dc82090 FROMGIT: wifi: cfg80211: Do not create BSS entries for unsupported channels
* 5c5911ff ANDROID: Fix platforms config_setting values.
* 0951c314 ANDROID: Move protected modules list to modules.bzl
* 18798d6b ANDROID: Protect Kunit & virtio modules
* da9c5d87 ANDROID: abi_gki_aarch64_qcom: Add xa_erase
* 329bde2c ANDROID: GKI: update symbol list file for xiaomi
* 44abc109 ANDROID: vendor_hooks: Add hook for futex
* 4e7ab1bb BACKPORT: FROMGIT: usb: typec: tcpm: Add support for parsing time dt properties
* c99834d7 BACKPORT: FROMGIT: dt-bindings: connector: Add properties to define time values
* 54b58c87 FROMGIT: pinmux: Use sequential access to access desc->pinmux data
* caa5d158 ANDROID: GKI: update symbol list for xiaomi
* c1e0294d ANDROID: module: Add vendor hooks
* 7959dfaf ANDROID: ABI: add android_debug_symbol to whitelist
* d082e31a ANDROID: use INDIVIDUAL_LEAVES for kunit parser resolution
* 9dad8325 ANDROID: use INDIVIDUAL_LEAVES for kunit parser resolution
* 17f2c50b ANDROID: use INDIVIDUAL_LEAVES for kselftests parser resolution
* 825f0191 BACKPORT: mseal: replace can_modify_mm_madv with a vma variant
* d0653d6e UPSTREAM: mm/mprotect: replace can_modify_mm with can_modify_vma
* 4b1c79aa BACKPORT: mm: move can_modify_vma to mm/vma.h
* 31170215 ANDROID: Update virtual_device symbol list
* 9cfc9464 ANDROID: KVM: arm64: Pre-alloctate mtree nodes in pkvm_mem_abort()
* d53a5496 ANDROID: KVM: arm64: Report size correctly from pkvm_mem_abort()
* ed14b491 ANDROID: KVM: arm64: Fix accounting of pinned THPs with pKVM
* 7a3007d1 FROMGIT: BACKPORT: iommu/io-pgtable-arm: Fix stage-2 map/unmap for concatenated tables
* a2c66ca8 UPSTREAM: scsi: ufs: ufs-sysfs: Expose UFS power info
* ace77dc2 BACKPORT: FROMLIST: firmware: arm_scmi: set mailbox timeout value from device tree
* 4996d559 FROMGIT: f2fs: introduce device aliasing file
* bd8c55b4 ANDROID: ABI: virtual_device update ABI and symbol list
* 116264b9 BACKPORT: FROMGIT: binder: add delivered_freeze to debugfs output
* 9a5ffd1c BACKPORT: FROMGIT: binder: fix memleak of proc->delivered_freeze
* b8926217 FROMGIT: binder: allow freeze notification for dead nodes
* ddc0270f FROMGIT: binder: fix BINDER_WORK_CLEAR_FREEZE_NOTIFICATION debug logs
* 92a40389 FROMGIT: binder: fix BINDER_WORK_FROZEN_BINDER debug logs
* ddc1a92e BACKPORT: FROMGIT: binder: fix freeze UAF in binder_release_work()
* 5381260a FROMGIT: binder: fix OOB in binder_add_freeze_work()
* f66b6ef3 FROMGIT: binder: fix node UAF in binder_add_freeze_work()
* 0061c689 FROMGIT: thermal: gov_power_allocator: Granted power set to max when nobody request power
* 4254247b BACKPORT: FROMGIT: cpufreq: add virtual-cpufreq driver
* 843ca406 FROMGIT: dt-bindings: cpufreq: add virtual cpufreq device
* c1eaaffa ANDROID: Check arch before running kunit
* 3a0f412c ANDROID: GKI: Update symbol list for honor
* b910ce6b ANDROID: vendor_hooks: add hooks for f2fs issue checkpoint
* 08deb99d ANDROID: GKI: Update symbol list for mtk
* 02b19dc5 ANDROID: ABI: Update pixel symbol list
* 7fd90d6f ANDROID: clean up CREATE_TRACE_POINTS in mm/compaction.c
* 9c5b1f14 UPSTREAM: exit: Sleep at TASK_IDLE when waiting for application core dump
* f9246448 ANDROID: drivers/arm-smmu-v3-kvm: Re-use CD table when possible
* 85731f83 ANDROID: drivers/arm-smmu-v3-kvm: Fix pgsize alignment for IDMAP
* ec55e52f ANDROID: KVM: iommu: Fix hyp share check in __pkvm_host_use_dma_page
* 04469eba ANDROID: drivers/arm-smmu-v3-kvm: Free io_pgtable struct on domain free
* a9beab09 ANDROID: drivers/arm-smmu-v3-kvm: Detach devices on release
* cec79a80 ANDROID: GKI: update symbol list file for xiaomi
* 6661bcac ANDROID: mm: export sum_mthp_stat
* 968c817f ANDROID: abi_gki_aarch64_qcom: Update abi symbol list
* 97d818d8 Merge tag 'android15-6.6.56_r00' into android15-6.6

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I528d780115b51fe0251fb78982b4defe7318c4ac
parents 5606e91e 14bff9b9
No related branches found
No related tags found
Loading
Showing
with 1845 additions and 321 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment