From: Shakeel Butt Date: Mon, 19 Feb 2024 20:50:50 +0000 (-0800) Subject: MAINTAINERS: mailmap: update Shakeel's email address X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=379c5aaa14351aa9faf1f569fe9e3c4f4b02f6a0;p=linux.git MAINTAINERS: mailmap: update Shakeel's email address Moving to linux.dev based email for kernel work. Link: https://lkml.kernel.org/r/20240219205050.887810-1-shakeel.butt@linux.dev Signed-off-by: Shakeel Butt Signed-off-by: Andrew Morton --- diff --git a/.mailmap b/.mailmap index b99a238ee3bde..08f28f2999f0d 100644 --- a/.mailmap +++ b/.mailmap @@ -553,6 +553,7 @@ Senthilkumar N L Serge Hallyn Serge Hallyn Seth Forshee +Shakeel Butt Shannon Nelson Shannon Nelson Shannon Nelson diff --git a/MAINTAINERS b/MAINTAINERS index 9ed4d38685394..c3c9cf33595cc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5378,7 +5378,7 @@ CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG) M: Johannes Weiner M: Michal Hocko M: Roman Gushchin -M: Shakeel Butt +M: Shakeel Butt R: Muchun Song L: cgroups@vger.kernel.org L: linux-mm@kvack.org