.mailmap: Update incorrect entry and my email in MAINTAINERS

[PATCH] .mailmap: Update incorrect entry and my email in MAINTAINERS

Posted by carlos.bilbao@kernel.org 1 year ago

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

Re: [PATCH] .mailmap: Update incorrect entry and my email in MAINTAINERS

Posted by Jonathan Corbet 1 year ago

carlos.bilbao@kernel.org writes:

> 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>

So I am getting confused ... why not just send me a correct patch for
this file rather than expecting me to apply the incorrect one followed
by the fix?

> 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/

As Willy pointed out, this last hunk looks like a mistake.

jon

Re: [PATCH] .mailmap: Update incorrect entry and my email in MAINTAINERS

Posted by Carlos Bilbao 1 year ago

Hello,

On 1/28/25 16:05, Jonathan Corbet wrote:
> carlos.bilbao@kernel.org writes:
>
>> 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>
> So I am getting confused ... why not just send me a correct patch for
> this file rather than expecting me to apply the incorrect one followed
> by the fix?


Because the incorrect one already made it upstream AFAIU:

https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?h=next-20250128&id=ed7c0f5395e05057ae6459fdcfe229fb9aaab5b6


>
>> 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/
> As Willy pointed out, this last hunk looks like a mistake.


Yes, I can fix and resend if we're good with the rest.


>
> jon


Thanks,

Carlos

Re: [PATCH] .mailmap: Update incorrect entry and my email in MAINTAINERS

Posted by Jonathan Corbet 1 year ago

Carlos Bilbao <carlos.bilbao.osdev@gmail.com> writes:

> Hello,
>
> On 1/28/25 16:05, Jonathan Corbet wrote:
>> carlos.bilbao@kernel.org writes:
>>
>>> 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>
>> So I am getting confused ... why not just send me a correct patch for
>> this file rather than expecting me to apply the incorrect one followed
>> by the fix?
>
>
> Because the incorrect one already made it upstream AFAIU:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?h=next-20250128&id=ed7c0f5395e05057ae6459fdcfe229fb9aaab5b6

Hmm... it looks like Andrew took it?  It's still in linux-next, though,
and could be pulled out.  It really seems better to just do it right
from the outset?

jon

Re: [PATCH] .mailmap: Update incorrect entry and my email in MAINTAINERS

Posted by Carlos Bilbao 1 year ago

On 1/29/25 08:52, Jonathan Corbet wrote:

> Carlos Bilbao <carlos.bilbao.osdev@gmail.com> writes:
>
>> Hello,
>>
>> On 1/28/25 16:05, Jonathan Corbet wrote:
>>> carlos.bilbao@kernel.org writes:
>>>
>>>> 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>
>>> So I am getting confused ... why not just send me a correct patch for
>>> this file rather than expecting me to apply the incorrect one followed
>>> by the fix?
>>
>> Because the incorrect one already made it upstream AFAIU:
>>
>> https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?h=next-20250128&id=ed7c0f5395e05057ae6459fdcfe229fb9aaab5b6
> Hmm... it looks like Andrew took it?  It's still in linux-next, though,
> and could be pulled out.  It really seems better to just do it right
> from the outset?


If that's possible, surely. Sending the patch again with the correct
mappings.


>
> jon


Thanks, Carlos

Re: [PATCH] .mailmap: Update incorrect entry and my email in MAINTAINERS

Posted by Matthew Wilcox 1 year ago

On Sat, Jan 25, 2025 at 09:47:21AM -0600, carlos.bilbao@kernel.org wrote:
> @@ -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/

oops?