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 /net/openvswitch/ssh:/git@git.zx2c4.com/git: | |
| parent | sched: Fix the do_set_cpus_allowed() locking fix (diff) | |
| parent | Merge tag 'sched_ext-for-6.18-rc3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext (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 'net/openvswitch/ssh:/git@git.zx2c4.com/git:')
0 files changed, 0 insertions, 0 deletions