From: Carlos Bilbao <carlos.bilbao@xxxxxxxxxx> 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. Signed-off-by: Carlos Bilbao <carlos.bilbao@xxxxxxxxxx> --- .mailmap | 4 +++- Documentation/translations/sp_SP/index.rst | 2 +- MAINTAINERS | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.mailmap b/.mailmap index 5ff0e5d681e7..ca7946736bc0 100644 --- a/.mailmap +++ b/.mailmap @@ -139,7 +139,9 @@ Bryan Tan <bryan-bt.tan@xxxxxxxxxxxx> <bryantan@xxxxxxxxxx> 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> diff --git a/Documentation/translations/sp_SP/index.rst b/Documentation/translations/sp_SP/index.rst index aae7018b0d1a..2b50283e1608 100644 --- 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@xxxxxxxxx> +:maintainer: Carlos Bilbao <carlos.bilbao@xxxxxxxxxx> .. _sp_disclaimer: diff --git a/MAINTAINERS b/MAINTAINERS index 4006434e0155..0b3af06d9b56 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1077,7 +1077,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 @@ -5793,7 +5793,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 @@ -11228,7 +11228,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 @@ -22018,7 +22018,7 @@ Q: http://patchwork.linuxtv.org/project/linux-media/list/ 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/ -- 2.43.5