MAINTAINERS: update email address of Christian Borntraeger

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]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Heiko Carstens <[email protected]>

.mailmap

@@ -71,6 +71,9 @@ Chao Yu <[email protected]> <[email protected]>
 Chao Yu <[email protected]> <[email protected]>
 Chris Chiu <[email protected]> <[email protected]>
 Chris Chiu <[email protected]> <[email protected]>
+Christian Borntraeger <[email protected]> <[email protected]>
+Christian Borntraeger <[email protected]> <[email protected]>
+Christian Borntraeger <[email protected]> <[email protected]>
 Christophe Ricard <[email protected]>
 Christoph Hellwig <[email protected]>
 Colin Ian King <[email protected]> <[email protected]>

MAINTAINERS

@@ -10445,7 +10445,7 @@ F:	arch/riscv/include/uapi/asm/kvm*
 F:	arch/riscv/kvm/
 
 KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
-M:	Christian Borntraeger <borntraeger@de.ibm.com>
+M:	Christian Borntraeger <borntraeger@linux.ibm.com>
 M:	Janosch Frank <[email protected]>
 R:	David Hildenbrand <[email protected]>
 R:	Claudio Imbrenda <[email protected]>
@@ -16573,7 +16573,7 @@ F:	drivers/video/fbdev/savage/
 S390
 M:	Heiko Carstens <[email protected]>
 M:	Vasily Gorbik <[email protected]>
-M:	Christian Borntraeger <borntraeger@de.ibm.com>
+M:	Christian Borntraeger <borntraeger@linux.ibm.com>
 R:	Alexander Gordeev <[email protected]>
 L:	[email protected]
 S:	Supported