Greg Kroah-Hartman 12283eb030 Merge 3fe2f7446f ("Merge tag 'sched-core-2022-03-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline ... Steps on the way to 5.18-rc1 Resolves merge conflicts in: kernel/sched/core.c kernel/sched/cputime.c kernel/sched/sched.h Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I5a1cc7ebbaf5f2fda5adf50a0bc7df9783633160		2022-04-02 16:38:28 +02:00
..
bpf	Merge 53ab78cd6d ("Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux") into android-mainline	2022-02-25 13:57:28 +01:00
cgroup	Merge 3fe2f7446f ("Merge tag 'sched-core-2022-03-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline	2022-04-02 16:38:28 +02:00
configs	configs/debug: restore DEBUG_INFO=y for overriding	2022-03-17 11:02:13 -07:00
debug	kdb: Adopt scheduler's task classification	2021-11-03 17:21:37 +00:00
dma	Merge 06be302970 ("Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost") into android-mainline	2022-03-09 12:44:48 +01:00
entry	Changes in this cycle were:	2022-03-22 14:39:12 -07:00
events	Merge ebd326ce72 ("Merge tag 'locking-core-2022-03-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline	2022-03-30 14:19:38 +02:00
futex	Merge branch 'signal-for-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace	2022-01-17 05:49:30 +02:00
gcov	gcov: Remove compiler version check	2021-12-02 17:25:21 +09:00
irq	Merge 3fe2f7446f ("Merge tag 'sched-core-2022-03-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline	2022-04-02 16:38:28 +02:00
kcsan	KCSAN updates for v5.17	2022-01-11 09:51:26 -08:00
livepatch	Livepatching changes for 5.17	2022-01-16 10:08:13 +02:00
locking	Revert "ANDROID: vendor_hooks: add waiting information for blocked tasks"	2022-04-01 14:26:26 +02:00
power	Merge 616355cc81 ("Merge tag 'for-5.18/block-2022-03-18' of git://git.kernel.dk/linux-block") into android-mainline	2022-03-26 10:51:32 +01:00
printk	Linux 5.17-rc3	2022-02-17 11:05:39 +01:00
rcu	Changes in this cycle were:	2022-03-22 14:39:12 -07:00
sched	Merge 3fe2f7446f ("Merge tag 'sched-core-2022-03-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline	2022-04-02 16:38:28 +02:00
time	Merge 84c2e17951 ("Merge tag 'timers-core-2022-03-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline	2022-03-25 08:47:33 +01:00
trace	Merge 3fe2f7446f ("Merge tag 'sched-core-2022-03-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline	2022-04-02 16:38:28 +02:00
.gitignore
acct.c	kernel: remove spurious blkdev.h includes	2021-10-18 06:17:01 -06:00
async.c	Revert "module, async: async_synchronize_full() on module init iff async is used"	2022-02-03 11:20:34 -08:00
audit.c	audit: improve audit queue handling when "audit=1" on cmdline	2022-01-25 13:22:51 -05:00
audit.h	audit: log AUDIT_TIME_* records only from rules	2022-02-22 13:51:40 -05:00
audit_fsnotify.c	fsnotify: clarify contract for create event hooks	2021-10-27 12:32:34 +02:00
audit_tree.c	audit: use struct_size() helper in kmalloc()	2021-12-14 17:39:42 -05:00
audit_watch.c	\n	2021-11-06 16:43:20 -07:00
auditfilter.c	audit/stable-5.17 PR 20220110	2022-01-11 13:08:21 -08:00
auditsc.c	audit/stable-5.18 PR 20220321	2022-03-21 20:53:11 -07:00
backtracetest.c
bounds.c
capability.c
cfi.c	cfi: Use rcu_read_{un}lock_sched_notrace	2021-08-11 13:11:12 -07:00
compat.c	arch: remove compat_alloc_user_space	2021-09-08 15:32:35 -07:00
configs.c
context_tracking.c
cpu.c	Merge 3fe2f7446f ("Merge tag 'sched-core-2022-03-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline	2022-04-02 16:38:28 +02:00
cpu_pm.c	PM: cpu: Make notifier chain use a raw_spinlock_t	2021-08-16 18:55:32 +02:00
crash_core.c	kernel/crash_core: suppress unknown crashkernel parameter warning	2021-12-25 12:20:55 -08:00
crash_dump.c
cred.c	Merge tag 'v5.17-rc5' into android-mainline	2022-02-21 15:17:17 +01:00
delayacct.c	delayacct: track delays from memory compact	2022-01-20 08:52:55 +02:00
dma.c
exec_domain.c
exit.c	for-5.18/block-2022-03-18	2022-03-21 16:48:55 -07:00
extable.c	extable: use is_kernel_text() helper	2021-11-09 10:02:51 -08:00
fail_function.c
fork.c	Merge bba90e0964 ("Merge tag 'core-core-2022-03-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline	2022-03-25 08:04:50 +01:00
freezer.c	sched: Add get_current_state()	2021-06-18 11:43:08 +02:00
gen_kheaders.sh	kbuild: clean up ${quiet} checks in shell scripts	2021-05-27 04:01:50 +09:00
gki_module.c	Revert "Revert "ANDROID: GKI: Add module load time protected symbol lookup""	2022-01-14 19:51:57 +00:00
groups.c
hung_task.c	hung_task: move hung_task sysctl interface to hung_task.c	2022-01-22 08:33:34 +02:00
iomem.c
irq_work.c	Merge 9a7e0a90a4 ("Merge tag 'sched-core-2021-11-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline	2021-11-05 17:07:26 +01:00
jump_label.c	jump_label: Fix jump_label_text_reserved() vs __init	2021-07-05 10:46:20 +02:00
kallsyms.c	Livepatching changes for 5.17	2022-01-16 10:08:13 +02:00
kcmp.c
Kconfig.freezer
Kconfig.hz
Kconfig.locks	locking/rwlock: Provide RT variant	2021-08-17 17:50:51 +02:00
Kconfig.preempt	Changes in this cycle were:	2022-03-22 14:39:12 -07:00
kcov.c	kcov: replace local_irq_save() with a local_lock_t	2021-11-09 10:02:52 -08:00
kexec.c	kexec: avoid compat_alloc_user_space	2021-09-08 15:32:34 -07:00
kexec_core.c	exit: Move oops specific logic from do_exit into make_task_dead	2021-12-13 12:04:45 -06:00
kexec_elf.c
kexec_file.c	memblock: add MEMBLOCK_DRIVER_MANAGED to mimic IORESOURCE_SYSRAM_DRIVER_MANAGED	2021-11-06 13:30:42 -07:00
kexec_internal.h
kheaders.c
kmod.c
kprobes.c	kprobe: move sysctl_kprobes_optimization to kprobes.c	2022-01-22 08:33:36 +02:00
ksysfs.c
kthread.c	Merge 3fe2f7446f ("Merge tag 'sched-core-2022-03-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline	2022-04-02 16:38:28 +02:00
latencytop.c
Makefile	Merge 763978ca67 ("Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux") into android-mainline	2022-02-16 08:03:10 +01:00
module-internal.h	Merge 763978ca67 ("Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux") into android-mainline	2022-02-16 08:03:10 +01:00
module.c	Merge ebd326ce72 ("Merge tag 'locking-core-2022-03-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline	2022-03-30 14:19:38 +02:00
module_decompress.c	module: fix building with sysfs disabled	2022-02-16 12:51:32 -08:00
module_signature.c
module_signing.c
notifier.c	notifier: Return an error when a callback has already been registered	2021-12-29 10:37:33 +01:00
nsproxy.c	memcg: enable accounting for new namesapces and struct nsproxy	2021-09-03 09:58:12 -07:00
padata.c	padata: replace cpumask_weight with cpumask_empty in padata.c	2022-01-31 11:21:46 +11:00
panic.c	panic: remove oops_id	2022-01-20 08:52:55 +02:00
params.c	kobject: remove kset from struct kset_uevent_ops callbacks	2021-12-28 11:26:18 +01:00
pid.c	Merge f78e9de80f ("Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input") into android-mainline	2021-11-22 19:06:45 +01:00
pid_namespace.c	memcg: enable accounting for new namesapces and struct nsproxy	2021-09-03 09:58:12 -07:00
profile.c	exit: Remove profile_handoff_task	2022-01-08 12:43:57 -06:00
ptrace.c	ptrace: Remove second setting of PT_SEIZED in ptrace_attach	2022-01-08 12:43:57 -06:00
range.c
reboot.c	Merge f78e9de80f ("Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input") into android-mainline	2021-11-22 19:06:45 +01:00
regset.c
relay.c
resource.c	proc: remove PDE_DATA() completely	2022-01-22 08:33:37 +02:00
resource_kunit.c
rseq.c	rseq: Remove broken uapi field layout on 32-bit little endian	2022-02-02 13:11:34 +01:00
scftorture.c	scftorture: Always log error message	2021-12-07 16:36:17 -08:00
scs.c	scs: Release kasan vmalloc poison in scs_free process	2021-09-30 09:37:27 +01:00
seccomp.c	seccomp: Invalidate seccomp mode to catch death failures	2022-02-10 19:09:12 -08:00
signal.c	signal, x86: Delay calling signals in atomic on RT enabled kernels	2022-03-04 14:58:54 +01:00
smp.c	sched: Improve wake_up_all_idle_cpus() take #2	2021-10-22 15:32:46 +02:00
smpboot.c	smpboot: Replace deprecated CPU-hotplug functions.	2021-08-10 14:57:42 +02:00
smpboot.h
softirq.c	Merge 93287e28bc ("Merge tag 'irq-core-2022-03-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline	2022-03-25 08:47:45 +01:00
stackleak.c	gcc-plugins/stackleak: Use noinstr in favor of notrace	2022-02-03 17:02:21 -08:00
stacktrace.c	ANDROID: stacktrace: export stack_trace_save_tsk/regs	2022-03-15 18:53:40 +00:00
static_call.c	static_call: Fix static_call_text_reserved() vs __init	2021-07-05 10:46:33 +02:00
stop_machine.c
sys.c	Merge dcde98da99 ("Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input") into android-mainline	2022-03-06 11:33:15 +01:00
sys_ni.c	mm/mempolicy: wire up syscall set_mempolicy_home_node	2022-01-15 16:30:30 +02:00
sysctl-test.c	kernel/sysctl-test: Remove some casts which are no-longer required	2021-06-23 16:41:24 -06:00
sysctl.c	Linux 5.17-rc8	2022-03-15 10:28:12 +01:00
task_work.c
taskstats.c
torture.c	torture: Wake up kthreads after storing task_struct pointer	2022-02-01 17:24:39 -08:00
tracepoint.c	Merge 996fe06160 ("Merge tag 'kgdb-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux") into android-mainline	2021-09-14 16:16:54 +02:00
tsacct.c	taskstats: Cleanup the use of task->exit_code	2022-01-08 12:43:57 -06:00
ucount.c	ucounts: Handle wrapping in is_ucounts_overlimit	2022-02-17 09:11:57 -06:00
uid16.c
uid16.h
umh.c
up.c
user-return-notifier.c
user.c	fs/epoll: use a per-cpu counter for user's watches count	2021-09-08 11:50:27 -07:00
user_namespace.c	ucounts: Fix systemd LimitNPROC with private users regression	2022-02-25 10:40:14 -06:00
usermode_driver.c	Merge branch 'work.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2021-07-03 11:41:14 -07:00
utsname.c
utsname_sysctl.c
watch_queue.c	watch_queue: Actually free the watch	2022-03-21 12:48:32 +00:00
watchdog.c	sched/isolation: Use single feature type while referring to housekeeping cpumask	2022-02-16 15:57:55 +01:00
watchdog_hld.c
workqueue.c	Merge 3fe2f7446f ("Merge tag 'sched-core-2022-03-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline	2022-04-02 16:38:28 +02:00
workqueue_internal.h	workqueue: Assign a color to barrier work items	2021-08-17 07:49:10 -10:00