]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge branch 'for-6.15-fixes' into for-6.16
authorTejun Heo <tj@kernel.org>
Tue, 29 Apr 2025 18:24:58 +0000 (08:24 -1000)
committerTejun Heo <tj@kernel.org>
Tue, 29 Apr 2025 18:24:58 +0000 (08:24 -1000)
commitce565f839c9e1c0952588f2b17ed4b02650f94b0
treeae0931af7b708e5aa5fdeff78723a4d821562c9a
parent069ac9e161eb9d5bfd5a4a5bf016522353226a51
parente38be1c7647c8c78304ce6d931b3b654e27948b3
Merge branch 'for-6.15-fixes' into for-6.16

To receive e38be1c7647c ("sched_ext: Fix rq lock state in hotplug ops") to
avoid conflicts with scx_sched related patches pending for for-6.16.
kernel/sched/ext.c