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

Merge branch 'android14-6.1' into android14-6.1-lts



Merge the recent changes in android14-6.1 into android14-6.1-lts to
catch up on abi changes and other issues fixed there already.  Changes
included in here are:

* 5a912daf ANDROID: OPP: fix function args mismatch for dev_pm_opp_add in pm_opp.h
* bcc435d3 ANDROID: GKI: Update KMI symbol list for ASR
* 9e167c1c ANDROID: GKI: Export a symbol “next_arg” for honor
* 4dcae85a BACKPORT: netem: fix return value if duplicate enqueue fails
* f4bcd4ef ANDROID: 16K: Fixup padding vm_flags bits on VMA splits
* 9027204d ANDROID: 16K: Introduce pgsize_migration_inline.h
* 03b93dc7 FROMLIST: binder: fix BINDER_WORK_FROZEN_BINDER debug logs
* 9c6fdb6b BACKPORT: FROMLIST: binder: fix freeze UAF in binder_release_work()
* 07a43515 FROMLIST: binder: fix OOB in binder_add_freeze_work()
* a26cde40 FROMLIST: binder: fix node UAF in binder_add_freeze_work()
* df571cd9 FROMGIT: virtio_pmem: Check device status before requesting flush
* b2a0a8f7 ANDROID: GKI: update rockchip symbols sync with kernel update
* 83e7e048 ANDROID: GKI: Update symbol list for honor
* 5c7d0d4f ANDROID: GKI: Update `kernel_aarch64_16k` build config to match `kernel_aarch64`
* 2cd8ac81 ANDROID: ABI: update symbol list for honor
* b5ee53c6 ANDROID: Allow vendor modules perform more operationson on sock.
* e64a80a0 ANDROID: GKI: update symbol list file for xiaomi
* 530ff6a3 ANDROID: GKI: add vendor hooks android_vh_page_should_be_protected() and android_vh_modify_scan_control().
* 41e1c6f9 Merge tag 'android14-6.1.99_r00' into android14-6.1
* 3b95e548 ANDROID: Update the ABI symbol list
* b3a2458f ANDROID: mm: add vh for kcompactd_cpu_online()
* 532fad00 ANDROID: ABI: update symbol list for honor
* 145b0831 ANDROID: vendor_hooks: add hook to perform targeted memory management
* c105083a ANDROID: ABI: update symbol list for honor
* eda4e9fa ANDROID: mm: add vendor hook in fault and read file
* 814dd5bf ANDROID: Update the ABI symbol list
* 8a268cb9 ANDROID: GKI: Update symbol list for honor
* be073891 ANDROID: Allow vendor modules perform operationson on memleak detect
* 47871c38 ANDROID: GKI: Update symbol list for honor
* c7b8f95c ANDROID: Allow vendor modules perform more operations on binder transaction.
* d1f3a046 FROMGIT: f2fs: prevent atomic file from being dirtied before commit
* 6e5b92a6 ANDROID: GKI: Add symbol list for exynosauto
* b18f8bbc ANDROID: GKI: Update symbol list for BCMSTB
* ff740524 BACKPORT: binder_alloc: Fix sleeping function called from invalid context
* 75c9b195 UPSTREAM: bpf: Fix overrunning reservations in ringbuf
* fdec2610 ANDROID: gki_config: Disable CONFIG_DEBUG_STACK_USAGE
* d02968a0 ANDROID: gki_defconfig: Enable CONFIG_SERIAL_8250_BCM7271
* a752cdd9 BACKPORT: serial: 8250_bcm7271: improve bcm7271 8250 port
* 04212acc ANDROID: GKI: Add initial symbol list for honor
* 27310ed6 ANDROID: binder: fix KMI issues due to frozen notification
* 2f43c68d FROMGIT: binder: frozen notification binder_features flag
* eda05704 BACKPORT: FROMGIT: binder: frozen notification
* 822682e7 ANDROID: KVM: arm64: Fix cpu type for tracing HVCs
* c7596f09 ANDROID: gki_defconfig: Enable CONFIG_RTC_HCTOSYS for x86
* d1af8906 ANDROID: GKI: Update symbol list for vivo
* 9eca8763 ANDROID: vendor_hooks: add hooks for exting task's swp_entrys
* 03a4ae5d ANDROID: gki_defconfig: Enable Broadcom SoCs
* ef0ea14d ANDROID: ABI: Update xiaomi symbol list
* eabf8327 ANDROID: Update the ABI symbol list
* f8829362 UPSTREAM: PM: domains: Add helper functions to attach/detach multiple PM domains
* 7b1e2d97 UPSTREAM: OPP: Fix -Wunsequenced in _of_add_opp_table_v1()
* c33dbb3b UPSTREAM: firmware: arm_scmi: Specify the performance level when adding an OPP
* 47933171 BACKPORT: firmware: arm_scmi: Simplify error path in scmi_dvfs_device_opps_add()
* b50a013d BACKPORT: OPP: Extend support for the opp-level beyond required-opps
* 9ba5e19e UPSTREAM: OPP: Extend dev_pm_opp_data with a level
* adf41f47 BACKPORT: OPP: Add dev_pm_opp_add_dynamic() to allow more flexibility
* 9c1597d2 UPSTREAM: dt-bindings: power: Clarify performance capabilities of power-domains
* dda942f0 UPSTREAM: dt-bindings: firmware: arm,scmi: Extend bindings for protocol@13
* ff18572d UPSTREAM: dt-bindings: arm: cpus: Add a power-domain-name for a performance-domain
* 5c0092ff UPSTREAM: PM: domains: Allow genpd providers to manage OPP tables directly by its FW
* c638aef4 UPSTREAM: cpufreq: scmi: Add support to parse domain-id using #power-domain-cells
* 0ccb8d6e UPSTREAM: cpufreq: scmi: Avoid one OF parsing in scmi_get_sharing_cpus()
* 1a6e8831 UPSTREAM: firmware: arm_scmi: Drop redundant ->device_domain_id() from perf ops
* 3aa5b540 UPSTREAM: firmware: arm_scmi: Align perf ops to use domain-id as in-parameter
* 49da9f27 UPSTREAM: cpufreq: scmi: Prepare to move OF parsing of domain-id to cpufreq
* 742d32f2 BACKPORT: firmware: arm_scmi: Extend perf protocol ops to get information of a domain
* b99f37e4 BACKPORT: firmware: arm_scmi: Extend perf protocol ops to get number of domains
* 09ab2356 ANDROID: vendor_hooks: export shrink_slab
* 8a0fa49a UPSTREAM: erofs: fix out-of-bound access when z_erofs_gbuf_growsize() partially fails
* 7c5c6b63 UPSTREAM: netfilter: ipset: Fix race between namespace cleanup and gc in the list:set type
* a1895da8 ANDROID: GKI: Add initial sunxi symbol list
* b5e374dd FROMLIST: usb: typec: fix up incorrectly backported "usb: typec: tcpm: unregister existing source caps before re-registration"
* 841cae88 UPSTREAM: net: sched: sch_multiq: fix possible OOB write in multiq_tune()
* 3bb5a64a ANDROID: Update the ABI symbol list
* 6cbdf0e2 ANDROID: Update the ABI symbol list
* 25641a61 ANDROID: GKI: Update symbol list for mtk
* 82b9eb64 FROMGIT: KVM: arm64: Ensure TLBI uses correct VMID after changing context
* 9920d258 FROMGIT: KVM: arm64: Invalidate EL1&0 TLB entries for all VMIDs in nvhe hyp init
* 1a48a88f FROMGIT: BACKPORT: KVM: arm64: Don't pass a TLBI level hint when zapping table entries
* 02fcfc12 Merge tag 'android14-6.1.93_r00' into android14-6.1
* 42515e92 ANDROID: sched: Add android_vh_set_task_comm
* 0f23336b BACKPORT: UPSTREAM: sched: Move psi_account_irqtime() out of update_rq_clock_task() hotpath
* 370ea8bc FROMLIST: binder: fix UAF caused by offsets overwrite
* f8f9a197 ANDROID: binder: fix KMI-break due to proc->dmap
* a55053f3 UPSTREAM: binder: fix descriptor lookup for context manager
* c5f1e683 BACKPORT: binder: use bitmap for faster descriptor lookup
* 514bdc80 UPSTREAM: perf/core: Fix potential NULL deref
* faf32723 BACKPORT: scsi: ufs: core: Fix ufshcd_abort_one racing issue
* 4d735ca7 BACKPORT: scsi: ufs: core: Fix ufshcd_clear_cmd racing issue

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