[PATCH 0/8] gitdm metadata updates for Oct '23

[PATCH 0/8] gitdm metadata updates for Oct '23

[Alex Bennée]

Hi,

I was looking at the stats today so I've done my usual run of gitdm
and then attempted to fix up the missing bits. I've had to patch gitdm
to deal with gitlab URLS in place of email addresses and will have to
work out if that is worth upstreaming at some point.

The Rivos Inc updates actually got acked a while back but have been
sitting on the tree waiting for me to bundle it in a PR. I've added
the HiSilicon, Daynix and mailmap patches. The others never got acked
so the come around one more time.

Thanks,

Alex.

Alex Bennée (7):
  contrib/gitdm: Add Rivos Inc to the domain map
  contrib/gitdm: add a group map for SiFive
  contrib/gitdm: add a group map for Google
  contrib/gitdm: add more individual contributors
  contrib/gitdm: map HiSilicon to Huawei
  contrib/gitdm: add Daynix to domain-map
  mailmap: fixup some more corrupted author fields

luzhipeng (1):
  contrib/gitdm: add domain-map for Cestc

 .mailmap                            | 2 ++
 contrib/gitdm/domain-map            | 4 ++++
 contrib/gitdm/group-map-google      | 5 +++++
 contrib/gitdm/group-map-individuals | 1 +
 contrib/gitdm/group-map-sifive      | 5 +++++
 gitdm.config                        | 2 ++
 6 files changed, 19 insertions(+)
 create mode 100644 contrib/gitdm/group-map-google
 create mode 100644 contrib/gitdm/group-map-sifive

-- 
2.39.2

[PATCH 1/8] contrib/gitdm: Add Rivos Inc to the domain map

[Alex Bennée]

Whatever they are up to a number of people for the company are
contributing to QEMU so lets group them together.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Palmer Dabbelt <palmer@rivosinc.com>
Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
Cc: Atish Patra <atishp@rivosinc.com>
Cc: Dao Lu <daolu@rivosinc.com>
Cc: Andrew Bresticker <abrestic@rivosinc.com>
Cc: Vineet Gupta <vineetg@rivosinc.com>
---
 contrib/gitdm/domain-map | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/gitdm/domain-map b/contrib/gitdm/domain-map
index 3e31a06245..e676da8d47 100644
--- a/contrib/gitdm/domain-map
+++ b/contrib/gitdm/domain-map
@@ -38,6 +38,7 @@ proxmox.com     Proxmox
 quicinc.com     Qualcomm Innovation Center
 redhat.com      Red Hat
 rev.ng          rev.ng Labs
+rivosinc.com    Rivos Inc
 rt-rk.com       RT-RK
 samsung.com     Samsung
 siemens.com     Siemens
-- 
2.39.2

[PATCH 2/8] contrib/gitdm: add a group map for SiFive

[Alex Bennée]

Some SiFive contributors use there personal emails. Add a group map
for those developers. Please confirm.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Cc: eopXD <yueh.ting.chen@gmail.com>
---
 contrib/gitdm/group-map-sifive | 5 +++++
 gitdm.config                   | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 contrib/gitdm/group-map-sifive

diff --git a/contrib/gitdm/group-map-sifive b/contrib/gitdm/group-map-sifive
new file mode 100644
index 0000000000..6ba761eb22
--- /dev/null
+++ b/contrib/gitdm/group-map-sifive
@@ -0,0 +1,5 @@
+#
+# SiFive contributors using non-corporate email
+#
+
+yueh.ting.chen@gmail.com
diff --git a/gitdm.config b/gitdm.config
index 9db43ca142..06ac729c7b 100644
--- a/gitdm.config
+++ b/gitdm.config
@@ -40,6 +40,7 @@ GroupMap contrib/gitdm/group-map-ibm IBM
 GroupMap contrib/gitdm/group-map-janustech Janus Technologies
 GroupMap contrib/gitdm/group-map-netflix Netflix
 GroupMap contrib/gitdm/group-map-redhat Red Hat
+GroupMap contrib/gitdm/group-map-sifive SiFive
 GroupMap contrib/gitdm/group-map-wavecomp Wave Computing
 
 # Also group together our prolific individual contributors
-- 
2.39.2

[PATCH 3/8] contrib/gitdm: add a group map for Google

[Alex Bennée]

Long standing community contributors often use their upstream email
addresses when working on project.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Cc: Marc Zyngier <maz@kernel.org>
---
 contrib/gitdm/group-map-google | 5 +++++
 gitdm.config                   | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 contrib/gitdm/group-map-google

diff --git a/contrib/gitdm/group-map-google b/contrib/gitdm/group-map-google
new file mode 100644
index 0000000000..8c53e0cf67
--- /dev/null
+++ b/contrib/gitdm/group-map-google
@@ -0,0 +1,5 @@
+#
+# Some Google employees contribute using their upstream email addresses.
+#
+
+maz@kernel.org
diff --git a/gitdm.config b/gitdm.config
index 06ac729c7b..c9d961dd23 100644
--- a/gitdm.config
+++ b/gitdm.config
@@ -36,6 +36,7 @@ GroupMap contrib/gitdm/group-map-amd AMD
 GroupMap contrib/gitdm/group-map-cadence Cadence Design Systems
 GroupMap contrib/gitdm/group-map-codeweavers CodeWeavers
 GroupMap contrib/gitdm/group-map-facebook Facebook
