In the near future, I will not have access to the email address I used as maintainer of a number of things, mostly in the documentation. Update that address to my personal email address (see Link) so I can continue contributing and update .mailmap. Link: https://lore.kernel.org/all/BL1PR12MB58749FF2BFEDB817DE1FE6CBF82A2@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/ Signed-off-by: Carlos Bilbao <carlos.bilbao@xxxxxxx> --- Change since v2: - Fix .mailmap entry from <old-email> <new-email> to <new-email> <old-email> Changes since v1: - Update .mailmap --- .mailmap | 1 + Documentation/security/snp-tdx-threat-model.rst | 2 +- Documentation/translations/sp_SP/index.rst | 2 +- Documentation/translations/sp_SP/memory-barriers.txt | 4 ++-- .../translations/sp_SP/process/code-of-conduct.rst | 2 +- Documentation/translations/sp_SP/process/coding-style.rst | 2 +- .../translations/sp_SP/process/email-clients.rst | 2 +- Documentation/translations/sp_SP/process/howto.rst | 2 +- Documentation/translations/sp_SP/process/kernel-docs.rst | 2 +- .../sp_SP/process/kernel-enforcement-statement.rst | 2 +- Documentation/translations/sp_SP/process/magic-number.rst | 2 +- .../translations/sp_SP/process/programming-language.rst | 2 +- .../translations/sp_SP/process/submitting-patches.rst | 2 +- MAINTAINERS | 8 ++++---- 14 files changed, 18 insertions(+), 17 deletions(-) diff --git a/.mailmap b/.mailmap index 1eb607efcc6e..4bac5578426a 100644 --- a/.mailmap +++ b/.mailmap @@ -113,6 +113,7 @@ Brian Silverman <bsilver16384@xxxxxxxxx> <brian.silverman@xxxxxxxxxxxxxxxxx> 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> 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/security/snp-tdx-threat-model.rst b/Documentation/security/snp-tdx-threat-model.rst index ec66f2ed80c9..3a2d41d2e645 100644 --- a/Documentation/security/snp-tdx-threat-model.rst +++ b/Documentation/security/snp-tdx-threat-model.rst @@ -4,7 +4,7 @@ Confidential Computing in Linux for x86 virtualization .. contents:: :local: -By: Elena Reshetova <elena.reshetova@xxxxxxxxx> and Carlos Bilbao <carlos.bilbao@xxxxxxx> +By: Elena Reshetova <elena.reshetova@xxxxxxxxx> and Carlos Bilbao <carlos.bilbao.osdev@xxxxxxxxx> Motivation ========== diff --git a/Documentation/translations/sp_SP/index.rst b/Documentation/translations/sp_SP/index.rst index c543b495c042..274ef4ad96b9 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@xxxxxxx> +:maintainer: Carlos Bilbao <carlos.bilbao.osdev@xxxxxxxxx> .. _sp_disclaimer: diff --git a/Documentation/translations/sp_SP/memory-barriers.txt b/Documentation/translations/sp_SP/memory-barriers.txt index 27097a808c88..153e57130775 100644 --- a/Documentation/translations/sp_SP/memory-barriers.txt +++ b/Documentation/translations/sp_SP/memory-barriers.txt @@ -1,6 +1,6 @@ NOTE: This is a version of Documentation/memory-barriers.txt translated into -Spanish by Carlos Bilbao <carlos.bilbao@xxxxxxx>. If you find any +Spanish by Carlos Bilbao <carlos.bilbao.osdev@xxxxxxxxx>. If you find any difference between this document and the original file or a problem with the translation, please contact the maintainer of this file. Please also note that the purpose of this file is to be easier to read for non English @@ -18,7 +18,7 @@ Documento original: David Howells <dhowells@xxxxxxxxxx> Will Deacon <will.deacon@xxxxxxx> Peter Zijlstra <peterz@xxxxxxxxxxxxx> -Traducido por: Carlos Bilbao <carlos.bilbao@xxxxxxx> +Traducido por: Carlos Bilbao <carlos.bilbao.osdev@xxxxxxxxx> Nota: Si tiene alguna duda sobre la exactitud del contenido de esta traducción, la única referencia válida es la documentación oficial en inglés. diff --git a/Documentation/translations/sp_SP/process/code-of-conduct.rst b/Documentation/translations/sp_SP/process/code-of-conduct.rst index adc6c770cc37..a6c08613aefc 100644 --- a/Documentation/translations/sp_SP/process/code-of-conduct.rst +++ b/Documentation/translations/sp_SP/process/code-of-conduct.rst @@ -1,7 +1,7 @@ .. include:: ../disclaimer-sp.rst :Original: :ref:`Documentation/process/code-of-conduct.rst <code_of_conduct>` -:Translator: Contributor Covenant and Carlos Bilbao <carlos.bilbao@xxxxxxx> +:Translator: Contributor Covenant and Carlos Bilbao <carlos.bilbao.osdev@xxxxxxxxx> .. _sp_code_of_conduct: diff --git a/Documentation/translations/sp_SP/process/coding-style.rst b/Documentation/translations/sp_SP/process/coding-style.rst index a37274764371..b5a84df44cea 100644 --- a/Documentation/translations/sp_SP/process/coding-style.rst +++ b/Documentation/translations/sp_SP/process/coding-style.rst @@ -1,7 +1,7 @@ .. include:: ../disclaimer-sp.rst :Original: :ref:`Documentation/process/coding-style.rst <submittingpatches>` -:Translator: Carlos Bilbao <carlos.bilbao@xxxxxxx> +:Translator: Carlos Bilbao <carlos.bilbao.osdev@xxxxxxxxx> .. _sp_codingstyle: diff --git a/Documentation/translations/sp_SP/process/email-clients.rst b/Documentation/translations/sp_SP/process/email-clients.rst index fdf1e51b84e4..55d5803daf41 100644 --- a/Documentation/translations/sp_SP/process/email-clients.rst +++ b/Documentation/translations/sp_SP/process/email-clients.rst @@ -1,7 +1,7 @@ .. include:: ../disclaimer-sp.rst :Original: :ref:`Documentation/process/email-clients.rst <email_clients>` -:Translator: Carlos Bilbao <carlos.bilbao@xxxxxxx> +:Translator: Carlos Bilbao <carlos.bilbao.osdev@xxxxxxxxx> .. _sp_email_clients: diff --git a/Documentation/translations/sp_SP/process/howto.rst b/Documentation/translations/sp_SP/process/howto.rst index dd793c0f8574..72ea855ac9dc 100644 --- a/Documentation/translations/sp_SP/process/howto.rst +++ b/Documentation/translations/sp_SP/process/howto.rst @@ -1,7 +1,7 @@ .. include:: ../disclaimer-sp.rst :Original: :ref:`Documentation/process/howto.rst <process_howto>` -:Translator: Carlos Bilbao <carlos.bilbao@xxxxxxx> +:Translator: Carlos Bilbao <carlos.bilbao.osdev@xxxxxxxxx> .. _sp_process_howto: diff --git a/Documentation/translations/sp_SP/process/kernel-docs.rst b/Documentation/translations/sp_SP/process/kernel-docs.rst index 2f9b3df8f8fa..a62c6854f59b 100644 --- a/Documentation/translations/sp_SP/process/kernel-docs.rst +++ b/Documentation/translations/sp_SP/process/kernel-docs.rst @@ -1,7 +1,7 @@ .. include:: ../disclaimer-sp.rst :Original: :ref:`Documentation/process/kernel-docs.rst <kernel_docs>` -:Translator: Carlos Bilbao <carlos.bilbao@xxxxxxx> +:Translator: Carlos Bilbao <carlos.bilbao.osdev@xxxxxxxxx> .. _sp_kernel_docs: diff --git a/Documentation/translations/sp_SP/process/kernel-enforcement-statement.rst b/Documentation/translations/sp_SP/process/kernel-enforcement-statement.rst index d66902694089..d47a1c154610 100644 --- a/Documentation/translations/sp_SP/process/kernel-enforcement-statement.rst +++ b/Documentation/translations/sp_SP/process/kernel-enforcement-statement.rst @@ -1,7 +1,7 @@ .. include:: ../disclaimer-sp.rst :Original: :ref:`Documentation/process/kernel-enforcement-statement.rst <process_statement_kernel>` -:Translator: Carlos Bilbao <carlos.bilbao@xxxxxxx> +:Translator: Carlos Bilbao <carlos.bilbao.osdev@xxxxxxxxx> .. _sp_process_statement_kernel: diff --git a/Documentation/translations/sp_SP/process/magic-number.rst b/Documentation/translations/sp_SP/process/magic-number.rst index 7c7dfb4ba80b..32a99aac2f6c 100644 --- a/Documentation/translations/sp_SP/process/magic-number.rst +++ b/Documentation/translations/sp_SP/process/magic-number.rst @@ -1,7 +1,7 @@ .. include:: ../disclaimer-sp.rst :Original: :ref:`Documentation/process/magic-number.rst <magicnumbers>` -:Translator: Carlos Bilbao <carlos.bilbao@xxxxxxx> +:Translator: Carlos Bilbao <carlos.bilbao.osdev@xxxxxxxxx> .. _sp_magicnumbers: diff --git a/Documentation/translations/sp_SP/process/programming-language.rst b/Documentation/translations/sp_SP/process/programming-language.rst index 301f525372d8..ba2164057f45 100644 --- a/Documentation/translations/sp_SP/process/programming-language.rst +++ b/Documentation/translations/sp_SP/process/programming-language.rst @@ -1,7 +1,7 @@ .. include:: ../disclaimer-sp.rst :Original: :ref:`Documentation/process/programming-language.rst <programming_language>` -:Translator: Carlos Bilbao <carlos.bilbao@xxxxxxx> +:Translator: Carlos Bilbao <carlos.bilbao.osdev@xxxxxxxxx> .. _sp_programming_language: diff --git a/Documentation/translations/sp_SP/process/submitting-patches.rst b/Documentation/translations/sp_SP/process/submitting-patches.rst index c2757d9ab216..18bb3413c3ca 100644 --- a/Documentation/translations/sp_SP/process/submitting-patches.rst +++ b/Documentation/translations/sp_SP/process/submitting-patches.rst @@ -1,7 +1,7 @@ .. include:: ../disclaimer-sp.rst :Original: :ref:`Documentation/process/submitting-patches.rst <submittingpatches>` -:Translator: Carlos Bilbao <carlos.bilbao@xxxxxxx> +:Translator: Carlos Bilbao <carlos.bilbao.osdev@xxxxxxxxx> .. _sp_submittingpatches: diff --git a/MAINTAINERS b/MAINTAINERS index cd7980e5b1ad..6b7c08907cc4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -997,7 +997,7 @@ F: drivers/video/fbdev/geode/ AMD HSMP DRIVER M: Naveen Krishna Chatradhi <naveenkrishna.chatradhi@xxxxxxx> -R: Carlos Bilbao <carlos.bilbao@xxxxxxx> +R: Carlos Bilbao <carlos.bilbao.osdev@xxxxxxxxx> L: platform-driver-x86@xxxxxxxxxxxxxxx S: Maintained F: Documentation/arch/x86/amd_hsmp.rst @@ -5352,7 +5352,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@xxxxxxx> +M: Carlos Bilbao <carlos.bilbao.osdev@xxxxxxxxx> S: Maintained F: Documentation/security/snp-tdx-threat-model.rst @@ -10590,7 +10590,7 @@ F: drivers/hwmon/ina2xx.c F: include/linux/platform_data/ina2xx.h INDEX OF FURTHER KERNEL DOCUMENTATION -M: Carlos Bilbao <carlos.bilbao@xxxxxxx> +M: Carlos Bilbao <carlos.bilbao.osdev@xxxxxxxxx> S: Maintained F: Documentation/process/kernel-docs.rst @@ -20701,7 +20701,7 @@ Q: http://patchwork.linuxtv.org/project/linux-media/list/ F: drivers/media/dvb-frontends/sp2* SPANISH DOCUMENTATION -M: Carlos Bilbao <carlos.bilbao@xxxxxxx> +M: Carlos Bilbao <carlos.bilbao.osdev@xxxxxxxxx> R: Avadhut Naik <avadhut.naik@xxxxxxx> S: Maintained F: Documentation/translations/sp_SP/ -- 2.41.0