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: a7b359fc6a: ("sched/fair: Correctly insert cfs_rq's to list on unthrottle") and this fresh commit in sched/core modified it in the old location: 9e077b52d8: ("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
..
alpha	Merge branch 'sched/urgent' into sched/core, to pick up fixes	2021-06-03 19:00:49 +02:00
arc	Merge branch 'sched/urgent' into sched/core, to pick up fixes	2021-06-03 19:00:49 +02:00
arm	Merge branch 'sched/urgent' into sched/core, to resolve conflicts	2021-06-18 11:31:25 +02:00
arm64	Merge branch 'sched/urgent' into sched/core, to resolve conflicts	2021-06-18 11:31:25 +02:00
csky	sched/core: Initialize the idle task with preemption disabled	2021-05-12 13:01:45 +02:00
h8300	arch: rearrange headers inclusion order in asm/bitops for m68k, sh and h8300	2021-05-06 19:24:11 -07:00
hexagon	Merge branch 'akpm' (patches from Andrew)	2021-05-07 00:34:51 -07:00
ia64	Merge branch 'sched/urgent' into sched/core, to pick up fixes	2021-06-03 19:00:49 +02:00
m68k	Merge branch 'for-v5.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace	2021-05-21 06:12:52 -10:00
microblaze	quota: Disable quotactl_path syscall	2021-05-17 14:39:56 +02:00
mips	Merge branch 'sched/urgent' into sched/core, to resolve conflicts	2021-06-18 11:31:25 +02:00
nds32	tracing updates for 5.13	2021-05-03 11:19:54 -07:00
nios2	Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2021-05-02 09:14:01 -07:00
openrisc	Merge branch 'sched/urgent' into sched/core, to pick up fixes	2021-06-03 19:00:49 +02:00
parisc	Merge branch 'sched/urgent' into sched/core, to pick up fixes	2021-06-03 19:00:49 +02:00
powerpc	Merge branch 'sched/urgent' into sched/core, to resolve conflicts	2021-06-18 11:31:25 +02:00
riscv	Merge branch 'sched/urgent' into sched/core, to resolve conflicts	2021-06-18 11:31:25 +02:00
s390	Merge branch 'sched/urgent' into sched/core, to pick up fixes	2021-06-03 19:00:49 +02:00
sh	Merge branch 'sched/urgent' into sched/core, to pick up fixes	2021-06-03 19:00:49 +02:00
sparc	Merge branch 'sched/urgent' into sched/core, to pick up fixes	2021-06-03 19:00:49 +02:00
um	Merge branch 'akpm' (patches from Andrew)	2021-05-07 00:34:51 -07:00
x86	Merge branch 'sched/urgent' into sched/core, to resolve conflicts	2021-06-18 11:31:25 +02:00
xtensa	Merge branch 'sched/urgent' into sched/core, to pick up fixes	2021-06-03 19:00:49 +02:00
.gitignore	.gitignore: prefix local generated files with a slash	2021-05-02 00:43:35 +09:00
Kconfig	Add Landlock, a new LSM from Mickaël Salaün <mic@linux.microsoft.com>	2021-05-01 18:50:44 -07:00