Commit 8bcc24f4 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android14-5.15' into android14-5.15-lts



This catches the -lts branch up with the changes made in the
android14-5.15 branch.  Changes in here include:

* b64a2ffe ANDROID: GKI: update amlogic symbol
* f4552ca3 ANDROID: GKI: update mtktv symbol
* bd4dfcd2 ANDROID: vendor_hooks: Add hooks to support rndis_host
* 35fae635 UPSTREAM: dma-buf: heaps: Fix off-by-one in CMA heap fault handler
* c1741cb6 ANDROID: GKI: update mtktv symbol
* 55fa1563 Merge tag 'android14-5.15.167_r00' into android14-5.15
* 4943d699 BACKPORT: firmware: arm_scmi: Queue in scmi layer for mailbox implementation
* 264422cc BACKPORT: gso: fix udp gso fraglist segmentation after pull from frag_list
* 1a3366f0 ANDROID: KVM: arm64: Don't run a protected VCPU if it isn't runnable
* 348e6a14 ANDROID: KVM: arm64: Don't skip accounting when memcache top-up fails
* b33149ee ANDROID: KVM: arm64: Fix accounting when VM creation fails
* 21592c88 ANDROID: ABI: add device_property_match_string to abi symbol list
* 6049721a ANDROID: Update Tuxera symbol list
* 5e49680d UPSTREAM: unicode: Don't special case ignorable code points
* 8d8a9ca4 ANDROID: 16K: Fixup padding vm_flags bits on VMA splits
* 9315175b ANDROID: 16K: Introduce pgsize_migration_inline.h
* 49482591 BACKPORT: f2fs: fix to handle segment allocation failure correctly
* ff6d81fd BACKPORT: f2fs: stop checkpoint when get a out-of-bounds segment
* 173f4a24 BACKPORT: f2fs: kill heap-based allocation
* 4836bc7f UPSTREAM: Revert "usb: typec: tcpm: clear pd_event queue in PORT_RESET"
* 86ae3709 UPSTREAM: f2fs: fix to update i_ctime in __f2fs_setxattr()
* bc30e790 BACKPORT: f2fs: Create COW inode from parent dentry for atomic write
* 01032a9b BACKPORT: f2fs: atomic: fix to avoid racing w/ GC
* 61e6faf4 BACKPORT: f2fs: use meta inode for GC of COW file
* 95a0ee97 BACKPORT: f2fs: use meta inode for GC of atomic file
* 4a8ef61b UPSTREAM: f2fs: truncate page cache before clearing flags when aborting atomic write
* 97788004 UPSTREAM: f2fs: atomic: fix to truncate pagecache before on-disk metadata truncation
* f42d43da UPSTREAM: f2fs: prevent atomic file from being dirtied before commit
* 505f9e13 UPSTREAM: f2fs: mark inode dirty for FI_ATOMIC_COMMITTED flag

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