From: Aleksandar Markovic <aleksandar.qemu.devel@xxxxxxxxx> Aleksandar Rikalo wants to use a different email address from now on. Reviewed-by: Aleksandar Rikalo <aleksandar.rikalo@xxxxxxxxxx> Reviewed-by: Philippe Mathieu-Daudé <f4bug@xxxxxxxxx> Tested-by: Philippe Mathieu-Daudé <f4bug@xxxxxxxxx> Signed-off-by: Aleksandar Markovic <aleksandar.qemu.devel@xxxxxxxxx> Message-id: <20200518200920.17344-18-aleksandar.qemu.devel@xxxxxxxxx> Signed-off-by: Philippe Mathieu-Daudé <f4bug@xxxxxxxxx> --- .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@xxxxxxxxxxxxx> Justin Terry (VM) via Qemu-devel <qemu Aleksandar Markovic <aleksandar.qemu.devel@xxxxxxxxx> <aleksandar.markovic@xxxxxxxx> Aleksandar Markovic <aleksandar.qemu.devel@xxxxxxxxx> <aleksandar.markovic@xxxxxxxxxx> Aleksandar Markovic <aleksandar.qemu.devel@xxxxxxxxx> <amarkovic@xxxxxxxxxxxx> -Aleksandar Rikalo <aleksandar.rikalo@xxxxxxxxx> <arikalo@xxxxxxxxxxxx> +Aleksandar Rikalo <aleksandar.rikalo@xxxxxxxxxx> <arikalo@xxxxxxxxxxxx> +Aleksandar Rikalo <aleksandar.rikalo@xxxxxxxxxx> <aleksandar.rikalo@xxxxxxxxx> Anthony Liguori <anthony@xxxxxxxxxxxxx> Anthony Liguori <aliguori@xxxxxxxxxx> James Hogan <jhogan@xxxxxxxxxx> <james.hogan@xxxxxxxxxx> Leif Lindholm <leif@xxxxxxxxxxxx> <leif.lindholm@xxxxxxxxxx> 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@xxxxxxxxx> R: Aurelien Jarno <aurelien@xxxxxxxxxxx> -R: Aleksandar Rikalo <aleksandar.rikalo@xxxxxxxxx> +R: Aleksandar Rikalo <aleksandar.rikalo@xxxxxxxxxx> S: Maintained F: target/mips/ F: default-configs/*mips* @@ -1048,7 +1048,7 @@ MIPS Machines ------------- Jazz M: Hervé Poussineau <hpoussin@xxxxxxxxxxx> -R: Aleksandar Rikalo <aleksandar.rikalo@xxxxxxxxx> +R: Aleksandar Rikalo <aleksandar.rikalo@xxxxxxxxxx> 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@xxxxxxxxx> -R: Aleksandar Rikalo <aleksandar.rikalo@xxxxxxxxx> +R: Aleksandar Rikalo <aleksandar.rikalo@xxxxxxxxxx> 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@xxxxxxxxx> R: Aurelien Jarno <aurelien@xxxxxxxxxxx> -R: Aleksandar Rikalo <aleksandar.rikalo@xxxxxxxxx> +R: Aleksandar Rikalo <aleksandar.rikalo@xxxxxxxxxx> S: Obsolete F: hw/mips/r4k.c @@ -1094,7 +1094,7 @@ F: include/hw/isa/vt82c686.h Boston M: Paul Burton <pburton@xxxxxxxxxxxx> -R: Aleksandar Rikalo <aleksandar.rikalo@xxxxxxxxx> +R: Aleksandar Rikalo <aleksandar.rikalo@xxxxxxxxxx> 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@xxxxxxxxx> R: Aurelien Jarno <aurelien@xxxxxxxxxxx> -R: Aleksandar Rikalo <aleksandar.rikalo@xxxxxxxxx> +R: Aleksandar Rikalo <aleksandar.rikalo@xxxxxxxxxx> S: Maintained F: tcg/mips/ -- 2.21.3