Commit 3bfe0893 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android13-5.15' into android13-5.15-lts



Merge the recent changes in the non-lts branch into here to catch up
with things.  Changes merged are:

* 595e1488 ANDROID: Update abi_gki_aarch64_qcom symbol list
* d86519f0 ANDROID: GKI: Update symbol list for honor
* f124355e UPSTREAM: dma-buf: heaps: Fix off-by-one in CMA heap fault handler
* 9f2785b4 ANDROID: ABI: update symbol list for honor
* 23ea46ca ANDROID: fs: add vendor hook to collect IO statistics
* 4c8c55d1 Merge tag 'android13-5.15.167_r00' into android13-5.15
* 400d91a8 Revert "drm/mipi-dsi: Set the fwnode for mipi_dsi_device"
* 1f43a4e4 ANDROID: Fix kernelci build-break
* 141576d5 ANDROID: GKI: Update symbol list for mtk
* 6de9ed73 BACKPORT: firmware: arm_scmi: Queue in scmi layer for mailbox implementation
* 38edc472 UPSTREAM: PCI/ASPM: Restore parent state to parent, child state to child
* 29d42b1c BACKPORT: PCI/ASPM: Disable L1 before configuring L1 Substates
* eae8cec7 UPSTREAM: PCI/ASPM: Call pci_save_ltr_state() from pci_save_pcie_state()
* a9ce883f BACKPORT: PCI/ASPM: Save L1 PM Substates Capability for suspend/resume
* eaddd715 BACKPORT: PCI/ASPM: Move pci_save_ltr_state() to aspm.c
* 41ff0c19 BACKPORT: PCI/ASPM: Move pci_configure_ltr() to aspm.c
* fba4db88 BACKPORT: gso: fix udp gso fraglist segmentation after pull from frag_list
* e0fc2d8d ANDROID: usb: Optimization the transfer rate of accessory mode in USB3.2 mode
* de93cca9 ANDROID: KVM: arm64: Don't run a protected VCPU if it isn't runnable
* bc3c6959 ANDROID: GKI: add init symbol list file for vivo
* d207e17b ANDROID: ABI: add device_property_match_string to abi symbol list
* b69cdb73 UPSTREAM: blk-mq: avoid extending delays of active hctx from blk_mq_delay_run_hw_queues
* 23dc02d0 ANDROID: ABI: update symbol list for honor
* 85552675 ANDROID: GKI: Add patch that uses vendor hook define for Honor
* 8619a212 ANDROID: GKI: Update symbol list for honor
* eeecbaa4 ANDROID: Allow vendor modules perform more operationson on sock.
* 9f09deec BACKPORT: exfat: Implement sops->shutdown and ioctl
* 62bbb08a UPSTREAM: unicode: Don't special case ignorable code points
* dcf77263 ANDROID: 16K: Fixup padding vm_flags bits on VMA splits
* 7772260e ANDROID: 16K: Introduce pgsize_migration_inline.h
* f86b8976 ANDROID: abi_gki_aarch64_qcom: Update QCOM symbol list
* e508fa9b UPSTREAM: f2fs: fix to update i_ctime in __f2fs_setxattr()
* ef65ab8d BACKPORT: f2fs: Create COW inode from parent dentry for atomic write
* 68b99668 BACKPORT: f2fs: atomic: fix to avoid racing w/ GC
* 9ebe3277 UPSTREAM: f2fs: remove unused PAGE_PRIVATE_ATOMIC_WRITE
* f16a6a97 BACKPORT: f2fs: use meta inode for GC of COW file
* 8ee60f3f BACKPORT: f2fs: use meta inode for GC of atomic file
* b4fc863c UPSTREAM: f2fs: truncate page cache before clearing flags when aborting atomic write
* 1f977927 UPSTREAM: f2fs: atomic: fix to truncate pagecache before on-disk metadata truncation
* 2b534ee2 UPSTREAM: f2fs: prevent atomic file from being dirtied before commit
* 3fc2e9fb UPSTREAM: f2fs: mark inode dirty for FI_ATOMIC_COMMITTED flag

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