| commit | d70522fc541224b8351ac26f4765f2c6268f8d72 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Fri May 06 10:21:46 2022 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Fri May 06 10:21:46 2022 +0200 |
| tree | 5c924231da32485f3675f8e9911399e838fa2437 | |
| parent | 1a90bfd220201fbe050dfc15deaac20ca5f15638 [diff] | |
| parent | 672c0c5173427e6b3e2a9bbb7be51ceeec78093a [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>