From: Ingo Molnar <mingo@kernel.org>
Date: Thu, 10 Aug 2023 07:05:43 +0000 (+0200)
Subject: Merge branch 'sched/eevdf' into sched/core
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b41bbb33cf75d251a816768580819aec17be718d;p=linux.git

Merge branch 'sched/eevdf' into sched/core

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>
---

b41bbb33cf75d251a816768580819aec17be718d
diff --cc kernel/sched/features.h
index e10074cb4be4d,54334ca5c5c61..61bcbf5e46a45
--- a/kernel/sched/features.h
+++ b/kernel/sched/features.h
@@@ -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)