Merge branch 'android14-6.1' into branch 'android14-6.1-lts'
This catches the android14-6.1-lts branch up with the latest changes in the android14-6.1 branch, including a number of important symbols being added for tracking. This includes the following commits: * 2d8a5dde ANDROID: Update the ABI symbol list * ddf142e5 ANDROID: netlink: add netlink poll and hooks * c9b5c232 ANDROID: Update the ABI symbol list * 3c9cb9c0 ANDROID: GKI: Update symbol list for mtk * 57238333 ANDROID: mm: lru_cache_disable skips lru cache drainnig * 0de2f429 ANDROID: mm: cma: introduce __cma_alloc API * db9d7ba7 ANDROID: Update the ABI representation * 6b972d60 BACKPORT: fscrypt: support crypto data unit size less than filesystem block size * 72bdb746 UPSTREAM: netfilter: nf_tables: remove catchall element in GC sync path * 924116f1 ANDROID: GKI: Update oplus symbol list * 0ad2a3cd ANDROID: vendor_hooks: export tracepoint symbol trace_mm_vmscan_kswapd_wake * 6465e295 BACKPORT: HID: input: map battery system charging * cfdfc17a ANDROID: fuse-bpf: Ignore readaheads unless they go to the daemon * 354b1b71 FROMGIT: f2fs: skip adding a discard command if exists * ccbea4f4 UPSTREAM: f2fs: clean up zones when not successfully unmounted * 88cccede UPSTREAM: f2fs: use finish zone command when closing a zone * b2d3a555 UPSTREAM: f2fs: check zone write pointer points to the end of zone * c9e29a00 UPSTREAM: f2fs: close unused open zones while mounting * e92b866e UPSTREAM: f2fs: maintain six open zones for zoned devices * 088f2283 ANDROID: update symbol for unisoc whitelist * aa71a02c ANDROID: vendor_hooks: mm: add hook to count the number pages allocated for each slab * 4326c78f ANDROID: Update the ABI symbol list * eb67f583 ANDROID: sched: Add trace_android_rvh_set_user_nice_locked * 85551117 UPSTREAM: ASoC: soc-compress: Fix deadlock in soc_compr_open_fe * 6cb21095 BACKPORT: ASoC: add snd_soc_card_mutex_lock/unlock() * edfef8fd BACKPORT: ASoC: expand snd_soc_dpcm_mutex_lock/unlock() * 52771d97 BACKPORT: ASoC: expand snd_soc_dapm_mutex_lock/unlock() Change-Id: I81dd834d6a7b6a32fae56cdc3ebd6a29f0decb80 Signed-off-by:Greg Kroah-Hartman <gregkh@google.com>
Loading
Please sign in to comment