From 0569b66c40972db66706b565bd902da07f70ff3c Mon Sep 17 00:00:00 2001
From: James Simmons <jsimmons@infradead.org>
Date: Sun, 21 Jun 2020 10:50:17 -0400
Subject: [PATCH] LU-930 doc: update James Simmons contact info

Update my email address to the one I have had for over 20 years.

Test-Parameters: trivial
Change-Id: Id29e9ef0ffb49fc1b568913d47bb24686b3175fc
Signed-off-by: James Simmons <jsimmons@infradead.org>
Reviewed-on: https://review.whamcloud.com/37756
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Shaun Tancheff <shaun.tancheff@hpe.com>
---
 .mailmap    | 6 +++---
 MAINTAINERS | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.mailmap b/.mailmap
index 83529af..aee6038 100644
--- a/.mailmap
+++ b/.mailmap
@@ -305,9 +305,9 @@ Frank Zago <fzago@cray.com> <frank@zago.net>
 Gregoire Pichon <gregoire.pichon@atos.net> <gregoire.pichon@bull.net>
 Jacques-Charles LaFoucriere <jacques-charles.lafoucriere@cea.fr> jcl <jacques-charles.lafoucriere@cea.fr>
 Jacques-Charles LaFoucriere <jacques-charles.lafoucriere@cea.fr> jcl <jc.lafoucriere@cea.fr>
-#James Simmons <simmonsja@ornl.gov> <uja.ornl@yahoo.com>
-#James Simmons <simmonsja@ornl.gov> <uja.ornl@gmail.com>
-James Simmons <uja.ornl@yahoo.com> <uja.ornl@gmail.com>
+James Simmons <jsimmons@infradead.org> <uja.ornl@gmail.com>
+James Simmons <jsimmons@infradead.org> <uja.ornl@yahoo.com>
+James Simmons <jsimmons@infradead.org>
 Jinshan Xiong <jinshan.xiong@uber.com> <jinshan.xiong@intel.com>
 Jinshan Xiong <jinshan.xiong@uber.com> <jinshan.xiong@gmail.com>
 Ned Bass <bass6@llnl.gov> <bass6@llnl.gov>
diff --git a/MAINTAINERS b/MAINTAINERS
index 6ca8902..daf6a58 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -157,7 +157,7 @@ F:	lustre/llite/symlink.c
 F:	lustre/llite/xattr*.c
 
 Lustre Configuration Management
-M:	James Simmons <uja.ornl@yahoo.com>
+M:	James Simmons <jsimmons@infradead.org>
 S:	Maintained
 F:	lustre/mgc/
 F:	lustre/mgs/
@@ -314,7 +314,7 @@ S:	Maintained
 F:	lustre/utils/lhsmtool_posix.c
 
 Lustre Kernel Compatibility
-R:	James Simmons <uja.ornl@yahoo.com>
+R:	James Simmons <jsimmons@infradead.org>
 S:	Maintained
 F:	libcfs/
 F:	lustre/include/lustre_compat.h
@@ -453,7 +453,7 @@ F:	lustre/tests/sanity-pcc.sh
 F:	lustre/utils/liblustreapi_pcc.c
 
 Lustre /proc and /sys
-R:	James Simmons <uja.ornl@yahoo.com>
+R:	James Simmons <jsimmons@infradead.org>
 S:	Maintained
 F:	lustre/*/*lproc*.[ch]
 F:	lustre/obdclass/obdsysfs.c
-- 
1.8.3.1