[tip: x86/misc] MAINTAINERS: Cleanup SGI-related entries

[tip-bot2 for Steve Wahl]

The following commit has been merged into the x86/misc branch of tip:

Commit-ID:     632211cdd6ad0efeef32c53ac731901b4bed3b94
Gitweb:        https://git.kernel.org/tip/632211cdd6ad0efeef32c53ac731901b4bed3b94
Author:        Steve Wahl <steve.wahl@xxxxxxx>
AuthorDate:    Mon, 19 Oct 2020 15:35:33 -05:00
Committer:     Borislav Petkov <bp@xxxxxxx>
CommitterDate: Mon, 26 Oct 2020 12:39:05 +01:00

MAINTAINERS: Cleanup SGI-related entries

UV platforms are the only ones which currently use the XP/XPC/XPNET
driver, so it seems fair HPE should take some responsibility as
maintainers of it; so add Mike Travis and Steve Wahl. Cliff Whickman's
email address is no longer valid, so remove it. Robin Holt was contacted
and wishes to remain as a maintainer.

Update Dimitri Sivanich's email address for the SGI GRU driver.

Add Mike Travis to HPE Superdome Flex (UV) platform.

 [ bp: Massage commit message. ]

Acked-by: Robin Holt <robinmholt@xxxxxxxxx>
Signed-off-by: Steve Wahl <steve.wahl@xxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Link: https://lkml.kernel.org/r/20201019203533.GA1203217@xxxxxxxxxxxxxxxxxxxxx
---
 MAINTAINERS | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index e73636b..e706e14 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -15833,13 +15833,14 @@ F:	include/linux/sfp.h
 K:	phylink\.h|struct\s+phylink|\.phylink|>phylink_|phylink_(autoneg|clear|connect|create|destroy|disconnect|ethtool|helper|mac|mii|of|set|start|stop|test|validate)
 
 SGI GRU DRIVER
-M:	Dimitri Sivanich <sivanich@xxxxxxx>
+M:	Dimitri Sivanich <dimitri.sivanich@xxxxxxx>
 S:	Maintained
 F:	drivers/misc/sgi-gru/
 
 SGI XP/XPC/XPNET DRIVER
-M:	Cliff Whickman <cpw@xxxxxxx>
 M:	Robin Holt <robinmholt@xxxxxxxxx>
+M:	Steve Wahl <steve.wahl@xxxxxxx>
+R:	Mike Travis <mike.travis@xxxxxxx>
 S:	Maintained
 F:	drivers/misc/sgi-xp/
 
@@ -19085,6 +19086,7 @@ F:	arch/x86/platform
 
 X86 PLATFORM UV HPE SUPERDOME FLEX
 M:	Steve Wahl <steve.wahl@xxxxxxx>
+R:	Mike Travis <mike.travis@xxxxxxx>
 R:	Dimitri Sivanich <dimitri.sivanich@xxxxxxx>
 R:	Russ Anderson <russ.anderson@xxxxxxx>
 S:	Supported