Merge branch 'android12-5.10' into `android12-5.10-lts`
Sync up with android12-5.10 for the following commits: 29af14b0 ANDROID: GKI: Update symbols to symbol list 8d7f609c ANDROID: fips140: add name and version, and a function to retrieve them 64d769e5 ANDROID: fips140: add service indicators b9066e59 ANDROID: GKI: Update symbols to symbol list 1eae8229 ANDROID: GKI: Update symbols to symbol list aee113fc ANDROID: Incremental fs: Fix dentry get/put imbalance on vfs_mkdir() failure 9cafb6af ANDROID: GKI: Update symbols to symbol list 6ad60946 ANDROID: Fix mmu_notifier imbalance 62f22f5c ANDROID: ABI: Update symbol list for IMX f5284c5c ANDROID: Update symbol list for mtk 8a30a2ca ANDROID: GKI: update virtual device symbol list cf721d6c ANDROID: ABI: add new symbols required by fips140.ko 482b0323 ANDROID: fips140: zeroize temporary values from integrity check ecf93411 ANDROID: fips140: remove in-place updating of live algorithms e45108ec ANDROID: fips140: block crypto operations until tests complete 6b995f5a ANDROID: fips140: preserve RELA sections without relying on the module loader e8d56bd7 ANDROID: module: apply special LTO treatment to .text even if CFI is disabled 52b70d49 ANDROID: fips140: use FIPS140_CFLAGS when compiling fips140-selftests.c e5b14396 ANDROID: fips140: take into account AES-GCM not being approvable 960ebb2b ANDROID: fips140: add jitterentropy to fips140 module 2ee56aad ANDROID: fips140: add AES-CMAC 2b5843ae ANDROID: fips140: add AES-CBC-CTS 1be58af0 ANDROID: fips140: remove non-prediction-resistant DRBG test 17ccefe1 ANDROID: fips140: use full 16-byte IV b397a038 ANDROID: fips140: test all implementations 82c940e0 ANDROID: Update symbol list for mtk 8d68a30f ANDROID: ASoC: soc-pcm: Get all BEs along DAPM path ea440234 ANDROID: GKI: refresh XML following ANDROID_KABI_USE change f8b361d1 ANDROID: GKI: rework the ANDROID_KABI_USE() macro to not use __UNIQUE() ad8da78c UPSTREAM: sched/scs: Reset the shadow stack when idle_task_exit 74782dd0 ANDROID: cpuhp/pause: add function define if not define CONFIG_CPUSETS 75a5637c ANDROID: GKI: Add a symbol to vendor symbol list 1c0e6833 ANDROID: f2fs: fix potential deadlock by android ftrace 8d5dd0a5 ANDROID: gki_defconfig: enable CONFIG_USB_CONFIGFS_F_UVC d4091df6 ANDROID: GKI: Update symbols list for vivo a451a6c4 ANDROID: GKI: Add missing symbol list whitespace a32d8ee3 Revert "ANDROID: mpam: add vendor hook to record MPAM" 2ccbb92f ANDROID: userfaultfd: Fix merge resolution: validate_range() 09bd9e94 ANDROID: cpuhp/pause: schedule cpu_hotplug_work on resume cpu 2a813b46 ANDROID: GKI: Update symbols to abi_gki_aarch64_oplus a8c611fa ANDROID: GKI: Update symbols list for vivo 16493a3c Revert "BACKPORT: ASoC: soc-pcm: Get all BEs along DAPM path" a84e45d3 FROMGIT: usb: dwc3: gadget: Skip resizing EP's TX FIFO if already resized 168de6b1 FROMGIT: usb: dwc3: gadget: Change to dev_dbg() when queuing to inactive gadget/ep 6cb41901 ANDROID: ABI: update allowed list for galaxy 48e5c07f ANDROID: dma_heap: add dma_parms for uncached heap a0345d45 ANDROID: GKI: rockchip: Enable symbols for pinctrl and rk8xx 8e9111c2 ANDROID: GKI: rockchip: Enable symbols for typec 28edc307 ANDROID: GKI: rockchip: Add build script 9329ddc3 ANDROID: GKI: Add some symbols to symbol list to support vendor module bd4a8425 UPSTREAM: core: Add L2P entry swap quirk for Micron UFS 44b33953 ANDROID: gki_defconfig: remove CONFIG_UBSAN_MISC entry 71f70987 UPSTREAM: ubsan: remove overflow checks 65a04c1a UPSTREAM: ubsan: disable unsigned-overflow check for i386 7611578e UPSTREAM: ubsan: expand tests and reporting fca16257 UPSTREAM: ubsan: remove UBSAN_MISC in favor of individual options c2985e13 UPSTREAM: ubsan: enable for all*config builds 5eb5780a UPSTREAM: ubsan: disable UBSAN_TRAP for all*config c108d79a UPSTREAM: ubsan: disable object-size sanitizer under GCC 9ecd3c91 UPSTREAM: ubsan: move cc-option tests into Kconfig 70e36583 UPSTREAM: ubsan: remove redundant -Wno-maybe-uninitialized 45b1eb71 UPSTREAM: mm/mremap: fix BUILD_BUG_ON() error in get_extent Due to api additions in android12-5.10, this also adds more api symbols to track: Leaf changes summary: 75 artifacts changed Changed leaf types summary: 0 leaf type changed Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 53 Added functions Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 22 Added variables 53 Added functions: [A] 'function __sum16 __skb_checksum_complete(sk_buff*)' [A] 'function int __traceiter_android_vh_cpu_up(void*, unsigned int)' [A] 'function int __traceiter_android_vh_cpufreq_acct_update_power(void*, u64, task_struct*, unsigned int)' [A] 'function int __traceiter_android_vh_filemap_fault_cache_page(void*, vm_fault*, page*)' [A] 'function int __traceiter_android_vh_filemap_fault_get_page(void*, vm_fault*, page**, bool*)' [A] 'function int __traceiter_android_vh_mem_cgroup_alloc(void*, mem_cgroup*)' [A] 'function int __traceiter_android_vh_mem_cgroup_css_offline(void*, cgroup_subsys_state*, mem_cgroup*)' [A] 'function int __traceiter_android_vh_mem_cgroup_css_online(void*, cgroup_subsys_state*, mem_cgroup*)' [A] 'function int __traceiter_android_vh_mem_cgroup_free(void*, mem_cgroup*)' [A] 'function int __traceiter_android_vh_mem_cgroup_id_remove(void*, mem_cgroup*)' [A] 'function int __traceiter_android_vh_mmap_region(void*, vm_area_struct*, unsigned long int)' [A] 'function int __traceiter_android_vh_scmi_timeout_sync(void*, int*)' [A] 'function int __traceiter_android_vh_shrink_slab_bypass(void*, gfp_t, int, mem_cgroup*, int, bool*)' [A] 'function int __traceiter_android_vh_snd_soc_card_get_comp_chain(void*, bool*)' [A] 'function int __traceiter_android_vh_try_to_unmap_one(void*, vm_area_struct*, page*, unsigned long int, bool)' [A] 'function int __traceiter_sched_stat_sleep(void*, task_struct*, u64)' [A] 'function int __traceiter_sched_waking(void*, task_struct*)' [A] 'function int __typec_altmode_register_driver(typec_altmode_driver*, module*)' [A] 'function int ahash_register_instance(crypto_template*, ahash_instance*)' [A] 'function int blkcg_activate_policy(request_queue*, const blkcg_policy*)' [A] 'function void blkcg_deactivate_policy(request_queue*, const blkcg_policy*)' [A] 'function int blkcg_policy_register(blkcg_policy*)' [A] 'function void blkcg_policy_unregister(blkcg_policy*)' [A] 'function blkcg_gq* blkg_lookup_slowpath(blkcg*, request_queue*, bool)' [A] 'function int crypto_grab_spawn(crypto_spawn*, crypto_instance*, const char*, u32, u32)' [A] 'function int crypto_register_aeads(aead_alg*, int)' [A] 'function int crypto_register_ahashes(ahash_alg*, int)' [A] 'function int crypto_register_rng(rng_alg*)' [A] 'function crypto_tfm* crypto_spawn_tfm(crypto_spawn*, u32, u32)' [A] 'function void crypto_unregister_rng(rng_alg*)' [A] 'function cgroup_subsys_state* css_next_descendant_pre(cgroup_subsys_state*, cgroup_subsys_state*)' [A] 'function int dump_align(coredump_params*, int)' [A] 'function int dump_emit(coredump_params*, void*, int)' [A] 'function fwnode_handle* fwnode_create_software_node(const property_entry*, const fwnode_handle*)' [A] 'function int ip6_local_out(net*, sock*, sk_buff*)' [A] 'function int ip6_route_me_harder(net*, sock*, sk_buff*)' [A] 'function int ip_local_out(net*, sock*, sk_buff*)' [A] 'function cgroup_subsys_state* kthread_blkcg()' [A] 'function void nf_ct_attach(sk_buff*, const sk_buff*)' [A] 'function cgroup_subsys_state* of_css(kernfs_open_file*)' [A] 'function pinctrl_gpio_range* pinctrl_find_gpio_range_from_pin(pinctrl_dev*, unsigned int)' [A] 'function void skb_dump(const char*, const sk_buff*, bool)' [A] 'function int spi_write_then_read(spi_device*, void*, unsigned int, void*, unsigned int)' [A] 'function tcpm_port* tcpm_register_port(device*, tcpc_dev*)' [A] 'function void tcpm_unregister_port(tcpm_port*)' [A] 'function typec_port* typec_altmode2port(typec_altmode*)' [A] 'function int typec_altmode_enter(typec_altmode*, u32*)' [A] 'function int typec_altmode_exit(typec_altmode*)' [A] 'function int typec_altmode_notify(typec_altmode*, unsigned long int, void*)' [A] 'function void typec_altmode_unregister_driver(typec_altmode_driver*)' [A] 'function int typec_altmode_vdm(typec_altmode*, const u32, const u32*, int)' [A] 'function int typec_get_negotiated_svdm_version(typec_port*)' [A] 'function int vb2_create_bufs(vb2_queue*, v4l2_create_buffers*)' 22 Added variables: [A] 'tracepoint __tracepoint_android_rvh_tcp_recvmsg' [A] 'tracepoint __tracepoint_android_rvh_tcp_recvmsg_stat' [A] 'tracepoint __tracepoint_android_rvh_tcp_sendmsg_locked' [A] 'tracepoint __tracepoint_android_rvh_udp_recvmsg' [A] 'tracepoint __tracepoint_android_rvh_udp_sendmsg' [A] 'tracepoint __tracepoint_android_vh_cpu_up' [A] 'tracepoint __tracepoint_android_vh_cpufreq_acct_update_power' [A] 'tracepoint __tracepoint_android_vh_filemap_fault_cache_page' [A] 'tracepoint __tracepoint_android_vh_filemap_fault_get_page' [A] 'tracepoint __tracepoint_android_vh_mem_cgroup_alloc' [A] 'tracepoint __tracepoint_android_vh_mem_cgroup_css_offline' [A] 'tracepoint __tracepoint_android_vh_mem_cgroup_css_online' [A] 'tracepoint __tracepoint_android_vh_mem_cgroup_free' [A] 'tracepoint __tracepoint_android_vh_mem_cgroup_id_remove' [A] 'tracepoint __tracepoint_android_vh_mmap_region' [A] 'tracepoint __tracepoint_android_vh_scmi_timeout_sync' [A] 'tracepoint __tracepoint_android_vh_shrink_slab_bypass' [A] 'tracepoint __tracepoint_android_vh_snd_soc_card_get_comp_chain' [A] 'tracepoint __tracepoint_android_vh_try_to_unmap_one' [A] 'tracepoint __tracepoint_sched_stat_sleep' [A] 'tracepoint __tracepoint_sched_waking' [A] 'blkcg blkcg_root' Signed-off-by:Greg Kroah-Hartman <gregkh@google.com> Change-Id: Ica9d2a84fcd58c6ff9c2b0eb7146a7e9657c167f
Loading
Please sign in to comment