xserver: Branch 'master'

[GitLab Mirror]

 .mailmap |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit dfbc672e85b03bccfe0454900e8d57b91be1c86b
Author: Peter Harris <pharris2 at rocketsoftware.com>
Date:   Tue Apr 15 13:46:05 2025 -0400

    Update mailmap for Peter Harris
    
    My division was acquired by Rocket Software. The opentext.com email
    address is no longer active.
    
    Ref: https://investors.opentext.com/press-releases/press-releases-details/2024/OpenText-Completes-Divestiture-of-Application-Modernization-and-Connectivity-AMC-Business-to-Rocket-Software-for-2.275B/default.aspx
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1914>

diff --git a/.mailmap b/.mailmap
index 0c3d52f5a..00bb8bbae 100644
--- a/.mailmap
+++ b/.mailmap
@@ -277,7 +277,8 @@ Paulo Zanoni <paulo.r.zanoni at intel.com> Paulo Ricardo Zanoni <pzanoni at mandriva.c
 
 Pekka Paalanen <pekka.paalanen at collabora.co.uk> <pekka.paalanen at collabora.com>
 
-Peter Harris <pharris at opentext.com> <peter.harris at hummingbird.com>
+Peter Harris <pharris2 at rocketsoftware.com> <peter.harris at hummingbird.com>
+Peter Harris <pharris2 at rocketsoftware.com> <pharris at opentext.com>
 
 Peter Hutterer <peter.hutterer at who-t.net> <peter.hutterer at redhat.com>
 Peter Hutterer <peter.hutterer at who-t.net> <peter at cs.unisa.edu.au>