MAINTAINERS: Update from @linux.vnet.ibm.com to @linux.ibm.com

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 <paulmck@linux.vnet.ibm.com>
Cc: Douglas Miller <dougmill@linux.ibm.com>
Cc: Eddie James <eajames@linux.ibm.com>
Cc: Frank Haverkamp <haver@linux.ibm.com>
Cc: Frederic Barrat <fbarrat@linux.ibm.com>
Cc: John Allen <jallen@linux.ibm.com>
Cc: Manoj N. Kumar <manoj@linux.ibm.com>
Cc: Matthew R. Ochs <mrochs@linux.ibm.com>
Cc: Michael Cyr <mikecyr@linux.ibm.com>
Cc: Naveen N. Rao <naveen.n.rao@linux.ibm.com>
Cc: Paulo Flabiano Smorigo <pfsmorigo@linux.ibm.com>
Cc: Philip Kelleher <pjk1939@linux.ibm.com>
Cc: Steven Royer <seroyer@linux.ibm.com>
Cc: Thomas Falcon <tlfalcon@linux.ibm.com>
Cc: Tyrel Datwyler <tyreld@linux.ibm.com>
Cc: Uma Krishnan <ukrishn@linux.ibm.com>
Acked-by: James Bottomley <jejb@linux.ibm.com>
Acked-by: Mimi Zohar <zohar@linux.ibm.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index f485597..1b80a02 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4033,7 +4033,7 @@ S:        Supported
 F:     drivers/net/ethernet/chelsio/cxgb4vf/
 
 CXL (IBM Coherent Accelerator Processor Interface CAPI) DRIVER
-M:     Frederic Barrat <fbarrat@linux.vnet.ibm.com>
+M:     Frederic Barrat <fbarrat@linux.ibm.com>
 M:     Andrew Donnellan <andrew.donnellan@au1.ibm.com>
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Supported
@@ -4045,9 +4045,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 <manoj@linux.vnet.ibm.com>
-M:     Matthew R. Ochs <mrochs@linux.vnet.ibm.com>
-M:     Uma Krishnan <ukrishn@linux.vnet.ibm.com>
+M:     Manoj N. Kumar <manoj@linux.ibm.com>
+M:     Matthew R. Ochs <mrochs@linux.ibm.com>
+M:     Uma Krishnan <ukrishn@linux.ibm.com>
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/cxlflash/
@@ -5428,7 +5428,7 @@ S:        Orphan
 F:     fs/efs/
 
 EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER
-M:     Douglas Miller <dougmill@linux.vnet.ibm.com>
+M:     Douglas Miller <dougmill@linux.ibm.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/ibm/ehea/
@@ -5565,7 +5565,7 @@ F:        Documentation/filesystems/ext4/ext4.rst
 F:     fs/ext4/
 
 Extended Verification Module (EVM)
-M:     Mimi Zohar <zohar@linux.vnet.ibm.com>
+M:     Mimi Zohar <zohar@linux.ibm.com>
 L:     linux-integrity@vger.kernel.org
 S:     Supported
 F:     security/integrity/evm/
@@ -5775,7 +5775,7 @@ F:        include/linux/firmware.h
 
 FLASH ADAPTER DRIVER (IBM Flash Adapter 900GB Full Height PCI Flash Card)
 M:     Joshua Morris <josh.h.morris@us.ibm.com>
-M:     Philip Kelleher <pjk1939@linux.vnet.ibm.com>
+M:     Philip Kelleher <pjk1939@linux.ibm.com>
 S:     Maintained
 F:     drivers/block/rsxx/
 
@@ -6042,7 +6042,7 @@ F:        include/linux/fscrypt*.h
 F:     Documentation/filesystems/fscrypt.rst
 
 FSI-ATTACHED I2C DRIVER
-M:     Eddie James <eajames@linux.vnet.ibm.com>
+M:     Eddie James <eajames@linux.ibm.com>
 L:     linux-i2c@vger.kernel.org
 L:     openbmc@lists.ozlabs.org (moderated for non-subscribers)
 S:     Maintained
@@ -6218,8 +6218,7 @@ S:        Supported
 F:     drivers/uio/uio_pci_generic.c
 
 GENWQE (IBM Generic Workqueue Card)
-M:     Frank Haverkamp <haver@linux.vnet.ibm.com>
-M:     Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
+M:     Frank Haverkamp <haver@linux.ibm.com>
 S:     Supported
 F:     drivers/misc/genwqe/
 
