Merge branch 'android12-5.10' into android12-5.10-lts
Sync up with android12-5.10 for the following commits:
1ba7c99bd3 ANDROID: cpufreq: times: record fast switch frequency transitions
45ebb9628e ANDROID: GKI: add required symbols for btusb to virtual device
06d074249f ANDROID: arm64: add vendor hooks for bti and pauth fault
129e04dc19 FROMLIST: drivers: thermal: Reset previous low and high trip during thermal zone init
f72f41f50c UPSTREAM: mm: vmalloc: prevent use after free in _vm_unmap_aliases
68a3d0062d ANDROID: ABI: update allowed list for galaxy
fb247ebba9 ANDROID: Add android_vh_rproc_recovery_set
14eae186e4 ANDROID: rproc: Add vendor hook when setting recovery mode
56cc81bb39 BACKPORT: FROMLIST: scsi: ufs: Fix a deadlock in the error handler
ff748ee298 BACKPORT: FROMLIST: scsi: core: Reserve one tag for the UFS driver
94ca15ec92 BACKPORT: FROMLIST: scsi: ufs: Limit the queue depth to host->can_queue
5b87b8d669 ANDROID: GKI: fix up abi breakage from "cfg80211: fix management registrations locking"
a7d87a08b4 UPSTREAM: cfg80211: fix management registrations locking
dd78ccadc4 ANDROID: GKI: Update symbol list for VIVO
8c9d9d8e44 FROMGIT: usb: gadget: f_mass_storage: Disable eps during disconnect
cde1d53cc9 FROMGIT: usb: gadget: udc: core: Revise comments for USB ep enable/disable
e35a305d19 UPSTREAM: tracing/cfi: Fix cmp_entries_* functions signature mismatch
335046583c FROMGIT: scsi: ufshpb: Do not report victim error in HCM
e2766208d7 FROMGIT: scsi: ufshpb: Verify that num_inflight_map_req is non-negative
193f33d061 FROMGIT: scsi: ufshpb: Use a correct max multi chunk
d054108519 FROMGIT: scsi: ufshpb: rewind the read timeout on every read
8c2c4d12bb ANDROID: sched: Add vendor hooks for sync_entity_load_avg
2cfefe22b9 ANDROID: GKI: Add symbols to abi_gki_aarch64_oplus
Resolves conflicts in:
drivers/scsi/hosts.c
Due to api additions in android12-5.10, this also adds more api symbols
to track:
Leaf changes summary: 34 artifacts changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 28 Added functions
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 6 Added variables
28 Added functions:
[A] 'function sk_buff* __hci_cmd_sync(hci_dev*, u16, u32, void*, u32)'
[A] 'function sk_buff* __hci_cmd_sync_ev(hci_dev*, u16, u32, void*, u8, u32)'
[A] 'function int __traceiter_android_vh_blk_alloc_rqs(void*, size_t*, blk_mq_tag_set*, blk_mq_tags*)'
[A] 'function int __traceiter_android_vh_blk_rq_ctx_init(void*, request*, blk_mq_tags*, blk_mq_alloc_data*, u64)'
[A] 'function int __traceiter_android_vh_mm_dirty_limits(void*, dirty_throttle_control* const, bool, unsigned long int, unsigned long int, unsigned long int, unsigned long int)'
[A] 'function int __traceiter_android_vh_rproc_recovery_set(void*, rproc*)'
[A] 'function int bit_wait_timeout(wait_bit_key*, int)'
[A] 'function int bt_to_errno(__u16)'
[A] 'function void bt_warn(const char*, ...)'
[A] 'function int btbcm_set_bdaddr(hci_dev*, const bdaddr_t*)'
[A] 'function int btbcm_setup_apple(hci_dev*)'
[A] 'function int btbcm_setup_patchram(hci_dev*)'
[A] 'function int cgroup_add_legacy_cftypes(cgroup_subsys*, cftype*)'
[A] 'function void gpiod_put(gpio_desc*)'
[A] 'function sk_buff* hci_cmd_sync(hci_dev*, u16, u32, void*, u32)'
[A] 'function int hci_recv_diag(hci_dev*, sk_buff*)'
[A] 'function int kern_path(const char*, unsigned int, path*)'
[A] 'function int kstrtos16(const char*, unsigned int, s16*)'
[A] 'function mem_cgroup* mem_cgroup_from_id(unsigned short int)'
[A] 'function int out_of_line_wait_on_bit_timeout(void*, int, wait_bit_action_f*, unsigned int, unsigned long int)'
[A] 'function void path_put(const path*)'
[A] 'function void unregister_memory_notifier(notifier_block*)'
[A] 'function int usb_driver_claim_interface(usb_driver*, usb_interface*, void*)'
[A] 'function void usb_driver_release_interface(usb_driver*, usb_interface*)'
[A] 'function urb* usb_get_from_anchor(usb_anchor*)'
[A] 'function void usb_queue_reset_device(usb_interface*)'
[A] 'function void usb_scuttle_anchored_urbs(usb_anchor*)'
[A] 'function void wake_up_bit(void*, int)'
6 Added variables:
[A] 'tracepoint __tracepoint_android_vh_blk_alloc_rqs'
[A] 'tracepoint __tracepoint_android_vh_blk_rq_ctx_init'
[A] 'tracepoint __tracepoint_android_vh_mm_dirty_limits'
[A] 'tracepoint __tracepoint_android_vh_rproc_recovery_set'
[A] 'cgroup_subsys memory_cgrp_subsys'
[A] 'static_key_true memory_cgrp_subsys_enabled_key'
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id2c3ae3d700bbe5567c0840dc4e2acff9bba246e
Greg Kroah-Hartman
be686d451e