Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck...

Pull RCU fix from Paul E. McKenney:

 "This series contains a single change that fixes Kconfig asking pointless
  questions."

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

diff --combined lib/Kconfig.debug
index 93967e634a1e5b33396a39c59dc2defccf12e3ab,5f5ff7d7e5ebea4b3c7efc9eb2268e395877c31c..7815ddd5ae56cf250fe7775900f439dce7a0b543
--- 1/lib/Kconfig.debug
--- 2/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -865,19 -865,6 +865,19 @@@ config SCHED_STACK_END_CHEC
          data corruption or a sporadic crash at a later stage once the region
          is examined. The runtime overhead introduced is minimal.
  
 +config DEBUG_TIMEKEEPING
 +      bool "Enable extra timekeeping sanity checking"
 +      help
 +        This option will enable additional timekeeping sanity checks
 +        which may be helpful when diagnosing issues where timekeeping
 +        problems are suspected.
 +
 +        This may include checks in the timekeeping hotpaths, so this
 +        option may have a (very small) performance impact to some
 +        workloads.
 +
 +        If unsure, say N.
 +
  config TIMER_STATS
        bool "Collect kernel timers statistics"
        depends on DEBUG_KERNEL && PROC_FS
@@@ -1281,6 -1268,7 +1281,7 @@@ config RCU_TORTURE_TEST_SLOW_INIT_DELA
        int "How much to slow down RCU grace-period initialization"
        range 0 5
        default 3
+       depends on RCU_TORTURE_TEST_SLOW_INIT
        help
          This option specifies the number of jiffies to wait between
          each rcu_node structure initialization.