diff options
| author | Tejun Heo <tj@kernel.org> | 2026-04-21 19:30:11 +0300 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2026-04-21 19:35:42 +0300 |
| commit | 9af5d67065c31ae9d3ba5723e252baed532c73a4 (patch) | |
| tree | 3a21fc7bbd91d6eccf839db5e9410c6444a61a40 /include/linux/debugobjects.h | |
| parent | 12ff49d4e1d9df09320b19a0c33477f9cc737baf (diff) | |
| parent | 05909810a946222aca5d0611d37be82d18f95228 (diff) | |
| download | linux-9af5d67065c31ae9d3ba5723e252baed532c73a4.tar.xz | |
Merge branch 'for-7.1-fixes' into for-7.2
Pull to receive:
05909810a946 ("tools/sched_ext: scx_qmap: Silence task_ctx lookup miss")
which conflicts with the cid-form qmap rework on for-7.2. Resolved
by applying the same silence-on-NULL semantics to the arena-backed
lookup_task_ctx() and qmap_select_cpu() on for-7.2.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include/linux/debugobjects.h')
0 files changed, 0 insertions, 0 deletions