[PULL 0/7] gitdm metadata updates

[PULL 0/7] gitdm metadata updates

[Alex Bennée]

The following changes since commit 499039798cdad7d86b787fec0eaf1da4151c0f05:

  Merge tag 'pull-request-2026-07-12' of https://gitlab.com/huth/qemu into staging (2026-07-12 21:49:04 +0200)

are available in the Git repository at:

  https://gitlab.com/stsquad/qemu.git tags/pull-11.1-gitdm-updates-130726-1

for you to fetch changes up to 651c451c8e576989e3086a2915c50a9a72356cb4:

  scripts/gitdm: migrate from contrib (2026-07-13 17:13:11 +0100)

----------------------------------------------------------------
gitdm updates

  - various mailmap fixes
  - update IBM gitdm map
  - add more individual contributors to gitdm
  - update Qualcomm entries
  - migrate gitdm to scripts/

----------------------------------------------------------------
Alex Bennée (3):
      mailmap: add fix for Zhongyao Chen
      contrib/gitdm: add more individual contributors
      scripts/gitdm: migrate from contrib

Alexander Mikhalitsyn (1):
      mailmap: add email mapping for Alexander Mikhalitsyn

Joel Stanley (1):
      contrib/gitdm: Update IBM map

Philippe Mathieu-Daudé (2):
      mailmap: Fix Ryan Zhang email address
      contrib/gitdm: Update Qualcomm entries

 MAINTAINERS                                      |  2 +-
 .mailmap                                         |  3 ++
 contrib/gitdm/group-map-ibm                      | 15 ----------
 gitdm.config                                     | 38 ++++++++++++------------
 {contrib => scripts}/gitdm/aliases               |  1 +
 {contrib => scripts}/gitdm/domain-map            |  3 +-
 {contrib => scripts}/gitdm/filetypes.txt         |  0
 {contrib => scripts}/gitdm/group-map-academics   |  0
 {contrib => scripts}/gitdm/group-map-alibaba     |  0
 {contrib => scripts}/gitdm/group-map-amd         |  0
 {contrib => scripts}/gitdm/group-map-cadence     |  0
 {contrib => scripts}/gitdm/group-map-codeweavers |  0
 {contrib => scripts}/gitdm/group-map-facebook    |  0
 {contrib => scripts}/gitdm/group-map-huawei      |  0
 scripts/gitdm/group-map-ibm                      |  7 +++++
 {contrib => scripts}/gitdm/group-map-individuals |  2 ++
 {contrib => scripts}/gitdm/group-map-interns     |  0
 {contrib => scripts}/gitdm/group-map-janustech   |  0
 {contrib => scripts}/gitdm/group-map-microsoft   |  0
 {contrib => scripts}/gitdm/group-map-netflix     |  0
 {contrib => scripts}/gitdm/group-map-redhat      |  0
 {contrib => scripts}/gitdm/group-map-robots      |  0
 {contrib => scripts}/gitdm/group-map-wavecomp    |  0
 23 files changed, 35 insertions(+), 36 deletions(-)
 delete mode 100644 contrib/gitdm/group-map-ibm
 rename {contrib => scripts}/gitdm/aliases (97%)
 rename {contrib => scripts}/gitdm/domain-map (94%)
 rename {contrib => scripts}/gitdm/filetypes.txt (100%)
 rename {contrib => scripts}/gitdm/group-map-academics (100%)
 rename {contrib => scripts}/gitdm/group-map-alibaba (100%)
 rename {contrib => scripts}/gitdm/group-map-amd (100%)
 rename {contrib => scripts}/gitdm/group-map-cadence (100%)
 rename {contrib => scripts}/gitdm/group-map-codeweavers (100%)
 rename {contrib => scripts}/gitdm/group-map-facebook (100%)
 rename {contrib => scripts}/gitdm/group-map-huawei (100%)
 create mode 100644 scripts/gitdm/group-map-ibm
 rename {contrib => scripts}/gitdm/group-map-individuals (96%)
 rename {contrib => scripts}/gitdm/group-map-interns (100%)
 rename {contrib => scripts}/gitdm/group-map-janustech (100%)
 rename {contrib => scripts}/gitdm/group-map-microsoft (100%)
 rename {contrib => scripts}/gitdm/group-map-netflix (100%)
 rename {contrib => scripts}/gitdm/group-map-redhat (100%)
 rename {contrib => scripts}/gitdm/group-map-robots (100%)
 rename {contrib => scripts}/gitdm/group-map-wavecomp (100%)

