From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 16 May 2018 07:34:51 +0000 (+0200)
Subject: Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck... 
X-Git-Tag: v4.18-rc1~169^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=13a553199fa9327f957ba5e8462705ed250a9e6a;p=thirdparty%2Flinux.git

Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/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>
---

13a553199fa9327f957ba5e8462705ed250a9e6a
diff --cc drivers/nvme/host/core.c
index 99b857e5a7a9c,c3cea8a298435..00f5aad34fbcf
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@@ -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);
  }