Commit 2712f357 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android12-5.4' into branch 'android12-5.4-lts'



Sync up with android12-5.4 for the following commits:

83681244 UPSTREAM: Revert "net: af_key: add check for pfkey_broadcast in function pfkey_process"
60efae04 Merge tag 'android12-5.4.197_r00' into 'android12-5.4'
397b3ca4 FROMGIT: arm64: fix oops in concurrently setting insn_emulation sysctls
330fa791 ANDROID: GKI: Add FCNT KMI symbol list
337727ea ANDROID: ABI: update symbols to sunxi whitelist for snd-aloop driver
aec1142c ANDROID: ABI: update symbols to sunxi whitelist for btlpm driver
bed8910f ANDROID: ABI: update symbols to sunxi whitelist for softmac wifi
996a4638 UPSTREAM: serial: sprd: remove __init from sprd_console_setup

Add the new symbols that are now being tracked to the .xml file:

Leaf changes summary: 60 artifacts changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 60 Added functions
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable

60 Added functions:

  [A] 'function void* __alloc_percpu_gfp(size_t, size_t, gfp_t)'
  [A] 'function int _snd_pcm_lib_alloc_vmalloc_buffer(snd_pcm_substream*, size_t, gfp_t)'
  [A] 'function void bt_info(const char*, ...)'
  [A] 'function void cfg80211_abandon_assoc(net_device*, cfg80211_bss*)'
  [A] 'function void cfg80211_ch_switch_started_notify(net_device*, cfg80211_chan_def*, u8)'
  [A] 'function const cfg80211_chan_def* cfg80211_chandef_compatible(const cfg80211_chan_def*, const cfg80211_chan_def*)'
  [A] 'function int cfg80211_chandef_dfs_required(wiphy*, const cfg80211_chan_def*, nl80211_iftype)'
  [A] 'function bool cfg80211_chandef_usable(wiphy*, const cfg80211_chan_def*, u32)'
  [A] 'function int cfg80211_check_combinations(wiphy*, iface_combination_params*)'
  [A] 'function int cfg80211_check_station_change(wiphy*, station_parameters*, cfg80211_station_type)'
  [A] 'function void cfg80211_cqm_beacon_loss_notify(net_device*, gfp_t)'
  [A] 'function void cfg80211_free_nan_func(cfg80211_nan_func*)'
  [A] 'function void cfg80211_get_drvinfo(net_device*, ethtool_drvinfo*)'
  [A] 'function int cfg80211_get_p2p_attr(const u8*, unsigned int, ieee80211_p2p_attr_id, u8*, unsigned int)'
  [A] 'function bool cfg80211_iftype_allowed(wiphy*, nl80211_iftype, bool, u8)'
  [A] 'function bool cfg80211_is_element_inherited(const element*, const element*)'
  [A] 'function int cfg80211_iter_combinations(wiphy*, iface_combination_params*, void (const ieee80211_iface_combination*, void*)*, void*)'
  [A] 'function size_t cfg80211_merge_profile(const u8*, size_t, const element*, const element*, u8*, size_t)'
  [A] 'function void cfg80211_nan_func_terminated(wireless_dev*, u8, nl80211_nan_func_term_reason, u64, gfp_t)'
  [A] 'function void cfg80211_nan_match(wireless_dev*, cfg80211_nan_match_params*, gfp_t)'
  [A] 'function void cfg80211_probe_status(net_device*, const u8*, u64, bool, s32, bool, gfp_t)'
  [A] 'function void cfg80211_ref_bss(wiphy*, cfg80211_bss*)'
  [A] 'function bool cfg80211_reg_can_beacon(wiphy*, cfg80211_chan_def*, nl80211_iftype)'
  [A] 'function bool cfg80211_reg_can_beacon_relax(wiphy*, cfg80211_chan_def*, nl80211_iftype)'
  [A] 'function void cfg80211_report_obss_beacon(wiphy*, const u8*, size_t, int, int)'
  [A] 'function void cfg80211_report_wowlan_wakeup(wireless_dev*, cfg80211_wowlan_wakeup*, gfp_t)'
  [A] 'function bool cfg80211_rx_control_port(net_device*, sk_buff*, bool)'
  [A] 'function bool cfg80211_rx_spurious_frame(net_device*, const u8*, gfp_t)'
  [A] 'function bool cfg80211_rx_unexpected_4addr_frame(net_device*, const u8*, gfp_t)'
  [A] 'function void cfg80211_sched_scan_stopped_rtnl(wiphy*, u64)'
  [A] 'function void cfg80211_send_layer2_update(net_device*, const u8*)'
  [A] 'function void cfg80211_shutdown_all_interfaces(wiphy*)'
  [A] 'function int cfg80211_sinfo_alloc_tid_stats(station_info*, gfp_t)'
  [A] 'function void cfg80211_sta_opmode_change_notify(net_device*, const u8*, sta_opmode_info*, gfp_t)'
  [A] 'function void cfg80211_tx_mgmt_expired(wireless_dev*, u64, ieee80211_channel*, gfp_t)'
  [A] 'function int crypto_aead_decrypt(aead_request*)'
  [A] 'function int crypto_shash_finup(shash_desc*, const u8*, unsigned int, u8*)'
  [A] 'function dentry* debugfs_create_x8(const char*, umode_t, dentry*, u8*)'
  [A] 'function int device_move(device*, device*, dpm_order)'
  [A] 'function void devm_led_classdev_unregister(device*, led_classdev*)'
  [A] 'function file* filp_open(const char*, int, umode_t)'
  [A] 'function bool ieee80211_chandef_to_operating_class(cfg80211_chan_def*, u8*)'
  [A] 'function size_t ieee80211_ie_split_ric(const u8*, size_t, const u8*, int, const u8*, int, size_t)'
  [A] 'function u32 ieee80211_mandatory_rates(ieee80211_supported_band*, nl80211_bss_scan_width)'
  [A] 'function bool ieee80211_operating_class_to_band(u8, nl80211_band*)'
  [A] 'function time64_t ktime_get_seconds()'
  [A] 'function int mmc_gpio_set_cd_wake(mmc_host*, bool)'
  [A] 'function void netdev_set_default_ethtool_ops(net_device*, const ethtool_ops*)'
  [A] 'function int param_get_uint(char*, const kernel_param*)'
  [A] 'function void prandom_bytes(void*, size_t)'
  [A] 'function bool regulatory_pre_cac_allowed(wiphy*)'
  [A] 'function void rhashtable_free_and_destroy(rhashtable*, void (void*, void*)*, void*)'
  [A] 'function int rhltable_init(rhltable*, const rhashtable_params*)'
  [A] 'function long long unsigned int simple_strtoull(const char*, char**, unsigned int)'
  [A] 'function sk_buff* skb_clone_sk(sk_buff*)'
  [A] 'function void skb_complete_wifi_ack(sk_buff*, bool)'
  [A] 'function __u32 skb_get_hash_perturb(const sk_buff*, const siphash_key_t*)'
  [A] 'function int snd_pcm_format_set_silence(snd_pcm_format_t, void*, unsigned int)'
  [A] 'function int snd_pcm_lib_free_vmalloc_buffer(snd_pcm_substream*)'
  [A] 'function page* snd_pcm_lib_get_vmalloc_page(snd_pcm_substream*, unsigned long int)'

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