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
..
acpi
asm-generic	Merge branch 'sched/urgent' into sched/core, to resolve conflicts	2021-06-18 11:31:25 +02:00
clocksource
crypto
drm
dt-bindings	dt-bindings: connector: Add PD rev 2.0 VDO definition	2021-06-04 11:43:01 +02:00
keys
kunit
kvm
linux	Merge branch 'sched/urgent' into sched/core, to resolve conflicts	2021-06-18 11:31:25 +02:00
math-emu
media
memory
misc
net	net: caif: add proper error handling	2021-06-03 15:05:06 -07:00
pcmcia
ras
rdma
scsi
soc
sound	ASoC: Fixes for v5.13	2021-05-25 08:58:01 +02:00
target
trace	NFS client updates for Linux 5.13	2021-05-07 11:23:41 -07:00
uapi	Merge branch 'sched/urgent' into sched/core, to resolve conflicts	2021-06-18 11:31:25 +02:00
vdso
video
xen	xen/arm: move xen_swiotlb_detect to arm/swiotlb-xen.h	2021-05-14 15:52:05 +02:00