From: Aleksandar Markovic <aleksandar.qemu.devel(a)gmail.com>
Aleksandar Rikalo wants to use a different email address from
now on.
Reviewed-by: Aleksandar Rikalo <aleksandar.rikalo(a)syrmia.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug(a)amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug(a)amsat.org>
Signed-off-by: Aleksandar Markovic <aleksandar.qemu.devel(a)gmail.com>
Message-id: <20200518200920.17344-18-aleksandar.qemu.devel(a)gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug(a)amsat.org>
---
.mailmap | 3 ++-
MAINTAINERS | 12 ++++++------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/.mailmap b/.mailmap
index 6412067bde..e3628c7a66 100644
--- a/.mailmap
+++ b/.mailmap
@@ -42,7 +42,8 @@ Justin Terry (VM) <juterry(a)microsoft.com> Justin Terry (VM) via
Qemu-devel <qemu
Aleksandar Markovic <aleksandar.qemu.devel(a)gmail.com>
<aleksandar.markovic(a)mips.com>
Aleksandar Markovic <aleksandar.qemu.devel(a)gmail.com>
<aleksandar.markovic(a)imgtec.com>
Aleksandar Markovic <aleksandar.qemu.devel(a)gmail.com>
<amarkovic(a)wavecomp.com>
-Aleksandar Rikalo <aleksandar.rikalo(a)rt-rk.com> <arikalo(a)wavecomp.com>
+Aleksandar Rikalo <aleksandar.rikalo(a)syrmia.com> <arikalo(a)wavecomp.com>
+Aleksandar Rikalo <aleksandar.rikalo(a)syrmia.com>
<aleksandar.rikalo(a)rt-rk.com>
Anthony Liguori <anthony(a)codemonkey.ws> Anthony Liguori
<aliguori(a)us.ibm.com>
James Hogan <jhogan(a)kernel.org> <james.hogan(a)imgtec.com>
Leif Lindholm <leif(a)nuviainc.com> <leif.lindholm(a)linaro.org>
diff --git a/MAINTAINERS b/MAINTAINERS
index f46ab150dc..a209b5d8ce 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -213,7 +213,7 @@ F: disas/microblaze.c
MIPS TCG CPUs
M: Aleksandar Markovic <aleksandar.qemu.devel(a)gmail.com>
R: Aurelien Jarno <aurelien(a)aurel32.net>
-R: Aleksandar Rikalo <aleksandar.rikalo(a)rt-rk.com>
+R: Aleksandar Rikalo <aleksandar.rikalo(a)syrmia.com>
S: Maintained
F: target/mips/
F: default-configs/*mips*
@@ -1048,7 +1048,7 @@ MIPS Machines
-------------
Jazz
M: Hervé Poussineau <hpoussin(a)reactos.org>
-R: Aleksandar Rikalo <aleksandar.rikalo(a)rt-rk.com>
+R: Aleksandar Rikalo <aleksandar.rikalo(a)syrmia.com>
S: Maintained
F: hw/mips/jazz.c
F: hw/display/jazz_led.c
@@ -1069,7 +1069,7 @@ F: tests/acceptance/machine_mips_malta.py
Mipssim
M: Aleksandar Markovic <aleksandar.qemu.devel(a)gmail.com>
-R: Aleksandar Rikalo <aleksandar.rikalo(a)rt-rk.com>
+R: Aleksandar Rikalo <aleksandar.rikalo(a)syrmia.com>
S: Odd Fixes
F: hw/mips/mipssim.c
F: hw/net/mipsnet.c
@@ -1077,7 +1077,7 @@ F: hw/net/mipsnet.c
R4000
M: Aleksandar Markovic <aleksandar.qemu.devel(a)gmail.com>
R: Aurelien Jarno <aurelien(a)aurel32.net>
-R: Aleksandar Rikalo <aleksandar.rikalo(a)rt-rk.com>
+R: Aleksandar Rikalo <aleksandar.rikalo(a)syrmia.com>
S: Obsolete
F: hw/mips/r4k.c
@@ -1094,7 +1094,7 @@ F: include/hw/isa/vt82c686.h
Boston
M: Paul Burton <pburton(a)wavecomp.com>
-R: Aleksandar Rikalo <aleksandar.rikalo(a)rt-rk.com>
+R: Aleksandar Rikalo <aleksandar.rikalo(a)syrmia.com>
S: Maintained
F: hw/core/loader-fit.c
F: hw/mips/boston.c
@@ -2608,7 +2608,7 @@ F: disas/i386.c
MIPS TCG target
M: Aleksandar Markovic <aleksandar.qemu.devel(a)gmail.com>
R: Aurelien Jarno <aurelien(a)aurel32.net>
-R: Aleksandar Rikalo <aleksandar.rikalo(a)rt-rk.com>
+R: Aleksandar Rikalo <aleksandar.rikalo(a)syrmia.com>
S: Maintained
F: tcg/mips/
--
2.21.3