diff options
| author | Christian Borntraeger | 2021-11-26 11:24:49 +0100 |
|---|---|---|
| committer | Thomas Huth | 2021-12-17 09:12:37 +0100 |
| commit | 2c092950a4766307e3d14f3764f7610d551515b9 (patch) | |
| tree | 885c5e49ab090e27dfbf0874407817d6af389c91 | |
| parent | s390: kvm: adjust diag318 resets to retain data (diff) | |
| download | qemu-2c092950a4766307e3d14f3764f7610d551515b9.tar.gz qemu-2c092950a4766307e3d14f3764f7610d551515b9.tar.xz qemu-2c092950a4766307e3d14f3764f7610d551515b9.zip | |
MAINTAINERS: update email address of Christian Borntraeger
My borntraeger@de.ibm.com 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 <borntraeger@linux.ibm.com>
Message-Id: <20211126102449.287524-1-borntraeger@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
| -rw-r--r-- | .mailmap | 1 | ||||
| -rw-r--r-- | MAINTAINERS | 6 |
2 files changed, 4 insertions, 3 deletions
@@ -50,6 +50,7 @@ Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <arikalo@wavecomp.com> Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <aleksandar.rikalo@rt-rk.com> Alexander Graf <agraf@csgraf.de> <agraf@suse.de> Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com> +Christian Borntraeger <borntraeger@linux.ibm.com> <borntraeger@de.ibm.com> Filip Bozuta <filip.bozuta@syrmia.com> <filip.bozuta@rt-rk.com.com> Frederic Konrad <konrad@adacore.com> <fred.konrad@greensocs.com> Greg Kurz <groug@kaod.org> <gkurz@linux.vnet.ibm.com> diff --git a/MAINTAINERS b/MAINTAINERS index fbd6d0b174..9a8d1bdf72 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -393,7 +393,7 @@ F: target/ppc/kvm.c S390 KVM CPUs M: Halil Pasic <pasic@linux.ibm.com> -M: Christian Borntraeger <borntraeger@de.ibm.com> +M: Christian Borntraeger <borntraeger@linux.ibm.com> S: Supported F: target/s390x/kvm/ F: target/s390x/ioinst.[ch] @@ -1527,7 +1527,7 @@ S390 Machines ------------- S390 Virtio-ccw M: Halil Pasic <pasic@linux.ibm.com> -M: Christian Borntraeger <borntraeger@de.ibm.com> +M: Christian Borntraeger <borntraeger@linux.ibm.com> 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: qemu-s390x@nongnu.org S390-ccw boot -M: Christian Borntraeger <borntraeger@de.ibm.com> +M: Christian Borntraeger <borntraeger@linux.ibm.com> M: Thomas Huth <thuth@redhat.com> S: Supported F: hw/s390x/ipl.* |