Merge branch 'android14-6.1' into branch 'android14-6.1-lts'
This catches the -lts branch up with all of the recent changes that have gone into the non-lts branch, INCLUDING the ABI update which we want here to ensure that we do NOT break any newly added dependent symbols (and to bring back in the reverts that were required before the ABI break). This includes the following commits: 88959a53 ANDROID: 6/16/2023 KMI update 21bc72f3 UPSTREAM: binder: fix UAF of alloc->vma in race with munmap() 62c6dbdc UPSTREAM: binder: add lockless binder_alloc_(set|get)_vma() 3cac1746 UPSTREAM: Revert "android: binder: stop saving a pointer to the VMA" dadb40b4 UPSTREAM: Revert "binder_alloc: add missing mmap_lock calls when using the VMA" fcdbf469 UPSTREAM: tipc: check the bearer min mtu properly when setting it by netlink e48a8017 UPSTREAM: tipc: do not update mtu if msg_max is too small in mtu negotiation 461038ba UPSTREAM: tipc: add tipc_bearer_min_mtu to calculate min mtu d0be9e79 UPSTREAM: Revert "usb: gadget: udc: core: Invoke usb_gadget_connect only when started" 66a5c034 UPSTREAM: ASoC: fsl_micfil: Fix error handler with pm_runtime_enable 6e721f99 UPSTREAM: platform: Provide a remove callback that returns no value 07a8c091 UPSTREAM: firmware: arm_sdei: Fix sleep from invalid context BUG b065972b UPSTREAM: uapi/linux/const.h: prefer ISO-friendly __typeof__ aaf6ccb6 UPSTREAM: posix-cpu-timers: Implement the missing timer_wait_running callback f3b712fc ANDROID: GKI: reserve extra arm64 cpucaps for ABI preservation d1c7974b ANDROID: arm64: errata: Add WORKAROUND_NXP_ERR050104 cpucaps b489c530 ANDROID: KVM: arm64: Allow setting {P,U}XN in stage-2 PTEs b7aff5c6 ANDROID: KVM: arm64: Restrict host-to-hyp MMIO donations f5f8c19f ANDROID: KVM: arm64: Allow state changes of MMIO pages 4ddb4ed8 ANDROID: KVM: arm64: Allow MMIO perm changes from modules 5d0225cd ANDROID: KVM: arm64: Don't allocate from handle_host_mem_abort 5136a28a ANDROID: KVM: arm64: Donate IOMMU regions to pKVM 23b62ec3 ANDROID: KVM: arm64: Map MMIO donation as device at EL2 adc78128 ANDROID: KVM: arm64: Don't recycle pages from host mem abort 452ef5ae ANDROID: KVM: arm64: Pin host stage-2 tables a8bba661 ANDROID: KVM: arm64: Move kvm_pte_follow() to header 04ddc7ee ANDROID: KVM: arm64: Pre-populate host stage2 0b673645 ANDROID: KVM: arm64: Fix the host ownership later cf2d193d ANDROID: KVM: arm64: Don't recycle non-default PTEs a701418f ANDROID: KVM: arm64: Introduce kvm_pgtable_stage2_reclaim_leaves 5224fbb5 ANDROID: GKI: enable CONFIG_BLK_CGROUP_IOCOST fe109543 BACKPORT: FROMGIT: usb: core: add sysfs entry for usb device state 251efd65 ANDROID: GKI: Update symbols to symbol list 71761b36 ANDROID: HID; Over-ride default maximum buffer size when using UHID c3f3dc31 UPSTREAM: maple_tree: make maple state reusable after mas_empty_area() d31ddcdb Revert "Revert "mm/mmap: regression fix for unmapped_area{_topdown}"" 6852d5cc FROMLIST: scsi: ufs: ufs-mediatek: Set UFSHCD_QUIRK_MCQ_BROKEN_RTC quirk 274d5965 FROMLIST: scsi: ufs: ufs-mediatek: Set UFSHCD_QUIRK_MCQ_BROKEN_INTR quirk 0171df93 FROMLIST: scsi: ufs: core: Add host quirk UFSHCD_QUIRK_MCQ_BROKEN_RTC 27b569b5 FROMLIST: scsi: ufs: core: Add host quirk UFSHCD_QUIRK_MCQ_BROKEN_INTR 46554e08 ANDROID: GKI: Add symbols and update symbol list for Unisoc e59544b8 UPSTREAM: mailbox: mailbox-test: fix a locking issue in mbox_test_message_write() 749386a0 UPSTREAM: mailbox: mailbox-test: Fix potential double-free in mbox_test_message_write() 9c6866c9 ANDROID: dma-buf: support users to change dma_buf.name 09e0f850 ANDROID: set CONFIG_IKHEADERS=m for gki_defconfig. 7641ff0a ANDROID: mm: Avoid merging cma with others 9b16d612 ANDROID: cpufreq: times: record fast switch frequency transitions d645236c ANDROID: fix kernelci build failure in vmscan.c 8a609c5e ANDROID: ABI: Update symbol list for Exynos SoC 25058fea ANDROID: gki_defconfig: enable NVME e8f6ddbd ANDROID: ABI: Update symbols to unisoc whitelist for the scheduler 82a01530 UPSTREAM: usb: gadget: uvc: queue empty isoc requests if no video buffer is available 855f25e3 ANDROID: GKI: Update symbol list for xiaomi 87f8c826 ANDROID: vendor_hooks:vendor hook for madvise_cold_or_pageout_pte_range. f73aafc2 ANDROID: ABI: Update pixel symbol list a0d46c1d ANDROID: KVM: arm64: iommu: Erase pvmfw from EL1 if possible Change-Id: I76a89d70290eb13ac671ccfdab80d80dad3030eb Signed-off-by:Greg Kroah-Hartman <gregkh@google.com>
Loading
Please sign in to comment