Commit 6b6ffe2c 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:

* a34fd739 Merge tag 'android16-6.12.52_r00' into android16-6.12
* 3b5220a0 ANDROID: iommu/arm-smmu-v3: Handle NULL gather in arm_smmu_tlb_inv_page_nosync
* cd52fcbd ANDROID: ABI: Update pixel symbol list for platform_pci_*() hooks
* 98fc963d ANDROID: PCI: Add platform_pci_*() vendor hooks
* e0f7aae0 ANDROID: GKI: update symbol list file for xiaomi
* 2d01a3fb ANDROID: vendor_hooks: Add hooks for fuse
* 9750048d UPSTREAM: HID: hid-input: only ignore 0 battery events for digitizers
* c9fd0f25 ANDROID: ABI: update symbol list for galaxy
* 8ee3e2d9 ANDROID: GKI: rust: Enable inlining of `static inline` functions
* 064d1fc9 ANDROID: build: rust: Switch from linkonce_odr rewrite to internal linkage
* 315f8edb FROMLIST: build: rust: provide an option to inline C helpers into Rust
* 9077fcbc FROMLIST: kbuild: rust: add `CONFIG_RUSTC_CLANG_LLVM_COMPATIBLE`
* b92abfb1 ANDROID: ABI: Update pixel symbol list
* 9816e69a ANDROID: GKI: update symbol list file for xiaomi
* ab90d1e3 ANDROID: vendor_hooks: Add hook for futex
* f880678f Revert "ANDROID: add .bazelignore file"
* 12d519c7 ANDROID: GKI: Update transsion symbol list
* 1a762c61 ANDROID: GKI: update symbol list for galaxy
* 0a7833fa ANDROID: mm: add vendor hook to adjust nr_reclaimed
* fff065e0 ANDROID: GKI: Update symbol list for Amlogic
* 52402c83 ANDROID: ABI: Update the symbol list for mtk
* 40a0822d ANDROID: GKI: Add XFS filesystem support to arm64 TV configuration
* b3d5394e ANDROID: rust_binder: adjust tracepoint names
* 43c26111 ANDROID: binder: unload C Binder trace events
* 0d6730ee ANDROID: mm/swap_cgroup: remove global swap cgroup lock from swap_cgroup_cmpxchg
* cde9c39e Revert "ANDROID: mm/swap_cgroup: remove global swap cgroup lock from swap_cgroup_cmpxchg"
* 17c2421b UPSTREAM: clk: Use hashtable for global clk lookups
* 55036ffc UPSTREAM: clk: Sort include statements
* 285c8432 UPSTREAM: f2fs: fix wrong block mapping for multi-devices
* 046b3205 ANDROID: Update symbols to oplus symbol list.
* 6b836537 ANDROID: vendor_hooks: fix rt !move_entity bug while switching to sched_ext
* 326e433a FROMGIT: f2fs: set default valid_thresh_ratio to 80 for zoned devices
* ea812a27 BACKPORT: FROMGIT: f2fs: maintain one time GC mode is enabled during whole zoned GC cycle
* ab30be3d ANDROID: ABI: Update pixel symbol list
* 92d3ba8b ANDROID: zram: ioctl: Ignore swap entries from other devices
* bc60d1da ANDROID: mm: Export get_swap_device for zram module
* da67f7cc ANDROID: zram: ioctl: remove PTRACE permission check
* 9c6c6608 ANDROID: zram: enable ZRAM_ANDROID_IOCTL config
* a7835ad6 ANDROID: zram: Add ioctl for per-process writeback operation
* e31fc84d ANDROID: zram: Add ioctl infrastructure
* 171f2d5a ANDROID: zram: Track bytes processed during writeback
* e267522e ANDROID: zram: Refactor writeback helpers
* 638a31d6 ANDROID: export symbols for zram module
* 47a0b8f4 UPSTREAM: zram: modernize writeback interface
* d3f6b5ba UPSTREAM: zram: do not leak page on writeback_store error path
* 5725c522 UPSTREAM: zram: do not leak page on recompress_store error path
* daa64269 UPSTREAM: zram: move post-processing target allocation
* 4deb1a80 UPSTREAM: zram: filter out recomp targets based on priority
* 0c402a9d UPSTREAM: zram: limit max recompress prio to num_active_comps
* 9b539b45 UPSTREAM: zram: remove UNDER_WB and simplify writeback
* ae8998fe UPSTREAM: zram: reshuffle zram_free_page() flags operations
* e43fd1da UPSTREAM: zram: rework writeback target selection strategy
* 5fb9b14e UPSTREAM: zram: rework recompress target selection strategy
* 3f6fdc54 UPSTREAM: zram: introduce ZRAM_PP_SLOT flag
* 5e8f01fc ANDROID: mm/swap_cgroup: remove global swap cgroup lock from swap_cgroup_cmpxchg
* b9deb026 UPSTREAM: mm: memcontrol: fix swap counter leak from offline cgroup
* a2525867 UPSTREAM: mm/swap_cgroup: decouple swap cgroup recording and clearing
* b468e9d0 UPSTREAM: mm/swap_cgroup: remove global swap cgroup lock
* e9a30051 UPSTREAM: mm, memcontrol: avoid duplicated memcg enable check
* a5dbce29 UPSTREAM: mm: swap_cgroup: get rid of __lookup_swap_cgroup()
* a7dd5f74 UPSTREAM: mm: swap_cgroup: allocate swap_cgroup map using vcalloc()
* 8355ef6e ANDROID: zram: Stop using kernel_read_file_from_path
* 8d6ff5f2 UPSTREAM: crypto: af_alg - Disallow concurrent writes in af_alg_sendmsg
* 503192cb ANDROID: GKI: Enable Landlock support
* 278ceedf ANDROID: GKI: Fixup ABI to account for changes to kvm_iommu_ops
* 3c4ca882 ANDROID: KVM: arm64: iommu: Add new ops iotlb_sync_map()
* 6cac1692 ANDROID: ABI: update symbol list for galaxy
* 48f216fe Reapply "ANDROID: add vendor hooks for getting information of dtask"
* 1ad096a3 Reapply "ANDROID: Re-apply vendor hooks for information of blocked tasks"
* 1a16274e ANDROID: GKI: arm64 Enable SafeSetID to limit CAP_SET{U/G}ID capabilities
* 101347b9 ANDROID: GKI: update symbol list file for xiaomi
* 445110a1 ANDROID: Update the ABI symbol list
* f01d1357 ANDROID: fs: Add vendor hooks for ep_create_wakeup_source & timerfd_create
* e8f1df91 Revert "ANDROID: Re-apply vendor hooks for information of blocked tasks"
* 0713df6b ANDROID: USB: gadget: removed unused android device functions.
* eac97f05 ANDROID: binder: unexport "binder_loaded"
* f49ad834 Revert "ANDROID: add vendor hooks for getting information of dtask"
* 7cfa81d8 ANDROID: xfs: add MODULE_IMPORT_NS to fix build error
* a6599738 UPSTREAM: regulator: pm8008: fix probe failure due to negative voltage selector
* be9ba86c ANDROID: iommu/io-pgtable: Always call io_pgtable_tlb_add_page even if gather is NULL
* f2049f89 ANDROID: GKI: Honor add symbols to symbol list
* 220ada06 ANDROID: mm: Add a vendor hook to identify and protect foreground app file pages in kernel
* 8f2e4670 Revert "ANDROID: power: Add vendor hook for suspend"
* 3dc85ac0 Revert "ANDROID: gic: Add affinity-setting vendor hooks to gic"
* 5d55eb8a Revert "ANDROID: GKI: net: add vendor hooks net qos for gki purpose"
* 7a5ee311 Revert "ANDROID: PM / Domains: add vendor_hook to disallow domain idle state"
* f1a8bc35 BACKPORT: UPSTREAM: iio: cros_ec_sensors: add cros_ec_activity driver
* 29ca4a5a UPSTREAM: iio: cros_ec_sensors: Flush when changing the FIFO timeout
* 4934f482 UPSTREAM: mm: swap: check for stable address space before operating on the VMA
* abb1806c UPSTREAM: mm: slub: avoid wake up kswapd in set_track_prepare
* fceb4d76 ANDROID: ABI: Update pixel symbol list
* 2197d1c8 Revert "ANDROID: sched: Add vendor hooks for find_energy_efficient_cpu"
* dacecf47 Revert "ANDROID: vendor_hooks:add restricted hook for logbuf"
* 1e40c2fa ANDROID: iommu/arm-smmu-v3-kvm: Fix missing atomic_mc init
* 77c7b4b1 ANDROID: KVM: arm64: Fix kvm_hyp_memcache::mapping leak
* fbb5490c ANDROID: Avoid get_order(0) in kmalloc_gfp_adjust tracepoint
* 065dac09 UPSTREAM: char: tpm: cr50: Add new device/vendor ID 0x50666666
* acababa6 ANDROID: GKI: Update oplus symbol list
* c06b1f4b ANDROID: mm: mglru: add vendor_hook for should_abort_scan()
* 6bae5d45 ANDROID: mm: add vendor hooks for file folio reclaim.
* b7df6074 ANDROID: KVM: arm64: Fix pKVM module symbols import
* 77576625 FROMGIT: KVM: arm64: Mask response to FFA_FEATURE call
* 39da69c6 UPSTREAM: soc: qcom: mdt_loader: Deal with zero e_shentsize
* 8200a058 ANDROID: fuse-bpf: Check inode before calling fuse_file_put
* 1fdc0a6a ANDROID: ABI: Update oplus symbol list
* bb493f3f ANDROID: KVM: arm64: Allow pvmfw loading in the middle of a region
* 389ccf71 FROMGIT: KVM: arm64: Mark optional FF-A 1.2 interfaces as unsupported
* 712e7bfb FROMGIT: KVM: arm64: Mark FFA_NOTIFICATION_* calls as unsupported
* 365a1481 ANDROID: KVM: arm64: Use SMCCC 1.2 to notify vm availability
* 8b37bbc7 BACKPORT: FROMGIT: KVM: arm64: Use SMCCC 1.2 for FF-A initialization and in host handler
* 4408d5c6 FROMLIST: rust_binder: report freeze notification only when fully frozen
* c848b544 BACKPORT: FROMLIST: rust_binder: don't delete FreezeListener if there are pending duplicates
* 69af7554 FROMLIST: rust_binder: freeze_notif_done should resend if wrong state
* a9b9af5d FROMLIST: rust_binder: remove warning about orphan mappings
* 8f4e429a UPSTREAM: tls: make sure to abort the stream if headers are bogus
* 2918ff1d FROMGIT: scsi: ufs: sysfs: Make HID attributes visible
* 07297717 ANDROID: ufs: core: Implement UFSHCD_ANDROID_QUIRK_MCQ_BROKEN_ICU
* c32a505a UPSTREAM: arm64: map [_text, _stext) virtual address range non-executable+read-only
* 02b1d2ed ANDROID: vendor hooks: fix build issue with f2fs down read
* 9f1850d3 BACKPORT: vsock/virtio: Fix message iterator handling on transmit path
* 1334ca83 UPSTREAM: net: Introduce skb_copy_datagram_from_iter_full()
* 0d29477b ANDROID: GKI: Add trace_android_vh_kernel_nofault to qcom symbol list
* 0c49fbe2 ANDROID: arm64: Add kernel_nofault vendor hook in __slab_alloc path
* 445fb9b8 ANDROID: firmware_loader: Fix a buffer underflow in firmware_param_path_get()
* 077de228 FROMGIT: mm/thp: fix MTE tag mismatch when replacing zero-filled subpages
* 874994a8 UPSTREAM: f2fs: add missing dput() when printing the donation list
* c964de6a UPSTREAM: usb: typec: altmodes/displayport: add irq_hpd to sysfs
* 6c400c2e ANDROID: KVM: arm64: Reland split the host ffa handle store
* 5af76940 UPSTREAM: cpufreq: scmi: Account for malformed DT in scmi_dev_used_by_cpus()
* 6a4218cc UPSTREAM: ASoC: hdmi-codec: use SND_JACK_AVOUT as jack status
* 54497cba UPSTREAM: platform/chrome: cros_ec_proto: Allow to build as module
* 62ba42cd ANDROID: ABI: update symbol list for galaxy
* c5148581 FROMGIT: f2fs: fix infinite loop in __insert_extent_tree()
* 7ccce76f FROMGIT: f2fs: fix zero-sized extent for precache extents
* 78ce3369 FROMGIT: f2fs: fix to update map->m_next_extent correctly in f2fs_map_blocks()
* 389151e6 ANDROID: 16K: Check for ELF file before marking padding
* b33cc4fb ANDROID: ABI: Update honor symbol list
* 23b27871 ANDROID: mm: Add vendor hook to thaw the killed process
* ff337fdf FROMGIT: mm/oom_kill: the OOM reaper traverses the VMA maple tree in reverse order
* 226e30d5 FROMGIT: mm/oom_kill: thaw the entire OOM victim process
* d27ccc6e Revert "ANDROID: KVM: arm64: Split the host ffa handle store"
* 6c382330 ANDROID: virtio-balloon: fix virtio balloon hyp_ops
* 470ce9a9 ANDROID: binder: unregister netlink in unload_binder()
* 03a78e85 ANDROID: ABI: Update the symbol list for mtk
* 4560d0e9 ANDROID: KVM: arm64: Split the host ffa handle store
* e34340c0 ANDROID: ABI: update symbol list for desktop
* 220001a5 BACKPORT: drm/file: Add fdinfo helper for printing regions with prefix
* 10396a1f ANDROID: KVM: arm64: Prevent the host from reclaiming guest FF-A memory

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