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
..
boot	riscv: Fix BUILTIN_DTB for sifive and microchip soc	2021-06-11 21:07:09 -07:00
configs	RISC-V: Enable Microchip PolarFire ICICLE SoC	2021-04-26 08:31:32 -07:00
errata	riscv: skip errata_cip_453.o if CONFIG_ERRATA_SIFIVE_CIP_453 is disabled	2021-06-01 21:16:41 -07:00
include	riscv: alternative: fix typo in macro name	2021-06-10 20:35:05 -07:00
kernel	Merge branch 'sched/urgent' into sched/core, to resolve conflicts	2021-06-18 11:31:25 +02:00
lib	riscv: Add support for function error injection	2021-01-14 15:09:09 -08:00
mm	riscv: mm: Fix W+X mappings at boot	2021-06-01 21:15:09 -07:00
net	riscv: bpf: Avoid breaking W^X	2021-04-26 08:25:14 -07:00
Kbuild	riscv: Allow device trees to be built into the kernel	2020-05-18 11:38:05 -07:00
Kconfig	riscv: code patching only works on !XIP_KERNEL	2021-06-10 16:33:50 -07:00
Kconfig.debug	RISC-V: Remove EARLY_PRINTK support	2018-12-17 10:23:46 -08:00
Kconfig.erratas	riscv: enable SiFive errata CIP-453 and CIP-1200 Kconfig only if CONFIG_64BIT=y	2021-05-06 09:40:13 -07:00
Kconfig.socs	RISC-V Patches for the 5.13 Merge Window, Part 1	2021-05-06 09:24:18 -07:00
Makefile	riscv: Use -mno-relax when using lld linker	2021-05-29 11:40:16 -07:00