Merge branch 'sched/eevdf' into sched/core
authorIngo Molnar <mingo@kernel.org>
Thu, 10 Aug 2023 07:05:43 +0000 (09:05 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 10 Aug 2023 07:05:43 +0000 (09:05 +0200)
Pick up the EEVDF work into the main branch - it's looking good so far.

 Conflicts:
kernel/sched/features.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
kernel/sched/core.c
kernel/sched/fair.c
kernel/sched/features.h
kernel/sched/sched.h

Simple merge
Simple merge
@@@ -98,8 -86,3 +86,5 @@@ SCHED_FEAT(UTIL_EST, true
  SCHED_FEAT(UTIL_EST_FASTUP, true)
  
  SCHED_FEAT(LATENCY_WARN, false)
- SCHED_FEAT(ALT_PERIOD, true)
- SCHED_FEAT(BASE_SLICE, true)
 +
 +SCHED_FEAT(HZ_BW, true)
Simple merge