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

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

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 ccacdbdecf452bda8769878ca6e558d13ebb4e74,313c0f63e29a9b36b47b11e7f284f8482fd3580f..50e3f564d5b5fbd1033c9b8f5717f79de4741f31
--- 1/kernel/sched.c
--- 2/kernel/sched.c
+++ b/kernel/sched.c
@@@ -8217,8 -8185,10 +8207,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;