Merge branch 'android14-5.15' into branch 'android14-5.15-lts'
A back-merge to catch the latest changes that are in the android14-5.15 branch. This contains the following commits: * 1982cd32 ANDROID: GKI: Remove CONFIG_MEDIA_CEC_RC * 270ce44f Merge "Merge tag 'android14-5.15.144_r00' into branch 'android14-5.15'" into android14-5.15 |\ | * f26b6b03 Merge tag 'android14-5.15.144_r00' into branch 'android14-5.15' * | 9a196e80 ANDROID: uid_sys_stats: Drop CONFIG_UID_SYS_STATS_DEBUG logic * | debd0f47 ANDROID: uid_sys_stats: Fully initialize uid_entry_tmp value * | cf1268f6 UPSTREAM: usb: gadget: uvc: Remove nested locking * | c9395ddb UPSTREAM: usb: gadget: uvc: Fix use are free during STREAMOFF * | 7a71ed71 ANDROID: fuse-bpf: Fix the issue of abnormal lseek system calls * | da99db44 ANDROID: Update the ABI symbol list * | 4f66f3be ANDROID: Export sysctl_sched_min_granularity * | e32aeb03 UPSTREAM: sched/fair: Limit sched slice duration * | b9e9a2c0 FROMGIT: mm: update mark_victim tracepoints fields * | 61d5f76a UPSTREAM: mmc: core: Do not force a retune before RPMB switch * | d85e6cb6 ANDROID: GKI: add symbol list for etm driver * | eb31cad2 UPSTREAM: coresight: tmc: Don't enable TMC when it's not ready. * | 57ddb1ec UPSTREAM: netfilter: nf_tables: bail out on mismatching dynset and set expressions |/ * a4da62d2 FROMGIT: usb: dwc3: gadget: Handle EP0 request dequeuing properly * 0d3c4918 UPSTREAM: usb: dwc3: gadget: Refactor EP0 forced stall/restart into a separate API * 154a4394 UPSTREAM: usb: dwc3: gadget: Execute gadget stop after halting the controller * 0b1767af BACKPORT: usb: dwc3: gadget: Stall and restart EP0 if host is unresponsive * b68fafef UPSTREAM: usb: dwc3: gadget: Submit endxfer command if delayed during disconnect * 02524b75 UPSTREAM: usb: dwc3: ep0: Don't prepare beyond Setup stage * 14932056 ANDROID: arm64: mm: perform clean & invalidation in __dma_map_area * d0cdb904 ANDROID: GKI: Update symbol list for Amlogic * a95b3554 UPSTREAM: bcache: move uapi header bcache.h to bcache code directory * 6246b8f3 UPSTREAM: netfilter: nf_tables: skip set commit for deleted/destroyed sets * 60489918 ANDROID: KVM: arm64: Avoid BUG-ing from the host abort path * 38cb0b11 ANDROID: GKI: Update symbol list for lenovo * 3cd67287 ANDROID: binder: fix KMI-break due to alloc->lock * 63f7ddea ANDROID: binder: fix KMI-break due to address type change * 74ecd99c BACKPORT: FROMGIT: binder: switch alloc->mutex to spinlock_t * 5a8658ea BACKPORT: FROMGIT: binder: reverse locking order in shrinker callback * f0667c87 FROMGIT: binder: avoid user addresses in debug logs * b93c9f85 FROMGIT: binder: refactor binder_delete_free_buffer() * f6b1c043 FROMGIT: binder: collapse print_binder_buffer() into caller * 683f84a3 FROMGIT: binder: document the final page calculation * 4c82cbad BACKPORT: FROMGIT: binder: rename lru shrinker utilities * eba1fb96 UPSTREAM: drivers/android: remove redundant ret variable * 356047fe FROMGIT: binder: make oversized buffer code more readable * f7476dca FROMGIT: binder: remove redundant debug log * 477e8e84 BACKPORT: FROMGIT: binder: perform page installation outside of locks * af711934 FROMGIT: binder: initialize lru pages in mmap callback * ef524f4d FROMGIT: binder: malloc new_buffer outside of locks * b23dbdbf BACKPORT: FROMGIT: binder: refactor page range allocation * 59e0d62f BACKPORT: FROMGIT: binder: relocate binder_alloc_clear_buf() * 081ddad2 FROMGIT: binder: relocate low space calculation * e1d195e9 FROMGIT: binder: separate the no-space debugging logic * 26d06d93 FROMGIT: binder: remove pid param in binder_alloc_new_buf() * d5c44f90 FROMGIT: binder: do unlocked work in binder_alloc_new_buf() * 0b24368f FROMGIT: binder: split up binder_update_page_range() * c38a8980 FROMGIT: binder: keep vma addresses type as unsigned long * ca5c7be9 FROMGIT: binder: remove extern from function prototypes * 2a250a15 FROMGIT: binder: fix comment on binder_alloc_new_buf() return value * 26f0c013 FROMGIT: binder: fix trivial typo of binder_free_buf_locked() * 11ca0765 FROMGIT: binder: fix unused alloc->free_async_space * 65cf1585 FROMGIT: binder: fix async space check for 0-sized buffers * 1787dddd FROMGIT: binder: fix race between mmput() and do_exit() * 8dce2880 FROMGIT: binder: fix use-after-free in shinker's callback * 3c473256 FROMGIT: binder: use EPOLLERR from eventpoll.h * 486b17a0 ANDROID: GKI: Update symbol list for Amlogic * bfefe25d UPSTREAM: bpf: Fix prog_array_map_poke_run map poke update * 27474859 ANDROID: gki_defconfig: Set CONFIG_IDLE_INJECT and CONFIG_CPU_IDLE_THERMAL into y * 597362d4 ANDROID: KVM: arm64: Don't prepopulate MMIO regions for host stage-2 * 45d542ad ANDROID: KVM: arm64: Fix host_smc print typo * 38bb85f2 ANDROID: KVM: arm64: Fix hyp event alignment * c09c7c05 ANDROID: KVM: arm64: Document module_change_host_prot_range * 80d91f64 BACKPORT: USB: gadget: core: adjust uevent timing on gadget unbind * 19a4494b ANDROID: GKI: Update RTK STB KMI symbol list * 55f6a969 UPSTREAM: dm verity: don't perform FEC for failed readahead IO * 781393c0 UPSTREAM: ipv4: igmp: fix refcnt uaf issue when receiving igmp query packet * 97c69470 UPSTREAM: netfilter: nft_set_pipapo: skip inactive elements during set walk * 16ea5940 ANDROID: fuse-bpf: Follow mounts in lookups * abea1cb1 ANDROID: Snapshot Mainline's version of checkpatch.pl * 9f6f0c1d ANDROID: GKI: Update symbol list for Amlogic * a5123cff ANDROID: KVM: arm64: Skip prefaulting ptes which will be modified later * 97bbbf44 ANDROID: KVM: arm64: Introduce module_change_host_prot_range * 1dc2dbbb ANDROID: KVM: arm64: Relax checks in module_change_host_page_prot * b43baa77 ANDROID: KVM: arm64: Optimise module_change_host_page_prot * dc87f352 ANDROID: KVM: arm64: Prefault entries when splitting a block mapping * ab6f88ae ANDROID: GKI: Update symbol list for transsion * 896cff87 ANDROID: Add vendor_hooks to workaround CONFIG_TASK_DELAY_ACCT * 3d3f9377 ANDROID: Add missing symbol for QCOM * 5feaf92b UPSTREAM: binder: fix memory leaks of spam and pending work * 92bef7c6 UPSTREAM: mm,kfence: decouple kfence from page granularity mapping judgement * e6ffb329 UPSTREAM: arm64/mm: fold check for KFENCE into can_set_direct_map() * b39c28c4 ANDROID: GKI: db845c: Update symbols list and ABI on rpmsg_register_device_override * d0b481d9 ANDROID: fix up rpmsg_device ABI break * 6bfb3020 ANDROID: fix up platform_device ABI break * 649e9135 UPSTREAM: rpmsg: Fix possible refcount leak in rpmsg_register_device_override() * b1e39dea UPSTREAM: rpmsg: glink: Release driver_override * 9697a164 BACKPORT: rpmsg: Fix calling device_lock() on non-initialized device * 01b4519a BACKPORT: rpmsg: Fix kfree() of static memory on setting driver_override * d82ae690 UPSTREAM: rpmsg: Constify local variable in field store macro * 341acb7b UPSTREAM: driver: platform: Add helper for safer setting of driver_override * 81051a61 Revert "ANDROID: Enable CONFIG_KUNIT=y." * 1d5461be Revert "ANDROID: Add kunit targets." * 12ab8f15 UPSTREAM: io_uring/fdinfo: lock SQ thread while retrieving thread cpu/pid * 3a7b8e54 ANDROID: arm64: Remove a bunch of duplicate errata hunks * 4ba6c319 ANDROID: arm64: Disable workaround for CPU errata 2441007 and 2441009 * 0bea71c8 ANDROID: abi_gki_aarch64_qcom: Add GIC and hibernation APIs * 3923e995 ANDROID: irqchip/irq-gic-v3: Add vendor hook for gic suspend * bd588368 ANDROID: Update the ABI representation * 16a47663 BACKPORT: fscrypt: support crypto data unit size less than filesystem block size * a934b923 ANDROID: mm: do not allow file-backed pages from CMA * 35482d0d UPSTREAM: netfilter: nf_tables: remove catchall element in GC sync path * e19a3cd1 ANDROID: fuse-bpf: Ignore readaheads unless they go to the daemon * 5421e17c ANDROID: Update the ABI symbol list * 46f8b2ca ANDROID: GKI: add a vendor hook in ptep_clear_flush_young() * 0add0e52 UPSTREAM: fs: drop_caches: draining pages before dropping caches * 0d1f309e Merge "Merge tag 'android14-5.15.137_r00' into branch 'android14-5.15'" into android14-5.15 |\ | * 6dfd4d40 Merge tag 'android14-5.15.137_r00' into branch 'android14-5.15' * | 73c2c0d5 ANDROID: Update the ABI symbol list * | 87344b2a ANDROID: sched: Add trace_android_rvh_set_user_nice_locked |/ * bd1e76c0 ANDROID: GKI: update symbol list * fdaddcab ANDROID: GKI: vendor code needs __balance_callbacks access * e2fbc5cc ANDROID: KVM: arm64: pkvm_module_ops documentation * bf291bdd UPSTREAM: usb: typec: tcpm: Fix NULL pointer dereference in tcpm_pd_svdm() * 52ecdc26 UPSTREAM: USB: core: Fix race by not overwriting udev->descriptor in hub_port_init() * a7f10372 UPSTREAM: USB: core: Change usb_get_device_descriptor() API * 28e703ec UPSTREAM: USB: core: Unite old scheme and new scheme descriptor reads * e5f93571 ANDROID: GKI: Update symbol list for lenovo * dcf95aa0 FROMGIT: usb:gadget:uvc Do not use worker thread to pump isoc usb requests * 8078e50f FROMGIT: usb: gadget: uvc: Fix use-after-free for inflight usb_requests * 00417482 FROMGIT: usb: gadget: uvc: move video disable logic to its own function * 56328305 FROMGIT: usb: gadget: uvc: Allocate uvc_requests one at a time * 848fa308 FROMGIT: usb: gadget: uvc: prevent use of disabled endpoint * 24e0a18c ANDROID: abi_gki_aarch64_qcom: Update symbol list * 8ab43e8a ANDROID: arch_topology: Add android_rvh_update_thermal_stats * 6ac8b4fb ANDROID: fuse-bpf: Add NULL pointer check in fuse_release_in * 4030b1ee ANDROID: GKI: update symbol list for lenovo * 71647086 ANDROID: GKI: add a vendor hook in cpufreq_online * 2cecfa73 FROMGIT: Input: uinput - allow injecting event times * e9a7a206 ANDROID: Update the ABI symbol list * 984523c3 ANDROID: sched: Add vendor hook for update_load_sum * f88c9605 ANDROID: GKI: update mtktv symbol * b6fd46aa ANDROID: GKI: Add symbol list for Transsion * 17d202d8 ANDROID: KVM: arm64: mount procfs for pKVM module loading * be8f9c8b ANDROID: GKI: Update symbol list for Amlogic * 76fcf197 UPSTREAM: ASoC: soc-compress: Fix deadlock in soc_compr_open_fe * 7f194d67 BACKPORT: ASoC: add snd_soc_card_mutex_lock/unlock() * 8cdc41d9 BACKPORT: ASoC: expand snd_soc_dpcm_mutex_lock/unlock() * 2721efad BACKPORT: ASoC: expand snd_soc_dapm_mutex_lock/unlock() * b7bcf839 ANDROID: KVM: arm64: Fix error path in pkvm_mem_abort() * 27aaaa9a ANDROID: GKI: Update symbol list for Amlogic * 0681d570 ANDROID: mm: add vendor hook in isolate_freepages() * f206a8c3 ANDROID: GKI: Update symbol list for Amlogic * 88b56693 ANDROID: GKI: Update symbol list for rtktv * dbeed231 ANDROID: fs/passthrough: Fix compatibility with R/O file system * bde02310 ANDROID: Update the ABI symbol list * 71320d0c Revert "ANDROID: KVM: arm64: Don't allocate from handle_host_mem_abort" * 7b356cb3 UPSTREAM: netfilter: ipset: add the missing IP_SET_HASH_WITH_NET0 macro for ip_set_hash_netportnet.c * 7d75f803 UPSTREAM: vringh: don't use vringh_kiov_advance() in vringh_iov_xfer() * 484868e9 BACKPORT: usb: gadget: uvc: Add missing initialization of ssp config descriptor * ae71397d BACKPORT: usb: gadget: unconditionally allocate hs/ss descriptor in bind operation * f5beeb23 UPSTREAM: usb: gadget: f_uvc: change endpoint allocation in uvc_function_bind() * 65aa3dd9 UPSTREAM: usb: gadget: function: Remove unused declarations * 81bffd1c UPSTREAM: usb: gadget: uvc: clean up comments and styling in video_pump * 0772c040 UPSTREAM: ravb: Fix use-after-free issue in ravb_tx_timeout_work() * 069cc149 UPSTREAM: ravb: Fix up dma_free_coherent() call in ravb_remove() * 501954e8 BACKPORT: usb: typec: altmodes/displayport: Signal hpd low when exiting mode * b39c40b6 ANDROID: Update the ABI symbol list * 858e65da ANDROID: f2fs: Fix the calculation of the number of zones * 2eb17577 ANDROID: GKI: Update symbol list for lenovo * 0a25bb8f ANDROID: KVM: arm64: Fix KVM_HOST_S2_DEFAULT_MMIO_PTE encoding Change-Id: I7d833acbf81f15f2b96f130d293febe6a8b3fca2 Signed-off-by:Greg Kroah-Hartman <gregkh@google.com>
Loading