diff options
| author | Tejun Heo <tj@kernel.org> | 2026-04-25 03:37:32 +0300 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2026-04-25 03:37:32 +0300 |
| commit | dfe454e37b1ef58136ae3ce5019325d274296253 (patch) | |
| tree | 2ab95ab47a4e17379587c2aae1cf27035a70def5 /include/linux | |
| parent | c2929bc21dcec3b547d5b4b2ac643f7b071662ba (diff) | |
| parent | deb7b2f93d0129b79425f830a1e5e7e1bb2c4973 (diff) | |
| download | linux-dfe454e37b1ef58136ae3ce5019325d274296253.tar.xz | |
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>
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions