diff options
| author | Tejun Heo <tj@kernel.org> | 2025-09-23 09:10:20 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2025-09-23 09:10:20 -1000 |
| commit | ebfd5226ec365d0901d3ddee4aba9c737137645c (patch) | |
| tree | 32957e60df4967a5afa6af7e642aeb2077414064 /rust/helpers/barrier.c | |
| parent | c0008a5632103eae31302e83d012e2d3b0cfad41 (diff) | |
| parent | 55ed11b181c43d81ce03b50209e4e7c4a14ba099 (diff) | |
sched_ext: Merge branch 'for-6.17-fixes' into for-6.18
Pull sched_ext/for-6.17-fixes to receive:
55ed11b181c4 ("sched_ext: idle: Handle migration-disabled tasks in BPF code")
which conflicts with the following commit in for-6.18:
2407bae23d1e ("sched_ext: Add the @sch parameter to ext_idle helpers")
The conflict is a simple context conflict which can be resolved by taking
the updated parts from both commits.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'rust/helpers/barrier.c')
0 files changed, 0 insertions, 0 deletions