Re: [PATCH] .mailmap: Update incorrect entry and my email in MAINTAINERS
From: Carlos Bilbao
Date: Tue Jan 28 2025 - 20:12:38 EST
Hello,
On 1/28/25 16:05, Jonathan Corbet wrote:
> carlos.bilbao@xxxxxxxxxx writes:
>
>> From: Carlos Bilbao <carlos.bilbao@xxxxxxxxxx>
>>
>> Update .mailmap to fix a mapping and my email address in MAINTAINERS.
>>
>> Signed-off-by: Carlos Bilbao <carlos.bilbao@xxxxxxxxxx>
>> ---
>> .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@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.osdev@xxxxxxxxx>
>> Carlos Bilbao <carlos.bilbao@xxxxxxxxxx> <carlos.bilbao@xxxxxxx>
>> Carlos Bilbao <carlos.bilbao@xxxxxxxxxx> <bilbao@xxxxxx>
> 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@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/
>> @@ -22030,7 +22030,7 @@ L: sparclinux@xxxxxxxxxxxxxxx
>> 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