Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck...
authorIngo Molnar <mingo@kernel.org>
Wed, 16 May 2018 07:34:51 +0000 (09:34 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 16 May 2018 07:34:51 +0000 (09:34 +0200)
commit13a553199fa9327f957ba5e8462705ed250a9e6a
tree34de51e3233394d26cf03417a4ee7e113758a667
parent67b8d5c7081221efa252e111cd52532ec6d4266f
parent22df7316ac71dc1ac57415349938737d2a229c59
Merge branch 'for-mingo' of git://git./linux/kernel/git/paulmck/linux-rcu into core/rcu

 - Updates to the handling of expedited grace periods, perhaps most
   notably parallelizing their initialization.  Other changes
   include fixes from Boqun Feng.

 - Miscellaneous fixes.  These include an nvme fix from Nitzan Carmi
   that I am carrying because it depends on a new SRCU function
   cleanup_srcu_struct_quiesced().  This branch also includes fixes
   from Byungchul Park and Yury Norov.

 - Updates to reduce lock contention in the rcu_node combining tree.
   These are in preparation for the consolidation of RCU-bh,
   RCU-preempt, and RCU-sched into a single flavor, which was
   requested by Linus Torvalds in response to a security flaw
   whose root cause included confusion between the multiple flavors
   of RCU.

 - Torture-test updates that save their users some time and effort.

Conflicts:
drivers/nvme/host/core.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
drivers/nvme/host/core.c
include/linux/sched.h
kernel/sched/core.c