projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1a90bfd 672c0c5)
Merge tag 'v5.18-rc5' into sched/core to pull in fixes & to resolve a conflict
authorIngo Molnar <mingo@kernel.org>
Fri, 6 May 2022 08:21:46 +0000 (10:21 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 6 May 2022 08:21:46 +0000 (10:21 +0200)
commitd70522fc541224b8351ac26f4765f2c6268f8d72
tree5c924231da32485f3675f8e9911399e838fa2437tree | snapshot
parent1a90bfd220201fbe050dfc15deaac20ca5f15638commit | diff
parent672c0c5173427e6b3e2a9bbb7be51ceeec78093acommit | diff
Merge tag 'v5.18-rc5' into sched/core to pull in fixes & to resolve a conflict

 - sched/core is on a pretty old -rc1 base - refresh it to include recent fixes.
 - this also allows up to resolve a (trivial) .mailmap conflict

Conflicts:
.mailmap

Signed-off-by: Ingo Molnar <mingo@kernel.org>
.mailmap diff1 | diff2 | blob | history
MAINTAINERS diff1 | diff2 | blob | history
include/linux/sched.h diff1 | diff2 | blob | history
kernel/sched/core.c diff1 | diff2 | blob | history
kernel/sched/fair.c diff1 | diff2 | blob | history
kernel/sched/idle.c diff1 | diff2 | blob | history
kernel/sched/sched.h diff1 | diff2 | blob | history
kernel/smp.c diff1 | diff2 | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git