mailmap, MAINTAINERS, docs: update Carlos's email address

Update .mailmap to reflect my new (and final) primary email address,
carlos.bilbao@kernel.org.  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@kernel.org
Signed-off-by: Carlos Bilbao <carlos.bilbao@kernel.org>
Cc: Carlos Bilbao <bilbao@vt.edu>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Mattew Wilcox <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/.mailmap b/.mailmap
index fec6b455b576a73cc8bf8eff4fd88a3079fe035a..9a270c53675b199b84c8548b68d003ff4f460ad9 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -148,7 +148,9 @@ Bryan Tan <bryan-bt.tan@broadcom.com> <bryantan@vmware.com>
 Cai Huoqing <cai.huoqing@linux.dev> <caihuoqing@baidu.com>
 Can Guo <quic_cang@quicinc.com> <cang@codeaurora.org>
 Carl Huang <quic_cjhuang@quicinc.com> <cjhuang@codeaurora.org>
-Carlos Bilbao <carlos.bilbao.osdev@gmail.com> <carlos.bilbao@amd.com>
+Carlos Bilbao <carlos.bilbao@kernel.org> <carlos.bilbao@amd.com>
+Carlos Bilbao <carlos.bilbao@kernel.org> <carlos.bilbao.osdev@gmail.com>
+Carlos Bilbao <carlos.bilbao@kernel.org> <bilbao@vt.edu>
 Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>
 Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>
 Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>

diff --git a/Documentation/translations/sp_SP/index.rst b/Documentation/translations/sp_SP/index.rst
index aae7018b0d1a26b53c3177083395c5c7552b3a03..2b50283e16089e834d681c7847d2be4d2e7c4919 100644 (file)
--- a/Documentation/translations/sp_SP/index.rst
+++ b/Documentation/translations/sp_SP/index.rst
@@ -7,7 +7,7 @@ Traducción al español
 
        \kerneldocCJKoff
 
-:maintainer: Carlos Bilbao <carlos.bilbao.osdev@gmail.com>
+:maintainer: Carlos Bilbao <carlos.bilbao@kernel.org>
 
 .. _sp_disclaimer:
 

diff --git a/MAINTAINERS b/MAINTAINERS
index d269d3c6e3171b70ab2140b3531d87db6aa9873e..1824df1f61f07f18ae50f362668e667db1bc8fc9 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1090,7 +1090,7 @@ F:        drivers/video/fbdev/geode/
 
 AMD HSMP DRIVER
 M:     Naveen Krishna Chatradhi <naveenkrishna.chatradhi@amd.com>
-R:     Carlos Bilbao <carlos.bilbao.osdev@gmail.com>
+R:     Carlos Bilbao <carlos.bilbao@kernel.org>
 L:     platform-driver-x86@vger.kernel.org
 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@intel.com>
-M:     Carlos Bilbao <carlos.bilbao.osdev@gmail.com>
+M:     Carlos Bilbao <carlos.bilbao@kernel.org>
 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@gmail.com>
+M:     Carlos Bilbao <carlos.bilbao@kernel.org>
 S:     Maintained
 F:     Documentation/process/kernel-docs.rst
 
@@ -22205,7 +22205,7 @@ Q:      http://patchwork.linuxtv.org/project/linux-media/list/
 F:     drivers/media/dvb-frontends/sp2*
 
 SPANISH DOCUMENTATION
-M:     Carlos Bilbao <carlos.bilbao.osdev@gmail.com>
+M:     Carlos Bilbao <carlos.bilbao@kernel.org>
 R:     Avadhut Naik <avadhut.naik@amd.com>
 S:     Maintained
 F:     Documentation/translations/sp_SP/