r.bolshakov@xxxxxxxxx is bouncing: Update Roman's email address using one found somewhere on the Internet; this way he can Ack-by. (Reorder Taylor's line to keep the section sorted alphabetically). Signed-off-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx> --- MAINTAINERS | 4 ++-- .mailmap | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 7f323cd2eb..1da135b0c8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -497,14 +497,14 @@ F: target/arm/hvf/ X86 HVF CPUs M: Cameron Esfahani <dirty@xxxxxxxxx> -M: Roman Bolshakov <r.bolshakov@xxxxxxxxx> +M: Roman Bolshakov <rbolshakov@xxxxxxx> W: https://wiki.qemu.org/Features/HVF S: Maintained F: target/i386/hvf/ HVF M: Cameron Esfahani <dirty@xxxxxxxxx> -M: Roman Bolshakov <r.bolshakov@xxxxxxxxx> +M: Roman Bolshakov <rbolshakov@xxxxxxx> W: https://wiki.qemu.org/Features/HVF S: Maintained F: accel/hvf/ diff --git a/.mailmap b/.mailmap index b57da4827e..64ef9f4de6 100644 --- a/.mailmap +++ b/.mailmap @@ -76,9 +76,10 @@ Paul Burton <paulburton@xxxxxxxxxx> <pburton@xxxxxxxxxxxx> Philippe Mathieu-Daudé <philmd@xxxxxxxxxx> <f4bug@xxxxxxxxx> Philippe Mathieu-Daudé <philmd@xxxxxxxxxx> <philmd@xxxxxxxxxx> Philippe Mathieu-Daudé <philmd@xxxxxxxxxx> <philmd@xxxxxxxxxxxx> +Roman Bolshakov <rbolshakov@xxxxxxx> <r.bolshakov@xxxxxxxxx> Stefan Brankovic <stefan.brankovic@xxxxxxxxxx> <stefan.brankovic@xxxxxxxxxxxxx> -Yongbok Kim <yongbok.kim@xxxxxxxx> <yongbok.kim@xxxxxxxxxx> Taylor Simpson <ltaylorsimpson@xxxxxxxxx> <tsimpson@xxxxxxxxxxx> +Yongbok Kim <yongbok.kim@xxxxxxxx> <yongbok.kim@xxxxxxxxxx> # Also list preferred name forms where people have changed their # git author config, or had utf8/latin1 encoding issues. -- 2.38.1
