mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/
synced 2026-11-08 18:57:22 +00:00
Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into for-7.1
Pull sched/core to resolve conflicts between:c2a57380df("sched: Replace use of system_unbound_wq with system_dfl_wq") from the tip tree and commit:cde94c032b("sched_ext: Make watchdog sub-sched aware") The latter moves around code modiefied by the former. Apply the changes in the new locations. Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
commit
0e7cd9cef6
15 changed files with 363 additions and 112 deletions
Loading…
Add table
Add a link
Reference in a new issue