@@ -7001,8 +7000,7 @@ F:        crypto/842.c
 F:     lib/842/
 
 IBM Power in-Nest Crypto Acceleration
-M:     Leonidas S. Barbosa <leosilva@linux.vnet.ibm.com>
-M:     Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com>
+M:     Paulo Flabiano Smorigo <pfsmorigo@linux.ibm.com>
 L:     linux-crypto@vger.kernel.org
 S:     Supported
 F:     drivers/crypto/nx/Makefile
@@ -7019,8 +7017,8 @@ S:        Supported
 F:     drivers/scsi/ipr.*
 
 IBM Power SRIOV Virtual NIC Device Driver
-M:     Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
-M:     John Allen <jallen@linux.vnet.ibm.com>
+M:     Thomas Falcon <tlfalcon@linux.ibm.com>
+M:     John Allen <jallen@linux.ibm.com>
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/ibm/ibmvnic.*
@@ -7035,41 +7033,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 <tlfalcon@linux.vnet.ibm.com>
+M:     Thomas Falcon <tlfalcon@linux.ibm.com>
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/ibm/ibmveth.*
 
 IBM Power Virtual FC Device Drivers
-M:     Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
+M:     Tyrel Datwyler <tyreld@linux.ibm.com>
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/ibmvscsi/ibmvfc*
 
 IBM Power Virtual Management Channel Driver
-M:     Bryant G. Ly <bryantly@linux.vnet.ibm.com>
-M:     Steven Royer <seroyer@linux.vnet.ibm.com>
+M:     Steven Royer <seroyer@linux.ibm.com>
 S:     Supported
 F:     drivers/misc/ibmvmc.*
 
 IBM Power Virtual SCSI Device Drivers
-M:     Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
+M:     Tyrel Datwyler <tyreld@linux.ibm.com>
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/ibmvscsi/ibmvscsi*
 F:     include/scsi/viosrp.h
 
 IBM Power Virtual SCSI Device Target Driver
-M:     Bryant G. Ly <bryantly@linux.vnet.ibm.com>
-M:     Michael Cyr <mikecyr@linux.vnet.ibm.com>
+M:     Michael Cyr <mikecyr@linux.ibm.com>
 L:     linux-scsi@vger.kernel.org
 L:     target-devel@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/ibmvscsi_tgt/
 
 IBM Power VMX Cryptographic instructions
-M:     Leonidas S. Barbosa <leosilva@linux.vnet.ibm.com>
-M:     Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com>
+M:     Paulo Flabiano Smorigo <pfsmorigo@linux.ibm.com>
 L:     linux-crypto@vger.kernel.org
 S:     Supported
 F:     drivers/crypto/vmx/Makefile
@@ -7346,7 +7341,7 @@ S:        Maintained
 L:     linux-crypto@vger.kernel.org
 
 INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
-M:     Mimi Zohar <zohar@linux.vnet.ibm.com>
+M:     Mimi Zohar <zohar@linux.ibm.com>
 M:     Dmitry Kasatkin <dmitry.kasatkin@gmail.com>
 L:     linux-integrity@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
@@ -7938,9 +7933,8 @@ S:        Maintained
 F:     drivers/media/platform/rcar_jpu.c
 
 JSM Neo PCI based serial card
-M:     Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
 L:     linux-serial@vger.kernel.org
-S:     Maintained
+S:     Orphan
 F:     drivers/tty/serial/jsm/
 
 K10TEMP HARDWARE MONITORING DRIVER
@@ -8170,7 +8164,7 @@ F:        include/uapi/linux/kexec.h
 F:     kernel/kexec*
 
 KEYS-ENCRYPTED
-M:     Mimi Zohar <zohar@linux.vnet.ibm.com>
+M:     Mimi Zohar <zohar@linux.ibm.com>
 L:     linux-integrity@vger.kernel.org
 L:     keyrings@vger.kernel.org
 S:     Supported
@@ -8179,9 +8173,9 @@ F:        include/keys/encrypted-type.h
 F:     security/keys/encrypted-keys/
 
 KEYS-TRUSTED
-M:     James Bottomley <jejb@linux.vnet.ibm.com>
+M:     James Bottomley <jejb@linux.ibm.com>
 M:      Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
