From c1bacb02cb2f2c56db10f3d927acb5f91fe4d064 Mon Sep 17 00:00:00 2001 From: Zack Rusin Date: Sun, 24 Dec 2023 00:20:36 -0500 Subject: MAINTAINERS: change vmware.com addresses to broadcom.com Update the email addresses for vmwgfx and vmmouse to reflect the fact that VMware is now part of Broadcom. Add a .mailmap entry because the vmware.com address will start bouncing soon. Link: https://lkml.kernel.org/r/20231224052036.603621-1-zack.rusin@broadcom.com Signed-off-by: Zack Rusin Acked-by: Florian Fainelli Cc: Ian Forbes Cc: Martin Krastev Cc: Maaz Mombasawala Signed-off-by: Andrew Morton --- .mailmap | 1 + 1 file changed, 1 insertion(+) (limited to '.mailmap') diff --git a/.mailmap b/.mailmap index 6fb41ef38e86..8fb17c846dc7 100644 --- a/.mailmap +++ b/.mailmap @@ -631,4 +631,5 @@ Wolfram Sang Wolfram Sang Yakir Yang Yusuke Goda +Zack Rusin Zhu Yanjun -- cgit From 5b8fbf50a54b02e09eb64679defdebd4bc7dfe8a Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 23 Dec 2023 15:42:22 +0100 Subject: mailmap: add entries for Mathieu Othacehe Add my gnu.org mail address. Link: https://lkml.kernel.org/r/20231223144226.25740-1-othacehe@gnu.org Signed-off-by: Mathieu Othacehe Cc: Bjorn Andersson Cc: Heiko Stuebner Cc: Jakub Kicinski Cc: Jiri Kosina Cc: Konrad Dybcio Cc: Matthieu Baerts Cc: Matt Ranostay Cc: Oleksij Rempel Signed-off-by: Andrew Morton --- .mailmap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.mailmap') diff --git a/.mailmap b/.mailmap index 8fb17c846dc7..2fb9cc5f02d8 100644 --- a/.mailmap +++ b/.mailmap @@ -370,7 +370,7 @@ Martin Kepplinger Martin Kepplinger Martin Kepplinger Martyna Szapar-Mudlaw -Mathieu Othacehe +Mathieu Othacehe Mat Martineau Mat Martineau Matthew Wilcox -- cgit