Merge branch 'android14-6.1' into branch 'android14-6.1-lts'
This catches the android14-6.1-lts branch up with a lot of changes that have only gone into the android14-6.1 branch to make testing easier and to track more symbols properly. This includes the following commits: * 171c27ba BACKPORT: usb: gadget: uvc: Add missing initialization of ssp config descriptor * bb0173a1 BACKPORT: usb: gadget: unconditionally allocate hs/ss descriptor in bind operation * 5c4815f5 UPSTREAM: usb: gadget: f_uvc: change endpoint allocation in uvc_function_bind() * 5a05f2e7 UPSTREAM: usb: gadget: function: Remove unused declarations * defd93f2 UPSTREAM: usb: gadget: uvc: clean up comments and styling in video_pump * 82fe654f UPSTREAM: mm/page_alloc: use write_seqlock_irqsave() instead write_seqlock() + local_irq_save(). * ed6694a6 UPSTREAM: cpuidle: teo: Update idle duration estimate when choosing shallower state * d8e99e1a BACKPORT: Revert "PCI: dwc: Wait for link up only if link is started" * 841ad9b9 UPSTREAM: ravb: Fix use-after-free issue in ravb_tx_timeout_work() * 17e456ce UPSTREAM: ravb: Fix up dma_free_coherent() call in ravb_remove() * 5ba644e8 BACKPORT: usb: typec: altmodes/displayport: Signal hpd low when exiting mode * 9e4f6e1e ANDROID: KVM: arm64: Fix KVM_HOST_S2_DEFAULT_MMIO_PTE encoding * 5418491f ANDROID: Update the ABI symbol list * b821a3c8 ANDROID: fs/proc: Perform priority inheritance around access_remote_vm() * 37c1a914 UPSTREAM: serial: 8250_dw: fall back to poll if there's no interrupt * 35361bda Merge "Merge tag 'android14-6.1.43_r00' into android14-6.1" into android14-6.1 |\ | * 769612f5 Merge tag 'android14-6.1.43_r00' into android14-6.1 * | 034b4b4f ANDROID: Update the ABI representation * | 09474646 ANDROID: power: Add vendor hook for suspend |/ * b783e856 ANDROID: Update the ABI symbol list * 2c609cab UPSTREAM: of: reserved-mem: print out reserved-mem details during boot * ff2563f3 ANDROID: GKI: Update symbol list for xiaomi "abi_gki_aarch64_xiaomi" * 7542b3be ANDROID: Update symbols list and ABI for qcom * 63d4231d ANDROID: fuse-bpf: Add NULL pointer check in fuse_entry_revalidate * 09641ca7 ANDROID: GKI: Update oplus symbol list update oplus symbol list for Addding hooks for adjusting alloc_flags * 0b200357 ANDROID: vendor_hooks: Add hooks for adjusting alloc_flags * 367ce30d UPSTREAM: libceph: harden msgr2.1 frame segment length checks * debc1e04 ANDROID: Update the ABI symbol list * 401b78ce ANDROID: mm: Add vendor hook in filemap_get_folio() * 1b3269be UPSTREAM: netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP * a9c65c7e UPSTREAM: netfilter: ipset: Add schedule point in call_ad(). * cd4ea97d UPSTREAM: net: xfrm: Fix xfrm_address_filter OOB read * a4ccba8b UPSTREAM: igb: set max size RX buffer when store bad packet is enabled * 8a67c060 ANDROID: GKI: fix ABI breakage in struct hid_device * 28ee91ed UPSTREAM: HID: input: map battery system charging * 2dd1c535 FROMGIT: maple_tree: add GFP_KERNEL to allocations in mas_expected_entries() * faa4efd6 UPSTREAM: maple_tree: replace data before marking dead in split and spanning store * 47e3b492 UPSTREAM: maple_tree: change mas_adopt_children() parent usage * e0f829b7 UPSTREAM: maple_tree: introduce mas_tree_parent() definition * e69d6570 UPSTREAM: maple_tree: introduce mas_put_in_tree() * d2e45cee UPSTREAM: maple_tree: reorder replacement of nodes to avoid live lock * 545cc51b ANDROID: GKI: add allowed list for Exynosauto SoC * f51787df ANDROID: Update the ABI symbol list * 1b71e8ef ANDROID: Update the ABI symbol list * 908a5307 ANDROID: KVM: Update nVHE stack size to 8KB * 53771c18 ANDROID: Update the ABI symbol list * a22ff19f ANDROID: mm: Add vendor hook in rmqueue() * 09ca291e FROMLIST: virt: geniezone: Add memory pin/unpin support * 7cc3767c FROMLIST: virt: geniezone: Add block-based demand paging support * 3fcc07ee FROMLIST: virt: geniezone: Add demand paging support * 6a1a3089 ANDROID: virt: geniezone: Refactoring memory region support * 9f64b18d ANDROID: virt: geniezone: Refactor code comments from mainline v6 accordingly * 544b1287 ANDROID: virt: geniezone: Refactoring vgic to align with upstream v6 * f9291d7a ANDROID: virt: geniezone: Refactoring vcpu to align with upstream v6 * e348fe6d ANDROID: virt: geniezone: Refactoring vm capability to align with upstream v6 * fb3444af ANDROID: virt: geniezone: Refactoring irqfd to align with upstream v6 * 7e1cb3bd ANDROID: sched: Add EXPORT_SYMBOL_GPL for sched_wakeup * 73cee741 ANDROID: vendor_hooks: Export direct reclaim trace points * fca353bd ANDROID: mm: freeing MIGRATE_ISOLATE page instantly * 08351370 ANDROID: KVM: arm64: Allow setting device attr in stage-2 PTEs * b25aabd5 ANDROID: KVM: arm64: Fix hyp tracing build dependencies * f82e0808 ANDROID: abi_gki_aarch64_qcom: update abi symbols * 2fff9f7c ANDROID: vendor hooks: Enable Vendor hook to register smmu driver to dedicated iommu bus defined by vendor. * fadd5042 UPSTREAM: netfilter: xt_sctp: validate the flag_info count * 1c904089 UPSTREAM: mm/mglru: make memcg_lru->lock irq safe * 87cd3d68 UPSTREAM: iommu/amd: Fix possible memory leak of 'domain' * e5f37a2c UPSTREAM: selftests/tc-testing: Remove configs that no longer exist * 7c793b4d ANDROID: abi_gki_aarch64_qcom: update abi symbols * bf51ba7b ANDROID: ABI: Update symbol list for imx * 1e6a9aeb ANDROID: GKI: add allowed list for Exynosauto SoC * a338830f UPSTREAM: ufs: core: wlun send SSU timeout recovery * fd2e98c6 UPSTREAM: PM: domains: fix integer overflow issues in genpd_parse_state() * e3e2ece8 ANDROID: mm: vh for compaction begin/end * 2176509c UPSTREAM: netfilter: xt_u32: validate user space input * 132b4711 UPSTREAM: netfilter: nfnetlink_osf: avoid OOB read * 8c3b0a34 UPSTREAM: ipv4: fix null-deref in ipv4_link_failure * 4181951d UPSTREAM: net/sched: Retire rsvp classifier * acb07286 UPSTREAM: usb: core: stop USB enumeration if too many retries * 8b1bd879 ANDROID: KVM: arm64: Add missing hyp events for forwarded SMCs * f4812c68 ANDROID: KVM: arm64: Store hyp address in the host fp state array * 6334225e ANDROID: KVM: arm64: Allocate host fp/simd state later in initialization * 83ebd502 UPSTREAM: netfilter: nf_tables: disallow rule removal from chain binding * 7d088a3e UPSTREAM: fs/smb/client: Reset password pointer to NULL * 2807a43b ANDROID: Update the ABI symbol list * 368b7529 FROMGIT: usb: typec: ucsi: Clear EVENT_PENDING bit if ucsi_send_command fails * 4fcc13c1 ANDROID: mm: add missing check in the backport for handling faults under VMA lock * 1fe24899 ANDROID: Update the ABI symbol list * 43019013 ANDROID: Update STG for ANDROID_KABI_USE(1, unsigned int saved_state) * 22cd8e0d FROMGIT: freezer,sched: Use saved_state to reduce some spurious wakeups * 457e6569 BACKPORT: FROMGIT: sched/core: Remove ifdeffery for saved_state * 3437652f BACKPORT: erofs: set block size to the on-disk block size * e84c93fd BACKPORT: erofs: avoid hardcoded blocksize for subpage block support * 36496d09 BACKPORT: erofs: get rid of z_erofs_do_map_blocks() forward declaration * cee06943 BACKPORT: erofs: get rid of erofs_inode_datablocks() * f7d9c7d0 BACKPORT: erofs: simplify iloc() * 7d42260e ANDROID: Update the ABI symbol list * 324c8522 ANDROID: Update symbol list for mtk * 30d86f76 ANDROID: mm: Add vendor hooks for recording when kswapd finishing the reclaim job * 0deb7bb7 ANDROID: mm: Add vendor hooks for __alloc_pages_slowpath * 5c2855fb ANDROID: mm: Add vendor hook for compact pages work. * 4e10001b ANDROID: Update the ABI symbol list * 2434dece FROMGIT: usb: gadget: u_serial: Add null pointer check in gserial_suspend * 5f8aa272 ANDROID: Update the ABI symbol list * f7e7874d BACKPORT: usb: typec: bus: verify partner exists in typec_altmode_attention * 5cb3b26d ANDROID: ABI: Update the pixel symbol list and stg * cf1ba6a1 UPSTREAM: shmem: fix smaps BUG sleeping while atomic * 52824b71 UPSTREAM: blk-ioprio: Introduce promote-to-rt policy * dce18348 ANDROID: ABI: Update oplus symbol list * 89815ec1 ANDROID: GKI: export symbols to do reverse mapping within memcg and modify lru stats * 45fe413f ANDROID: gki_defconfig: Enable CONFIG_BLK_CGROUP_IOPRIO * c240f4ed ANDROID: gunyah: Convert mutex_lock_interruptible to mutex_lock * 6305df80 UPSTREAM: bpf, sockmap: fix deadlocks in the sockhash and sockmap * 7999b48d UPSTREAM: net: sched: sch_qfq: Fix UAF in qfq_dequeue() * 709dc094 UPSTREAM: ARM: ptrace: Restore syscall skipping for tracers * ea494b27 UPSTREAM: ARM: ptrace: Restore syscall restart tracing * b374d941 Revert "BACKPORT: FROMGIT: usb: gadget: udc: Handle gadget_connect failure during bind operation" * ae5ea904 ANDROID: Move microdroid and crashdump defconfigs to common * b548c046 UPSTREAM: net: prevent skb corruption on frag list segmentation * 060ebb37 ANDROID: ABI: Update oplus symbol list * f451f4a5 ANDROID: vendor_hooks: Add hooks for oem percpu-rwsem optimaton * a3cb85bf ANDROID: ABI: Update oplus symbol list * 740a5139 ANDROID: vendor_hooks: Add hooks for binder * c6724bfe ANDROID: uid_sys_stat: instead update_io_stats_uid_locked to update_io_stats_uid * 97f2f8a0 ANDROID: uid_sys_stat: split the global lock uid_lock to the fine-grained locks for each hlist in hash_table. * 9290fc3e ANDROID: Flush deferred probe list before dropping host priv * 66251331 ANDROID: KVM: arm64: Don't force pte mappings in [n]VHE guest stage-2 * 2f2c0354 UPSTREAM: usb: gadget: u_serial: Add null pointer check in gs_start_io * ac900594 UPSTREAM: sched: Consider task_struct::saved_state in wait_task_inactive() * b52b33e9 UPSTREAM: sched: Unconditionally use full-fat wait_task_inactive() * 8465ef2b ANDROID: GKI: Update symbol list for ASUS * 1e4c6e50 UPSTREAM: tty: n_gsm: fix the UAF caused by race condition in gsm_cleanup_mux * 40b46d86 UPSTREAM: netfilter: nf_tables: prevent OOB access in nft_byteorder_eval * d8f69aad UPSTREAM: iommu/of: mark an unused function as __maybe_unused * a032fbc7 UPSTREAM: iommu: dma: Use of_iommu_get_resv_regions() * 693c7129 UPSTREAM: iommu: Implement of_iommu_get_resv_regions() * e9603e85 UPSTREAM: dt-bindings: reserved-memory: Document iommu-addresses * 64ed2913 UPSTREAM: of: Introduce of_translate_dma_region() * 536996aa ANDROID: GKI: Add rockchip fragment and build.config * 6a10b343 ANDROID: GKI: Add symbols for rockchip v4l2 * 3e3c6deb ANDROID: GKI: Add hid and usb symbols for rockchip * 53162778 ANDROID: GKI: Add cdc symbols for rockchip * b09b06dc ANDROID: GKI: Add symbols for rockchip sdhci * 62d64a59 ANDROID: GKI: Add symbols for rockchip devfreq * 9c9ee611 ANDROID: GKI: Add crypto symbols for rockchip * 7246ecec ANDROID: GKI: Add rockchip drm symbols and abi * 2f3d6aa0 ANDROID: GKI: Add initial abi for rockchip * 1e26ba19 ANDROID: GKI: Add initial rockchip symbol list * 404360f6 FROMLIST: clk: clk-fractional-divider: Export clk_fractional_divider_general_approximation API * c3d6c235 UPSTREAM: net/sched: sch_hfsc: Ensure inner classes have fsc curve * d3212c2d UPSTREAM: sched/rt: Fix bad task migration for rt tasks * 215e38e5 ANDROID: GKI: Add ASUS symbol list * e52e60e3 UPSTREAM: tcpm: Avoid soft reset when partner does not support get_status * bbc9d3bc ANDROID: vendor_hooks: mm: Add tune_swappiness vendor hook in get_swappiness() * 7024c9cd ANDROID: ABI: Update symbols to unisoc whitelist * de3e9f31 ANDROID: ABI: Add to QCOM symbols list * 85902d60 ANDROID: ABI: update symbol list for galaxy * c2ac6126 BACKPORT: printk: ringbuffer: Fix truncating buffer size min_t cast * 7579b226 ANDROID: GKI: Add symbols to symbol list for oplus * 6e5f1821 ANDROID: signal: Add vendor hook for memory reap * 3a51a619 ANDROID: abi_gki_aarch64_qcom: white list symbols for mglru overshoot * 0500235e ANDROID: vendor_hook: Add vendor hook to decide scan abort policy * e6ed5912 UPSTREAM: af_unix: Fix null-ptr-deref in unix_stream_sendpage(). * 2eb5b31a FROMLIST: ufs: core: fix abnormal scale up after last cmd finish * 89434cbd FROMLIST: ufs: core: fix abnormal scale up after scale down * e490b62f FROMLIST: ufs: core: only suspend clock scaling if scale down * 3ffb0380 ANDROID: GKI: update ABI definition * e2fa9ebc UPSTREAM: zsmalloc: allow only one active pool compaction context * 478ec4db ANDROID: GKI: Update Tuxera symbol list * cd94fe67 ANDROID: ABI: Update symbols to qcom whitelist * 68eefde2 UPSTREAM: usb: typec: tcpm: set initial svdm version based on pd revision * a68bd014 ANDROID: KVM: arm64: Don't update IOMMUs for share/unshare * 20ecb229 ANDROID: cpuidle: teo: Export a function that allows modifying util_threshold * 2490ab50 ANDROID: sched: Add vendor hook for rt util update * 6d97f75a ANDROID: sched: Add vendor hook for util-update related functions * e08c5de0 ANDROID: sched: Add vendor hooks for override sugov behavior * 57629741 ANDROID: Add new hook to enable overriding uclamp_validate() * b57e3c1d ANDROID: sched/uclamp: Don't enable uclamp_is_used static key by in-kernel requests * 2b25d535 ANDROID: topology: Add vendor hook for use_amu_fie * eb968693 ANDROID: sched: Export symbols needed for vendor hooks * 84131c98 ANDROID: Update symbol list for Exynos Auto SoCs * 3367abad UPSTREAM: netfilter: nf_tables: deactivate catchall elements in next generation * a891f77b ANDROID: GKI: Update symbols to symbol list * 4d8d9522 ANDROID: GKI: Export four symbols in file net/core/net-trace.c * 3973acfe UPSTREAM: blk-ioc: fix recursive spin_lock/unlock_irq() in ioc_clear_queue() * 523bfe85 ANDROID: fuse-bpf: Align data structs for 32-bit kernels * 9f5a84b9 ANDROID: GKI: Update symbol list for xiaomi * 176d72d9 ANDROID: vendor_hooks: export cgroup_threadgroup_rwsem * 1fb9e95d ANDROID: GKI: add symbol list file for meizu * 8fb9de08 ANDROID: fuse-bpf: Get correct inode in mkdir * 0fdb4496 ANDROID: ABI: Update allowed list for QCOM * 404522c7 UPSTREAM: blk-ioc: protect ioc_destroy_icq() by 'queue_lock' * bd0308e3 ANDROID: GKI: Update symbols to symbol list * 87647c0c ANDROID: uid_sys_stats: Use llist for deferred work * 4b3ab916 UPSTREAM: net: nfc: Fix use-after-free caused by nfc_llcp_find_local * c603880b UPSTREAM: netfilter: nf_tables: disallow rule addition to bound chain via NFTA_RULE_CHAIN_ID * d95b2b00 UPSTREAM: net: tap_open(): set sk_uid from current_fsuid() * b15c3a3d UPSTREAM: usb: typec: ucsi: Fix command cancellation * 0c34d588 UPSTREAM: locks: fix KASAN: use-after-free in trace_event_raw_event_filelock_lock * 20266a06 ANDROID: kleaf: Remove ptp_kvm.ko from i386 modules * ce18fe6f ANDROID: GKI: Add symbols to symbol list for oplus * 8e6550ad ANDROID: vendor_hooks: Add tune swappiness hook in get_scan_count() * dd87a712 ANDROID: GKI: Update symbol list for VIVO * 638804ea ANDROID: kleaf: get_gki_modules_list add i386 option * 264e2973 ANDROID: arm as an option for get_gki_modules_list * 37edfbc5 UPSTREAM: um: Only disable SSE on clang to work around old GCC bugs * 2a13641a ANDROID: GKI: Update abi_gki_aarch64_qcom for page_owner symbols * f0862364 ANDROID: mm: Export page_owner_inited and __set_page_owner * e44e3955 ANDROID: Use alias for old rules. * 67018dd4 ANDROID: virt: geniezone: Enable as GKI module for arm64 * 9a399ca7 ANDROID: Add arch specific gki module list targets * 3e079b76 FROMLIST: virt: geniezone: Add dtb config support * 39bd65ec FROMLIST: virt: geniezone: Add memory region support * c26057e3 FROMLIST: virt: geniezone: Add ioeventfd support * e73a5222 FROMLIST: virt: geniezone: Add irqfd support * 7427b76f FROMLIST: virt: geniezone: Add irqchip support for virtual interrupt injection * 540cff08 FROMLIST: virt: geniezone: Add vcpu support * 6ce86d07 FROMLIST: virt: geniezone: Add GenieZone hypervisor support * 40107a00 FROMLIST: dt-bindings: hypervisor: Add MediaTek GenieZone hypervisor * beaffb63 FROMLIST: docs: geniezone: Introduce GenieZone hypervisor * e0c4636b UPSTREAM: net/sched: cls_route: No longer copy tcf_result on update to avoid use-after-free * ec1f17dd UPSTREAM: net: tun_chr_open(): set sk_uid from current_fsuid() * 0adc759b UPSTREAM: exfat: check if filename entries exceeds max filename length * f4ba064f UPSTREAM: net/sched: cls_fw: No longer copy tcf_result on update to avoid use-after-free * 5b0878fc ANDROID: abi_gki_aarch64_qcom: update abi symbols * 7551a1a2 ANDROID: cgroup: Add android_rvh_cgroup_force_kthread_migration * cd018c99 FROMGIT: pstore/ram: Check start of empty przs during init * ffaab713 UPSTREAM: erofs: avoid infinite loop in z_erofs_do_read_page() when reading beyond EOF * 8497f46a UPSTREAM: erofs: avoid useless loops in z_erofs_pcluster_readmore() when reading beyond EOF * 2f805fb9 UPSTREAM: erofs: Fix detection of atomic context * cc6111a2 UPSTREAM: erofs: fix compact 4B support for 16k block size * f11ccb03 UPSTREAM: erofs: kill hooked chains to avoid loops on deduplicated compressed images * 7521b904 UPSTREAM: erofs: fix potential overflow calculating xattr_isize * 6ec6eee8 UPSTREAM: erofs: stop parsing non-compact HEAD index if clusterofs is invalid * 9089c10d UPSTREAM: erofs: initialize packed inode after root inode is assigned * 797dac42 ANDROID: GKI: Update ABI for zsmalloc fixes * cb440cec BACKPORT: zsmalloc: fix races between modifications of fullness and isolated * c0e84be9 ANDROID: ABI: Update symbols to unisoc whitelist for A14-6.1 * 5ef132d5 UPSTREAM: zsmalloc: consolidate zs_pool's migrate_lock and size_class's locks * ec6b3d55 UPSTREAM: netfilter: nfnetlink_log: always add a timestamp * 4db95aa2 ANDROID: virt: gunyah: Do not allocate irq for GH_RM_RESOURCE_NO_VIRQ * 2d1d3be2 ANDROID: GKI: Add Tuxera symbol list * 20d8a897 ANDROID: ABI: Update oplus symbol list * 7afa84fb ANDROID: vendor_hooks: Add hooks for waking up and exiting control * 9ca47685 ANDROID: GKI: Update symbol list for xiaomi * 2d7f87b0 ANDROID: vendor_hooks:vendor hook for percpu-rwsem * 63af84cf ANDROID: fips140: fix the error injection module parameters * 71bedf9d BACKPORT: blk-crypto: dynamically allocate fallback profile * 086befdd UPSTREAM: net/sched: cls_u32: No longer copy tcf_result on update to avoid use-after-free * ecd8d8a2 UPSTREAM: Bluetooth: L2CAP: Fix use-after-free in l2cap_sock_ready_cb * 6923dcc2 UPSTREAM: media: usb: siano: Fix warning due to null work_func_t function pointer Change-Id: Idc01a15f70d151d08c30ee23c2939260764e428b Signed-off-by:Greg Kroah-Hartman <gregkh@google.com>
Loading
Please sign in to comment