Merge branch 'android12-5.10' into branch 'android12-5.10-lts'
Sync up with android12-5.10 for the following commits: af699fd6 ANDROID: vendor_hook: skip trace_android_vh_page_trylock_set when ignore_references is true 5aec776e BACKPORT: ANDROID: dma-buf: Move sysfs work out of DMA-BUF export path d61d7ebf UPSTREAM: wifi: mac80211: fix MBSSID parsing use-after-free 173913b3 UPSTREAM: wifi: mac80211: don't parse mbssid in assoc response 9ed9ab8c UPSTREAM: mac80211: mlme: find auth challenge directly d6e68e31 UPSTREAM: wifi: cfg80211: update hidden BSSes to avoid WARN_ON 3ea906ba UPSTREAM: wifi: mac80211: fix crash in beacon protection for P2P-device 241426b2 UPSTREAM: wifi: mac80211_hwsim: avoid mac80211 warning on bad rate 50e27143 UPSTREAM: wifi: cfg80211: avoid nontransmitted BSS list corruption 05a01222 UPSTREAM: wifi: cfg80211: fix BSS refcounting bugs 2e8c292e UPSTREAM: wifi: cfg80211: ensure length byte is present before access 5f6b1435 UPSTREAM: wifi: cfg80211/mac80211: reject bad MBSSID elements 6aeb3ccf UPSTREAM: wifi: cfg80211: fix u8 overflow in cfg80211_update_notlisted_nontrans() 13a84bfa ANDROID: GKI: Update symbols to symbol list 09f42462 ANDROID: sched: add restricted hooks to replace the former hooks 376aaf80 ANDROID: GKI: Add symbol snd_pcm_stop_xrun 8512c353 ANDROID: ABI: update allowed list for galaxy 439fc067 ANDROID: GKI: Update symbols to symbol list beaaa7bf UPSTREAM: dma-buf: ensure unique directory name for dmabuf stats d71115b1 UPSTREAM: dma-buf: call dma_buf_stats_setup after dmabuf is in valid list f9a66cbe ANDROID: GKI: Update symbol list for mtk AIoT projects a3835ce6 UPSTREAM: psi: Fix psi state corruption when schedule() races with cgroup move 3b39e913 BACKPORT: HID: steam: Prevent NULL pointer dereference in steam_{recv,send}_report c35cda52 BACKPORT: mm: don't be stuck to rmap lock on reclaim path 9613bc53 Revert "firmware_loader: use kernel credentials when reading firmware" 95f23ced UPSTREAM: crypto: jitter - add oversampling of noise source b046e2dc ANDROID: Fix kenelci build-break for !CONFIG_PERF_EVENTS 24220df8 FROMGIT: f2fs: support recording stop_checkpoint reason into super_block f18e68a2 UPSTREAM: wifi: mac80211_hwsim: use 32-bit skb cookie 08cb67eb UPSTREAM: wifi: mac80211_hwsim: add back erroneously removed cast 9b080edf UPSTREAM: wifi: mac80211_hwsim: fix race condition in pending packet Update the .xml file with the newly tracked symbols: Leaf changes summary: 30 artifacts changed Changed leaf types summary: 0 leaf type changed Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 24 Added functions Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 6 Added variables 24 Added functions: [A] 'function void __rtnl_link_unregister(rtnl_link_ops*)' [A] 'function int __traceiter_android_rvh_alloc_si(void*, swap_info_struct**, bool*)' [A] 'function int __traceiter_android_rvh_alloc_swap_slot_cache(void*, swap_slots_cache*, int*, bool*)' [A] 'function int __traceiter_android_rvh_drain_slots_cache_cpu(void*, swap_slots_cache*, unsigned int, bool, bool*)' [A] 'function int __traceiter_android_rvh_free_swap_slot(void*, swp_entry_t, swap_slots_cache*, bool*)' [A] 'function int __traceiter_android_rvh_get_swap_page(void*, page*, swp_entry_t*, swap_slots_cache*, bool*)' [A] 'function int __traceiter_android_rvh_handle_pte_fault_end(void*, vm_fault*, unsigned long int)' [A] 'function net_device* dev_get_by_index_rcu(net*, int)' [A] 'function phy_device* fixed_phy_register(unsigned int, fixed_phy_status*, device_node*)' [A] 'function void fixed_phy_unregister(phy_device*)' [A] 'function irq_domain* irq_domain_add_simple(device_node*, unsigned int, unsigned int, const irq_domain_ops*, void*)' [A] 'function int nf_register_net_hook(net*, const nf_hook_ops*)' [A] 'function void nf_unregister_net_hook(net*, const nf_hook_ops*)' [A] 'function int phy_ethtool_set_wol(phy_device*, ethtool_wolinfo*)' [A] 'function int phy_register_fixup_for_uid(u32, u32, int (phy_device*)*)' [A] 'function int phy_save_page(phy_device*)' [A] 'function int phy_unregister_fixup_for_uid(u32, u32)' [A] 'function int snd_pcm_stop_xrun(snd_pcm_substream*)' [A] 'function void tty_encode_baud_rate(tty_struct*, speed_t, speed_t)' [A] 'function int usb_autopm_get_interface_async(usb_interface*)' [A] 'function void usb_autopm_put_interface_async(usb_interface*)' [A] 'function int usb_clear_halt(usb_device*, int)' [A] 'function int usb_interrupt_msg(usb_device*, unsigned int, void*, int, int*, int)' [A] 'function int usb_unlink_urb(urb*)' 6 Added variables: [A] 'tracepoint __tracepoint_android_rvh_alloc_si' [A] 'tracepoint __tracepoint_android_rvh_alloc_swap_slot_cache' [A] 'tracepoint __tracepoint_android_rvh_drain_slots_cache_cpu' [A] 'tracepoint __tracepoint_android_rvh_free_swap_slot' [A] 'tracepoint __tracepoint_android_rvh_get_swap_page' [A] 'tracepoint __tracepoint_android_rvh_handle_pte_fault_end' Signed-off-by:Greg Kroah-Hartman <gregkh@google.com> Change-Id: I225d5838de38d886151cf619654412ee8c5428b2
No related branches found
No related tags found
Showing
- android/abi_gki_aarch64.xml 856 additions, 758 deletionsandroid/abi_gki_aarch64.xml
- android/abi_gki_aarch64_galaxy 11 additions, 0 deletionsandroid/abi_gki_aarch64_galaxy
- android/abi_gki_aarch64_mtk 2 additions, 0 deletionsandroid/abi_gki_aarch64_mtk
- android/abi_gki_aarch64_oplus 4 additions, 0 deletionsandroid/abi_gki_aarch64_oplus
- android/abi_gki_aarch64_rockchip 1 addition, 0 deletionsandroid/abi_gki_aarch64_rockchip
- android/abi_gki_aarch64_transsion 12 additions, 0 deletionsandroid/abi_gki_aarch64_transsion
- crypto/jitterentropy.c 21 additions, 2 deletionscrypto/jitterentropy.c
- drivers/android/vendor_hooks.c 6 additions, 0 deletionsdrivers/android/vendor_hooks.c
- drivers/base/firmware_loader/main.c 0 additions, 17 deletionsdrivers/base/firmware_loader/main.c
- drivers/dma-buf/dma-buf-sysfs-stats.c 52 additions, 14 deletionsdrivers/dma-buf/dma-buf-sysfs-stats.c
- drivers/dma-buf/dma-buf.c 12 additions, 4 deletionsdrivers/dma-buf/dma-buf.c
- fs/f2fs/checkpoint.c 7 additions, 3 deletionsfs/f2fs/checkpoint.c
- fs/f2fs/data.c 4 additions, 2 deletionsfs/f2fs/data.c
- fs/f2fs/f2fs.h 3 additions, 1 deletionfs/f2fs/f2fs.h
- fs/f2fs/file.c 6 additions, 5 deletionsfs/f2fs/file.c
- fs/f2fs/gc.c 4 additions, 2 deletionsfs/f2fs/gc.c
- fs/f2fs/inode.c 2 additions, 1 deletionfs/f2fs/inode.c
- fs/f2fs/segment.c 5 additions, 2 deletionsfs/f2fs/segment.c
- fs/f2fs/super.c 20 additions, 0 deletionsfs/f2fs/super.c
- include/linux/f2fs_fs.h 16 additions, 1 deletioninclude/linux/f2fs_fs.h
Loading