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

Merge android16-6.12 into android16-6.12-lts



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

It contains the following commits:

* e6f3cb87 BACKPORT: FROMLIST: scsi: ufs: core: Fix data race in CPU latency PM QoS request handling
* 8bd536ac ANDROID: KVM: arm64: Read REVIDR_EL1 and AIDR_EL1 for protected VMs
* cc349aa0 ANDROID: KVM: arm64: Always keep a spare block for GFP_ATOMIC case
* 125478c2 ANDROID: KVM: arm64: CMA donations to the hypervisor
* c949df87 ANDROID: KVM: arm64: iommu: Allow donations from a CMA pool
* cfa06f1f ANDROID: Add FOP_DONTCACHE support for f2fs
* 1e5f142b ANDROID: fixup ABI break in struct readahead_control.
* 982553db UPSTREAM: mm/filemap: unify dropbehind flag testing and clearing
* 3de933ca UPSTREAM: mm/filemap: unify read/write dropbehind naming
* eeb8c2d6 UPSTREAM: mm/filemap: use filemap_end_dropbehind() for read invalidation
* 7f2338bc UPSTREAM: mm/filemap: gate dropbehind invalidate on folio !dirty && !writeback
* 698d4907 UPSTREAM: mm/truncate: don't skip dirty page in folio_unmap_invalidate()
* 16e7a186 UPSTREAM: mm/filemap: fix miscalculated file range for filemap_fdatawrite_range_kick()
* 2b812f3a UPSTREAM: mm: add FGP_DONTCACHE folio creation flag
* 84ed6adf UPSTREAM: mm: call filemap_fdatawrite_range_kick() after IOCB_DONTCACHE issue
* e3d8565c UPSTREAM: mm/filemap: add filemap_fdatawrite_range_kick() helper
* a88d7a6a UPSTREAM: mm/filemap: drop streaming/uncached pages when writeback completes
* b925f292 UPSTREAM: mm/filemap: add read support for RWF_DONTCACHE
* ffbad91e BACKPORT: fs: add RWF_DONTCACHE iocb and FOP_DONTCACHE file_operations flag
* c7d78b29 UPSTREAM: mm/truncate: add folio_unmap_invalidate() helper
* b18d7d20 UPSTREAM: mm/readahead: add readahead_control->dropbehind member
* 54775f6b UPSTREAM: mm: add PG_dropbehind folio flag
* 43cabbea BACKPORT: mm/readahead: add folio allocation helper
* 9a0a8df0 UPSTREAM: mm/filemap: use page_cache_sync_ra() to kick off read-ahead
* e28025d4 UPSTREAM: mm/filemap: change filemap_create_folio() to take a struct kiocb
* fe25c08f ANDROID: partially re-enable KABI macros for VDSO and EFI libstub
* 5287d831 ANDROID: GKI: Update symbol list for Amlogic
* a55a63d6 ANDROID: ABI: update symbol list for xiaomi
* 21f01db5 FROMGIT: xhci: dbc: Fix full DbC transfer ring after several reconnects
* 2bdfefb0 FROMGIT: xhci: dbc: decouple endpoint allocation from initialization
* 9ebce096 Merge tag 'android16-6.12.45_r00' into android16-6.12
* 3907c0eb ANDROID: rust_binder: Add newline to ref logging
* c57a491d ANDROID: Add document for kernel AutoFDO profile
* abdb3eb9 FROMGIT: binder: fix double-free in dbitmap
* 5e5cde58 BACKPORT: FROMGIT: KVM: arm64: Sync protected guest VBAR_EL1 on injecting an undef exception
* 9da964bb BACKPORT: FROMGIT: KVM: arm64: Handle AIDR_EL1 and REVIDR_EL1 in host for protected VMs
* a79d3484 ANDROID: kconfig: Enable option needed for MTK desktop
* e13e0acd ANDROID: kconfig: Add MTK_IRQ  dedicated for irq-mtk
* 8419b8c5 BACKPORT: FROMGIT: sched/deadline: Fix dl_server behaviour
* 741f2ff0 BACKPORT: FROMGIT: sched/deadline: Fix dl_server getting stuck
* 4871f692 UPSTREAM: sched/deadline: Fix RT task potential starvation when expiry time passed
* 43a9f831 BACKPORT: UPSTREAM: sched/deadline: Always stop dl-server before changing parameters
* 3a426846 UPSTREAM: sched/deadline: Fix dl_server_stopped()
* 849a7734 BACKPORT: UPSTREAM: sched/deadline: Less agressive dl_server handling
* 6235ea22 Revert "FROMGIT: sched/deadline: Less agressive dl_server handling"
* b71965ea BACKPORT: FROMGIT: f2fs: add reserved nodes for privileged users
* 707938a4 BACKPORT: fs/proc/task_mmu: read proc/pid/maps under per-vma lock
* 147b075c UPSTREAM: fs/proc/task_mmu: remove conversion of seq_file position to unsigned
* 73bcbf1e ANDROID: GKI: Update symbol list for Galaxy
* ecb87057 ANDROID: vendor_hooks: Add hooks for dmv
* 8671d1f1 FROMGIT: usb: udc: Add trace event for usb_gadget_set_state
* 749cf174 ANDROID: KVM: arm64: Check PGD alignment when creating a pVM
* c65cb1d6 BACKPORT: FROMGIT: selinux: enable per-file labeling for functionfs
* db12c0e7 FROMGIT: usb: dwc3: Refactor dwc3_mode_show
* d518b0bc FROMGIT: usb: dwc3: Add trace event for dwc3_set_prtcap
* c9cce7e7 UPSTREAM: selftests/bpf: Add test for open coded dmabuf_iter
* 5d4cc7dc UPSTREAM: selftests/bpf: Add test for dmabuf_iter
* 2948f9da UPSTREAM: bpf: Add open coded dmabuf iterator
* e6c89908 BACKPORT: bpf: Add dmabuf iterator
* 362dc181 BACKPORT: dma-buf: Rename debugfs symbols
* 72759659 UPSTREAM: bpf/selftests: test_select_reuseport_kern: Remove unused header
* a0439bfa ANDROID: ABI: Update pixel symbol list
* bdeefc1b ANDROID: relist android_vh_f2fs_printk and android_vh_f2fs_set_bio_flag symbols
* 465f76d7 ANDROID: vendor_hooks: Refactor f2fs_submit_folio_write and trace_android_vh_f2fs_printk hooks
* e194fc8e ANDROID: delist f2fs_submit_folio_write and android_vh_f2fs_printk symbols
* e5c38acc BACKPORT: FROMGIT: userfaultfd: opportunistic TLB-flush batching for present pages in MOVE
* 1c370e7d FROMGIT: usb: host: enable USB offload during system sleep
* 2c9c6119 FROMGIT: xhci: sideband: add api to trace sideband usage
* 11464453 BACKPORT: FROMGIT: usb: offload: add apis for offload usage tracking
* cbd122ab FROMGIT: usb: xhci-plat: separate dev_pm_ops for each pm_event
* 4cc80704 FROMGIT: scsi: ufs: core: Disable timestamp functionality if not supported
* b1a53aee ANDROID: rust_binder: set NodeDeath.dead=true when already dead
* 44d5627d ANDROID: ABI: Update pixel symbol list
* 1e46082d ANDROID: rust_binder: Enable and fix missing-prototypes errors
* 079b8b87 ANDROID: rust_binder: use dedicated build files
* 31fc378e UPSTREAM: vsock: Do not allow binding to VMADDR_PORT_ANY
* f3a4b4d4 ANDROID: KVM: arm64: size overflow checks for mem_protect HVCs
* 557d30a1 ANDROID: KVM: Fix ToCToU issue when admitting pages in memcache
* 33eb6bde ANDROID: KVM: Prevent memory sharing outside of the RAM regions
* 0dd5dcd6 ANDROID: iommu/arm-smmu-v3-kvm: Fix free_domain for VMs
* 6a615265 ANDROID: allow kunit symbol to be used by vendor modules
* c882e6ef ANDROID: GKI: update symbol list for xiaomi
* 71c3c86a ANDROID: module: Add vendor hooks
* 695893ef ANDROID: Enable CONFIG_ARM64_PSEUDO_NMI
* 8baa5302 UPSTREAM: mm: skip CMA pages when they are not available
* 38ccf546 ANDROID: ABI: Update honor symbol list
* 7f29b30f ANDROID: mm: Add vendor hook to bypass the delay in queue_oom_reaper
* caeb52b3 ANDROID: cgroup: Use backport reservation for freeze time
* 6cb12af2 FROMGIT: cgroup: Fix 64-bit division in cgroup.stat.local
* 4d45d195 BACKPORT: FROMGIT: cgroup: cgroup.stat.local time accounting
* 8dad1dda ANDROID: Update AutoFDO profile for 6.12.40
* ef71e857 ANDROID: gzvm: fix memleak in gzvm_ioeventfd
* 2282fc11 ANDROID: gzvm driver: fix UAF issue
* 9e3a0161 ANDROID: virt: geniezone: irqfd: fix memleak in srcu
* 78993dd6 ANDROID: add ddk headers to enable pKVM driver support
* 0668e45a ANDROID: iommu/arm-smmu-v3-kvm: Fix SID validation
* 0779e367 ANDROID: iommu/arm-smmu-v3-kvm: Fix pointer location error
* 514ebc78 ANDROID: GKI: update symbol list for galaxy
* e3be1878 ANDROID: mm: export delete_from_swap_cache for vendor module
* fe3859bd FROMGIT: f2fs: fix condition in __allow_reserved_blocks()
* 2f73efd7 ANDROID: iommu/arm-smmu-v3-kvm: Add support for reporting IOMMU faults to clients
* 1b664ac9 ANDROID: iommu/arm-smmu-v3-kvm: Add support for identifying SMMU masters from SIDs
* 7d6820ee ANDROID: Don't build 4k kernel when building 16k dist
* c13405a7 ANDROID: KVM: Fix error path of allocator topup
* 6d5091a7 ANDROID: refresh ABI, allow ABI break and fix up symbol CRCs
* e255bfe0 UPSTREAM: iio: Add channel type for attention
* 15806a23 ANDROID: GKI: Update symbol list for Amlogic
* 44dce0de FROMGIT: fs: create dedicated workqueue for quota_release_work
* 65d7fc64 ANDROID: GKI: refresh ABI and add allowed break
* c0fe83ef ANDROID: KVM: arm64: Add TRNG handling for protected guests
* 1ea73330 Revert "ANDROID: KVM: arm64: Remove DEBUG dependency to PKVM_STACKTRACE"
* 61f2d360 Revert "ANDROID: KVM: arm64: Always resolve nvhe BUGs file and line"
* bdba33dd Revert "ANDROID: Enable PKVM_STACKTRACE"
* d41d0584 ANDROID: KVM: arm64: Fix CPU type when reading trace_pdesc
* 1d46a7ce ANDROID: iommu: Fix error path for deferred map_sg
* c3591bab UPSTREAM: iio: hid-sensors: Add proximity and attention IDs
* 9a2a4b6d FROMLIST: KVM: Avoid synchronize_srcu() in kvm_io_bus_register_dev()
* 01e4ac39 Revert "FROMLIST: KVM: Avoid synchronize_srcu() in kvm_io_bus_register_dev()"
* 9bc9677b ANDROID: KVM: arm64: Reduce include dependencies of nvhe/iommu.h
* 3d97de67 UPSTREAM: xfrm: interface: fix use-after-free after changing collect_md xfrm interface
* 7471f5c0 ANDROID: binder: KMI-break workaround for binder_alloc
* ee25d80f UPSTREAM: binder: use per-vma lock in page reclaiming
* 251bbdfb BACKPORT: binder: propagate vm_insert_page() errors
* 397209d7 UPSTREAM: binder: use per-vma lock in page installation
* 1e0db6a0 UPSTREAM: binder: replace alloc->vma with alloc->mapped
* 1414bd7d BACKPORT: binder: store shrinker metadata under page->private
* 658b9fc0 BACKPORT: binder: concurrent page installation
* 3fb6436f BACKPORT: Revert "binder: switch alloc->mutex to spinlock_t"
* addb7a94 UPSTREAM: net/packet: fix a race in packet_set_ring() and packet_notifier()
* a54f6a76 ANDROID: binder: allow changing binder.impl during boot
* ad337532 ANDROID: Move SCX_OPS_DISABLING VH inside the scx_fork_rwsem section
* ca12b93f ANDROID: Fix error message for debug builds
* d9542e0a ANDROID: Fix build error in linker_ctx() when CONFIG_PER_VMA_LOCK=n
* 6904c560 UPSTREAM: mm: fix the race between collapse and PT_RECLAIM under per-vma lock
* d7023412 ANDROID: look up vma under RCU in linker_ctx()
* f90ba27e BACKPORT: mm: use per_vma lock for MADV_DONTNEED
* d16bae51 BACKPORT: mm/madvise: define and use madvise_behavior struct for madvise_do_behavior()
* afb28681 BACKPORT: mm/madvise: split out mmap locking operations for madvise()
* c5058bfb ANDROID: drm: fixup ABI break in struct drm_framebuffer
* 33c125be Reapply "drm/framebuffer: Acquire internal references on GEM handles"
* 8cf0645e ANDROID: drm: Fixup ABI break due to support_hdcp
* 30c11ac4 FROMGIT: drm_bridge: register content protect property
* 7a3066af UPSTREAM: blk-zoned: Split queue_zone_wplugs_show()
* dda5f406 UPSTREAM: blk-mq: Clean up blk_mq_requeue_work()
* 848f1374 UPSTREAM: block: fix blk_zone_append_update_request_bio() kernel-doc
* 6d5e6165 UPSTREAM: block: add trace messages to zone write plugging
* 257939f2 UPSTREAM: block: add tracepoint for blkdev_zone_mgmt
* 3a1f8568 ANDROID: define python library in BUILD for kunit parser
* 5731f24e BACKPORT: UPSTREAM: block: add tracepoint for blk_zone_update_request_bio
* 1d1be390 UPSTREAM: block: split blk_zone_update_request_bio into two functions
* 2d8ecb2d UPSTREAM: blktrace: add zoned block commands to blk_fill_rwbs
* 6e560a72 UPSTREAM: traceevent/block: Add REQ_ATOMIC flag to block trace events
* c79994b4 UPSTREAM: mq-deadline: Remove a local variable
* 3c19cbf4 UPSTREAM: block: Add a public bdev_zone_is_seq() helper
* 12aafa4b ANDROID: ufs: core: Minimize diffs with upstream
* f67a8c04 BACKPORT: FROMGIT: f2fs: show the list of donation files
* ea4956ef UPSTREAM: f2fs: fix to avoid UAF in f2fs_sync_inode_meta()
* 53e4390f ANDROID: GKI: Update symbol list for Amlogic
* a74c28e2 ANDROID: vendor_hooks: Add hooks for printk
* 4ae522d0 ANDROID: rust_binder: avoid cloning `DArc` in `find_from`

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