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	powerpc/fsl: set fsl,i2c-erratum-a004447 flag for P1010 i2c controllers	2021-05-27 21:52:16 +02:00
configs	powerpc updates for 5.13	2021-04-30 12:22:28 -07:00
crypto	crypto: powepc/sha1 - remove unneeded semicolon	2021-03-07 15:13:14 +11:00
include	powerpc fixes for 5.13 #5	2021-06-06 12:39:36 -07:00
kernel	Merge branch 'sched/urgent' into sched/core, to resolve conflicts	2021-06-18 11:31:25 +02:00
kexec	powerpc/kexec_file: Use current CPU info while setting up FDT	2021-05-04 22:26:57 +10:00
kvm	powerpc fixes for 5.13 #5	2021-06-06 12:39:36 -07:00
lib	powerpc/64s: Fix stf mitigation patching w/strict RWX & hash	2021-05-14 17:27:37 +10:00
math-emu	powerpc/math: Fix missing __user qualifier for get_user() and other sparse warnings	2021-03-29 13:22:12 +11:00
mm	Merge branch 'akpm' (patches from Andrew)	2021-05-05 13:50:15 -07:00
net	powerpc/ebpf32: Use standard function call for functions within 32M distance	2021-04-21 22:52:33 +10:00
perf	powerpc/perf: Fix the threshold event selection for memory events in power10	2021-04-23 01:38:02 +10:00
platforms	powerpc/pseries: warn if recursing into the hcall tracing code	2021-05-12 11:07:39 +10:00
purgatory	powerpc/kexec: Don't use .machine ppc64 in trampoline_64.S	2021-04-08 21:17:43 +10:00
sysdev	Merge branch 'akpm' (patches from Andrew)	2021-04-30 14:38:01 -07:00
tools	powerpc/tools: Remove 90 line limit in checkpatch script	2020-09-08 22:57:11 +10:00
xmon	powerpc updates for 5.13	2021-04-30 12:22:28 -07:00
Kbuild	powerpc/kexec: Move kexec files into a dedicated subdir.	2019-11-21 15:41:34 +11:00
Kconfig	Merge branch 'master' into next	2021-05-08 21:12:55 +10:00
Kconfig.debug	powerpc: iommu: fix build when neither PCI or IBMVIO is set	2021-04-08 21:17:46 +10:00
Makefile	powerpc: Only define _TASK_CPU for 32-bit	2021-04-20 14:22:24 +10:00
Makefile.postlink	powerpc: unrel_branch_check.sh: use nm to find symbol value	2020-09-02 11:00:22 +10:00