aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2023-03-11 17:17:31 +0000
committerPeter Maydell <peter.maydell@linaro.org>2023-03-11 17:17:31 +0000
commitee41280a93003583e44015ac93ca737de9c8ae3a (patch)
treec15b6e5257b77744a189c4ed4382fca25cd06207
parent7284d53f6fc2c00e930155e7cf1d1ed4ea59f56f (diff)
parent0194e846c43f0ee18e0384c0c1f35757760e04ec (diff)
downloadqemu-ee41280a93003583e44015ac93ca737de9c8ae3a.zip
qemu-ee41280a93003583e44015ac93ca737de9c8ae3a.tar.gz
qemu-ee41280a93003583e44015ac93ca737de9c8ae3a.tar.bz2
Merge tag 'pull-gitdm-100323-1' of https://gitlab.com/stsquad/qemu into staging
gitdm updates for: - IBM - Facebook - Individual contributors - Ventana # -----BEGIN PGP SIGNATURE----- # # iQEzBAABCgAdFiEEZoWumedRZ7yvyN81+9DbCVqeKkQFAmQLUy8ACgkQ+9DbCVqe # KkRCdwf+L7Y0mHKKvxVyfRO2W51HbzUYqzPF6bFgqxqwbL6CRdPw5Ks3RHGV8N6C # Er4MIsVhzLUY7BX+IcHZG1C9/8UrtymY2tUA1Qg5L2NQ/pNvDN9OHA/HXw+JkOq2 # l/l1ZkWmlT0IZwtTrKYHjZnqxMfEOey33y+t623wtMh7Bpj/ZPjYLsYxhhkwobvc # fPFAZ2tukkECFkvylnaoE+3S2g86EY9soZEmeSdOYPtIbeb42o38cTchaAHQnc09 # sQJ1hguRUpwi1Y1CaP3QCqS8TkdV1oObWJ4+ZfHHXmDWfI0yQfbNFBU7bGZkxGkI # i9EKqF+xfdklrqJz9Y7jEjFfetUghA== # =p/39 # -----END PGP SIGNATURE----- # gpg: Signature made Fri 10 Mar 2023 15:56:31 GMT # 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 * tag 'pull-gitdm-100323-1' of https://gitlab.com/stsquad/qemu: contrib/gitdm: add Idan to IBM's group map contrib/gitdm: Add Facebook the domain map contrib/gitdm: add Tsukasa as an individual contributor contrib/gitdm: Add Ventana Micro Systems to the domain map contrib/gitdm: Add VRULL to the domain map Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--contrib/gitdm/domain-map3
-rw-r--r--contrib/gitdm/group-map-facebook5
-rw-r--r--contrib/gitdm/group-map-ibm1
-rw-r--r--contrib/gitdm/group-map-individuals1
-rw-r--r--gitdm.config1
5 files changed, 11 insertions, 0 deletions
diff --git a/contrib/gitdm/domain-map b/contrib/gitdm/domain-map
index 3727918..8913a88 100644
--- a/contrib/gitdm/domain-map
+++ b/contrib/gitdm/domain-map
@@ -12,6 +12,7 @@ citrix.com Citrix
crudebyte.com Crudebyte
chinatelecom.cn China Telecom
eldorado.org.br Instituto de Pesquisas Eldorado
+fb.com Facebook
fujitsu.com Fujitsu
google.com Google
greensocs.com GreenSocs
@@ -37,7 +38,9 @@ siemens.com Siemens
sifive.com SiFive
suse.com SUSE
suse.de SUSE
+ventanamicro.com Ventana Micro Systems
virtuozzo.com Virtuozzo
+vrull.eu VRULL
wdc.com Western Digital
windriver.com Wind River
xilinx.com Xilinx
diff --git a/contrib/gitdm/group-map-facebook b/contrib/gitdm/group-map-facebook
new file mode 100644
index 0000000..38589f8
--- /dev/null
+++ b/contrib/gitdm/group-map-facebook
@@ -0,0 +1,5 @@
+#
+# Some Facebook contributors also occasionally use personal email addresses.
+#
+
+peter@pjd.dev
diff --git a/contrib/gitdm/group-map-ibm b/contrib/gitdm/group-map-ibm
index da62fa3..24d8dc1 100644
--- a/contrib/gitdm/group-map-ibm
+++ b/contrib/gitdm/group-map-ibm
@@ -12,3 +12,4 @@ jcfaracco@gmail.com
joel@jms.id.au
sjitindarsingh@gmail.com
tommusta@gmail.com
+idan.horowitz@gmail.com
diff --git a/contrib/gitdm/group-map-individuals b/contrib/gitdm/group-map-individuals
index 53883cc..e2263a5 100644
--- a/contrib/gitdm/group-map-individuals
+++ b/contrib/gitdm/group-map-individuals
@@ -37,3 +37,4 @@ akihiko.odaki@gmail.com
paul@nowt.org
git@xen0n.name
simon@simonsafar.com
+research_trasio@irq.a4lg.com
diff --git a/gitdm.config b/gitdm.config
index 288b100..907ffde 100644
--- a/gitdm.config
+++ b/gitdm.config
@@ -33,6 +33,7 @@ EmailMap contrib/gitdm/domain-map
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-ibm IBM
GroupMap contrib/gitdm/group-map-janustech Janus Technologies
GroupMap contrib/gitdm/group-map-netflix Netflix