-- 
2.47.3

[PULL 1/7] mailmap: Fix Ryan Zhang email address

[Alex Bennée]

From: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>

Add a .mailmap entry to fix the invalid email introduced
in commit 490a3e1867f ("ui/sdl2: Set GL ES profile before
creating initial GL context").

Signed-off-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Message-ID: <20260619071422.99061-1-philmd@oss.qualcomm.com>
Message-ID: <20260709080040.4157324-2-alex.bennee@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

diff --git a/.mailmap b/.mailmap
index 593b6c2c534..7665ea87562 100644
--- a/.mailmap
+++ b/.mailmap
@@ -36,6 +36,7 @@ Jason Wang <jasowangio@gmail.com> Jason Wang <jasowang@redhat.com>
 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>
+Ryan Zhang <ryan.zhang@nxp.com> Ryan Zhang <mailto>
 Timothée Cocault <timothee.cocault@gmail.com> timothee.cocault@gmail.com <timothee.cocault@gmail.com>
 Stefan Weil <sw@weilnetz.de> <weil@mail.berlios.de>
 Stefan Weil <sw@weilnetz.de> Stefan Weil <stefan@kiwi.(none)>
-- 
2.47.3

[PULL 2/7] mailmap: add email mapping for Alexander Mikhalitsyn

[Alex Bennée]

From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@futurfusion.io>

I use my company's email to sign-off patches, but send them from my
personal email cause it's Gmail hosted and works much better than Outlook.

It causes some misunderstanding and inconvenience for maintainers sometimes [1].
So I would like to add this email mapping to clear out all possible confusion here.

Link: https://lore.kernel.org/qemu-devel/CAAjaMXabXNmh1UZ5wnpX4wucnC+yWvMo2-jr2XBTby4zqf6CTA@mail.gmail.com/ [1]
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@futurfusion.io>
Message-ID: <20260708134744.169452-1-alexander@mihalicyn.com>
Message-ID: <20260709080040.4157324-3-alex.bennee@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

diff --git a/.mailmap b/.mailmap
index 7665ea87562..9ad072234ff 100644
--- a/.mailmap
+++ b/.mailmap
@@ -123,6 +123,7 @@ Stefan Weil <sw@weilnetz.de> Stefan Weil <stefan@weilnetz.de>
 Song Gao <17746591750@163.com> <gaosong@loongson.cn>
 Taylor Simpson <ltaylorsimpson@gmail.com> <tsimpson@quicinc.com>
 Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com>
+Alexander Mikhalitsyn <alexander@mihalicyn.com> <aleksandr.mikhalitsyn@futurfusion.io>
 
 # Also list preferred name forms where people have changed their
 # git author config, or had utf8/latin1 encoding issues.
diff --git a/contrib/gitdm/aliases b/contrib/gitdm/aliases
index e26b00a71d7..f838768792a 100644
--- a/contrib/gitdm/aliases
+++ b/contrib/gitdm/aliases
@@ -33,6 +33,7 @@ malc@c046a42c-6fe2-441c-8c8c-71466251a162 av1474@comtv.ru
 
 # canonical emails
 liq3ea@163.com liq3ea@gmail.com
+aleksandr.mikhalitsyn@futurfusion.io alexander@mihalicyn.com
 
 # some broken DCO tags
 yuval.shaia.ml.gmail.com yuval.shaia.ml@gmail.com
-- 
2.47.3

[PULL 3/7] mailmap: add fix for Zhongyao Chen

[Alex Bennée]

Fixes: c24f58d5322 (target/riscv: Fix tail handling for vmv.s.x and vfmv.s.f)
Cc: chen.zhongyao@zte.com.cn
Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-ID: <20260709080040.4157324-4-alex.bennee@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

diff --git a/.mailmap b/.mailmap
index 9ad072234ff..e5dc644623f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -40,6 +40,7 @@ Ryan Zhang <ryan.zhang@nxp.com> Ryan Zhang <mailto>
 Timothée Cocault <timothee.cocault@gmail.com> timothee.cocault@gmail.com <timothee.cocault@gmail.com>
 Stefan Weil <sw@weilnetz.de> <weil@mail.berlios.de>
 Stefan Weil <sw@weilnetz.de> Stefan Weil <stefan@kiwi.(none)>
+Zhongyao Chen <chen.zhongyao@zte.com.cn> chen.zhongyao@zte.com.cn <chen.zhongyao@zte.com.cn>
 
 # There is also a:
 #    (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162>
-- 
2.47.3

[PULL 4/7] contrib/gitdm: Update IBM map

[Alex Bennée]

From: Joel Stanley <joel@jms.id.au>

A number of us have moved on from IBM.

 * Alexey moved to AMD in 2022.
 * Andrew moved to Code Construct in 2023.
 * Ben moved to Amazon in 2019.
 * Cedric moved to Redhat.
 * Daniel moved to Ventana in 2024.
 * Greg moved to Redhat.
 * Joel moved to Tenstorrent in 2025.
 * Suraj moved to Amazon in 2019

Most have either stopped working on QEMU or swtiched to corp addresses.

Signed-off-by: Joel Stanley <joel@jms.id.au>
Acked-by: Greg Kurz <groug@kaod.org>
Message-ID: <20260709080040.4157324-5-alex.bennee@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

diff --git a/contrib/gitdm/group-map-ibm b/contrib/gitdm/group-map-ibm
index 24d8dc1b865..39c53a42ca1 100644
--- a/contrib/gitdm/group-map-ibm
+++ b/contrib/gitdm/group-map-ibm
@@ -2,14 +2,6 @@
 # Some IBM contributors submit via another domain
 #
 
-aik@ozlabs.ru
-andrew@aj.id.au
-benh@kernel.crashing.org
-clg@kaod.org
-danielhb413@gmail.com
-groug@kaod.org
 jcfaracco@gmail.com
-joel@jms.id.au
-sjitindarsingh@gmail.com
 tommusta@gmail.com
 idan.horowitz@gmail.com
-- 
2.47.3

[PULL 5/7] contrib/gitdm: add more individual contributors

[Alex Bennée]

Acked-by: Tomita Moeko <tomitamoeko@gmail.com>
Acked-by: Julian Ganz <neither@nut.email>
Message-ID: <20260709080040.4157324-8-alex.bennee@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

diff --git a/contrib/gitdm/group-map-individuals b/contrib/gitdm/group-map-individuals
index 178b393b8c3..190941bf72d 100644
--- a/contrib/gitdm/group-map-individuals
+++ b/contrib/gitdm/group-map-individuals
@@ -46,3 +46,5 @@ amarjargal16@gmail.com
 me@sean.taipei
 kosasihwilliam4@gmail.com
 philmd@mailo.com
+tomitamoeko@gmail.com
+neither@nut.email
-- 
2.47.3

[PULL 6/7] contrib/gitdm: Update Qualcomm entries

[Alex Bennée]

From: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>

Add an entry for Qualcomm Technologies, Inc.,
include previous quicinc.com contributions.

Signed-off-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Reviewed-by: Leif Lindholm <leif.lindholm@oss.qualcomm.com>
Reviewed-by: Daniel Henrique Barboza <daniel.barboza@oss.qualcomm.com>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
Message-ID: <20260707153003.58914-1-philmd@oss.qualcomm.com>
Message-ID: <20260709080040.4157324-9-alex.bennee@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

diff --git a/contrib/gitdm/domain-map b/contrib/gitdm/domain-map
index c07dffc51bd..aef20c4949c 100644
--- a/contrib/gitdm/domain-map
+++ b/contrib/gitdm/domain-map
@@ -40,7 +40,8 @@ nuviainc.com    NUVIA
 nvidia.com      NVIDIA
 oracle.com      Oracle
 proxmox.com     Proxmox
-quicinc.com     Qualcomm Innovation Center
+oss.qualcomm.com Qualcomm Technologies, Inc.
+quicinc.com     Qualcomm Technologies, Inc.
 redhat.com      Red Hat
 rev.ng          rev.ng Labs
 rivosinc.com    Rivos Inc
-- 
2.47.3

[PULL 7/7] scripts/gitdm: migrate from contrib

[Alex Bennée]

As discussed previously it was suggested scripts might be a better
location for this meta data.

Link: https://lore.kernel.org/all/CAFEAcA_5HvGriDsWnb1ALuA_dgG320eKv7yuM2kThv=rfOSZQA@mail.gmail.com/
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Message-ID: <20260709080040.4157324-10-alex.bennee@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index e25df9493c5..0be68396e9e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4611,7 +4611,7 @@ GIT Data Mining Config
 M: Alex Bennée <alex.bennee@linaro.org>
 S: Odd Fixes
 F: gitdm.config
-F: contrib/gitdm/*
+F: scripts/gitdm/*
 
 Incompatible changes
 L: devel@lists.libvirt.org
diff --git a/gitdm.config b/gitdm.config
index 8764bf2f9ff..b9627de5eac 100644
--- a/gitdm.config
+++ b/gitdm.config
@@ -17,13 +17,13 @@
 # the information in the existing .mailmap but in a slightly different
 # form.
 #
-EmailAliases contrib/gitdm/aliases
+EmailAliases scripts/gitdm/aliases
 
 #
 # EmailMap does the main work of mapping addresses onto
 # employers.
 #
-EmailMap contrib/gitdm/domain-map
+EmailMap scripts/gitdm/domain-map
 
 #
 # Use GroupMap to map a file full of addresses to the
@@ -31,31 +31,31 @@ EmailMap contrib/gitdm/domain-map
 # identifiable corporate emails. Please keep this list sorted.
 #
 
-GroupMap contrib/gitdm/group-map-alibaba Alibaba
-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-huawei Huawei
-GroupMap contrib/gitdm/group-map-ibm IBM
-GroupMap contrib/gitdm/group-map-janustech Janus Technologies
-GroupMap contrib/gitdm/group-map-microsoft Microsoft
-GroupMap contrib/gitdm/group-map-netflix Netflix
-GroupMap contrib/gitdm/group-map-redhat Red Hat
-GroupMap contrib/gitdm/group-map-wavecomp Wave Computing
+GroupMap scripts/gitdm/group-map-alibaba Alibaba
+GroupMap scripts/gitdm/group-map-amd AMD
+GroupMap scripts/gitdm/group-map-cadence Cadence Design Systems
+GroupMap scripts/gitdm/group-map-codeweavers CodeWeavers
+GroupMap scripts/gitdm/group-map-facebook Facebook
+GroupMap scripts/gitdm/group-map-huawei Huawei
+GroupMap scripts/gitdm/group-map-ibm IBM
+GroupMap scripts/gitdm/group-map-janustech Janus Technologies
+GroupMap scripts/gitdm/group-map-microsoft Microsoft
+GroupMap scripts/gitdm/group-map-netflix Netflix
+GroupMap scripts/gitdm/group-map-redhat Red Hat
+GroupMap scripts/gitdm/group-map-wavecomp Wave Computing
 
 # Also group together our prolific individual contributors
 # and those working under academic or intern auspices
-GroupMap contrib/gitdm/group-map-individuals (None)
-GroupMap contrib/gitdm/group-map-academics Academics (various)
-GroupMap contrib/gitdm/group-map-interns GSoC/Outreachy Interns
+GroupMap scripts/gitdm/group-map-individuals (None)
+GroupMap scripts/gitdm/group-map-academics Academics (various)
+GroupMap scripts/gitdm/group-map-interns GSoC/Outreachy Interns
 
 # Group together robots and other auto-reporters
-GroupMap contrib/gitdm/group-map-robots Robots (various)
+GroupMap scripts/gitdm/group-map-robots Robots (various)
 
 #
 #
 # Use FileTypeMap to map a file types to file names using regular
 # regular expressions.
 #
-FileTypeMap contrib/gitdm/filetypes.txt
+FileTypeMap scripts/gitdm/filetypes.txt
diff --git a/contrib/gitdm/aliases b/scripts/gitdm/aliases
similarity index 100%
rename from contrib/gitdm/aliases
rename to scripts/gitdm/aliases
diff --git a/contrib/gitdm/domain-map b/scripts/gitdm/domain-map
similarity index 100%
rename from contrib/gitdm/domain-map
rename to scripts/gitdm/domain-map
diff --git a/contrib/gitdm/filetypes.txt b/scripts/gitdm/filetypes.txt
similarity index 100%
rename from contrib/gitdm/filetypes.txt
rename to scripts/gitdm/filetypes.txt
diff --git a/contrib/gitdm/group-map-academics b/scripts/gitdm/group-map-academics
similarity index 100%
rename from contrib/gitdm/group-map-academics
rename to scripts/gitdm/group-map-academics
diff --git a/contrib/gitdm/group-map-alibaba b/scripts/gitdm/group-map-alibaba
similarity index 100%
rename from contrib/gitdm/group-map-alibaba
rename to scripts/gitdm/group-map-alibaba
diff --git a/contrib/gitdm/group-map-amd b/scripts/gitdm/group-map-amd
similarity index 100%
rename from contrib/gitdm/group-map-amd
rename to scripts/gitdm/group-map-amd
diff --git a/contrib/gitdm/group-map-cadence b/scripts/gitdm/group-map-cadence
similarity index 100%
rename from contrib/gitdm/group-map-cadence
rename to scripts/gitdm/group-map-cadence
diff --git a/contrib/gitdm/group-map-codeweavers b/scripts/gitdm/group-map-codeweavers
similarity index 100%
rename from contrib/gitdm/group-map-codeweavers
rename to scripts/gitdm/group-map-codeweavers
diff --git a/contrib/gitdm/group-map-facebook b/scripts/gitdm/group-map-facebook
similarity index 100%
rename from contrib/gitdm/group-map-facebook
rename to scripts/gitdm/group-map-facebook
diff --git a/contrib/gitdm/group-map-huawei b/scripts/gitdm/group-map-huawei
similarity index 100%
rename from contrib/gitdm/group-map-huawei
rename to scripts/gitdm/group-map-huawei
diff --git a/contrib/gitdm/group-map-ibm b/scripts/gitdm/group-map-ibm
similarity index 100%
rename from contrib/gitdm/group-map-ibm
rename to scripts/gitdm/group-map-ibm
diff --git a/contrib/gitdm/group-map-individuals b/scripts/gitdm/group-map-individuals
similarity index 100%
rename from contrib/gitdm/group-map-individuals
rename to scripts/gitdm/group-map-individuals
diff --git a/contrib/gitdm/group-map-interns b/scripts/gitdm/group-map-interns
similarity index 100%
rename from contrib/gitdm/group-map-interns
rename to scripts/gitdm/group-map-interns
diff --git a/contrib/gitdm/group-map-janustech b/scripts/gitdm/group-map-janustech
similarity index 100%
rename from contrib/gitdm/group-map-janustech
rename to scripts/gitdm/group-map-janustech
diff --git a/contrib/gitdm/group-map-microsoft b/scripts/gitdm/group-map-microsoft
similarity index 100%
rename from contrib/gitdm/group-map-microsoft
rename to scripts/gitdm/group-map-microsoft
diff --git a/contrib/gitdm/group-map-netflix b/scripts/gitdm/group-map-netflix
similarity index 100%
rename from contrib/gitdm/group-map-netflix
rename to scripts/gitdm/group-map-netflix
diff --git a/contrib/gitdm/group-map-redhat b/scripts/gitdm/group-map-redhat
similarity index 100%
rename from contrib/gitdm/group-map-redhat
rename to scripts/gitdm/group-map-redhat
diff --git a/contrib/gitdm/group-map-robots b/scripts/gitdm/group-map-robots
similarity index 100%
rename from contrib/gitdm/group-map-robots
rename to scripts/gitdm/group-map-robots
diff --git a/contrib/gitdm/group-map-wavecomp b/scripts/gitdm/group-map-wavecomp
similarity index 100%
rename from contrib/gitdm/group-map-wavecomp
rename to scripts/gitdm/group-map-wavecomp
-- 
2.47.3

Re: [PULL 0/7] gitdm metadata updates

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 116 bytes --]

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/11.1 for any user-visible changes.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]