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

Pull RCU and LKMM changes from Paul E. McKenney:

  - Documentation updates.

  - Miscellaneous fixes.

  - Dynamic tick (nohz) updates, perhaps most notably changes to
    force the tick on when needed due to lengthy in-kernel execution
    on CPUs on which RCU is waiting.

  - Replace rcu_swap_protected() with rcu_prepace_pointer().

  - Torture-test updates.

  - Linux-kernel memory consistency model updates.

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

diff --cc drivers/scsi/scsi_sysfs.c
Simple merge

diff --cc kernel/stop_machine.c
Simple merge

diff --cc net/sched/act_api.c
Simple merge

diff --cc net/sched/act_mirred.c
Simple merge

diff --cc net/sched/act_mpls.c
Simple merge