On Tue, 23 Nov 2021 10:55:11 +0100 Christian Borntraeger <borntrae...@linux.ibm.com> wrote:
> My borntrae...@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 <borntrae...@de.ibm.com> Acked-by: Halil Pasic <pa...@linux.ibm.com> > --- > .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 <aleksandar.rik...@syrmia.com> > <arik...@wavecomp.com> > Aleksandar Rikalo <aleksandar.rik...@syrmia.com> > <aleksandar.rik...@rt-rk.com> > Alexander Graf <ag...@csgraf.de> <ag...@suse.de> > Anthony Liguori <anth...@codemonkey.ws> Anthony Liguori <aligu...@us.ibm.com> > +Christian Borntraeger <borntrae...@linux.ibm.com> <borntrae...@de.ibm.com> > Filip Bozuta <filip.boz...@syrmia.com> <filip.boz...@rt-rk.com.com> > Frederic Konrad <kon...@adacore.com> <fred.kon...@greensocs.com> > Greg Kurz <gr...@kaod.org> <gk...@linux.vnet.ibm.com> > 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 <pa...@linux.ibm.com> > -M: Christian Borntraeger <borntrae...@de.ibm.com> > +M: Christian Borntraeger <borntrae...@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 <pa...@linux.ibm.com> > -M: Christian Borntraeger <borntrae...@de.ibm.com> > +M: Christian Borntraeger <borntrae...@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-s3...@nongnu.org > > S390-ccw boot > -M: Christian Borntraeger <borntrae...@de.ibm.com> > +M: Christian Borntraeger <borntrae...@linux.ibm.com> > M: Thomas Huth <th...@redhat.com> > S: Supported > F: hw/s390x/ipl.*