+GroupMap contrib/gitdm/group-map-google Google
 GroupMap contrib/gitdm/group-map-ibm IBM
 GroupMap contrib/gitdm/group-map-janustech Janus Technologies
 GroupMap contrib/gitdm/group-map-netflix Netflix
-- 
2.39.2

[PATCH 4/8] contrib/gitdm: add more individual contributors

[Alex Bennée]

I'll only add names explicitly acked here. Let me know if you want
contributions mapped to a company instead.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Cc: Amarjargal Gundjalam <amarjargal16@gmail.com>
---
 contrib/gitdm/group-map-individuals | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/gitdm/group-map-individuals b/contrib/gitdm/group-map-individuals
index d7116f5444..4bdc2731b7 100644
--- a/contrib/gitdm/group-map-individuals
+++ b/contrib/gitdm/group-map-individuals
@@ -42,3 +42,4 @@ shentey@gmail.com
 bmeng@tinylab.org
 strahinja.p.jankovic@gmail.com
 Jason@zx2c4.com
+amarjargal16@gmail.com
-- 
2.39.2

[PATCH 5/8] contrib/gitdm: add domain-map for Cestc

[Alex Bennée]

From: luzhipeng <luzhipeng@cestc.cn>

Signed-off-by: luzhipeng <luzhipeng@cestc.cn>
Message-Id: <20230628072236.1925-1-luzhipeng@cestc.cn>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 contrib/gitdm/domain-map | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/gitdm/domain-map b/contrib/gitdm/domain-map
index e676da8d47..38945cddf0 100644
--- a/contrib/gitdm/domain-map
+++ b/contrib/gitdm/domain-map
@@ -12,6 +12,7 @@ amd.com         AMD
 aspeedtech.com  ASPEED Technology Inc.
 baidu.com       Baidu
 bytedance.com   ByteDance
+cestc.cn        Cestc
 cmss.chinamobile.com China Mobile
 citrix.com      Citrix
 crudebyte.com   Crudebyte
-- 
2.39.2

[PATCH 6/8] contrib/gitdm: map HiSilicon to Huawei

[Alex Bennée]

HiSilicon is a wholly owned subsidiary of Huawei so map the domain to
the same company to avoid splitting the contributions.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Cc: Yicong Yang <yangyicong@hisilicon.com>
Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---
 contrib/gitdm/domain-map | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/gitdm/domain-map b/contrib/gitdm/domain-map
index 38945cddf0..42571fc1c4 100644
--- a/contrib/gitdm/domain-map
+++ b/contrib/gitdm/domain-map
@@ -22,6 +22,7 @@ fb.com          Facebook
 fujitsu.com     Fujitsu
 google.com      Google
 greensocs.com   GreenSocs
+hisilicon.com   Huawei
 huawei.com      Huawei
 ibm.com         IBM
 igalia.com      Igalia
-- 
2.39.2

[PATCH 7/8] contrib/gitdm: add Daynix to domain-map

[Alex Bennée]

Daynix describes itself as a cloud technology company so I assume
employee contributions should count as such.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Cc: Viktor Prutyanov <viktor@daynix.com>
Cc: Akihiko Odaki <akihiko.odaki@daynix.com>
---
 contrib/gitdm/domain-map | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/gitdm/domain-map b/contrib/gitdm/domain-map
index 42571fc1c4..bf1dce03fd 100644
--- a/contrib/gitdm/domain-map
+++ b/contrib/gitdm/domain-map
@@ -17,6 +17,7 @@ cmss.chinamobile.com China Mobile
 citrix.com      Citrix
 crudebyte.com   Crudebyte
 chinatelecom.cn China Telecom
+daynix.com      Daynix
 eldorado.org.br Instituto de Pesquisas Eldorado
 fb.com          Facebook
 fujitsu.com     Fujitsu
-- 
2.39.2

[PATCH 8/8] mailmap: fixup some more corrupted author fields

[Alex Bennée]

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Cc: Timothée Cocault <timothee.cocault@gmail.com>
Cc: fanwenjie <fanwj@mail.ustc.edu.cn>
---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index d214959288..477c1fae2a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -30,10 +30,12 @@ malc <av1474@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>
 # Corrupted Author fields
 Aaron Larson <alarson@ddci.com> alarson@ddci.com
 Andreas Färber <andreas.faerber@web.de> Andreas Färber <andreas.faerber>
+fanwenjie <fanwj@mail.ustc.edu.cn> fanwj@mail.ustc.edu.cn <fanwj@mail.ustc.edu.cn>
 Jason Wang <jasowang@redhat.com> Jason Wang <jasowang>
 Marek Dolata <mkdolata@us.ibm.com> mkdolata@us.ibm.com <mkdolata@us.ibm.com>
 Michael Ellerman <mpe@ellerman.id.au> michael@ozlabs.org <michael@ozlabs.org>
 Nick Hudson <hnick@vmware.com> hnick@vmware.com <hnick@vmware.com>
