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)
 - 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>
1  2 
drivers/nvme/host/core.c
include/linux/sched.h
kernel/sched/core.c

index 99b857e5a7a9c7dcde1e031eeab99f3737f026c3,c3cea8a2984350dbd5c6b159b172fda35f683f13..00f5aad34fbcf8c077a0bc89c69d64db027db46d
@@@ -351,8 -349,7 +351,8 @@@ static void nvme_free_ns_head(struct kr
        nvme_mpath_remove_disk(head);
        ida_simple_remove(&head->subsys->ns_ida, head->instance);
        list_del_init(&head->entry);
-       cleanup_srcu_struct(&head->srcu);
+       cleanup_srcu_struct_quiesced(&head->srcu);
 +      nvme_put_subsystem(head->subsys);
        kfree(head);
  }
  
Simple merge
Simple merge