git.monstr.eu Git - linux-2.6-microblaze.git/commit

projects / linux-2.6-microblaze.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 88c56cf d07f09a)

author	Ingo Molnar <mingo@kernel.org>
	Thu, 10 Aug 2023 07:05:43 +0000 (09:05 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Thu, 10 Aug 2023 07:05:43 +0000 (09:05 +0200)
commit	b41bbb33cf75d251a816768580819aec17be718d
tree	f50ecdfa8f7608af122e6215b7a967265085fb32	tree \| snapshot
parent	88c56cfeaec4642aee8aac58b38d5708c6aae0d3	commit \| diff
parent	d07f09a1f99cabbc86bc5c97d962eb8a466106b5	commit \| diff

Merge branch 'sched/eevdf' into sched/core

Pick up the EEVDF work into the main branch - it's looking good so far.

Conflicts:
kernel/sched/features.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>

kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/fair.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/features.h	diff1 \|	diff2 \|	blob \| history
kernel/sched/sched.h	diff1 \|	diff2 \|	blob \| history

MicroBlaze GIT Repository