Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu

Pull the v3.5 RCU tree from Paul E. McKenney:

 1)	A set of improvements and fixes to the RCU_FAST_NO_HZ feature
	(with more on the way for 3.6).  Posted to LKML:
	https://lkml.org/lkml/2012/4/23/324 (commits 1-3 and 5),
	https://lkml.org/lkml/2012/4/16/611 (commit 4),
	https://lkml.org/lkml/2012/4/30/390 (commit 6), and
	https://lkml.org/lkml/2012/5/4/410 (commit 7, combined with
	the other commits for the convenience of the tester).

 2)	Changes to make rcu_barrier() avoid disrupting execution of CPUs
	that have no RCU callbacks.  Posted to LKML:
	https://lkml.org/lkml/2012/4/23/322.

 3)	A couple of commits that improve the efficiency of the interaction
	between preemptible RCU and the scheduler, these two being all
	that survived an abortive attempt to allow preemptible RCU's
	__rcu_read_lock() to be inlined.  The full set was posted to
	LKML at https://lkml.org/lkml/2012/4/14/143, and the first and
	third patches of that set remain.

 4)	Lai Jiangshan's algorithmic implementation of SRCU, which includes
	call_srcu() and srcu_barrier().  A major feature of this new
	implementation is that synchronize_srcu() no longer disturbs
	the execution of other CPUs.  This work is based on earlier
	implementations by Peter Zijlstra and Paul E. McKenney.  Posted to
	LKML: https://lkml.org/lkml/2012/2/22/82.

 5)	A number of miscellaneous bug fixes and improvements which were
	posted to LKML at: https://lkml.org/lkml/2012/4/23/353 with
	subsequent updates posted to LKML.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 11 insertions, 3 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index b36270986501..dff245064d4b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5608,14 +5608,13 @@ F:	net/rds/
 READ-COPY UPDATE (RCU)
 M:      Dipankar Sarma <dipankar@in.ibm.com>
 M:      "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
-W:      http://www.rdrop.com/users/paulmck/rclock/
+W:      http://www.rdrop.com/users/paulmck/RCU/
 S:      Supported
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 F:      Documentation/RCU/
+X:      Documentation/RCU/torture.txt
 F:      include/linux/rcu*
-F:      include/linux/srcu*
 F:      kernel/rcu*
-F:      kernel/srcu*
 X:      kernel/rcutorture.c
 
 REAL TIME CLOCK (RTC) SUBSYSTEM
@@ -6132,6 +6131,15 @@ S:	Maintained
 F:      include/linux/sl?b*.h
 F:      mm/sl?b.c
 
+SLEEPABLE READ-COPY UPDATE (SRCU)
+M:      Lai Jiangshan <laijs@cn.fujitsu.com>
+M:      "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+W:      http://www.rdrop.com/users/paulmck/RCU/
+S:      Supported
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
+F:      include/linux/srcu*
+F:      kernel/srcu*
+
 SMC91x ETHERNET DRIVER
 M:      Nicolas Pitre <nico@fluxnic.net>
 S:      Odd Fixes