The following changes since commit 2cb73afa6a2408b397a5af1427d120b8aa04997a:

  Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging (2019-03-12 15:25:46 +0000)

are available in the Git repository at:

  https://github.com/stsquad/qemu.git tags/pull-gitdm-next-120319-1

for you to fetch changes up to eb34fc03e2de541bda26e625afcdd680c6c7c1f1:

  contrib: gitdm: add a mapping for Janus Technologies (2019-03-12 19:31:29 +0000)

----------------------------------------------------------------
Final gitdm updates for 4.0

----------------------------------------------------------------
Aleksandar Markovic (2):
      contrib: gitdm: Update domain-map
      contrib: gitdm: Update Wave Computing group

Alex Bennée (3):
      contrib: gitdm: add more individual contributors
      contrib: gitdm: another IBM email
      contrib: gitdm: add a mapping for Janus Technologies

 contrib/gitdm/domain-map            |  5 +++++
 contrib/gitdm/group-map-ibm         |  1 +
 contrib/gitdm/group-map-individuals |  5 +++++
 contrib/gitdm/group-map-janustech   |  5 +++++
 contrib/gitdm/group-map-wavecomp    | 12 ++++++++++++
 gitdm.config                        |  1 +
 6 files changed, 29 insertions(+)
 create mode 100644 contrib/gitdm/group-map-janustech

-- 
2.20.1

On Tue, 12 Mar 2019 at 19:34, Alex Bennée <alex.bennee@linaro.org> wrote:
>
> The following changes since commit 2cb73afa6a2408b397a5af1427d120b8aa04997a:
>
>   Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging (2019-03-12 15:25:46 +0000)
>
> are available in the Git repository at:
>
>   https://github.com/stsquad/qemu.git tags/pull-gitdm-next-120319-1
>
> for you to fetch changes up to eb34fc03e2de541bda26e625afcdd680c6c7c1f1:
>
>   contrib: gitdm: add a mapping for Janus Technologies (2019-03-12 19:31:29 +0000)
>
> ----------------------------------------------------------------
> Final gitdm updates for 4.0
>

Applied, thanks.

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

-- PMM

From: Aleksandar Markovic <amarkovic@wavecomp.com>

Add Citrix, Huawei, Intel, and Microsoft to domain-map.

Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>
[AJB: sorted, added Fujitsu]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

diff --git a/contrib/gitdm/domain-map b/contrib/gitdm/domain-map
index 0ab41ee27a..fa9d454473 100644
--- a/contrib/gitdm/domain-map
+++ b/contrib/gitdm/domain-map
@@ -5,10 +5,15 @@
 #
 
 amd.com         AMD
+citrix.com      Citrix
 greensocs.com   GreenSocs
+fujitsu.com     Fujitsu
+huawei.com      Huawei
 ibm.com         IBM
 igalia.com      Igalia
+intel.com       Intel
 linaro.org      Linaro
+microsoft.com   Microsoft
 nokia.com       Nokia
 oracle.com      Oracle
 proxmox.com     Proxmox
-- 
2.20.1

From: Aleksandar Markovic <amarkovic@wavecomp.com>

Add all missing MIPS/Imgtec/Wave contributors (from the inception of
QEMU).

Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

diff --git a/contrib/gitdm/group-map-wavecomp b/contrib/gitdm/group-map-wavecomp
index 2801a966b6..c5c57f0eaf 100644
--- a/contrib/gitdm/group-map-wavecomp
+++ b/contrib/gitdm/group-map-wavecomp
@@ -5,13 +5,25 @@
 
 aleksandar.markovic@imgtec.com
 aleksandar.markovic@mips.com
+alex.smith@imgtec.com
+andrew.bennett@imgtec.com
 amarkovic@wavecomp.com
 arikalo@wavecomp.com
+chris@mips.com
 dnikolic@wavecomp.com
+ericj@mips.com
+goran.ferenc@imgtec.com
+james.cowgill@mips.com
+james.hogan@imgtec.com
 james.hogan@mips.com
 leon.alrae@imgtec.com
+matt.redfearn@imgtec.com
 matthew.fortune@mips.com
+miodrag.dinic@imgtec.com
+paul@archlinuxmips.org
 paul.burton@imgtec.com
+petar.jovanovic@imgtec.com
+petarj@mips.com
 pburton@wavecomp.com
 smarkovic@wavecomp.com
 yongbok.kim@imgtec.com
-- 
2.20.1

I know Richard's is right because I asked him in the pub. I'm guessing
Fredrik's based on the fact I vaguely remember an Atari demo. The
others I attributed to academic institutions last time I posted so
have moved them to individuals as requested.

Cc: Fredrik Noring <noring@nocrew.org>
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: BALATON Zoltan <balaton@eik.bme.hu>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Richard Henderson <rth@twiddle.net>

diff --git a/contrib/gitdm/group-map-individuals b/contrib/gitdm/group-map-individuals
index afdbe7d460..05e355d30e 100644
--- a/contrib/gitdm/group-map-individuals
+++ b/contrib/gitdm/group-map-individuals
@@ -8,3 +8,8 @@
 f4bug@amsat.org
 mjt@tls.msk.ru
 mark.cave-ayland@ilande.co.uk
+rth@twiddle.net
+noring@nocrew.org
+samuel.thibault@ens-lyon.org
+aurelien@aurel32.net
+balaton@eik.bme.hu
-- 
2.20.1

Alex Bennée, le mar. 12 mars 2019 19:34:56 +0000, a ecrit:
> I know Richard's is right because I asked him in the pub. I'm guessing
> Fredrik's based on the fact I vaguely remember an Atari demo. The
> others I attributed to academic institutions last time I posted so
> have moved them to individuals as requested.
> 
> Cc: Fredrik Noring <noring@nocrew.org>
> Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
> Cc: Aurelien Jarno <aurelien@aurel32.net>
> Cc: BALATON Zoltan <balaton@eik.bme.hu>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Acked-by: Richard Henderson <rth@twiddle.net>

Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

Thanks!
> 
> diff --git a/contrib/gitdm/group-map-individuals b/contrib/gitdm/group-map-individuals
> index afdbe7d460..05e355d30e 100644
> --- a/contrib/gitdm/group-map-individuals
> +++ b/contrib/gitdm/group-map-individuals
> @@ -8,3 +8,8 @@
>  f4bug@amsat.org
>  mjt@tls.msk.ru
>  mark.cave-ayland@ilande.co.uk
> +rth@twiddle.net
> +noring@nocrew.org
> +samuel.thibault@ens-lyon.org
> +aurelien@aurel32.net
> +balaton@eik.bme.hu
> -- 
> 2.20.1
> 

-- 
Samuel
"...[Linux's] capacity to talk via any medium except smoke signals."
(By Dr. Greg Wettstein, Roger Maris Cancer Center)

Based on Tom's LinkedIn profile his QEMU work was while in IBM's
virtualisation group.

Reviewed-by: Tom Musta <tommusta@gmail.com>
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 22727319b3..da62fa3f44 100644
--- a/contrib/gitdm/group-map-ibm
+++ b/contrib/gitdm/group-map-ibm
@@ -11,3 +11,4 @@ groug@kaod.org
 jcfaracco@gmail.com
 joel@jms.id.au
 sjitindarsingh@gmail.com
+tommusta@gmail.com
-- 
2.20.1