Merge branch 'android14-6.1' into android14-6.1-lts
Catch the lts branch up with changes made in the normal one. Commits include in here are: * a624f97c Merge tag 'android14-6.1.128_r00' into android14-6.1 * 52a41f0b ANDROID: usb: typec: tcpci: Combine the parameters of set_auto_vbus_discharge_threshold * f84d5a5f FROMGIT: usb: typec: tcpci: Prevent Sink disconnection before vPpsShutdown in SPR PPS * a5f88b65 UPSTREAM: f2fs: Optimize f2fs_truncate_data_blocks_range() * 8171ecc3 BACKPORT: f2fs: add parameter @len to f2fs_invalidate_blocks() * 2e7c1f7a UPSTREAM: f2fs: update_sit_entry_for_release() supports consecutive blocks. * 80b35f89 BACKPORT: f2fs: introduce update_sit_entry_for_release/alloc() * 600d7eac BACKPORT: f2fs: add parameter @len to f2fs_invalidate_internal_cache() * 187a48cb UPSTREAM: f2fs: expand f2fs_invalidate_compress_page() to f2fs_invalidate_compress_pages_range() * edcfc793 UPSTREAM: f2fs: fix to truncate meta inode pages forcely * 3812bc69 BACKPORT: f2fs: introduce f2fs_invalidate_internal_cache() for cleanup * ccc91578 ANDROID: cma: Add restrict_cma_redirect boot parameter * 34a86330 FROMLIST: KVM: arm64: Fix alignment of kvm_hyp_memcache allocations * c93dcf3b UPSTREAM: binder: log transaction code on failure * 4e534b8a ANDROID: GKI: Galaxy android14-6.1 update symbol for alsa audio device * 1ac09f5c ANDROID: GKI: Update symbol list for arg * e5f309b2 ANDROID: dm-bow: Protect Ranges fetched and erased from the RB tree * 09717ac6 ANDROID: Update the ABI symbol list * 3031fa18 ANDROID: Adding an Android vendor LMK event * 7658169f BACKPORT: usb: xhci: Fix NULL pointer dereference on certain command aborts * 4033df20 ANDROID: OPP: Fix incorrectly backported logic in _set_opp_level() * 1cf6be70 UPSTREAM: io_uring: fix waiters missing wake ups * 2055772e UPSTREAM: f2fs: avoid trying to get invalid block address * 554eb9d6 ANDROID: KABI macros to release excess KABI fields for use with backports * 773ad7ab ANDROID: GKI: Add new symbol list for arg Change-Id: I71e368853a486e3893c0cc5b964b8fc3c390a4e9 Signed-off-by:Greg Kroah-Hartman <gregkh@google.com>
Loading