summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorSerge Hallyn <serge@hallyn.com>2023-11-13 10:22:22 -0600
committerPaul Moore <paul@paul-moore.com>2023-11-13 14:15:11 -0500
commite596ff4a79300423b2ae8fbd1a78a3e311f99dfe (patch)
tree895d002b1e3048da1b2b7fd0c03ba74cfc19b3c4 /.mailmap
parent00eb7bd699ccd60d3e5c0ef2ca89467461c39178 (diff)
downloadlwn-e596ff4a79300423b2ae8fbd1a78a3e311f99dfe.tar.gz
lwn-e596ff4a79300423b2ae8fbd1a78a3e311f99dfe.zip
mailmap: add entries for Serge Hallyn's dead accounts
Signed-off-by: Serge Hallyn <serge@hallyn.com> Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 2ba581ebb2cf..35086f4a7961 100644
--- a/.mailmap
+++ b/.mailmap
@@ -535,6 +535,8 @@ Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>
Sebastian Reichel <sre@kernel.org> <sre@debian.org>
Sedat Dilek <sedat.dilek@gmail.com> <sedat.dilek@credativ.de>
Senthilkumar N L <quic_snlakshm@quicinc.com> <snlakshm@codeaurora.org>
+Serge Hallyn <sergeh@kernel.org> <serge.hallyn@canonical.com>
+Serge Hallyn <sergeh@kernel.org> <serue@us.ibm.com>
Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>
Shannon Nelson <shannon.nelson@amd.com> <snelson@pensando.io>
Shannon Nelson <shannon.nelson@amd.com> <shannon.nelson@intel.com>