-M:     Mimi Zohar <zohar@linux.vnet.ibm.com>
+M:     Mimi Zohar <zohar@linuxibm.com>
 L:     linux-integrity@vger.kernel.org
 L:     keyrings@vger.kernel.org
 S:     Supported
@@ -8234,7 +8228,7 @@ F:        lib/test_kmod.c
 F:     tools/testing/selftests/kmod/
 
 KPROBES
-M:     Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
+M:     Naveen N. Rao <naveen.n.rao@linux.ibm.com>
 M:     Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
 M:     "David S. Miller" <davem@davemloft.net>
 M:     Masami Hiramatsu <mhiramat@kernel.org>
@@ -8590,7 +8584,7 @@ M:        Nicholas Piggin <npiggin@gmail.com>
 M:     David Howells <dhowells@redhat.com>
 M:     Jade Alglave <j.alglave@ucl.ac.uk>
 M:     Luc Maranget <luc.maranget@inria.fr>
-M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+M:     "Paul E. McKenney" <paulmck@linux.ibm.com>
 R:     Akira Yokosawa <akiyks@gmail.com>
 R:     Daniel Lustig <dlustig@nvidia.com>
 L:     linux-kernel@vger.kernel.org
@@ -9548,7 +9542,7 @@ F:        drivers/platform/x86/mlx-platform.c
 
 MEMBARRIER SUPPORT
 M:     Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+M:     "Paul E. McKenney" <paulmck@linux.ibm.com>
 L:     linux-kernel@vger.kernel.org
 S:     Supported
 F:     kernel/sched/membarrier.c
@@ -10686,7 +10680,7 @@ S:      Supported
 F:     tools/objtool/
 
 OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER
-M:     Frederic Barrat <fbarrat@linux.vnet.ibm.com>
+M:     Frederic Barrat <fbarrat@linux.ibm.com>
 M:     Andrew Donnellan <andrew.donnellan@au1.ibm.com>
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Supported
@@ -12487,7 +12481,7 @@ S:      Orphan
 F:     drivers/net/wireless/ray*
 
 RCUTORTURE TEST FRAMEWORK
-M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+M:     "Paul E. McKenney" <paulmck@linux.ibm.com>
 M:     Josh Triplett <josh@joshtriplett.org>
 R:     Steven Rostedt <rostedt@goodmis.org>
 R:     Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
@@ -12534,7 +12528,7 @@ F:      arch/x86/include/asm/intel_rdt_sched.h
 F:     Documentation/x86/intel_rdt*
 
 READ-COPY UPDATE (RCU)
-M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+M:     "Paul E. McKenney" <paulmck@linux.ibm.com>
 M:     Josh Triplett <josh@joshtriplett.org>
 R:     Steven Rostedt <rostedt@goodmis.org>
 R:     Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
@@ -12674,7 +12668,7 @@ F:      include/linux/reset-controller.h
 RESTARTABLE SEQUENCES SUPPORT
 M:     Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
 M:     Peter Zijlstra <peterz@infradead.org>
-M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+M:     "Paul E. McKenney" <paulmck@linux.ibm.com>
 M:     Boqun Feng <boqun.feng@gmail.com>
 L:     linux-kernel@vger.kernel.org
 S:     Supported
@@ -13199,7 +13193,7 @@ F:      drivers/scsi/sg.c
 F:     include/scsi/sg.h
 
 SCSI SUBSYSTEM
-M:     "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>
+M:     "James E.J. Bottomley" <jejb@linux.ibm.com>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
 M:     "Martin K. Petersen" <martin.petersen@oracle.com>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
@@ -13634,7 +13628,7 @@ F:      mm/sl?b*
 
 SLEEPABLE READ-COPY UPDATE (SRCU)
 M:     Lai Jiangshan <jiangshanlai@gmail.com>
-M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+M:     "Paul E. McKenney" <paulmck@linux.ibm.com>
 M:     Josh Triplett <josh@joshtriplett.org>
 R:     Steven Rostedt <rostedt@goodmis.org>
 R:     Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
@@ -15057,7 +15051,7 @@ F:      drivers/platform/x86/topstar-laptop.c
 
 TORTURE-TEST MODULES
 M:     Davidlohr Bueso <dave@stgolabs.net>
-M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+M:     "Paul E. McKenney" <paulmck@linux.ibm.com>
 M:     Josh Triplett <josh@joshtriplett.org>
 L:     linux-kernel@vger.kernel.org
 S:     Supported