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

Pull additional commits for locktorture, from Paul E. McKenney.

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

tools/testing/selftests/rcutorture/configs/lock/CFLIST

@@ -1,3 +1,4 @@
 LOCK01
 LOCK02
 LOCK03
+LOCK04

tools/testing/selftests/rcutorture/configs/lock/LOCK04

@@ -0,0 +1,6 @@
+CONFIG_SMP=y
+CONFIG_NR_CPUS=4
+CONFIG_HOTPLUG_CPU=y
+CONFIG_PREEMPT_NONE=n
+CONFIG_PREEMPT_VOLUNTARY=n
+CONFIG_PREEMPT=y

tools/testing/selftests/rcutorture/configs/lock/LOCK04.boot

@@ -0,0 +1 @@
+locktorture.torture_type=rw_lock