Merge remote-tracking branch 'rcu/rcu/next'

diff --cc arch/powerpc/platforms/pseries/lpar.c
Simple merge

diff --cc include/linux/rcupdate.h
index 8f4f881a0ad8153dd82150745aee03881448a3b0,9d40e425d46c8206019d57566bcb49c7b2406d97..ea9bc708ccef2a6e5448c52cb372a56f4f7160f2
--- 1/include/linux/rcupdate.h
--- 2/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@@ -238,8 -313,18 +313,18 @@@ extern int rcu_read_lock_bh_held(void)
   *
   * Check debug_lockdep_rcu_enabled() to prevent false positives during boot
   * and while lockdep is disabled.
+  *
+  * Note that if the CPU is in an extended quiescent state, for example,
+  * if the CPU is in dyntick-idle mode, then rcu_read_lock_held() returns
+  * false even if the CPU did an rcu_read_lock().  The reason for this is
+  * that RCU ignores CPUs that are in extended quiescent states, so such
+  * a CPU is effectively never in an RCU read-side critical section
+  * regardless of what RCU primitives it invokes.  This state of affairs
+  * is required -- RCU would otherwise need to periodically wake up
+  * dyntick-idle CPUs, which would defeat the whole purpose of dyntick-idle
+  * mode.
   */
 -#ifdef CONFIG_PREEMPT
 +#ifdef CONFIG_PREEMPT_COUNT
  static inline int rcu_read_lock_sched_held(void)
  {
        int lockdep_opinion = 0;

diff --cc include/linux/sched.h
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc kernel/lockdep.c
Simple merge

diff --cc kernel/pid.c
Simple merge

diff --cc kernel/rcupdate.c
Simple merge

diff --cc kernel/rcutorture.c
Simple merge

diff --cc kernel/rcutree_trace.c
Simple merge

diff --cc kernel/rtmutex.c
Simple merge

diff --cc kernel/sched.c
index 5895135f0f6fa0dc2559ca8a6075598615f35d2f,313c0f63e29a9b36b47b11e7f284f8482fd3580f..941360f57b1bd25f865a8c993891d110d0f02da3
--- 1/kernel/sched.c
--- 2/kernel/sched.c
+++ b/kernel/sched.c
@@@ -8374,8 -8185,10 +8364,9 @@@ static inline int preempt_count_equals(
  
  void __might_sleep(const char *file, int line, int preempt_offset)
  {
 -#ifdef in_atomic
        static unsigned long prev_jiffy;        /* ratelimiting */
  
+       rcu_sleep_check(); /* WARN_ON_ONCE() by default, no rate limit reqd. */
        if ((preempt_count_equals(preempt_offset) && !irqs_disabled()) ||
            system_state != SYSTEM_RUNNING || oops_in_progress)
                return;

diff --cc kernel/time/tick-sched.c
Simple merge