diff options
| author | Tejun Heo <tj@kernel.org> | 2026-03-30 08:52:33 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2026-03-30 09:02:05 -1000 |
| commit | 94555ca6d0bb41a7cb3c12ad2a7cacb6fdbdca0b (patch) | |
| tree | 6c614260e1eb81b2f9fefb4a1a76ddcb0200b300 /tools/lib/python/kdoc/python_version.py | |
| parent | 238aa43f0b77ea7db7f306e010f688c77439ee62 (diff) | |
| parent | 090d34f0f0285124452373225bcc520a31e305e4 (diff) | |
Merge branch 'for-7.0-fixes' into for-7.1
Conflict in kernel/sched/ext.c init_sched_ext_class() between:
415cb193bb97 ("sched_ext: Fix SCX_KICK_WAIT deadlock by deferring wait
to balance callback")
which adds cpus_to_sync cpumask allocation, and:
84b1a0ea0b7c ("sched_ext: Implement scx_bpf_dsq_reenq() for user DSQs")
8c1b9453fde6 ("sched_ext: Convert deferred_reenq_locals from llist to
regular list")
which add deferred_reenq init code at the same location. Both are
independent additions. Include both.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'tools/lib/python/kdoc/python_version.py')
0 files changed, 0 insertions, 0 deletions