IBM's patch-friendly email infrastructure is changing domains from
@linux.vnet.ibm.com to @linux.ibm.com, which if nothing else might
save a bit of typing.  This commit therefore updates us stragglers'
email addresses in the MAINTAINERS file.  The old addresses are
expected to continue to work for a few more months.

While in the neighborhood, remove some obsolete entries, which results
in an orphaned subsystem: "JSM Neo PCI based serial card".

Signed-off-by: Paul E. McKenney <[email protected]>
Cc: Douglas Miller <[email protected]>
Cc: Eddie James <[email protected]>
Cc: Frank Haverkamp <[email protected]>
Cc: Frederic Barrat <[email protected]>
Cc: James Bottomley <[email protected]>
Cc: John Allen <[email protected]>
Cc: Manoj N. Kumar <[email protected]>
Cc: Matthew R. Ochs <[email protected]>
Cc: Michael Cyr <[email protected]>
Cc: Mimi Zohar <[email protected]>
Cc: Naveen N. Rao <[email protected]>
Cc: Paulo Flabiano Smorigo <[email protected]>
Cc: Philip Kelleher <[email protected]>
Cc: Steven Royer <[email protected]>
Cc: Thomas Falcon <[email protected]>
Cc: Tyrel Datwyler <[email protected]>
Cc: Uma Krishnan <[email protected]>

diff --git a/MAINTAINERS b/MAINTAINERS
index a5b256b25905..ce6ad11b1c17 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4013,7 +4013,7 @@ S:        Supported
 F:     drivers/net/ethernet/chelsio/cxgb4vf/
 
 CXL (IBM Coherent Accelerator Processor Interface CAPI) DRIVER
-M:     Frederic Barrat <[email protected]>
+M:     Frederic Barrat <[email protected]>
 M:     Andrew Donnellan <[email protected]>
 L:     [email protected]
 S:     Supported
@@ -4025,9 +4025,9 @@ F:        Documentation/powerpc/cxl.txt
 F:     Documentation/ABI/testing/sysfs-class-cxl
 
 CXLFLASH (IBM Coherent Accelerator Processor Interface CAPI Flash) SCSI DRIVER
-M:     Manoj N. Kumar <[email protected]>
-M:     Matthew R. Ochs <[email protected]>
-M:     Uma Krishnan <[email protected]>
+M:     Manoj N. Kumar <[email protected]>
+M:     Matthew R. Ochs <[email protected]>
+M:     Uma Krishnan <[email protected]>
 L:     [email protected]
 S:     Supported
 F:     drivers/scsi/cxlflash/
@@ -5381,7 +5381,7 @@ S:        Orphan
 F:     fs/efs/
 
 EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER
-M:     Douglas Miller <[email protected]>
+M:     Douglas Miller <[email protected]>
 L:     [email protected]
 S:     Maintained
 F:     drivers/net/ethernet/ibm/ehea/
@@ -5517,7 +5517,7 @@ F:        Documentation/filesystems/ext4.txt
 F:     fs/ext4/
 
 Extended Verification Module (EVM)
-M:     Mimi Zohar <[email protected]>
+M:     Mimi Zohar <[email protected]>
 L:     [email protected]
 S:     Supported
 F:     security/integrity/evm/
@@ -5726,7 +5726,7 @@ F:        include/linux/firmware.h
 
 FLASH ADAPTER DRIVER (IBM Flash Adapter 900GB Full Height PCI Flash Card)
 M:     Joshua Morris <[email protected]>
-M:     Philip Kelleher <[email protected]>
+M:     Philip Kelleher <[email protected]>
 S:     Maintained
 F:     drivers/block/rsxx/
 
@@ -5985,7 +5985,7 @@ F:        include/linux/fscrypt*.h
 F:     Documentation/filesystems/fscrypt.rst
 
 FSI-ATTACHED I2C DRIVER
-M:     Eddie James <[email protected]>
+M:     Eddie James <[email protected]>
 L:     [email protected]
 L:     [email protected] (moderated for non-subscribers)
 S:     Maintained
@@ -6161,8 +6161,7 @@ S:        Supported
 F:     drivers/uio/uio_pci_generic.c
 
 GENWQE (IBM Generic Workqueue Card)
-M:     Frank Haverkamp <[email protected]>
-M:     Guilherme G. Piccoli <[email protected]>
+M:     Frank Haverkamp <[email protected]>
 S:     Supported
 F:     drivers/misc/genwqe/
 
