Merge branch 'android12-5.10' into branch 'android12-5.10-lts'
Sync up with android12-5.10 for the following commits: 5545801f ANDROID: abi_gki_aarch64_qcom: Add android_vh_madvise_cold_or_pageout d195c9f2 ANDROID: force struct page_vma_mapped_walk to be defined in KMI 464a3706 Merge "Merge tag 'android12-5.10.136_r00' into android12-5.10" into android12-5.10 18cd39b7 Merge tag 'android12-5.10.136_r00' into android12-5.10 6d04d8ce ANDROID: vendor_hooks: Allow shared pages reclaim via MADV_PAGEOUT 2d8afda4 UPSTREAM: usb: gadget: mass_storage: Fix cdrom data transfers on MAC-OS 4135365b ANDROID: GKI: Update symbols to symbol list c6f7a0eb ANDROID: make sure all types for hooks are defined in KMI b9ac329a ANDROID: force struct selinux_state to be defined in KMI b71060e6 BACKPORT: erofs: fix use-after-free of on-stack io[] ecf5583f ANDROID: GKI: Update symbols to symbol list 5c5b7a4d ANDROID: vendor_hook: rename the the name of hooks 2c625a20 ANDROID: ABI: Add extcon_get_property_capability symbol 72b1f9fd Revert "ANDROID: arm64: debug-monitors: export break hook APIs" cc51dcbc Revert "ANDROID: vendor_hooks:vendor hook for __alloc_pages_slowpath." 9072e986 Revert "ANDROID: Export functions to be used with dma_map_ops in modules" 2fc96f32 FROMLIST: f2fs: let FI_OPU_WRITE override FADVISE_COLD_BIT 06b30106 ANDROID: remove unused xhci_get_endpoint_address export bcf6dddd ANDROID: incfs: Add check for ATTR_KILL_SUID and ATTR_MODE in incfs_setattr d915364e ANDROID: GKI: Update symbols to symbol list db2516ff ANDROID: vendor_hooks: Add hooks for lookaround feedd14d Revert "Revert "ANDROID: add for tuning readahead size"" 9252f4d5 ANDROID: transsion: Update the ABI xml and symbol list f50f24e7 ANDROID: vendor_hooks: Add hooks for lookaround c762f435 BACKPORT: dm verity: set DM_TARGET_IMMUTABLE feature flag 2bd9e6cd BACKPORT: pipe: Fix missing lock in pipe_resize_ring() d7586fa2 BACKPORT: KVM: x86: avoid calling x86 emulator without a decoded instruction cee231f8 ANDROID: GKI: add symbols in android/abi_gki_aarch64_oplus 8aaba3c5 BACKPORT: watchqueue: make sure to serialize 'wqueue->defunct' properly 7351343b ANDROID: GKI: Update symbol list for Exynos SoC 95279078 UPSTREAM: usb: dwc3: gadget: Avoid duplicate requests to enable Run/Stop bda2986f UPSTREAM: usb: typec: ucsi: Acknowledge the GET_ERROR_STATUS command completion eef3b6ff BACKPORT: scsi: ufs: core: Increase fDeviceInit poll frequency eaa7364b FROMGIT: f2fs: increase the limit for reserve_root 42aa1955 FROMGIT: f2fs: complete checkpoints during remount 1c5313a9 FROMGIT: f2fs: flush pending checkpoints when freezing super 604f2f56 BACKPORT: f2fs: don't get FREEZE lock in f2fs_evict_inode in frozen fs 59483514 BACKPORT: f2fs: introduce F2FS_IPU_HONOR_OPU_WRITE ipu policy 85aff723 Revert "ANDROID: GKI: signal: Export for __lock_task_sighand" 22b447e9 BACKPORT: f2fs: invalidate meta pages only for post_read required inode fa0cdb5b BACKPORT: f2fs: fix to invalidate META_MAPPING before DIO write 23013074 BACKPORT: f2fs: invalidate META_MAPPING before IPU/DIO write 99f01600 ANDROID: mm: page_pinner: use page_ext_get/put() to work with page_ext 2b3f9b81 FROMLIST: mm: fix use-after free of page_ext after race with memory-offline dec2f52d ANDROID: vendor_hooks:vendor hook for __alloc_pages_slowpath. bc08447e ANDROID: GKI: rockchip: add symbol netif_set_xps_queue 3f90d4f1 ANDROID: GKI: Update symbol list 7b0822a2 Revert "ANDROID: vendor_hooks: tune reclaim scan type for specified mem_cgroup" 425c0f18 ANDROID: Fix a build warning inside early_memblock_nomap 84a0d243 ANDROID: mm/memory_hotplug: Fix error path handling 98e5fb34 Revert "ANDROID: add for tuning readahead size" 486580ff Revert "ANDROID: vendor_hooks: Add hooks for mutex" Update the .xml file to add the following new symbols that were now started to be tracked in the android12-5.10 branch: Leaf changes summary: 40 artifacts changed Changed leaf types summary: 0 leaf type changed Removed/Changed/Added functions summary: 1 Removed, 0 Changed, 18 Added functions Removed/Changed/Added variables summary: 1 Removed, 0 Changed, 20 Added variables 1 Removed function: [D] 'function int __traceiter_android_vh_record_percpu_rwsem_lock_starttime(void*, task_struct*, unsigned long int)' 18 Added functions: [A] 'function void __page_frag_cache_drain(page*, unsigned int)' [A] 'function int __traceiter_android_vh_check_page_look_around_ref(void*, page*, int*)' [A] 'function int __traceiter_android_vh_do_futex(void*, int, unsigned int*, u32*)' [A] 'function int __traceiter_android_vh_futex_wait_end(void*, unsigned int, u32)' [A] 'function int __traceiter_android_vh_futex_wait_start(void*, unsigned int, u32)' [A] 'function int __traceiter_android_vh_futex_wake_this(void*, int, int, int, task_struct*)' [A] 'function int __traceiter_android_vh_futex_wake_traverse_plist(void*, plist_head*, int*, futex_key, u32)' [A] 'function int __traceiter_android_vh_futex_wake_up_q_finish(void*, int, int)' [A] 'function int __traceiter_android_vh_look_around(void*, page_vma_mapped_walk*, page*, vm_area_struct*, int*)' [A] 'function int __traceiter_android_vh_look_around_migrate_page(void*, page*, page*)' [A] 'function int __traceiter_android_vh_ra_tuning_max_page(void*, readahead_control*, unsigned long int*)' [A] 'function int __traceiter_android_vh_record_pcpu_rwsem_starttime(void*, task_struct*, unsigned long int)' [A] 'function int __traceiter_android_vh_test_clear_look_around_ref(void*, page*)' [A] 'function int extcon_get_property_capability(extcon_dev*, unsigned int, unsigned int)' [A] 'function int netif_set_xps_queue(net_device*, const cpumask*, u16)' [A] 'function void* page_frag_alloc(page_frag_cache*, unsigned int, gfp_t)' [A] 'function void page_frag_free(void*)' [A] 'function bool rng_is_initialized()' 1 Removed variable: [D] 'tracepoint __tracepoint_android_vh_record_percpu_rwsem_lock_starttime' 20 Added variables: [A] 'const gic_chip_data* GKI_struct_gic_chip_data' [A] 'selinux_state* GKI_struct_selinux_state' [A] 'const swap_slots_cache* GKI_struct_swap_slots_cache' [A] 'tracepoint __tracepoint_android_vh_check_page_look_around_ref' [A] 'tracepoint __tracepoint_android_vh_do_futex' [A] 'tracepoint __tracepoint_android_vh_futex_wait_end' [A] 'tracepoint __tracepoint_android_vh_futex_wait_start' [A] 'tracepoint __tracepoint_android_vh_futex_wake_this' [A] 'tracepoint __tracepoint_android_vh_futex_wake_traverse_plist' [A] 'tracepoint __tracepoint_android_vh_futex_wake_up_q_finish' [A] 'tracepoint __tracepoint_android_vh_look_around' [A] 'tracepoint __tracepoint_android_vh_look_around_migrate_page' [A] 'tracepoint __tracepoint_android_vh_madvise_cold_or_pageout' [A] 'tracepoint __tracepoint_android_vh_ra_tuning_max_page' [A] 'tracepoint __tracepoint_android_vh_record_pcpu_rwsem_starttime' [A] 'tracepoint __tracepoint_android_vh_test_clear_look_around_ref' [A] 'tracepoint __tracepoint_net_dev_queue' [A] 'tracepoint __tracepoint_net_dev_xmit' [A] 'tracepoint __tracepoint_netif_receive_skb' [A] 'tracepoint __tracepoint_netif_rx' Signed-off-by:Greg Kroah-Hartman <gregkh@google.com> Change-Id: I300286a8e658793249f37797cd2ede7555dfacc9
Loading
Please sign in to comment