My borntraeger@xxxxxxxxxx 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@xxxxxxxxxxxxx> --- .mailmap | 3 +++ MAINTAINERS | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index 14314e3c5d5e..6277bb27b4bf 100644 --- a/.mailmap +++ b/.mailmap @@ -71,6 +71,9 @@ Chao Yu <chao@xxxxxxxxxx> <chao2.yu@xxxxxxxxxxx> Chao Yu <chao@xxxxxxxxxx> <yuchao0@xxxxxxxxxx> Chris Chiu <chris.chiu@xxxxxxxxxxxxx> <chiu@xxxxxxxxxxxx> Chris Chiu <chris.chiu@xxxxxxxxxxxxx> <chiu@xxxxxxxxxxxxx> +Christian Borntraeger <borntraeger@xxxxxxxxxxxxx> <borntraeger@xxxxxxxxxx> +Christian Borntraeger <borntraeger@xxxxxxxxxxxxx> <cborntra@xxxxxxxxxx> +Christian Borntraeger <borntraeger@xxxxxxxxxxxxx> <borntrae@xxxxxxxxxx> Christophe Ricard <christophe.ricard@xxxxxxxxx> Christoph Hellwig <hch@xxxxxx> Colin Ian King <colin.king@xxxxxxxxx> <colin.king@xxxxxxxxxxxxx> diff --git a/MAINTAINERS b/MAINTAINERS index 7a2345ce8521..b9a09edb3efb 100644 --- a/MAINTAINERS +++ b/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@xxxxxxxxxx> +M: Christian Borntraeger <borntraeger@xxxxxxxxxxxxx> M: Janosch Frank <frankja@xxxxxxxxxxxxx> R: David Hildenbrand <david@xxxxxxxxxx> R: Claudio Imbrenda <imbrenda@xxxxxxxxxxxxx> @@ -16573,7 +16573,7 @@ F: drivers/video/fbdev/savage/ S390 M: Heiko Carstens <hca@xxxxxxxxxxxxx> M: Vasily Gorbik <gor@xxxxxxxxxxxxx> -M: Christian Borntraeger <borntraeger@xxxxxxxxxx> +M: Christian Borntraeger <borntraeger@xxxxxxxxxxxxx> R: Alexander Gordeev <agordeev@xxxxxxxxxxxxx> L: linux-s390@xxxxxxxxxxxxxxx S: Supported -- 2.31.1
