Commit b18ad4b7 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:

* d0c63317 ANDROID: Disable miscellaneous features from microdroid kernels
* 62f8e0b7 ANDROID: Use small core data structures for microdroid kernels
* b56240a1 ANDROID: Reduce perturb table size for microdroid kernels
* 1489ec02 ANDROID: Remove byte queue limit and RPS support from microdroid's kernels
* aeb6d834 ANDROID: GKI: Update oplus symbol list
* 7356f4db ANDROID: mm: Add vendor hook to trace wp_page_reuse
* 47cca682 ANDROID: sched: Add trace hook for DL server
* e76cff49 ANDROID: KVM: Enforce hyp requests alignment
* 05c9d941 ANDROID: KVM: add pkvm_el2_mod_call_smccc() macro
* e8903094 ANDROID: KVM: arm64: pviommu: Mark allocated domain as busy
* 02ac8f6d ANDROID: iommu/arm-smmu-v3-kvm: Don't leak SMMU ref in error path
* c8f99e42 ANDROID: iommu/arm-smmu-v3-kvm: Put SMMU ref on detach
* c60bcaaf ANDROID: iommu/arm-smmu-v3-kvm: Don't detach pasid if doesn't exist
* 209015b5 ANDROID: GKI: Add batman-adv symbols for unisoc
* 4b68bb0b UPSTREAM: firmware: arm_ffa: Explicitly cast return value from NOTIFICATION_INFO_GET
* aac0851f UPSTREAM: firmware: arm_ffa: Skip the first/partition ID when parsing vCPU list
* 67ff14c5 UPSTREAM: firmware: arm_ffa: Explicitly cast return value from FFA_VERSION before comparison
* e5a17398 ANDROID: gunyah: Fix use-after-free in gunyah_vm_clean_resources()
* 886d2f37 ANDROID: qcom: Update the ABI symbol list
* a475a3d8 ANDROID: scmi_cpufreq: Add restricted vendor hook for scmi_limit_notify_cb
* 052da8f4 ANDROID: Fix implicit enum conversion in ufs
* 78c6c493 UPSTREAM: drm: writeback: Fix drm_writeback_connector_cleanup signature
* 82154090 ANDROID: GKI: Update transsion symbol list
* 3140a70d ANDROID: Export memcg functions to allow module to add new files
* ba125a42 BACKPORT: FROMGIT: scsi: ufs: core: Add HID support
* 1ccd114e UPSTREAM: usb: dwc3: core: Avoid redundant system suspend/resume callbacks
* bf0fb8bb ANDROID: GKI: Update vivo symbol list
* 8a9183c5 ANDROID: mm: Export several symbols
* 792718bb ANDROID: vendor_hook: Added hook to tune reclaimed huge page
* 6c25b93a ANDROID: vendor_hook: Added hook for memory reclaim tuning
* 73c426b1 ANDROID: vendor_hook: Added hook for memory allocation tuning
* c0458397 ANDROID: mm: Added memcg1_charge_batch
* 97187b04 ANDROID: mm: Added zone_pageset_high_and_batch_update
* e3489f30 ANDROID: mm: Added early_param pcp_thp_order
* 1195471b ANDROID: KVM: arm64: allow trace file to be open for read
* b362680d ANDROID: KVM: arm64: make per-cpu trace file read-write
* ce2b0625 ANDROID: KVM: arm64: use ring_buffer_page_data in hyp_trace_raw_read
* d403a094 ANDROID: KVM: arm64: use hyp_trace_raw_fops for trace_pipe_raw
* c98acaeb FROMGIT: f2fs: drop inode from the donation list when the last file is closed
* e06733ed ANDROID: GKI: update symbol list for galaxy
* daadcbc8 ANDROID: mm: add vendor hook in free_unref_folios and free_unref_page
* f4ada86f ANDROID: GKI: update symbol list for galaxy
* b85940e9 ANDROID: mm: add vendor hook to allow nonworkingset for gcma
* cab1c944 ANDROID: sched: Remove set_blocked_on_waking_nested() warning
* e24b0a3d ANDROID: GKI: update symbol list for vivo
* 196f0307 ANDROID: GKI: add fair task core selection logic vendor hooks.
* d6ad6516 ANDROID: GKI: update exynos symbol list
* 7f13e3e2 ANDROID: KVM: arm64: Don't copy pvmfw pages more than once
* a650639d ANDROID: Remove additional TCP congestion configs from microdroid
* e7953638 ANDROID: Remove CONFIG_ETHTOOL_NETLINK from microdroid kernels
* 90f9bd85 ANDROID: Remove CONFIG_INET_DIAG from microdroid kernels
* 136094c3 ANDROID: Remove IPV6 support from microdroid kernels
* d12def49 UPSTREAM: eventpoll: don't decrement ep refcount while still holding the ep mutex
* 616c12b4 ANDROID: GKI: Update symbol list for rtktv
* c05e52aa ANDROID: vendor_hooks: Add hooks in filemap_get_folio
* 1897bee5 ANDROID: GKI: update symbol list for xiaomi
* ee117211 ANDROID: mm: add vendor hook to trace swap bio charge
* 6aa695ed ANDROID: GKI: Update honor symbol list
* 83d3e716 ANDROID: GKI: Update symbol list for Amlogic
* 47365056 ANDROID: KVM: arm64: poison/account relinquished pages after unmap
* d64d8b7d FROMGIT: rcu: Fix delayed execution of hurry callbacks
* e9bbc29c ANDROID: Remove unneeded block and MD features
* b200d023 ANDROID: Remove CONFIG_DM_USER from microdroid kernels

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