mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: carlos.bilbao@kernel.org
To: corbet@lwn.net
Cc: avadhut.naik@amd.com, akpm@linux-foundation.org,
	linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
	Carlos Bilbao <carlos.bilbao@kernel.org>
Subject: [PATCH] .mailmap: Update incorrect entry and my email in MAINTAINERS
Date: Sat, 25 Jan 2025 09:47:21 -0600	[thread overview]
Message-ID: <20250125154721.1035737-1-carlos.bilbao@kernel.org> (raw)

From: Carlos Bilbao <carlos.bilbao@kernel.org>

Update .mailmap to fix a mapping and my email address in MAINTAINERS.

Signed-off-by: Carlos Bilbao <carlos.bilbao@kernel.org>
---
 .mailmap    |  1 -
 MAINTAINERS | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.mailmap b/.mailmap
index 83837191affb..0768824e9d19 100644
--- a/.mailmap
+++ b/.mailmap
@@ -139,7 +139,6 @@ 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.osdev@gmail.com>
 Carlos Bilbao <carlos.bilbao@kernel.org> <carlos.bilbao@amd.com>
 Carlos Bilbao <carlos.bilbao@kernel.org> <bilbao@vt.edu>
diff --git a/MAINTAINERS b/MAINTAINERS
index 4006434e0155..f7e70513ebff 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1077,7 +1077,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
@@ -5793,7 +5793,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
 
@@ -11228,7 +11228,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
 
@@ -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@gmail.com>
+M:	Carlos Bilbao <carlos.bilbao@kernel.org>
 R:	Avadhut Naik <avadhut.naik@amd.com>
 S:	Maintained
 F:	Documentation/translations/sp_SP/
@@ -22030,7 +22030,7 @@ L:	sparclinux@vger.kernel.org
 S:	Maintained
 Q:	http://patchwork.ozlabs.org/project/sparclinux/list/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git
-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git
+:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git
 F:	arch/sparc/
 F:	drivers/sbus/
 
-- 
2.43.5


             reply	other threads:[~2025-01-25 15:47 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-25 15:47 carlos.bilbao [this message]
2025-01-25 16:38 ` Matthew Wilcox
2025-01-28 22:05 ` Jonathan Corbet
2025-01-29  1:12   ` Carlos Bilbao
2025-01-29 14:52     ` Jonathan Corbet
2025-01-30  1:18       ` Carlos Bilbao

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250125154721.1035737-1-carlos.bilbao@kernel.org \
    --to=carlos.bilbao@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=avadhut.naik@amd.com \
    --cc=corbet@lwn.net \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®