Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 9f1bc299e8fd20950c7e8c3b2d3e888dac5a07b3..cbe625343277ea0277e470e413c9cdbf79cabc04 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9325,7 +9325,7 @@ F:        drivers/misc/lkdtm/*
 
 LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM)
 M:     Alan Stern <stern@rowland.harvard.edu>
-M:     Andrea Parri <andrea.parri@amarulasolutions.com>
+M:     Andrea Parri <parri.andrea@gmail.com>
 M:     Will Deacon <will@kernel.org>
 M:     Peter Zijlstra <peterz@infradead.org>
 M:     Boqun Feng <boqun.feng@gmail.com>
@@ -9333,7 +9333,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.ibm.com>
+M:     "Paul E. McKenney" <paulmck@kernel.org>
 R:     Akira Yokosawa <akiyks@gmail.com>
 R:     Daniel Lustig <dlustig@nvidia.com>
 L:     linux-kernel@vger.kernel.org
@@ -10362,7 +10362,7 @@ F:      drivers/platform/x86/mlx-platform.c
 
 MEMBARRIER SUPPORT
 M:     Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-M:     "Paul E. McKenney" <paulmck@linux.ibm.com>
+M:     "Paul E. McKenney" <paulmck@kernel.org>
 L:     linux-kernel@vger.kernel.org
 S:     Supported
 F:     kernel/sched/membarrier.c
@@ -13465,7 +13465,7 @@ S:      Orphan
 F:     drivers/net/wireless/ray*
 
 RCUTORTURE TEST FRAMEWORK
-M:     "Paul E. McKenney" <paulmck@linux.ibm.com>
+M:     "Paul E. McKenney" <paulmck@kernel.org>
 M:     Josh Triplett <josh@joshtriplett.org>
 R:     Steven Rostedt <rostedt@goodmis.org>
 R:     Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
@@ -13512,7 +13512,7 @@ F:      arch/x86/include/asm/resctrl_sched.h
 F:     Documentation/x86/resctrl*
 
 READ-COPY UPDATE (RCU)
-M:     "Paul E. McKenney" <paulmck@linux.ibm.com>
+M:     "Paul E. McKenney" <paulmck@kernel.org>
 M:     Josh Triplett <josh@joshtriplett.org>
 R:     Steven Rostedt <rostedt@goodmis.org>
 R:     Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
@@ -13670,7 +13670,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.ibm.com>
+M:     "Paul E. McKenney" <paulmck@kernel.org>
 M:     Boqun Feng <boqun.feng@gmail.com>
 L:     linux-kernel@vger.kernel.org
 S:     Supported
@@ -14710,7 +14710,7 @@ F:      mm/sl?b*
 
 SLEEPABLE READ-COPY UPDATE (SRCU)
 M:     Lai Jiangshan <jiangshanlai@gmail.com>
-M:     "Paul E. McKenney" <paulmck@linux.ibm.com>
+M:     "Paul E. McKenney" <paulmck@kernel.org>
 M:     Josh Triplett <josh@joshtriplett.org>
 R:     Steven Rostedt <rostedt@goodmis.org>
 R:     Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
@@ -16209,7 +16209,7 @@ F:      drivers/platform/x86/topstar-laptop.c
 
 TORTURE-TEST MODULES
 M:     Davidlohr Bueso <dave@stgolabs.net>
-M:     "Paul E. McKenney" <paulmck@linux.ibm.com>
+M:     "Paul E. McKenney" <paulmck@kernel.org>
 M:     Josh Triplett <josh@joshtriplett.org>
 L:     linux-kernel@vger.kernel.org
 S:     Supported