diff options
| -rw-r--r-- | .mailmap | 3 | ||||
| -rw-r--r-- | MAINTAINERS | 16 |
2 files changed, 10 insertions, 9 deletions
diff --git a/.mailmap b/.mailmap index 33fe75400f..e7271852dc 100644 --- a/.mailmap +++ b/.mailmap @@ -67,7 +67,8 @@ Andrey Drobyshev <andrey.drobyshev@virtuozzo.com> Andrey Drobyshev via <qemu-blo BALATON Zoltan <balaton@eik.bme.hu> BALATON Zoltan via <qemu-ppc@nongnu.org> # Next, replace old addresses by a more recent one. -Akihiko Odaki <akihiko.odaki@daynix.com> <akihiko.odaki@gmail.com> +Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp> <akihiko.odaki@daynix.com> +Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp> <akihiko.odaki@gmail.com> Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <aleksandar.markovic@mips.com> Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <aleksandar.markovic@imgtec.com> Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> <amarkovic@wavecomp.com> diff --git a/MAINTAINERS b/MAINTAINERS index eb2b338fb1..8d2fd4d57d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2519,7 +2519,7 @@ F: tests/qtest/fuzz-megasas-test.c Network packet abstractions M: Dmitry Fleytman <dmitry.fleytman@gmail.com> -R: Akihiko Odaki <akihiko.odaki@daynix.com> +R: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp> S: Maintained F: include/net/eth.h F: net/eth.c @@ -2549,13 +2549,13 @@ F: docs/specs/rocker.rst e1000x M: Dmitry Fleytman <dmitry.fleytman@gmail.com> -R: Akihiko Odaki <akihiko.odaki@daynix.com> +R: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp> S: Maintained F: hw/net/e1000x* e1000e M: Dmitry Fleytman <dmitry.fleytman@gmail.com> -R: Akihiko Odaki <akihiko.odaki@daynix.com> +R: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp> S: Maintained F: hw/net/e1000e* F: tests/qtest/fuzz-e1000e-test.c @@ -2563,9 +2563,9 @@ F: tests/qtest/e1000e-test.c F: tests/qtest/libqos/e1000e.* igb -M: Akihiko Odaki <akihiko.odaki@daynix.com> +M: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp> R: Sriram Yagnaraman <sriram.yagnaraman@ericsson.com> -S: Maintained +S: Odd Fixes F: docs/system/devices/igb.rst F: hw/net/igb* F: tests/functional/test_netdev_ethtool.py @@ -2910,7 +2910,7 @@ Core Audio framework backend M: Gerd Hoffmann <kraxel@redhat.com> M: Philippe Mathieu-Daudé <philmd@linaro.org> R: Christian Schoenebeck <qemu_oss@crudebyte.com> -R: Akihiko Odaki <akihiko.odaki@daynix.com> +R: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp> S: Odd Fixes F: audio/coreaudio.m @@ -3211,7 +3211,7 @@ F: tests/functional/test_vnc.py Cocoa graphics M: Peter Maydell <peter.maydell@linaro.org> M: Philippe Mathieu-Daudé <philmd@linaro.org> -R: Akihiko Odaki <akihiko.odaki@daynix.com> +R: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp> S: Odd Fixes F: ui/cocoa.m @@ -3738,7 +3738,7 @@ F: util/iova-tree.c elf2dmp M: Viktor Prutyanov <viktor.prutyanov@phystech.edu> -R: Akihiko Odaki <akihiko.odaki@daynix.com> +R: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp> S: Maintained F: contrib/elf2dmp/ |