LU-930 misc: update .mailmap again

Correct some more mailmap entries.

Test-Parameters: trivial
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: Iadfabbf67f12add4977969f83fc80c93955cac28
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/57406
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Peter Jones <pjones@whamcloud.com>
Reviewed-by: Patrick Farrell <pfarrell@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/.mailmap b/.mailmap
index ba94be3..caa810e 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -378,6 +378,7 @@ Chuck Fossen <charles.fossen@hpe.com> <chuckf@cray.com>
 Elena Gryaznova <elena.gryaznova@hpe.com> <c17455@cray.com>
 Nathan Rutman <nathan.rutman@hpe.com> <nrutman@cray.com>
 Nikitas Angelinas <nikitas.angelinas@hpe.com> <nangelinas@cray.com>
+Olaf Weber <olaf.weber@hpe.com> <olaf@sgi.com>
 Petros Koutoupis <petros.koutoupis@hpe.com> <pkoutoupis@cray.com>
 Sergey Cheremencev <sergey.cheremencev@hpe.com> <c17829@cray.com>
 Sergey Cheremencev <sergey.cheremencev@hpe.com> <sergey.cheremencev@hpe.ccom>
@@ -407,7 +408,6 @@ James Simmons <jsimmons@infradead.org> <uja.ornl@gmail.com>
 James Simmons <jsimmons@infradead.org> <uja.ornl@yahoo.com>
 James Simmons <jsimmons@infradead.org>
 Jean-Baptiste Skutnik <jskutnik@ddn.com> <jb.skutnik@gmail.com>
-Jinshan Xiong <jinshan.xiong@uber.com> <jinshan.xiong@gmail.com>
 John L. Hammond <jhammond@tacc.utexas.edu>
 Marcus Miller <marcusm@llnl.gov> <wmarcusm>
 Mark Burton <markb@ordern.com> <[mailto:markb@ordern.com]>