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

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



Sync up with the android15-6.6 branch to fix the TH build due to recent
required ABI symbol additions there.  Included in here are the following
commits:

* ee2542f0 ANDROID: ABI: Update pixel symbol list
* 9a46e8ec ANDROID: mm: add vh for kcompactd_cpu_online()
* dd7de90d ANDROID: sched: Add android_vh_set_task_comm
* e0b348c4 Revert "UPSTREAM: Revert "f2fs: use flush command instead of FUA for zoned device""
* d5c1618b UPSTREAM: usb: gadget: uvc: queue pump work in uvcg_video_enable()
* 466f7192 UPSTREAM: usb: xhci: Check for xhci->interrupters being allocated in xhci_mem_clearup()
* 90248f12 UPSTREAM: cachestat: do not flush stats in recency check
* 3e6bc549 UPSTREAM: mm: shmem: fix getting incorrect lruvec when replacing a shmem folio
* 00079e2b UPSTREAM: wifi: cfg80211: validate HE operation element parsing
* af3fbe44 UPSTREAM: riscv: cpufeature: Fix extension subset checking
* 412ee5bc UPSTREAM: memcg: fix data-race KCSAN bug in rstats
* 6134f98d UPSTREAM: PM: EM: fix wrong utilization estimation in em_cpu_energy()
* 600d8fb2 UPSTREAM: exfat: fix timing of synchronizing bitmap and inode
* 11a6be14 UPSTREAM: firmware: arm_ffa: Fix the partition ID check in ffa_notification_info_get()
* 05181e57 UPSTREAM: mm/damon/core: check apply interval in damon_do_apply_schemes()
* 49bb2617 UPSTREAM: firmware: arm_ffa: Check xa_load() return value
* 1c8bc639 UPSTREAM: firmware: arm_ffa: Add missing rwlock_init() for the driver partition
* 18bbf1be UPSTREAM: firmware: arm_ffa: Add missing rwlock_init() in ffa_setup_partitions()
* 7f8ed76f UPSTREAM: mm/damon/sysfs-schemes: add timeout for update_schemes_tried_regions
* ba95736c BACKPORT: mm/damon/core: copy nr_accesses when splitting region
* a44df1cf UPSTREAM: firmware: arm_ffa: Fix ffa_notification_info_get() IDs handling
* 7c593903 UPSTREAM: exfat: fix ctime is not updated
* 178f4703 UPSTREAM: exfat: fix setting uninitialized time to ctime/atime
* bb51ec91 ANDROID: GKI: add symbols to symbol list
* cc5fad93 ANDROID: vendor_hooks: add hook in alloc_workqueue()
* 2fd50de3 ANDROID: Update the ABI symbol list and stg

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