The quilt patch titled
Subject: mailmap, MAINTAINERS, docs: update Carlos's email address
has been removed from the -mm tree. Its filename was
mailmap-maintainers-docs-update-my-email-address.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Carlos Bilbao <carlos.bilbao@xxxxxxxxxx>
Subject: mailmap, MAINTAINERS, docs: update Carlos's email address
Date: Wed, 29 Jan 2025 19:22:44 -0600
Update .mailmap to reflect my new (and final) primary email address,
carlos.bilbao@xxxxxxxxxx. Also update contact information in files
Documentation/translations/sp_SP/index.rst and MAINTAINERS.
Link: https://lkml.kernel.org/r/20250130012248.1196208-1-carlos.bilbao@xxxxxxxxxx
Signed-off-by: Carlos Bilbao <carlos.bilbao@xxxxxxxxxx>
Cc: Carlos Bilbao <bilbao@xxxxxx>
Cc: Jonathan Corbet <corbet@xxxxxxx>
Cc: Mattew Wilcox <willy@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
.mailmap | 4 +++-
Documentation/translations/sp_SP/index.rst | 2 +-
MAINTAINERS | 8 ++++----
3 files changed, 8 insertions(+), 6 deletions(-)
--- a/Documentation/translations/sp_SP/index.rst~mailmap-maintainers-docs-update-my-email-address
+++ a/Documentation/translations/sp_SP/index.rst
@@ -7,7 +7,7 @@ Traducción al español
\kerneldocCJKoff
-:maintainer: Carlos Bilbao <carlos.bilbao.osdev@xxxxxxxxx>
+:maintainer: Carlos Bilbao <carlos.bilbao@xxxxxxxxxx>
.. _sp_disclaimer:
--- a/.mailmap~mailmap-maintainers-docs-update-my-email-address
+++ a/.mailmap
@@ -148,7 +148,9 @@ Bryan Tan <bryan-bt.tan@xxxxxxxxxxxx> <b
Cai Huoqing <cai.huoqing@xxxxxxxxx> <caihuoqing@xxxxxxxxx>
Can Guo <quic_cang@xxxxxxxxxxx> <cang@xxxxxxxxxxxxxx>
Carl Huang <quic_cjhuang@xxxxxxxxxxx> <cjhuang@xxxxxxxxxxxxxx>
-Carlos Bilbao <carlos.bilbao.osdev@xxxxxxxxx> <carlos.bilbao@xxxxxxx>
+Carlos Bilbao <carlos.bilbao@xxxxxxxxxx> <carlos.bilbao@xxxxxxx>
+Carlos Bilbao <carlos.bilbao@xxxxxxxxxx> <carlos.bilbao.osdev@xxxxxxxxx>
+Carlos Bilbao <carlos.bilbao@xxxxxxxxxx> <bilbao@xxxxxx>
Changbin Du <changbin.du@xxxxxxxxx> <changbin.du@xxxxxxxxx>
Changbin Du <changbin.du@xxxxxxxxx> <changbin.du@xxxxxxxxx>
Chao Yu <chao@xxxxxxxxxx> <chao2.yu@xxxxxxxxxxx>
--- a/MAINTAINERS~mailmap-maintainers-docs-update-my-email-address
+++ a/MAINTAINERS
@@ -1090,7 +1090,7 @@ F: drivers/video/fbdev/geode/
AMD HSMP DRIVER
M: Naveen Krishna Chatradhi <naveenkrishna.chatradhi@xxxxxxx>
-R: Carlos Bilbao <carlos.bilbao.osdev@xxxxxxxxx>
+R: Carlos Bilbao <carlos.bilbao@xxxxxxxxxx>
L: platform-driver-x86@xxxxxxxxxxxxxxx
S: Maintained
F: Documentation/arch/x86/amd_hsmp.rst
@@ -5856,7 +5856,7 @@ F: drivers/usb/atm/cxacru.c
CONFIDENTIAL COMPUTING THREAT MODEL FOR X86 VIRTUALIZATION (SNP/TDX)
M: Elena Reshetova <elena.reshetova@xxxxxxxxx>
-M: Carlos Bilbao <carlos.bilbao.osdev@xxxxxxxxx>
+M: Carlos Bilbao <carlos.bilbao@xxxxxxxxxx>
S: Maintained
F: Documentation/security/snp-tdx-threat-model.rst
@@ -11323,7 +11323,7 @@ S: Orphan
F: drivers/video/fbdev/imsttfb.c
INDEX OF FURTHER KERNEL DOCUMENTATION
-M: Carlos Bilbao <carlos.bilbao.osdev@xxxxxxxxx>
+M: Carlos Bilbao <carlos.bilbao@xxxxxxxxxx>
S: Maintained
F: Documentation/process/kernel-docs.rst
@@ -22205,7 +22205,7 @@ Q: http://patchwork.linuxtv.org/project/
F: drivers/media/dvb-frontends/sp2*
SPANISH DOCUMENTATION
-M: Carlos Bilbao <carlos.bilbao.osdev@xxxxxxxxx>
+M: Carlos Bilbao <carlos.bilbao@xxxxxxxxxx>
R: Avadhut Naik <avadhut.naik@xxxxxxx>
S: Maintained
F: Documentation/translations/sp_SP/
_
Patches currently in -mm which might be from carlos.bilbao@xxxxxxxxxx are
mailmap-remove-redundant-mappings-of-emails.patch
