Merge tag 'pull-11.1-gitdm-updates-130726-1' of https://gitlab.com/stsquad/qemu into staging

gitdm updates

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

# -----BEGIN PGP SIGNATURE-----
#
# iQEzBAABCgAdFiEEZoWumedRZ7yvyN81+9DbCVqeKkQFAmpVD1oACgkQ+9DbCVqe
# KkQlVQf/W7AyRksRaBM9JdfJwq3po5iDrUqBCU1VInz1fviltSOVD0qluInqzcnH
# ZbBA9l9B0Luq9RLFUSHfaX3kvyF2Ti+/6kmdFLkuAxKdyEuzY5k4yGhPmNUyPm6r
# gWQds6dMKcEzChmfzKloDUVkWbnlDrtUCLrjFXIA/32qODMNG/hUEAGO5xR6XojF
# 2sCJhBgeuEbBPEqghv6oCv4YAPLipmk2TgAAia7CPMX9pDlEBH9bs5T5O6QMoepF
# ZsYG+QALVEIEJAwAgQcHwzPEzSajb47BEPGskiXyL9oFZ0jUwyMAI1iQqzBhJvbB
# i7w+4CTMgAXgrjnmg1HoB2R0o1rgTg==
# =+6U6
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon 13 Jul 2026 17:16:26 BST
# gpg:                using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* tag 'pull-11.1-gitdm-updates-130726-1' of https://gitlab.com/stsquad/qemu:
  scripts/gitdm: migrate from contrib
  contrib/gitdm: Update Qualcomm entries
  contrib/gitdm: add more individual contributors
  contrib/gitdm: Update IBM map
  mailmap: add fix for Zhongyao Chen
  mailmap: add email mapping for Alexander Mikhalitsyn
  mailmap: Fix Ryan Zhang email address

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

.mailmap

@@ -36,9 +36,11 @@ 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)>
+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>
@@ -122,6 +124,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.

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

contrib/gitdm/group-map-ibm

@@ -1,15 +0,0 @@
-#
-# 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

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

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

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

scripts/gitdm/group-map-ibm

@@ -0,0 +1,7 @@
+#
+# Some IBM contributors submit via another domain
+#
+
+jcfaracco@gmail.com
+tommusta@gmail.com
+idan.horowitz@gmail.com

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