]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 2e7df12 f3f08c3)
Merge branch 'for-6.14-fixes' into for-6.15
authorTejun Heo <tj@kernel.org>
Mon, 10 Feb 2025 20:45:43 +0000 (10:45 -1000)
committerTejun Heo <tj@kernel.org>
Mon, 10 Feb 2025 20:45:43 +0000 (10:45 -1000)
commit78e4690de4227393c7cc260739ba94d10ca1df47
tree29e37edc8b48600a172912bab345617bf56e425atree
parent2e7df12bdde13c0efefc3230dc96b36edfa53ec5commit | diff
parentf3f08c3acfb8860e07a22814a344e83c99ad7398commit | diff
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.
kernel/sched/ext.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.