diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2025-10-28 15:04:17 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-10-29 08:42:28 +0100 |
| commit | 977b9a00541929973fddfbc2f5e932469f7cdc81 (patch) | |
| tree | 50885bdc977a6fa822b5419114e4ea44cfc1d480 /tools/docs/parse-headers.py | |
| parent | af13e5e437dc2eb8a3291aad70fc80d9cc78bc73 (diff) | |
| parent | fd57572253bc356330dbe5b233c2e1d8426c66fd (diff) | |
Merge branch 'linus/master' into sched/core, to resolve conflict
Conflicts:
kernel/sched/ext.c
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/docs/parse-headers.py')
0 files changed, 0 insertions, 0 deletions