Commit 63040ce8 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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



This brings the -lts branch up to date with the recent changes in
'android14-6.1'.  Included in here are the following commits:

* af361f9a UPSTREAM: usb: typec: Return size of buffer if pd_set operation succeeds
* 07d4bc4f UPSTREAM: usb: typec: tcpm: Update PD of Type-C port upon pd_set
* 59dc5390 UPSTREAM: usb: typec: tcpm: fix double-free issue in tcpm_port_unregister_pd()
* 0e88400d UPSTREAM: usb: typec: tcpm: Correct port source pdo array in pd_set callback
* 3ca42715 Reapply "Merge tag 'android14-6.1.75_r00' into android14-6.1"
* eb58741d Revert "ANDROID: null_blk: Support configuring the maximum segment size"
* e684a924 Revert "usb: dwc3: core: configure TX/RX threshold for DWC3_IP"
* f085398f ANDROID: Update the ABI symbol list
* fa57be19 ANDROID: GKI: Update symbols for rockchip drm
* 0c9784b7 FROMLIST: binder: check offset alignment in binder_get_object()
* 931187cc ANDROID: GKI: Add symbol list for Nothing
* 353c3de3 ANDROID: thermal: Add vendor thermal_pm_notify_suspend function
* 5b8114ec UPSTREAM: usb: dwc3: gadget: Don't disconnect if not started
* 80cdac5d Revert "ANDROID: block: Add support for filesystem requests and small segments"
* 71ad82fd ANDROID: vendor_hook: fix issue vip thread do not sleep while no vip work
* 8f2f0a3b UPSTREAM: sched/wait: Fix a kthread_park race with wait_woken()
* eef3b6e5 ANDROID: KVM: arm64: Fix TLB invalidation when coalescing into a block
* 8790a944 ANDROID: ABI: Update symbol list for Exynos SoC
* d518ca9d ANDROID: GKI: Add symbols for rockchip snd trcm
* 89af1d57 FROMGIT: usb: dwc2: Disable clock gating feature on Rockchip SoCs
* 38f8abdd ANDROID: ABI: Update symbol list for Exynos SoC
* 421a0016 ANDROID: KVM: arm64: Fix missing trace event for nVHE dyn HVCs
* 609541ba ANDROID: Update the ABI symbol list
* b7511254 ANDROID: Add symbols for IIO SCMI module
* 24850809 ANDROID: GKI: Update symbols for rockchip
* 148edc25 UPSTREAM: usb: dwc2: disable lpm feature on Rockchip SoCs
* 2adbad22 ANDROID: Update symbols list for open-dice.ko
* 176b8fe5 FROMLIST: mm/migrate: set swap entry values of THP tail pages properly.
* 14a09b9f ANDROID: Update the ABI symbol list
* 7d911a14 ANDROID: virt: gunyah: Move send_lock around req and reply
* 75266774 ANDROID: null_blk: Support configuring the maximum segment size
* a265d535 ANDROID: scsi_debug: Support configuring the maximum segment size
* 8a2f432f ANDROID: block: Add support for filesystem requests and small segments
* 879eff29 ANDROID: block: Support submitting passthrough requests with small segments
* c5b86965 ANDROID: block: Make sub_page_limit_queues available in debugfs
* 4fd9a464 ANDROID: block: Support configuring limits below the page size
* 65bdaa75 ANDROID: block: Prepare for supporting sub-page limits
* 05ee0244 ANDROID: block: Use pr_info() instead of printk(KERN_INFO ...)
* 32669073 ANDROID: sound: usb: add vendor hook for cpu suspend support
* 41292928 ANDROID: usb: Add vendor hook for usb suspend and resume
* 3f5807c5 ANDROID: fips140: change linker script guard
* fa6c89a9 Revert "ANDROID: Update symbols list for open-dice.ko"
* 14e89262 ANDROID: Update symbols list for open-dice.ko
* 7b51d1fd FROMGIT: PM: sleep: wakeirq: fix wake irq warning in system suspend
* a354271b ANDROID: ABI: Update symbol for Exynos SoC
* 2df2c4b5 UPSTREAM: usb: dwc3: core: set force_gen1 bit in USB31 devices if max speed is SS
* 299c92ff UPSTREAM: PCI: dwc: Strengthen the MSI address allocation logic
* e3bc469e UPSTREAM: PCI: dwc: Restrict only coherent DMA mask for MSI address allocation
* e623dd5a ANDROID: ABI: Update oplus symbol list
* db91c5d3 ANDROID: vendor_hook: rename the the name of hooks
* 4292d259 FROMGIT: usb: xhci: Add error handling in xhci_map_urb_for_dma
* 6bce7cfc FROMGIT: usb: dwc3: host: Set XHCI_SG_TRB_CACHE_SIZE_QUIRK
* 89e4f7a7 FROMGIT: usb: host: xhci-plat: Add support for XHCI_SG_TRB_CACHE_SIZE_QUIRK
* ef39f76e ANDROID: fuse-bpf: Fix readdir for getdents
* 4c25eb8e ANDROID: EXPORT raise_softirq and update the ABI symbol list
* a69447d2 UPSTREAM: netfilter: nf_tables: disallow timeout for anonymous sets
* 4a85f45e BACKPORT: FROMGIT: mm: add alloc_contig_migrate_range allocation statistics
* e2903ba0 FROMLIST: iommu: Avoid races around default domain allocations
* 65d457fa ANDROID: fips140 - fix integrity check by unapplying dynamic SCS
* 1616e03b ANDROID: fips140 - add option for debugging the integrity check
* fd355109 BACKPORT: f2fs: split initial and dynamic conditions for extent_cache
* e897dada ANDROID: Update the ABI symbol list
* bb197ceb UPSTREAM: usb: typec: altmodes/displayport: create sysfs nodes as driver's default device attribute group
* 981ffd6d UPSTREAM: epoll: use refcount to reduce ep_mutex contention
* 457946c2 ANDROID: GKI: Update oplus symbol list
* 2fd940bf ANDROID: uid_sys_stat: fix data-error of cputime and io
* 5f66e7c9 ANDROID: Update the ABI symbol list
* 8bd97710 ANDROID: vendor_hooks: Export cma_alloc trace points
* 9219a44e ANDROID: gki_defconfig: Enable CONFIG_ARM_SCMI_TRANSPORT_VIRTIO
* 6bad1052 Revert "Merge tag 'android14-6.1.75_r00' into android14-6.1"
* ecb45e2a UPSTREAM: net: tls: fix use-after-free with partial reads and async decrypt
* 1dbafe61 Merge tag 'android14-6.1.75_r00' into android14-6.1
* 95805f9e ANDROID: GKI: add GKI symbol list for Exynosauto SoC
* 23c89638 UPSTREAM: usb: typec: class: fix typec_altmode_put_partner to put plugs
* 3b7cd7d0 UPSTREAM: Revert "usb: typec: class: fix typec_altmode_put_partner to put plugs"
* 8b964b55 ANDROID: GKI: Update symbol list for mtk
* 945b0c8a ANDROID: GKI: Update oplus symbol list
* 9698f7e8 FROMGIT: f2fs: introduce FAULT_BLKADDR_CONSISTENCE
* cc322f7d FROMGIT: f2fs: fix to remove unnecessary f2fs_bug_on() to avoid panic
* 33d3b731 FROMGIT: f2fs: compress: fix to avoid inconsistence bewteen i_blocks and dnode
* ba28d24c FROMGIT: f2fs: compress: fix to check unreleased compressed cluster
* 0c3d1c94 FROMGIT: f2fs: compress: fix to cover normal cluster write with cp_rwsem
* 02a1ce0c FROMGIT: f2fs: compress: fix to guarantee persisting compressed blocks by CP
* 139e9a0f ANDROID: remove LTO check from build.config.gki.aarch64.fips140
* e61a6ec2 ANDROID: add symbol list for fips140 module
* 09ca5740 ANDROID: abi_gki_aarch64_qcom: Update symbol list
* 0832777c ANDROID: GKI: Update symbol list for transsion
* 35bb2c8c ANDROID: Add vendor_hooks to workaround CONFIG_TASK_DELAY_ACCT
* 70fdaa07 Revert "ANDROID: Build null_blk and scsi_debug as kernel modules"
* 30edcedb Revert "interconnect: Fix locking for runpm vs reclaim"
* 4289e134 ANDROID: GKI: Update symbol list for xiaomi
* 77277e4b ANDROID: sched/cpuset: Add vendor hook to change tasks affinity
* 18c75fa4 ANDROID: ABI: Update oplus symbol list
* 56e0cf4e ANDROID: binder: Add vendor hook to fix priority restore
* c7381452 Revert "interconnect: Teach lockdep about icc_bw_lock order"
* c38ea4a1 BACKPORT: gso: fix dodgy bit handling for GSO_UDP_L4
* 34cf02fe ANDROID: ABI: Update oplus symbol list
* 76364787 ANDROID: vendor_hooks: Add hook for trace_android_vh_copy_process
* 26d7216e ANDROID: GKI: Update symbol list for mtk
* ad499391 FROMGIT: PM: runtime: add tracepoint for runtime_status changes
* e7d236d9 ANDROID: GKI: add allowed list file for xiaomi
* 1bb51799 UPSTREAM: netfilter: nft_set_rbtree: skip end interval element from gc
* d68f68a9 ANDROID: GKI: add symbol list file for moto
* 7114c782 UPSTREAM: scsi: ufs: core: Fix racing issue between ufshcd_mcq_abort() and ISR
* db234052 UPSTREAM: scsi: ufs: core: Remove dev cmd clock scaling busy
* c622e98d ANDROID: ABI: Update symbol list for Nothing
* 8c0f9174 ANDROID: abi_gki_aarch64_qcom: Export trace_android_vh_try_fixup_sea
* 9be763fb ANDROID: arm64: Call fixup_exception() within do_sea()
* d6b58cc1 ANDROID: PCI: dwc: Wait for the link only if it has been started
* a7f647f4 ANDROID: Update the Pixel symbol list and GKI ABI
* eef88095 ANDROID: scsi: ufs: add complete init vendor hook
* 81d55bc3 ANDROID: Update the ABI symbol list

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