Re: linux-next: manual merge of the sched-ext tree with the origin tree

[Tejun Heo]

Hello, Mark.

This conflict is already resolved in sched_ext/for-next by a5ba5c61951d
("sched_ext: Merge branch 'for-7.3-fixes' into for-7.4"). The sched-ext
side of your diff matches for-next as of Oct 9 (a8acb152ff95), from
before that merge. The current for-next (24c453aa8598) merges cleanly
into mainline.

Ours differs from yours in one spot: in unlink_dsq_and_switch_rq_lock(),
scx_wait_dispatching() comes after clearing p->scx.dsq, not before.

Thanks.

-- 
tejun