Commit 766d61c1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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



Sync up with recent changes in android14-6.1.  Changes included here
are:

* 1ffc24e7 UPSTREAM: Revert "PCI: Use preserve_config in place of pci_flags"
* 34aea580 Merge tag 'android14-6.1.124_r00' into android14-6.1
* 11620ab9 FROMGIT: KVM: arm64: Flush hyp bss section after initialization of variables in bss
* 2f2e115e Merge 6.1.121-lts branch changes into android14-6.1
* d2841af6 Merge 6.1.119-lts branch changes into android14-6.1
* ef4fb40b ANDROID: GKI: Add Paragon symbol list
* 72db89d3 ANDROID: common-android14-6.1 Update the ABI symbol list
* 092a5809 ANDROID: KVM: arm64: Present the 16Kb granule support to the guest VMs
* 0405a25a ANDROID: KVM: arm64: Fix corrupted PSTATE during guest debug
* d12538e9 BACKPORT: PCI/portdrv: Prevent LS7A Bus Master clearing on shutdown
* dbdf659c UPSTREAM: selinux: ignore unknown extended permissions
* e09bed30 BACKPORT: f2fs: prevent writing without fallocate() for pinned files
* 8a225f95 ANDROID: Enable PM_USERSPACE_AUTOSLEEP in gki_defconfig
* a3387839 ANDROID: Update the ABI symbol list
* 6f0b82dd ANDROID: mm: add kswapd wake/done rvh
* 770852bf ANDROID: ABI: update protected symbol list
* bda0401c ANDROID: GKI: load vendor modules without tainting the kernel
* 7e96f2bf UPSTREAM: cgroup: remove cgroup_rstat_flush_atomic()
* b5b6e464 UPSTREAM: memcg: remove mem_cgroup_flush_stats_atomic()
* 4b27ab0c UPSTREAM: memcg: calculate root usage from global state
* 0ef8d00e UPSTREAM: memcg: flush stats non-atomically in mem_cgroup_wb_stats()
* c0d8df37 UPSTREAM: writeback: move wb_over_bg_thresh() call outside lock section
* 681efac6 UPSTREAM: memcg: do not modify rstat tree for zero updates
* 5795558d UPSTREAM: vmscan: memcg: sleep when flushing stats during reclaim
* e3e3beed UPSTREAM: workingset: memcg: sleep when flushing stats in workingset_refault()
* 0448f92c UPSTREAM: memcg: sleep during flushing stats in safe contexts
* c47c4c09 UPSTREAM: memcg: replace stats_flush_lock with an atomic
* 86ff6960 UPSTREAM: memcg: do not flush stats in irq context
* a77a4ca4 UPSTREAM: memcg: rename mem_cgroup_flush_stats_"delayed" to "ratelimited"
* 978adc3d UPSTREAM: cgroup: rename cgroup_rstat_flush_"irqsafe" to "atomic"
* 616d7c64 BACKPORT: epoll: Add synchronous wakeup support for ep_poll_callback
* 66ae563a UPSTREAM: bpf: sync_linked_regs() must preserve subreg_def
* eeccb292 UPSTREAM: ALSA: usb-audio: Fix a DMA to stack memory bug
* e2b97488 ANDROID: ABI: update symbol list for honor
* 3f924195 FROMGIT: usb: dwc3: gadget: Fix incorrect UDC state after manual deconfiguration
* c141a306 ANDROID: scsi: sd: Fix unexpect removal code on Merge commit
* 4c2d86d8 ANDROID: GKI: Update oplus symbol list
* 3e3f2b9e BACKPORT: f2fs: fix to account dirty data in __get_secs_required()
* e50cf165 BACKPORT: usb: gadget: uvc: configfs: Add frame-based frame format support
* 4bcafa4d ANDROID: dm-bow: Fix empty else blocks
* d5dfee96 ANDROID: dm-bow: Pass through zero sized requests
* 1149e6d6 ANDROID: dm-bow: Fix 5.15 compatibility issue
* 1f8f8e5c ANDROID: dm-bow: Fix up revert remove dm-bow
* e8944a38 Revert "ANDROID: dm-bow: remove dm-bow"
* d0e1b23b UPSTREAM: ALSA: usb-audio: Fix out of bounds reads when finding clock sources
* e93c64d6 ANDROID: GKI: Update symbols need by rockchip drm
* a8424205 UPSTREAM: ALSA: usb-audio: Fix potential out-of-bound accesses for Extigy and Mbox devices
* 204945a2 UPSTREAM: vsock/virtio: Initialization of the dangling pointer occurring in vsk->trans
* 367540fd Merge tag 'android14-6.1.118_r00' into android14-6.1
* 22b7ded8 ANDROID: ABI: update symbol list for honor
* dbb9fda3 ANDROID: fs: add vendor hook to collect IO statistics
* b9ba16d9 UPSTREAM: usb: xhci: Implement xhci_handshake_check_state() helper
* 191acd0d Revert "UPSTREAM: unicode: Don't special case ignorable code points"
* 0a310649 Reapply "UPSTREAM: unicode: Don't special case ignorable code points"
* e318dc4c ANDROID: abi_gki_aarch64_qcom: Update symbols list for Qcom
* 904ebc32 Revert "UPSTREAM: unicode: Don't special case ignorable code points"
* 0f332d7e ANDROID: KVM: arm64: Fix missing mutex init for hyp trace readers
* affd0c02 ANDROID: mm: EXPORT_SYMBOL_GPL(reclaim_pages) position adjustment
* d8ccecb7 ANDROID: GKI: Update symbol list for mtk
* 853ec04e UPSTREAM: HID: core: zero-initialize the report buffer
* c276c539 ANDROID: GKI: Update symbol list for mtk
* fddf80a6 UPSTREAM: of: property: fw_devlink: Add support for "post-init-providers" property
* b865d3ed UPSTREAM: driver core: Add FWLINK_FLAG_IGNORE to completely ignore a fwnode link
* 0a05df9c UPSTREAM: driver core: Adds flags param to fwnode_link_add()
* 182b090f UPSTREAM: f2fs: modify f2fs_is_checkpoint_ready logic to allow more data to be written with the CP disable
* 38149d53 BACKPORT: f2fs: introduce get_available_block_count() for cleanup
* 997d1e6f FROMGIT: pinmux: Use sequential access to access desc->pinmux data
* fa34bcaf BACKPORT: firmware: arm_scmi: Support 'reg-io-width' property for shared memory
* c9e7fc26 UPSTREAM: dt-bindings: sram: Document reg-io-width property
* cdea241b ANDROID: GKI: Update symbol list for mtk
* a887a44a ANDROID: KVM: arm64: Always check state from host_ack_unshare()
* fb69bae8 FROMLIST: KVM: arm64: Always check the state from hyp_ack_unshare()
* bfad6b01 Merge tag 'android14-6.1.115_r00' into android14-6.1
* 93460feb UPSTREAM: f2fs: fix fiemap failure issue when page size is 16KB
* 3a856b7c ANDROID: GKI: Update symbol list for mtk
* 929ff481 UPSTREAM: net/sched: stop qdisc_tree_reduce_backlog on TC_H_ROOT
* 7cd56b01 UPSTREAM: net: sched: use RCU read-side critical section in taprio_dump()
* 226e9f92 UPSTREAM: f2fs: compress: don't redirty sparse cluster during {,de}compress
* 84a9f618 UPSTREAM: f2fs: compress: don't {,de}compress non-full cluster
* 3b2e0044 UPSTREAM: f2fs: allow f2fs_ioc_{,de}compress_file to be interrupted
* 24492cb6 UPSTREAM: f2fs: compress: do sanity check on cluster when CONFIG_F2FS_CHECK_FS is on
* 268f1fed UPSTREAM: f2fs: support SEEK_DATA and SEEK_HOLE for compression files
* 672918d4 ANDROID: add file for recording allowed ABI breaks
* 1ca5db7e ANDROID: GKI: update symbol list for honor
* 13f2b693 ANDROID: vendor_hooks: add hook to record reboot reason
* 51bee181 BACKPORT: FROMGIT: binder: add delivered_freeze to debugfs output
* 2791dfac BACKPORT: FROMGIT: binder: fix memleak of proc->delivered_freeze
* c5233c56 FROMGIT: binder: allow freeze notification for dead nodes
* 194a332e FROMGIT: binder: fix BINDER_WORK_CLEAR_FREEZE_NOTIFICATION debug logs
* 5b095ade ANDROID: GKI: Update symbol list for BCMSTB
* 516ca879 ANDROID: psi: Add vendor hooks for PSI tracing
* 4a105e4e ANDROID: ABI: Update pixel symbol list
* 6cf2e7d9 ANDROID: GKI: update symbol list for honor
* eb010268 ANDROID: vendor_hooks: add hook to record slab alloc and free
* defe0024 UPSTREAM: Revert "arm64: dts: qcom: sm8250: switch UFS QMP PHY to new style of bindings"
* 55c3fa98 ANDROID: GKI: Update Honor abi symbol list
* cbc36a19 ANDROID: Allow vendor modules perform more operationson.
* 71607545 ANDROID: GKI: Add drm symbol need by rockchip soc
* 5f814d6b ANDROID: GKI: Update symbol list for mtk
* 351af49c ANDROID: GKI: Update rockchip symbols for some customers.
* 8ed9a61b ANDROID: usb: dwc3: core: Introduce vendor struct to deal with ABI breakage
* 9f49b974 BACKPORT: usb: dwc3: core: Refactor PHY logic to support Multiport Controller
* 28c74caa BACKPORT: usb: dwc3: core: Access XHCI address space temporarily to read port info
* 38859a23 BACKPORT: f2fs: compress: fix to update i_compr_blocks correctly
* a7a882d9 ANDROID: abi_gki_aarch64_qcom: Update symbol list
* 96ad4e75 UPSTREAM: USB: media: uvcvideo: Skip parsing frames of type UVC_VS_UNDEFINED in uvc_parse_format
* eef3d336 ANDROID: GKI: Update symbol list for honor
* ce0653fd ANDROID: Allow vendor modules perform more operations on memleak detect
* d3daafbf ANDROID: ABI: Update transsion symbol list and stg
* 11512e4a ANDROID: mmc: Add vendor hooks for sdcard failure diagnostics
* f3367f46 BACKPORT: usb: dwc3: Avoid waking up gadget during startxfer

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