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

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc arch/x86/kernel/tsc.c
Simple merge

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

diff --cc kernel/time/clocksource.c
Simple merge

diff --cc kernel/time/jiffies.c
Simple merge

diff --cc lib/Kconfig.debug
index 678c13967580ecca7b10daeb2223175d4ab218e3,344735b8b151d26cbf2966a4a4716f007c1006b8..0a5a70c742e6856b634f215339d087f8a567f0f1
--- 1/lib/Kconfig.debug
--- 2/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -2571,20 -2513,25 +2571,32 @@@ config TEST_FP
  
          If unsure, say N.
  
+ config TEST_CLOCKSOURCE_WATCHDOG
+       tristate "Test clocksource watchdog in kernel space"
+       depends on CLOCKSOURCE_WATCHDOG
+       help
+         Enable this option to create a kernel module that will trigger
+         a test of the clocksource watchdog.  This module may be loaded
+         via modprobe or insmod in which case it will run upon being
+         loaded, or it may be built in, in which case it will run
+         shortly after boot.
+ 
+         If unsure, say N.
+ 
  endif # RUNTIME_TESTING_MENU
  
 +config ARCH_USE_MEMTEST
 +      bool
 +      help
 +        An architecture should select this when it uses early_memtest()
 +        during boot process.
 +
  config MEMTEST
        bool "Memtest"
 +      depends on ARCH_USE_MEMTEST
        help
          This option adds a kernel parameter 'memtest', which allows memtest
 -        to be set.
 +        to be set and executed.
                memtest=0, mean disabled; -- default
                memtest=1, mean do 1 test pattern;
                ...