Merge tag 'io_uring-5.16-2021-11-09' of git://git.kernel.dk/linux-block

[mirror_ubuntu-kernels.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index 9d4fc1fea6652688912d7570a6782149f3adb9ef..14314e3c5d5e230374b34cd800dc63487ee906f7 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -73,6 +73,8 @@ Chris Chiu <chris.chiu@canonical.com> <chiu@endlessm.com>
 Chris Chiu <chris.chiu@canonical.com> <chiu@endlessos.org>
 Christophe Ricard <christophe.ricard@gmail.com>
 Christoph Hellwig <hch@lst.de>
+Colin Ian King <colin.king@intel.com> <colin.king@canonical.com>
+Colin Ian King <colin.king@intel.com> <colin.i.king@gmail.com>
 Corey Minyard <minyard@acm.org>
 Damian Hobson-Garcia <dhobsong@igel.co.jp>
 Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>