]> git.ipfire.org Git - thirdparty/linux.git/commit
projects / thirdparty / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c2929bc deb7b2f)
Merge branch 'for-7.1-fixes' into for-7.2
authorTejun Heo <tj@kernel.org>
Sat, 25 Apr 2026 00:37:32 +0000 (14:37 -1000)
committerTejun Heo <tj@kernel.org>
Sat, 25 Apr 2026 00:37:32 +0000 (14:37 -1000)
commitdfe454e37b1ef58136ae3ce5019325d274296253
tree2ab95ab47a4e17379587c2aae1cf27035a70def5tree | snapshot
parentc2929bc21dcec3b547d5b4b2ac643f7b071662bacommit | diff
parentdeb7b2f93d0129b79425f830a1e5e7e1bb2c4973commit | diff
Merge branch 'for-7.1-fixes' into for-7.2

Pull to receive:

 c0e8ddc76d54 ("sched_ext: Align cgroup #ifdef guards with SUB_SCHED vs GROUP_SCHED")

which conflicts with:

 41e3312861ea ("sched_ext: add p->scx.tid and SCX_OPS_TID_TO_TASK lookup")

It's a simple context conflict. Take changes from both.

Signed-off-by: Tejun Heo <tj@kernel.org>
kernel/sched/ext.c diff1 | diff2 | blob | history
kernel/sched/ext_internal.h diff1 | diff2 | blob | history
A mirror of Linus' kernel repository