Greg Kroah-Hartman 0c2e40b9a3 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: * 2d8a5ddebb ANDROID: Update the ABI symbol list * ddf142e5a8 ANDROID: netlink: add netlink poll and hooks * c9b5c232e7 ANDROID: Update the ABI symbol list * 3c9cb9c06f ANDROID: GKI: Update symbol list for mtk * 5723833390 ANDROID: mm: lru_cache_disable skips lru cache drainnig * 0de2f42977 ANDROID: mm: cma: introduce __cma_alloc API * db9d7ba706 ANDROID: Update the ABI representation * 6b972d6047 BACKPORT: fscrypt: support crypto data unit size less than filesystem block size * 72bdb74622 UPSTREAM: netfilter: nf_tables: remove catchall element in GC sync path * 924116f1b8 ANDROID: GKI: Update oplus symbol list * 0ad2a3cd4d ANDROID: vendor_hooks: export tracepoint symbol trace_mm_vmscan_kswapd_wake * 6465e29536 BACKPORT: HID: input: map battery system charging * cfdfc17a46 ANDROID: fuse-bpf: Ignore readaheads unless they go to the daemon * 354b1b716c FROMGIT: f2fs: skip adding a discard command if exists * ccbea4f458 UPSTREAM: f2fs: clean up zones when not successfully unmounted * 88cccede6d UPSTREAM: f2fs: use finish zone command when closing a zone * b2d3a555d3 UPSTREAM: f2fs: check zone write pointer points to the end of zone * c9e29a0073 UPSTREAM: f2fs: close unused open zones while mounting * e92b866e22 UPSTREAM: f2fs: maintain six open zones for zoned devices * 088f228370 ANDROID: update symbol for unisoc whitelist * aa71a02cf3 ANDROID: vendor_hooks: mm: add hook to count the number pages allocated for each slab * 4326c78f84 ANDROID: Update the ABI symbol list * eb67f58322 ANDROID: sched: Add trace_android_rvh_set_user_nice_locked * 855511173d UPSTREAM: ASoC: soc-compress: Fix deadlock in soc_compr_open_fe * 6cb2109589 BACKPORT: ASoC: add snd_soc_card_mutex_lock/unlock() * edfef8fdc9 BACKPORT: ASoC: expand snd_soc_dpcm_mutex_lock/unlock() * 52771d9792 BACKPORT: ASoC: expand snd_soc_dapm_mutex_lock/unlock() Change-Id: I81dd834d6a7b6a32fae56cdc3ebd6a29f0decb80 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>		2023-12-12 16:15:56 +00:00
..
events	Merge 6.1.60 into android14-6.1-lts	2023-11-03 16:23:47 +00:00
hooks	ANDROID: netlink: add netlink poll and hooks	2023-12-08 20:50:05 +00:00
stages	tracing: Error if a trace event has an array for a __field()	2023-05-11 23:02:58 +09:00
bpf_probe.h	tracing: Introduce helpers to safely handle dynamic-sized sockaddrs	2022-02-28 10:26:38 -05:00
define_custom_trace.h	tracing: Add TRACE_CUSTOM_EVENT() macro	2022-03-11 11:49:24 -05:00
define_trace.h
perf.h	tracing: Introduce helpers to safely handle dynamic-sized sockaddrs	2022-02-28 10:26:38 -05:00
syscall.h
trace_custom_events.h	tracing: Rename the staging files for trace_events	2022-04-02 08:40:04 -04:00
trace_events.h	tracing: Rename the staging files for trace_events	2022-04-02 08:40:04 -04:00