@@ -6937,8 +6936,7 @@ F:        crypto/842.c
 F:     lib/842/
 
 IBM Power in-Nest Crypto Acceleration
-M:     Leonidas S. Barbosa <[email protected]>
-M:     Paulo Flabiano Smorigo <[email protected]>
+M:     Paulo Flabiano Smorigo <[email protected]>
 L:     [email protected]
 S:     Supported
 F:     drivers/crypto/nx/Makefile
@@ -6955,8 +6953,8 @@ S:        Supported
 F:     drivers/scsi/ipr.*
 
 IBM Power SRIOV Virtual NIC Device Driver
-M:     Thomas Falcon <[email protected]>
-M:     John Allen <[email protected]>
+M:     Thomas Falcon <[email protected]>
+M:     John Allen <[email protected]>
 L:     [email protected]
 S:     Supported
 F:     drivers/net/ethernet/ibm/ibmvnic.*
@@ -6971,41 +6969,38 @@ F:      arch/powerpc/include/asm/vas.h
 F:     arch/powerpc/include/uapi/asm/vas.h
 
 IBM Power Virtual Ethernet Device Driver
-M:     Thomas Falcon <[email protected]>
+M:     Thomas Falcon <[email protected]>
 L:     [email protected]
 S:     Supported
 F:     drivers/net/ethernet/ibm/ibmveth.*
 
 IBM Power Virtual FC Device Drivers
-M:     Tyrel Datwyler <[email protected]>
+M:     Tyrel Datwyler <[email protected]>
 L:     [email protected]
 S:     Supported
 F:     drivers/scsi/ibmvscsi/ibmvfc*
 
 IBM Power Virtual Management Channel Driver
-M:     Bryant G. Ly <[email protected]>
-M:     Steven Royer <[email protected]>
+M:     Steven Royer <[email protected]>
 S:     Supported
 F:     drivers/misc/ibmvmc.*
 
 IBM Power Virtual SCSI Device Drivers
-M:     Tyrel Datwyler <[email protected]>
+M:     Tyrel Datwyler <[email protected]>
 L:     [email protected]
 S:     Supported
 F:     drivers/scsi/ibmvscsi/ibmvscsi*
 F:     include/scsi/viosrp.h
 
 IBM Power Virtual SCSI Device Target Driver
-M:     Bryant G. Ly <[email protected]>
-M:     Michael Cyr <[email protected]>
+M:     Michael Cyr <[email protected]>
 L:     [email protected]
 L:     [email protected]
 S:     Supported
 F:     drivers/scsi/ibmvscsi_tgt/
 
 IBM Power VMX Cryptographic instructions
-M:     Leonidas S. Barbosa <[email protected]>
-M:     Paulo Flabiano Smorigo <[email protected]>
+M:     Paulo Flabiano Smorigo <[email protected]>
 L:     [email protected]
 S:     Supported
 F:     drivers/crypto/vmx/Makefile
@@ -7268,7 +7263,7 @@ S:        Maintained
 L:     [email protected]
 
 INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
-M:     Mimi Zohar <[email protected]>
+M:     Mimi Zohar <[email protected]>
 M:     Dmitry Kasatkin <[email protected]>
 L:     [email protected]
 T:     git 
git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
@@ -7847,9 +7842,8 @@ S:        Maintained
 F:     drivers/media/platform/rcar_jpu.c
 
 JSM Neo PCI based serial card
-M:     Guilherme G. Piccoli <[email protected]>
 L:     [email protected]
-S:     Maintained
+S:     Orphan
 F:     drivers/tty/serial/jsm/
 
 K10TEMP HARDWARE MONITORING DRIVER
@@ -8079,7 +8073,7 @@ F:        include/uapi/linux/kexec.h
 F:     kernel/kexec*
 
 KEYS-ENCRYPTED
-M:     Mimi Zohar <[email protected]>
+M:     Mimi Zohar <[email protected]>
 L:     [email protected]
 L:     [email protected]
 S:     Supported
@@ -8088,8 +8082,8 @@ F:        include/keys/encrypted-type.h
 F:     security/keys/encrypted-keys/
 
 KEYS-TRUSTED
-M:     James Bottomley <[email protected]>
-M:     Mimi Zohar <[email protected]>
+M:     James Bottomley <[email protected]>
+M:     Mimi Zohar <[email protected]>
 L:     [email protected]
 L:     [email protected]
 S:     Supported
