diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2020-10-11 14:34:07 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2020-10-11 14:34:07 +0100 |
commit | 48a340d9b23ffcf7704f2de14d1e505481a84a1c (patch) | |
tree | 5442322e9e338ddccaa1a4b45f2917a4c3318868 /contrib/gitdm | |
parent | b433f2cb0115b11f74205a0cf75565976d4b2517 (diff) | |
parent | e5d402b28f1a325d46b7b0f08d04257f618e6d03 (diff) | |
download | qemu-48a340d9b23ffcf7704f2de14d1e505481a84a1c.zip qemu-48a340d9b23ffcf7704f2de14d1e505481a84a1c.tar.gz qemu-48a340d9b23ffcf7704f2de14d1e505481a84a1c.tar.bz2 |
Merge remote-tracking branch 'remotes/stsquad/tags/pull-various-091020-1' into staging
Testing, gitdm and plugin fixes:
- fix acceptance regressions in MIPS and IDE
- speed up cirrus msys2/mingw builds
- add genisoimage to more docker images
- slew of gitdb updates
- fix some windows compile issues for plugins
- add V=1 to cirrus output
- disable rxsim in gitlab CI
# gpg: Signature made Fri 09 Oct 2020 17:30:29 BST
# gpg: using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8 DF35 FBD0 DB09 5A9E 2A44
* remotes/stsquad/tags/pull-various-091020-1: (22 commits)
tests/acceptance: disable machine_rx_gdbsim on GitLab
cirrus: use V=1 when running tests on FreeBSD and macOS
plugin: Fixes compiling errors on msys2/mingw
plugins: Fixes a issue when dlsym failed, the handle not closed
.mailmap: Fix more contributor entries
contrib/gitdm: Add Yandex to the domain map
contrib/gitdm: Add Yadro to the domain map
contrib/gitdm: Add SUSE to the domain map
contrib/gitdm: Add Nir Soffer to Red Hat domain
contrib/gitdm: Add Qualcomm to the domain map
contrib/gitdm: Add Nuvia to the domain map
contrib/gitdm: Add Google to the domain map
contrib/gitdm: Add ByteDance to the domain map
contrib/gitdm: Add Baidu to the domain map
contrib/gitdm: Add more individual contributors
contrib/gitdm: Add more academic domains
tests/docker: Add genisoimage to the docker file
cirrus: msys2/mingw speed is up, add excluded target back
cirrus: Fixing and speedup the msys2/mingw CI
hw/ide: restore replay support of IDE
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'contrib/gitdm')
-rw-r--r-- | contrib/gitdm/domain-map | 10 | ||||
-rw-r--r-- | contrib/gitdm/group-map-academics | 4 | ||||
-rw-r--r-- | contrib/gitdm/group-map-individuals | 7 | ||||
-rw-r--r-- | contrib/gitdm/group-map-redhat | 1 |
4 files changed, 21 insertions, 1 deletions
diff --git a/contrib/gitdm/domain-map b/contrib/gitdm/domain-map index dd79147..0074da6 100644 --- a/contrib/gitdm/domain-map +++ b/contrib/gitdm/domain-map @@ -5,10 +5,13 @@ # amd.com AMD +baidu.com Baidu +bytedance.com ByteDance cmss.chinamobile.com China Mobile citrix.com Citrix -greensocs.com GreenSocs fujitsu.com Fujitsu +google.com Google +greensocs.com GreenSocs huawei.com Huawei ibm.com IBM igalia.com Igalia @@ -16,13 +19,18 @@ intel.com Intel linaro.org Linaro microsoft.com Microsoft nokia.com Nokia +nuviainc.com NUVIA oracle.com Oracle proxmox.com Proxmox +quicinc.com Qualcomm Innovation Center redhat.com Red Hat rt-rk.com RT-RK siemens.com Siemens sifive.com SiFive +suse.com SUSE suse.de SUSE virtuozzo.com Virtuozzo wdc.com Western Digital xilinx.com Xilinx +yadro.com YADRO +yandex-team.ru Yandex diff --git a/contrib/gitdm/group-map-academics b/contrib/gitdm/group-map-academics index 08f9d81..bf3c894 100644 --- a/contrib/gitdm/group-map-academics +++ b/contrib/gitdm/group-map-academics @@ -12,3 +12,7 @@ ispras.ru # Columbia University cs.columbia.edu cota@braap.org + +uni-paderborn.de +edu +edu.cn diff --git a/contrib/gitdm/group-map-individuals b/contrib/gitdm/group-map-individuals index cf8a2ce..641169f 100644 --- a/contrib/gitdm/group-map-individuals +++ b/contrib/gitdm/group-map-individuals @@ -16,3 +16,10 @@ aurelien@aurel32.net balaton@eik.bme.hu e.emanuelegiuseppe@gmail.com andrew.smirnov@gmail.com +sw@weilnetz.de +deller@gmx.de +fthain@telegraphics.com.au +vr_qemu@t-online.de +nieklinnenbank@gmail.com +devnexen@gmail.com +pauldzim@gmail.com diff --git a/contrib/gitdm/group-map-redhat b/contrib/gitdm/group-map-redhat index d15db2d..02507b7 100644 --- a/contrib/gitdm/group-map-redhat +++ b/contrib/gitdm/group-map-redhat @@ -6,3 +6,4 @@ david@gibson.dropbear.id.au laurent@vivier.eu pjp@fedoraproject.org armbru@pond.sub.org +nirsof@gmail.com |