My [email protected] email is just a forwarder to the linux.ibm.com address. Let us remove the extra hop to avoid a potential source of errors.
While at it, add the relevant email addresses to mailmap. Signed-off-by: Christian Borntraeger <[email protected]> --- .mailmap | 1 + MAINTAINERS | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.mailmap b/.mailmap index 8beb2f95ae28..c45d1c530144 100644 --- a/.mailmap +++ b/.mailmap @@ -50,6 +50,7 @@ Aleksandar Rikalo <[email protected]> <[email protected]> Aleksandar Rikalo <[email protected]> <[email protected]> Alexander Graf <[email protected]> <[email protected]> Anthony Liguori <[email protected]> Anthony Liguori <[email protected]> +Christian Borntraeger <[email protected]> <[email protected]> Filip Bozuta <[email protected]> <[email protected]> Frederic Konrad <[email protected]> <[email protected]> Greg Kurz <[email protected]> <[email protected]> diff --git a/MAINTAINERS b/MAINTAINERS index d3879aa3c12c..e19d88ca9960 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -393,7 +393,7 @@ F: target/ppc/kvm.c S390 KVM CPUs M: Halil Pasic <[email protected]> -M: Christian Borntraeger <[email protected]> +M: Christian Borntraeger <[email protected]> S: Supported F: target/s390x/kvm/ F: target/s390x/ioinst.[ch] @@ -1527,7 +1527,7 @@ S390 Machines ------------- S390 Virtio-ccw M: Halil Pasic <[email protected]> -M: Christian Borntraeger <[email protected]> +M: Christian Borntraeger <[email protected]> S: Supported F: hw/char/sclp*.[hc] F: hw/char/terminal3270.c @@ -1541,7 +1541,7 @@ T: git https://github.com/borntraeger/qemu.git s390-next L: [email protected] S390-ccw boot -M: Christian Borntraeger <[email protected]> +M: Christian Borntraeger <[email protected]> M: Thomas Huth <[email protected]> S: Supported F: hw/s390x/ipl.* -- 2.31.1
