Define my kernel.org address to be the canonical one, and add mailmap
entries for the various addresses (including typos) that have been
used over the years.

Signed-off-by: Alex Elder <elder@linaro.org>
---
 .mailmap | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.mailmap b/.mailmap
index 8284692f96107..a78cd3d300eb1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -38,6 +38,18 @@ Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
 Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
 Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
 Alexey Makhalov <alexey.amakhalov@broadcom.com> <amakhalov@vmware.com>
+Alex Elder <elder@kernel.org>
+Alex Elder <elder@kernel.org> <aelder@sgi.com>
+Alex Elder <elder@kernel.org> <alex.elder@linaro.org>
+Alex Elder <elder@kernel.org> <alex.elder@linary.org>
+Alex Elder <elder@kernel.org> <elder@dreamhost.com>
+Alex Elder <elder@kernel.org> <elder@dreawmhost.com>
+Alex Elder <elder@kernel.org> <elder@ieee.org>
+Alex Elder <elder@kernel.org> <elder@inktank.com>
+Alex Elder <elder@kernel.org> <elder@kernel.org>
+Alex Elder <elder@kernel.org> <elder@linaro.org>
+Alex Elder <elder@kernel.org> <elder@newdream.net>
+Alex Elder <elder@kernel.org> Alex Elder (Linaro) <elder@linaro.org>
 Alex Hung <alexhung@gmail.com> <alex.hung@canonical.com>
 Alex Shi <alexs@kernel.org> <alex.shi@intel.com>
 Alex Shi <alexs@kernel.org> <alex.shi@linaro.org>
-- 
2.40.1

On Sun, Apr 21, 2024 at 10:17:32AM -0500, Alex Elder wrote:
> Define my kernel.org address to be the canonical one, and add mailmap
> entries for the various addresses (including typos) that have been
> used over the years.
> 
> Signed-off-by: Alex Elder <elder@linaro.org>
> ---
>  .mailmap | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
> 
> diff --git a/.mailmap b/.mailmap
> index 8284692f96107..a78cd3d300eb1 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -38,6 +38,18 @@ Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
>  Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
>  Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
>  Alexey Makhalov <alexey.amakhalov@broadcom.com> <amakhalov@vmware.com>
> +Alex Elder <elder@kernel.org>
> +Alex Elder <elder@kernel.org> <aelder@sgi.com>
> +Alex Elder <elder@kernel.org> <alex.elder@linaro.org>
> +Alex Elder <elder@kernel.org> <alex.elder@linary.org>
> +Alex Elder <elder@kernel.org> <elder@dreamhost.com>
> +Alex Elder <elder@kernel.org> <elder@dreawmhost.com>
> +Alex Elder <elder@kernel.org> <elder@ieee.org>
> +Alex Elder <elder@kernel.org> <elder@inktank.com>
> +Alex Elder <elder@kernel.org> <elder@kernel.org>
> +Alex Elder <elder@kernel.org> <elder@linaro.org>
> +Alex Elder <elder@kernel.org> <elder@newdream.net>
> +Alex Elder <elder@kernel.org> Alex Elder (Linaro) <elder@linaro.org>

Isn't this form (with the name in the middle) when you want to be able
to map one email with two different names, to two different addresses?

As described in last example in the "gitmailmap" man page?

I think thereby this would be a duplicate with the entry two lines
above?

Regards,
Bjorn

>  Alex Hung <alexhung@gmail.com> <alex.hung@canonical.com>
>  Alex Shi <alexs@kernel.org> <alex.shi@intel.com>
>  Alex Shi <alexs@kernel.org> <alex.shi@linaro.org>
> -- 
> 2.40.1
>

On 4/21/24 11:16 AM, Bjorn Andersson wrote:
> On Sun, Apr 21, 2024 at 10:17:32AM -0500, Alex Elder wrote:
>> Define my kernel.org address to be the canonical one, and add mailmap
>> entries for the various addresses (including typos) that have been
>> used over the years.
>>
>> Signed-off-by: Alex Elder <elder@linaro.org>
>> ---
>>   .mailmap | 12 ++++++++++++
>>   1 file changed, 12 insertions(+)
>>
>> diff --git a/.mailmap b/.mailmap
>> index 8284692f96107..a78cd3d300eb1 100644
>> --- a/.mailmap
>> +++ b/.mailmap
>> @@ -38,6 +38,18 @@ Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
>>   Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
>>   Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
>>   Alexey Makhalov <alexey.amakhalov@broadcom.com> <amakhalov@vmware.com>
>> +Alex Elder <elder@kernel.org>
>> +Alex Elder <elder@kernel.org> <aelder@sgi.com>
>> +Alex Elder <elder@kernel.org> <alex.elder@linaro.org>
>> +Alex Elder <elder@kernel.org> <alex.elder@linary.org>
>> +Alex Elder <elder@kernel.org> <elder@dreamhost.com>
>> +Alex Elder <elder@kernel.org> <elder@dreawmhost.com>
>> +Alex Elder <elder@kernel.org> <elder@ieee.org>
>> +Alex Elder <elder@kernel.org> <elder@inktank.com>
>> +Alex Elder <elder@kernel.org> <elder@kernel.org>
>> +Alex Elder <elder@kernel.org> <elder@linaro.org>
>> +Alex Elder <elder@kernel.org> <elder@newdream.net>
>> +Alex Elder <elder@kernel.org> Alex Elder (Linaro) <elder@linaro.org>
> 
> Isn't this form (with the name in the middle) when you want to be able
> to map one email with two different names, to two different addresses?
> 
> As described in last example in the "gitmailmap" man page?
> 
> I think thereby this would be a duplicate with the entry two lines
> above?

I interpreted this form as meaning "change both the
name and the e-mail" but I tried deleting that last
one and it still mapped properly.  I also just noticed
that I mapped @kernel.org to @kernel.org, which is
dumb.

I'll send v2.  Thank you.

					-Alex

> 
> Regards,
> Bjorn
> 
>>   Alex Hung <alexhung@gmail.com> <alex.hung@canonical.com>
>>   Alex Shi <alexs@kernel.org> <alex.shi@intel.com>
>>   Alex Shi <alexs@kernel.org> <alex.shi@linaro.org>
>> -- 
>> 2.40.1
>>