summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Ian King <colin.i.king@gmail.com>2022-08-17 23:27:53 +0200
committerAndrew Morton <akpm@linux-foundation.org>2022-08-28 23:02:45 +0200
commitac733f6558ec86938e40433d88ec4e6148bac485 (patch)
tree9337548fb6f80416c563e3c8c989b6088db85ce9
parentasm-generic: sections: refactor memory_intersects (diff)
downloadlinux-ac733f6558ec86938e40433d88ec4e6148bac485.tar.xz
linux-ac733f6558ec86938e40433d88ec4e6148bac485.zip
mailmap: update email address for Colin King
Colin King is working on kernel janitorial fixes in his spare time and using his Intel email is confusing. Use his gmail account as the default email address. Link: https://lkml.kernel.org/r/20220817212753.101109-1-colin.i.king@gmail.com Signed-off-by: Colin Ian King <colin.i.king@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-rw-r--r--.mailmap3
1 files changed, 1 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index 23241db2647f..984ddd1f6ad3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -98,8 +98,7 @@ Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com>
Christian Marangi <ansuelsmth@gmail.com>
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>
+Colin Ian King <colin.i.king@gmail.com> <colin.king@canonical.com>
Corey Minyard <minyard@acm.org>
Damian Hobson-Garcia <dhobsong@igel.co.jp>
Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>