Merge branches 'consolidate.2019.01.26a' and 'fwd.2019.01.26a' into HEAD

consolidate.2019.01.26a: RCU flavor consolidation cleanups.
fwd.2019.01.26a: RCU grace-period forward-progress fixes.

diff --cc kernel/rcu/tree.c
index e53a586b397be817d839d2ba6b6da4769f1f6475,9d0e2ac9356e7b2738d533d6d717fc3139c563b6..1c4add0960780a27e0aa18396c7b40de90912f38
--- 1/kernel/rcu/tree.c
--- 2/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@@ -502,6 -507,23 +506,14 @@@ unsigned long rcu_exp_batches_completed
  }
  EXPORT_SYMBOL_GPL(rcu_exp_batches_completed);
  
 -/*
 - * Force a quiescent state.
 - */
 -void rcu_force_quiescent_state(void)
 -{
 -      force_quiescent_state();
 -}
 -EXPORT_SYMBOL_GPL(rcu_force_quiescent_state);
 -
+ /*
+  * Return the root node of the rcu_state structure.
+  */
+ static struct rcu_node *rcu_get_root(void)
+ {
+       return &rcu_state.node[0];
+ }
+ 
  /*
   * Convert a ->gp_state value to a character string.
   */

diff --cc kernel/rcu/tree.h
Simple merge

diff --cc kernel/rcu/tree_plugin.h
Simple merge