]> Gentwo Git Trees - linux/.git/commit
Merge branch 'linus/master' into sched/core, to resolve conflict
authorPeter Zijlstra <peterz@infradead.org>
Tue, 28 Oct 2025 14:04:17 +0000 (15:04 +0100)
committerIngo Molnar <mingo@kernel.org>
Wed, 29 Oct 2025 07:42:28 +0000 (08:42 +0100)
commit977b9a00541929973fddfbc2f5e932469f7cdc81
tree50885bdc977a6fa822b5419114e4ea44cfc1d480
parentaf13e5e437dc2eb8a3291aad70fc80d9cc78bc73
parentfd57572253bc356330dbe5b233c2e1d8426c66fd
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>
kernel/sched/core.c
kernel/sched/deadline.c
kernel/sched/ext.c
kernel/sched/fair.c
kernel/sched/sched.h