@@ -8142,7 +8136,7 @@ F:        lib/test_kmod.c
 F:     tools/testing/selftests/kmod/
 
 KPROBES
-M:     Naveen N. Rao <[email protected]>
+M:     Naveen N. Rao <[email protected]>
 M:     Anil S Keshavamurthy <[email protected]>
 M:     "David S. Miller" <[email protected]>
 M:     Masami Hiramatsu <[email protected]>
@@ -8471,7 +8465,7 @@ M:        Nicholas Piggin <[email protected]>
 M:     David Howells <[email protected]>
 M:     Jade Alglave <[email protected]>
 M:     Luc Maranget <[email protected]>
-M:     "Paul E. McKenney" <[email protected]>
+M:     "Paul E. McKenney" <[email protected]>
 R:     Akira Yokosawa <[email protected]>
 R:     Daniel Lustig <[email protected]>
 L:     [email protected]
@@ -9417,7 +9411,7 @@ F:        drivers/platform/x86/mlx-platform.c
 
 MEMBARRIER SUPPORT
 M:     Mathieu Desnoyers <[email protected]>
-M:     "Paul E. McKenney" <[email protected]>
+M:     "Paul E. McKenney" <[email protected]>
 L:     [email protected]
 S:     Supported
 F:     kernel/sched/membarrier.c
@@ -10431,7 +10425,7 @@ S:      Supported
 F:     tools/objtool/
 
 OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER
-M:     Frederic Barrat <[email protected]>
+M:     Frederic Barrat <[email protected]>
 M:     Andrew Donnellan <[email protected]>
 L:     [email protected]
 S:     Supported
@@ -12204,7 +12198,7 @@ S:      Orphan
 F:     drivers/net/wireless/ray*
 
 RCUTORTURE TEST FRAMEWORK
-M:     "Paul E. McKenney" <[email protected]>
+M:     "Paul E. McKenney" <[email protected]>
 M:     Josh Triplett <[email protected]>
 R:     Steven Rostedt <[email protected]>
 R:     Mathieu Desnoyers <[email protected]>
@@ -12250,7 +12244,7 @@ F:      arch/x86/include/asm/intel_rdt_sched.h
 F:     Documentation/x86/intel_rdt*
 
 READ-COPY UPDATE (RCU)
-M:     "Paul E. McKenney" <[email protected]>
+M:     "Paul E. McKenney" <[email protected]>
 M:     Josh Triplett <[email protected]>
 R:     Steven Rostedt <[email protected]>
 R:     Mathieu Desnoyers <[email protected]>
@@ -12384,7 +12378,7 @@ F:      include/linux/reset-controller.h
 RESTARTABLE SEQUENCES SUPPORT
 M:     Mathieu Desnoyers <[email protected]>
 M:     Peter Zijlstra <[email protected]>
-M:     "Paul E. McKenney" <[email protected]>
+M:     "Paul E. McKenney" <[email protected]>
 M:     Boqun Feng <[email protected]>
 L:     [email protected]
 S:     Supported
@@ -12897,7 +12891,7 @@ F:      drivers/scsi/sg.c
 F:     include/scsi/sg.h
 
 SCSI SUBSYSTEM
-M:     "James E.J. Bottomley" <[email protected]>
+M:     "James E.J. Bottomley" <[email protected]>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
 M:     "Martin K. Petersen" <[email protected]>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
@@ -13325,7 +13319,7 @@ F:      mm/sl?b*
 
 SLEEPABLE READ-COPY UPDATE (SRCU)
 M:     Lai Jiangshan <[email protected]>
-M:     "Paul E. McKenney" <[email protected]>
+M:     "Paul E. McKenney" <[email protected]>
 M:     Josh Triplett <[email protected]>
 R:     Steven Rostedt <[email protected]>
 R:     Mathieu Desnoyers <[email protected]>
@@ -14721,7 +14715,7 @@ F:      drivers/platform/x86/topstar-laptop.c
 
 TORTURE-TEST MODULES
 M:     Davidlohr Bueso <[email protected]>
-M:     "Paul E. McKenney" <[email protected]>
+M:     "Paul E. McKenney" <[email protected]>
 M:     Josh Triplett <[email protected]>
 L:     [email protected]
 S:     Supported

Reply via email to