Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull RCU updates from Ingo Molnar:
 "The main changes in this cycle were:

   - changes related to No-CBs CPUs and NO_HZ_FULL

   - RCU-tasks implementation

   - torture-test updates

   - miscellaneous fixes

   - locktorture updates

   - RCU documentation updates"

* 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (81 commits)
  workqueue: Use cond_resched_rcu_qs macro
  workqueue: Add quiescent state between work items
  locktorture: Cleanup header usage
  locktorture: Cannot hold read and write lock
  locktorture: Fix __acquire annotation for spinlock irq
  locktorture: Support rwlocks
  rcu: Eliminate deadlock between CPU hotplug and expedited grace periods
  locktorture: Document boot/module parameters
  rcutorture: Rename rcutorture_runnable parameter
  locktorture: Add test scenario for rwsem_lock
  locktorture: Add test scenario for mutex_lock
  locktorture: Make torture scripting account for new _runnable name
  locktorture: Introduce torture context
  locktorture: Support rwsems
  locktorture: Add infrastructure for torturing read locks
  torture: Address race in module cleanup
  locktorture: Make statistics generic
  locktorture: Teach about lock debugging
  locktorture: Support mutexes
  locktorture: Add documentation
  ...

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

diff --cc fs/file.c
Simple merge

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

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

diff --cc init/Kconfig
Simple merge

diff --cc init/main.c
index 8af2f1abfe38d5f36eade88169f4f9cd04d8ec5a,e3c4cdd94d5b62ea561da64644e5e95708116ce1..c5c11da6c4e15ef6ede067a7bfdcf34e8fce34ad
--- 1/init/main.c
--- 2/init/main.c
+++ b/init/main.c
@@@ -583,6 -585,6 +583,7 @@@ asmlinkage __visible void __init start_
        early_irq_init();
        init_IRQ();
        tick_init();
++      rcu_init_nohz();
        init_timers();
        hrtimers_init();
        softirq_init();

diff --cc kernel/sysctl.c
Simple merge

diff --cc mm/mlock.c
Simple merge