From: Ingo Molnar <mingo@kernel.org>
Date: Fri, 6 May 2022 08:21:46 +0000 (+0200)
Subject: Merge tag 'v5.18-rc5' into sched/core to pull in fixes & to resolve a conflict
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d70522fc541224b8351ac26f4765f2c6268f8d72;p=linux.git

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>
---

d70522fc541224b8351ac26f4765f2c6268f8d72
diff --cc .mailmap
index b76882fcc14a2,93458154ce7d4..ad2a01443aa0b
--- a/.mailmap
+++ b/.mailmap
@@@ -391,7 -391,10 +391,11 @@@ 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>
  Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>