]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip...
authorTejun Heo <tj@kernel.org>
Mon, 9 Mar 2026 19:59:36 +0000 (09:59 -1000)
committerTejun Heo <tj@kernel.org>
Mon, 9 Mar 2026 19:59:36 +0000 (09:59 -1000)
commit0e7cd9cef61fde36ebfb653fe9e7a9722185cb57
tree0eef127fa5f0bda6d0729a47ce5d3038c849b695
parentbec10581e92289bdc3eed17e90200900ddb00594
parent54a66e431eeacf23e1dc47cb3507f2d0c068aaf0
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:

  c2a57380df9dd ("sched: Replace use of system_unbound_wq with system_dfl_wq")

from the tip tree and commit:

  cde94c032b32b ("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>
kernel/sched/core.c
kernel/sched/ext.c
kernel/sched/sched.h