+Timothée Cocault <timothee.cocault@gmail.com> timothee.cocault@gmail.com <timothee.cocault@gmail.com>
 
 # There is also a:
 #    (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162>
-- 
2.39.2

Re: [PATCH 7/8] contrib/gitdm: add Daynix to domain-map

[Akihiko Odaki]

On 2023/10/14 0:44, Alex Bennée wrote:
> Daynix describes itself as a cloud technology company so I assume
> employee contributions should count as such.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Cc: Viktor Prutyanov <viktor@daynix.com>
> Cc: Akihiko Odaki <akihiko.odaki@daynix.com>
> ---
>   contrib/gitdm/domain-map | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/contrib/gitdm/domain-map b/contrib/gitdm/domain-map
> index 42571fc1c4..bf1dce03fd 100644
> --- a/contrib/gitdm/domain-map
> +++ b/contrib/gitdm/domain-map
> @@ -17,6 +17,7 @@ cmss.chinamobile.com China Mobile
>   citrix.com      Citrix
>   crudebyte.com   Crudebyte
>   chinatelecom.cn China Telecom
> +daynix.com      Daynix
>   eldorado.org.br Instituto de Pesquisas Eldorado
>   fb.com          Facebook
>   fujitsu.com     Fujitsu

Thanks!

Reviewed-by: Akihiko Odaki <akihiko.odaki@daynix.com>

Re: [PATCH 6/8] contrib/gitdm: map HiSilicon to Huawei

[Yicong Yang via]

On 2023/10/13 23:44, Alex Bennée wrote:
> HiSilicon is a wholly owned subsidiary of Huawei so map the domain to
> the same company to avoid splitting the contributions.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Cc: Yicong Yang <yangyicong@hisilicon.com>

Reviewed-by: Yicong Yang <yangyicong@hisilicon.com>

> Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> ---
>  contrib/gitdm/domain-map | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/contrib/gitdm/domain-map b/contrib/gitdm/domain-map
> index 38945cddf0..42571fc1c4 100644
> --- a/contrib/gitdm/domain-map
> +++ b/contrib/gitdm/domain-map
> @@ -22,6 +22,7 @@ fb.com          Facebook
>  fujitsu.com     Fujitsu
>  google.com      Google
>  greensocs.com   GreenSocs
> +hisilicon.com   Huawei
>  huawei.com      Huawei
>  ibm.com         IBM
>  igalia.com      Igalia
> 

Re: [PATCH 6/8] contrib/gitdm: map HiSilicon to Huawei

[Yicong Yang]

On 2023/10/13 23:44, Alex Bennée wrote:
> HiSilicon is a wholly owned subsidiary of Huawei so map the domain to
> the same company to avoid splitting the contributions.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Cc: Yicong Yang <yangyicong@hisilicon.com>

Reviewed-by: Yicong Yang <yangyicong@hisilicon.com>

> Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> ---
>  contrib/gitdm/domain-map | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/contrib/gitdm/domain-map b/contrib/gitdm/domain-map
> index 38945cddf0..42571fc1c4 100644
> --- a/contrib/gitdm/domain-map
> +++ b/contrib/gitdm/domain-map
> @@ -22,6 +22,7 @@ fb.com          Facebook
>  fujitsu.com     Fujitsu
>  google.com      Google
>  greensocs.com   GreenSocs
> +hisilicon.com   Huawei
>  huawei.com      Huawei
>  ibm.com         IBM
>  igalia.com      Igalia
> 

Re: [PATCH 8/8] mailmap: fixup some more corrupted author fields

[Philippe Mathieu-Daudé]

On 13/10/23 17:44, Alex Bennée wrote:
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Cc: Timothée Cocault <timothee.cocault@gmail.com>
> Cc: fanwenjie <fanwj@mail.ustc.edu.cn>
> ---
>   .mailmap | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/.mailmap b/.mailmap
> index d214959288..477c1fae2a 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -30,10 +30,12 @@ malc <av1474@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>
>   # Corrupted Author fields
>   Aaron Larson <alarson@ddci.com> alarson@ddci.com
>   Andreas Färber <andreas.faerber@web.de> Andreas Färber <andreas.faerber>
> +fanwenjie <fanwj@mail.ustc.edu.cn>

Just using the email is enough.

  fanwj@mail.ustc.edu.cn <fanwj@mail.ustc.edu.cn>
>   Jason Wang <jasowang@redhat.com> Jason Wang <jasowang>
>   Marek Dolata <mkdolata@us.ibm.com> mkdolata@us.ibm.com <mkdolata@us.ibm.com>
>   Michael Ellerman <mpe@ellerman.id.au> michael@ozlabs.org <michael@ozlabs.org>
>   Nick Hudson <hnick@vmware.com> hnick@vmware.com <hnick@vmware.com>
> +Timothée Cocault <timothee.cocault@gmail.com>

Ditto.

  timothee.cocault@gmail.com <timothee.cocault@gmail.com>
>   
>   # There is also a:
>   #    (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162>

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>