diff --git a/.mailmap b/.mailmap index 593b6c2c53..e5dc644623 100644 --- a/.mailmap +++ b/.mailmap @@ -36,9 +36,11 @@ Jason Wang Jason Wang Marek Dolata mkdolata@us.ibm.com Michael Ellerman michael@ozlabs.org Nick Hudson hnick@vmware.com +Ryan Zhang Ryan Zhang Timothée Cocault timothee.cocault@gmail.com Stefan Weil Stefan Weil Stefan Weil +Zhongyao Chen chen.zhongyao@zte.com.cn # There is also a: # (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162> @@ -122,6 +124,7 @@ Stefan Weil Stefan Weil Song Gao <17746591750@163.com> Taylor Simpson Yongbok Kim +Alexander Mikhalitsyn # Also list preferred name forms where people have changed their # git author config, or had utf8/latin1 encoding issues. diff --git a/MAINTAINERS b/MAINTAINERS index e25df9493c..0be68396e9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4611,7 +4611,7 @@ GIT Data Mining Config M: Alex Bennée S: Odd Fixes F: gitdm.config -F: contrib/gitdm/* +F: scripts/gitdm/* Incompatible changes L: devel@lists.libvirt.org diff --git a/contrib/gitdm/group-map-ibm b/contrib/gitdm/group-map-ibm deleted file mode 100644 index 24d8dc1b86..0000000000 --- a/contrib/gitdm/group-map-ibm +++ /dev/null @@ -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 diff --git a/gitdm.config b/gitdm.config index 8764bf2f9f..b9627de5ea 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 97% rename from contrib/gitdm/aliases rename to scripts/gitdm/aliases index e26b00a71d..f838768792 100644 --- a/contrib/gitdm/aliases +++ b/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 diff --git a/contrib/gitdm/domain-map b/scripts/gitdm/domain-map similarity index 94% rename from contrib/gitdm/domain-map rename to scripts/gitdm/domain-map index c07dffc51b..aef20c4949 100644 --- a/contrib/gitdm/domain-map +++ b/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 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/scripts/gitdm/group-map-ibm b/scripts/gitdm/group-map-ibm new file mode 100644 index 0000000000..39c53a42ca --- /dev/null +++ b/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 diff --git a/contrib/gitdm/group-map-individuals b/scripts/gitdm/group-map-individuals similarity index 96% rename from contrib/gitdm/group-map-individuals rename to scripts/gitdm/group-map-individuals index 178b393b8c..190941bf72 100644 --- a/contrib/gitdm/group-map-individuals +++ b/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 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