diff options
| author | Ingo Molnar <mingo@kernel.org> | 2022-05-06 10:21:46 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2022-05-06 10:21:46 +0200 |
| commit | d70522fc541224b8351ac26f4765f2c6268f8d72 (patch) | |
| tree | 5c924231da32485f3675f8e9911399e838fa2437 /.mailmap | |
| parent | 1a90bfd220201fbe050dfc15deaac20ca5f15638 (diff) | |
| parent | 672c0c5173427e6b3e2a9bbb7be51ceeec78093a (diff) | |
| download | linux-next-d70522fc541224b8351ac26f4765f2c6268f8d72.tar.gz | |
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>
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -391,6 +391,10 @@ Uwe Kleine-König <ukleinek@strlen.de> Uwe Kleine-König <ukl@pengutronix.de> Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com> Valdis Kletnieks <Valdis.Kletnieks@vt.edu> +Vasily Averin <vasily.averin@linux.dev> <vvs@virtuozzo.com> +Vasily Averin <vasily.averin@linux.dev> <vvs@openvz.org> +Vasily Averin <vasily.averin@linux.dev> <vvs@parallels.com> +Vasily Averin <vasily.averin@linux.dev> <vvs@sw.ru> Valentin Schneider <vschneid@redhat.com> <valentin.schneider@arm.com> Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com> Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com> |