diff options
| author |   Tejun Heo <tj@kernel.org> | 2025-02-10 10:45:43 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2025-02-10 10:45:43 -1000 |
| commit | 78e4690de4227393c7cc260739ba94d10ca1df47 (patch) | |
| tree | 29e37edc8b48600a172912bab345617bf56e425a /kernel/sched/core.c | |
| parent | tools/sched_ext: Update enum_defs.autogen.h (diff) | |
| parent | sched_ext: Fix incorrect assumption about migration disabled tasks in task_can_run_on_remote_rq() (diff) | |
| download | wireguard-linux-78e4690de4227393c7cc260739ba94d10ca1df47.tar.xz wireguard-linux-78e4690de4227393c7cc260739ba94d10ca1df47.zip | |
Merge branch 'for-6.14-fixes' into for-6.15
Pull to receive f3f08c3acfb8 ("sched_ext: Fix incorrect assumption about
migration disabled tasks in task_can_run_on_remote_rq()") which conflicts
with 26176116d931 ("sched_ext: Count SCX_EV_DISPATCH_LOCAL_DSQ_OFFLINE in
the right spot") in for-6.15.
Diffstat (limited to 'kernel/sched/core.c')
0 files changed, 0 insertions, 0 deletions