Commit 706ebf15 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android12-5.10' into `android12-5.10-lts`



Sync up with android12-5.10 for the following commits:

d3093852 ANDROID: GKI: Update symbol list for VIVO
47458bf1 ANDROID: block: export tracepoints
e41b1164 ANDROID: setlocalversion: make KMI_GENERATION optional
5dac28a1 BACKPORT: uapi: virtio_ids: add a sound device type ID from OASIS spec
2f3f5731 ANDROID: GKI: Add vendor hook to binder transaction
775cd211 ANDROID: qcom: Add smp_call_function_single_async to ABI
d736cbf8 Revert "sched/fair: Keep load_avg and load_sum synced"
de0ba4ea Revert "sched/pelt: Ensure that *_sum is always synced with *_avg"
8630facf Revert "sched/fair: Ensure _sum and _avg values stay consistent"
7a7b5f89 ANDROID: locking/rwsem: only clean RWSEM_FLAG_HANDOFF when already set
a1a4c802 UPSTREAM: f2fs: change fiemap way in printing compression chunk
cc98cd4a ANDROID: GKI: add allowed list file for xiaomi
fa9c9074 ANDROID: GKI: Update symbol list
ea592f07 ANDROID: Update symbol list for mtk
a4eacf32 ANDROID: binder: fix regression in sender_euid
6b7c37f6 ANDROID: fips140: use UTS_RELEASE as FIPS version
11db2de0 BACKPORT: binder: use cred instead of task for getsecid
3af7a2f6 BACKPORT: binder: use cred instead of task for selinux checks
d4929773 BACKPORT: binder: use euid from cred instead of using task
7e2fbdae ANDROID: vendor_hooks: Add hooks for frequency optimization
054a3c22 ANDROID: GKI: Update symbols to symbol list
0db69258 ANDROID: vendor_hooks: export get_wchan
a61d61ba ANDROID: vendor_hooks: Add hooks to record the time of the process in various states
6cf4b652 FROMGIT: dma-buf: acquire name lock before read/write dma_buf.name

Due to api additions in android12-5.10, this also adds more api symbols
to track:

Leaf changes summary: 33 artifacts changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 19 Added functions
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 14 Added variables

19 Added functions:

  [A] 'function int __traceiter_android_vh_cpufreq_fast_switch(void*, cpufreq_policy*, unsigned int, unsigned int)'
  [A] 'function int __traceiter_android_vh_cpufreq_resolve_freq(void*, cpufreq_policy*, unsigned int, unsigned int)'
  [A] 'function int __traceiter_android_vh_cpufreq_target(void*, cpufreq_policy*, unsigned int, unsigned int)'
  [A] 'function int __traceiter_android_vh_sched_stat_runtime_rt(void*, task_struct*, u64)'
  [A] 'function int __traceiter_block_bio_complete(void*, request_queue*, bio*)'
  [A] 'function int __traceiter_block_bio_queue(void*, request_queue*, bio*)'
  [A] 'function int __traceiter_block_getrq(void*, request_queue*, bio*, int)'
  [A] 'function int __traceiter_block_rq_complete(void*, request*, int, unsigned int)'
  [A] 'function int __traceiter_block_rq_insert(void*, request_queue*, request*)'
  [A] 'function int __traceiter_block_rq_issue(void*, request_queue*, request*)'
  [A] 'function int __traceiter_block_rq_merge(void*, request_queue*, request*)'
  [A] 'function int __traceiter_block_rq_requeue(void*, request_queue*, request*)'
  [A] 'function int __traceiter_block_split(void*, request_queue*, bio*, unsigned int)'
  [A] 'function int __traceiter_sched_stat_runtime(void*, task_struct*, u64, u64)'
  [A] 'function int dev_change_flags(net_device*, unsigned int, netlink_ext_ack*)'
  [A] 'function unsigned long int get_wchan(task_struct*)'
  [A] 'function void* mempool_alloc_pages(gfp_t, void*)'
  [A] 'function void mempool_free_pages(void*, void*)'
  [A] 'function int mempool_resize(mempool_t*, int)'

14 Added variables:

  [A] 'tracepoint __tracepoint_android_vh_cpufreq_fast_switch'
  [A] 'tracepoint __tracepoint_android_vh_cpufreq_resolve_freq'
  [A] 'tracepoint __tracepoint_android_vh_cpufreq_target'
  [A] 'tracepoint __tracepoint_android_vh_sched_stat_runtime_rt'
  [A] 'tracepoint __tracepoint_block_bio_complete'
  [A] 'tracepoint __tracepoint_block_bio_queue'
  [A] 'tracepoint __tracepoint_block_getrq'
  [A] 'tracepoint __tracepoint_block_rq_complete'
  [A] 'tracepoint __tracepoint_block_rq_insert'
  [A] 'tracepoint __tracepoint_block_rq_issue'
  [A] 'tracepoint __tracepoint_block_rq_merge'
  [A] 'tracepoint __tracepoint_block_rq_requeue'
  [A] 'tracepoint __tracepoint_block_split'
  [A] 'tracepoint __tracepoint_sched_stat_runtime'

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