Ingo Molnar b2c0931a07 Merge branch 'sched/urgent' into sched/core, to resolve conflicts ... This commit in sched/urgent moved the cfs_rq_is_decayed() function: a7b359fc6a37: ("sched/fair: Correctly insert cfs_rq's to list on unthrottle") and this fresh commit in sched/core modified it in the old location: 9e077b52d86a: ("sched/pelt: Check that *_avg are null when *_sum are") Merge the two variants. Conflicts: kernel/sched/fair.c Signed-off-by: Ingo Molnar <mingo@kernel.org>		2021-06-18 11:31:25 +02:00
..
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf	2021-05-11 16:05:56 -07:00
Makefile	md: move the early init autodetect code to drivers/md/	2020-07-16 15:34:47 +02:00
calibrate.c	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
do_mounts.c	block: merge struct block_device and struct hd_struct	2020-12-01 14:53:40 -07:00
do_mounts.h	init: add an init_mknod helper	2020-07-31 08:17:54 +02:00
do_mounts_initrd.c	Merge branch 'hch.init_path' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2020-08-07 09:40:34 -07:00
do_mounts_rd.c	init: add an init_unlink helper	2020-07-31 08:17:52 +02:00
init_task.c	seccomp: Fix CONFIG tests for Seccomp_filters	2021-03-30 22:33:50 -07:00
initramfs.c	init/initramfs.c: do unpacking asynchronously	2021-05-07 00:26:33 -07:00
main.c	Merge branch 'sched/urgent' into sched/core, to resolve conflicts	2021-06-18 11:31:25 +02:00
noinitramfs.c	init: add an init_mknod helper	2020-07-31 08:17:54 +02:00
version.c	kbuild: add an elfnote for whether vmlinux is built with lto	2021-04-25 05:25:42 +09:00