github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 22:52:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
0e8dfc1216
linux/kernel
History
Greg Kroah-Hartman 0e8dfc1216 Merge branch 'android12-5.10' into branch 'android12-5.10-lts' 
Sync up with android12-5.10 for the following commits:

5545801f5c ANDROID: abi_gki_aarch64_qcom: Add android_vh_madvise_cold_or_pageout
d195c9f2bb ANDROID: force struct page_vma_mapped_walk to be defined in KMI
464a3706e6 Merge "Merge tag 'android12-5.10.136_r00' into android12-5.10" into android12-5.10
18cd39b706 Merge tag 'android12-5.10.136_r00' into android12-5.10
6d04d8ce90 ANDROID: vendor_hooks: Allow shared pages reclaim via MADV_PAGEOUT
2d8afda40e UPSTREAM: usb: gadget: mass_storage: Fix cdrom data transfers on MAC-OS
4135365b5d ANDROID: GKI: Update symbols to symbol list
c6f7a0ebd8 ANDROID: make sure all types for hooks are defined in KMI
b9ac329a83 ANDROID: force struct selinux_state to be defined in KMI
b71060e6eb BACKPORT: erofs: fix use-after-free of on-stack io[]
ecf5583fc7 ANDROID: GKI: Update symbols to symbol list
5c5b7a4da6 ANDROID: vendor_hook: rename the the name of hooks
2c625a20c0 ANDROID: ABI: Add extcon_get_property_capability symbol
72b1f9fd16 Revert "ANDROID: arm64: debug-monitors: export break hook APIs"
cc51dcbc60 Revert "ANDROID: vendor_hooks:vendor hook for __alloc_pages_slowpath."
9072e986bd Revert "ANDROID: Export functions to be used with dma_map_ops in modules"
2fc96f32ee FROMLIST: f2fs: let FI_OPU_WRITE override FADVISE_COLD_BIT
06b301069f ANDROID: remove unused xhci_get_endpoint_address export
bcf6dddd97 ANDROID: incfs: Add check for ATTR_KILL_SUID and ATTR_MODE in incfs_setattr
d915364e92 ANDROID: GKI: Update symbols to symbol list
db2516ff46 ANDROID: vendor_hooks: Add hooks for lookaround
feedd14d14 Revert "Revert "ANDROID: add for tuning readahead size""
9252f4d58b ANDROID: transsion: Update the ABI xml and symbol list
f50f24e781 ANDROID: vendor_hooks: Add hooks for lookaround
c762f435c0 BACKPORT: dm verity: set DM_TARGET_IMMUTABLE feature flag
2bd9e6cddc BACKPORT: pipe: Fix missing lock in pipe_resize_ring()
d7586fa209 BACKPORT: KVM: x86: avoid calling x86 emulator without a decoded instruction
cee231f83b ANDROID: GKI: add symbols in android/abi_gki_aarch64_oplus
8aaba3c5a1 BACKPORT: watchqueue: make sure to serialize 'wqueue->defunct' properly
7351343bc8 ANDROID: GKI: Update symbol list for Exynos SoC
9527907814 UPSTREAM: usb: dwc3: gadget: Avoid duplicate requests to enable Run/Stop
bda2986f13 UPSTREAM: usb: typec: ucsi: Acknowledge the GET_ERROR_STATUS command completion
eef3b6ff41 BACKPORT: scsi: ufs: core: Increase fDeviceInit poll frequency
eaa7364bf7 FROMGIT: f2fs: increase the limit for reserve_root
42aa1955c2 FROMGIT: f2fs: complete checkpoints during remount
1c5313a9f7 FROMGIT: f2fs: flush pending checkpoints when freezing super
604f2f5656 BACKPORT: f2fs: don't get FREEZE lock in f2fs_evict_inode in frozen fs
594835143a BACKPORT: f2fs: introduce F2FS_IPU_HONOR_OPU_WRITE ipu policy
85aff72329 Revert "ANDROID: GKI: signal: Export for __lock_task_sighand"
22b447e9bd BACKPORT: f2fs: invalidate meta pages only for post_read required inode
fa0cdb5b9d BACKPORT: f2fs: fix to invalidate META_MAPPING before DIO write
2301307412 BACKPORT: f2fs: invalidate META_MAPPING before IPU/DIO write
99f0160022 ANDROID: mm: page_pinner: use page_ext_get/put() to work with page_ext
2b3f9b8187 FROMLIST: mm: fix use-after free of page_ext after race with memory-offline
dec2f52d08 ANDROID: vendor_hooks:vendor hook for __alloc_pages_slowpath.
bc08447eb7 ANDROID: GKI: rockchip: add symbol netif_set_xps_queue
3f90d4f1f3 ANDROID: GKI: Update symbol list
7b0822a261 Revert "ANDROID: vendor_hooks: tune reclaim scan type for specified mem_cgroup"
425c0f18ed ANDROID: Fix a build warning inside early_memblock_nomap
84a0d243b6 ANDROID: mm/memory_hotplug: Fix error path handling
98e5fb34d1 Revert "ANDROID: add for tuning readahead size"
486580ffb5 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
2022-10-01 14:58:20 +02:00
..
bpf This is the 5.10.142 stable release 2022-09-22 13:46:39 +02:00
cgroup This is the 5.10.145 stable release 2022-09-24 09:54:08 +02:00
configs
debug lockdown: also lock down previous kgdb use 2022-05-30 09:33:22 +02:00
dma Merge branch 'android12-5.10' into branch 'android12-5.10-lts' 2022-10-01 14:58:20 +02:00
entry KVM: rseq: Update rseq when processing NOTIFY_RESUME on xfer to KVM guest 2021-10-06 15:55:49 +02:00
events This is the 5.10.134 stable release 2022-08-03 12:42:13 +02:00
gcov gcov: re-fix clang-11+ support 2021-04-14 08:41:58 +02:00
irq This is the 5.10.137 stable release 2022-08-29 16:53:14 +02:00
kcsan kcsan: Fix debugfs initcall return type 2021-05-26 12:06:54 +02:00
livepatch livepatch: Fix build failure on 32 bits processors 2022-04-08 14:40:15 +02:00
locking Merge branch 'android12-5.10' into branch 'android12-5.10-lts' 2022-10-01 14:58:20 +02:00
power This is the 5.10.137 stable release 2022-08-29 16:53:14 +02:00
printk This is the 5.10.110 stable release 2022-04-18 17:41:18 +02:00
rcu This is the 5.10.121 stable release 2022-07-23 16:10:22 +02:00
sched Merge tag 'android12-5.10.136_r00' into android12-5.10 2022-09-28 09:54:28 +02:00
time This is the 5.10.137 stable release 2022-08-29 16:53:14 +02:00
trace This is the 5.10.145 stable release 2022-09-24 09:54:08 +02:00
.gitignore kbuild: update config_data.gz only when the content of .config is changed 2021-05-11 14:47:37 +02:00
acct.c kernel: acct.c: fix some kernel-doc nits 2020-10-16 11:11:19 -07:00
async.c Revert "module, async: async_synchronize_full() on module init iff async is used" 2022-02-23 12:01:00 +01:00
audit_fsnotify.c audit: fix potential double free on error path from fsnotify_add_inode_mark 2022-08-31 17:15:13 +02:00
audit_tree.c audit: move put_tree() to avoid trim_trees refcount underflow and UAF 2021-09-03 10:09:31 +02:00
audit_watch.c fsnotify: generalize handle_inode_event() 2020-12-30 11:54:18 +01:00
audit.c audit: improve audit queue handling when "audit=1" on cmdline 2022-02-08 18:30:34 +01:00
audit.h audit: log AUDIT_TIME_* records only from rules 2022-04-08 14:40:00 +02:00
auditfilter.c treewide: Use fallthrough pseudo-keyword 2020-08-23 17:36:59 -05:00
auditsc.c audit: log AUDIT_TIME_* records only from rules 2022-04-08 14:40:00 +02:00
backtracetest.c treewide: Replace DECLARE_TASKLET() with DECLARE_TASKLET_OLD() 2020-07-30 11:15:58 -07:00
bounds.c
capability.c LSM: Signal to SafeSetID when setting group IDs 2020-10-13 09:17:34 -07:00
cfi.c ANDROID: cfi: explicitly clear diag in __cfi_slowpath 2021-09-02 08:55:56 +00:00
compat.c treewide: Use fallthrough pseudo-keyword 2020-08-23 17:36:59 -05:00
configs.c
context_tracking.c context_tracking: Ensure that the critical path cannot be instrumented 2020-06-11 15:14:36 +02:00
cpu_pm.c PM: cpu: Make notifier chain use a raw_spinlock_t 2021-09-15 09:50:40 +02:00
cpu.c ANDROID: cpu/hotplug: avoid breaking Android ABI by fusing cpuhp steps 2022-07-14 14:35:23 +02:00
crash_core.c crash_core, vmcoreinfo: append 'SECTION_SIZE_BITS' to vmcoreinfo 2021-06-23 14:42:52 +02:00
crash_dump.c
cred.c Revert "Add a reference to ucounts for each cred" 2021-09-08 08:49:00 +02:00
delayacct.c
dma.c
exec_domain.c
exit.c This is the 5.10.132 stable release 2022-07-28 17:17:55 +02:00
extable.c
fail_function.c fail_function: Remove a redundant mutex unlock 2020-11-19 11:58:16 -08:00
fork.c This is the 5.10.143 stable release 2022-09-22 14:38:08 +02:00
freezer.c ANDROID: freezer: Add vendor hook to freezer for GKI purpose. 2021-06-07 16:07:44 +00:00
futex.c ANDROID: vendor_hooks: Add hooks for oem futex optimization 2022-08-24 00:15:59 +00:00
gen_kheaders.sh
groups.c LSM: Signal to SafeSetID when setting group IDs 2020-10-13 09:17:34 -07:00
hung_task.c FROMLIST: freezer: Add frozen_or_skipped() helper function 2021-06-02 15:42:01 +00:00
iomem.c
irq_work.c ANDROID: Sched: Export scheduler symbols needed by vendor modules 2020-12-03 16:50:04 +00:00
jump_label.c jump_label: Fix jump_label_text_reserved() vs __init 2021-07-20 16:05:58 +02:00
kallsyms.c ANDROID: kallsyms: cfi: strip hashes from static functions 2021-01-14 16:31:46 +00:00
kcmp.c exec: Transform exec_update_mutex into a rw_semaphore 2021-01-09 13:46:24 +01:00
Kconfig.freezer
Kconfig.hz
Kconfig.locks
Kconfig.preempt
kcov.c kcov: make some symbols static 2020-08-12 10:58:02 -07:00
kexec_core.c kernel: kexec: remove the lock operation of system_transition_mutex 2021-02-03 23:28:37 +01:00
kexec_elf.c
kexec_file.c ima: force signature verification when CONFIG_KEXEC_SIG is configured 2022-07-21 21:20:11 +02:00
kexec_internal.h
kexec.c LSM: Introduce kernel_post_load_data() hook 2020-10-05 13:37:03 +02:00
kheaders.c
kmod.c kmod: remove redundant "be an" in the comment 2020-08-12 10:58:01 -07:00
kprobes.c kprobes: Prohibit probes in gate area 2022-09-15 11:32:03 +02:00
ksysfs.c
kthread.c This is the 5.10.62 stable release 2021-09-03 10:51:56 +02:00
latencytop.c
Makefile kbuild: update config_data.gz only when the content of .config is changed 2021-05-11 14:47:37 +02:00
module_signature.c module: harden ELF info handling 2021-03-25 09:04:11 +01:00
module_signing.c module: harden ELF info handling 2021-03-25 09:04:11 +01:00
module-internal.h
module.c This is the 5.10.118 stable release 2022-06-06 16:37:12 +02:00
notifier.c notifier: Fix broken error handling pattern 2020-09-01 09:58:03 +02:00
nsproxy.c nsproxy: support CLONE_NEWTIME with setns() 2020-07-08 11:14:22 +02:00
padata.c padata: fix possible padata_works_lock deadlock 2020-09-04 17:51:55 +10:00
panic.c panic: don't dump stack twice on warn 2020-11-14 11:26:04 -08:00
params.c params: Replace zero-length array with flexible-array member 2020-10-29 17:22:59 -05:00
pid_namespace.c memcg: enable accounting for pids in nested pid namespaces 2021-09-18 13:40:36 +02:00
pid.c Revert "ANDROID: vendor_hooks:vendor hook for pidfd_open" 2022-08-17 07:58:13 +02:00
profile.c profiling: fix shift too large makes kernel panic 2022-08-21 15:16:05 +02:00
ptrace.c ptrace: Reimplement PTRACE_KILL by always sending SIGKILL 2022-06-09 10:20:49 +02:00
range.c kernel.h: split out min()/max() et al. helpers 2020-10-16 11:11:19 -07:00
reboot.c Merge e28c0d7c92 ("Merge branch 'akpm' (patches from Andrew)") into android-mainline 2020-11-15 14:37:09 +01:00
regset.c regset: kill ->get() 2020-07-27 14:31:12 -04:00
relay.c kernel/relay.c: drop unneeded initialization 2020-10-16 11:11:22 -07:00
resource.c kernel/resource: make walk_mem_res() find all busy IORESOURCE_MEM resources 2021-05-19 10:13:09 +02:00
rseq.c rseq: Remove broken uapi field layout on 32-bit little endian 2022-04-08 14:40:03 +02:00
scftorture.c scftorture: Fix distribution of short handler delays 2022-06-09 10:21:01 +02:00
scs.c FROMGIT: scs: Release kasan vmalloc poison in scs_free process 2021-10-04 15:44:53 +00:00
seccomp.c This is the 5.10.60 stable release 2021-08-27 17:14:51 +02:00
signal.c Merge tag 'android12-5.10.136_r00' into android12-5.10 2022-09-28 09:54:28 +02:00
smp.c This is the 5.10.112 stable release 2022-04-29 09:15:09 +02:00
smpboot.c sched/core: Initialize the idle task with preemption disabled 2021-07-14 16:55:50 +02:00
smpboot.h
softirq.c ANDROID: softirq: Export irq_handler_exit tracepoint 2020-12-21 17:48:06 +00:00
stackleak.c gcc-plugins/stackleak: Use noinstr in favor of notrace 2022-02-23 12:01:00 +01:00
stacktrace.c ANDROID: stacktrace: export stack_trace_save_tsk/regs 2021-04-13 13:18:04 +00:00
static_call.c static_call: Fix unused variable warn w/o MODULE 2021-09-08 08:49:00 +02:00
stop_machine.c ANDROID: stop_machine: stop_one_cpu_async 2020-12-08 19:07:21 +00:00
sys_ni.c This is the 5.10.140 stable release 2022-08-31 18:52:48 +02:00
sys.c This is the 5.10.69 stable release 2021-09-30 18:36:17 +02:00
sysctl-test.c
sysctl.c Merge branch 'android12-5.10' into branch 'android12-5.10-lts' 2022-08-16 14:34:54 +02:00
task_work.c FROMGIT: kasan: record task_work_add() call stack 2021-03-24 15:09:18 -07:00
taskstats.c taskstats: move specifying netlink policy back to ops 2020-10-02 19:11:12 -07:00
test_kprobes.c
torture.c torture: Dump ftrace at shutdown only if requested 2020-06-29 12:01:45 -07:00
tracepoint.c This is the 5.10.62 stable release 2021-09-03 10:51:56 +02:00
tsacct.c taskstats: Cleanup the use of task->exit_code 2022-01-27 10:54:33 +01:00
ucount.c Revert "Add a reference to ucounts for each cred" 2021-09-08 08:49:00 +02:00
uid16.c
uid16.h
umh.c usermodehelper: reset umask to default before executing user process 2020-10-06 10:31:52 -07:00
up.c smp: Fix smp_call_function_single_async prototype 2021-05-14 09:50:46 +02:00
user_namespace.c Revert "Add a reference to ucounts for each cred" 2021-09-08 08:49:00 +02:00
user-return-notifier.c
user.c Revert "ANDROID: user: Add vendor hook to user for GKI purpose" 2022-01-20 10:04:49 +01:00
usermode_driver.c bpf: Fix umd memory leak in copy_process() 2021-03-30 14:32:03 +02:00
utsname_sysctl.c
utsname.c
watch_queue.c BACKPORT: watchqueue: make sure to serialize 'wqueue->defunct' properly 2022-09-12 07:24:14 +00:00
watchdog_hld.c
watchdog.c Merge 5.10.138 into android12-5.10-lts 2022-08-30 12:59:52 +02:00
workqueue_internal.h
workqueue.c This is the 5.10.146 stable release 2022-09-29 17:06:30 +02:00