Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck...

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc kernel/rcu/rcu.h
index f95cfb5bf2eeb04676845c8cf37b54dd78218a33,5befd8780dcd3a401ea5d9bc15ed6e6c7b943d82..98e13be411afd3fe2a28285c2ba278a06623fa27
--- 1/kernel/rcu/rcu.h
--- 2/kernel/rcu/rcu.h
+++ b/kernel/rcu/rcu.h
@@@ -507,8 -508,17 +507,16 @@@ void show_rcu_tasks_gp_kthreads(void)
  #else /* #ifdef CONFIG_TASKS_RCU_GENERIC */
  static inline void show_rcu_tasks_gp_kthreads(void) {}
  #endif /* #else #ifdef CONFIG_TASKS_RCU_GENERIC */
 -void rcu_request_urgent_qs_task(struct task_struct *t);
  #endif /* #else #ifdef CONFIG_TINY_RCU */
  
+ #ifdef CONFIG_TASKS_RCU
+ struct task_struct *get_rcu_tasks_gp_kthread(void);
+ #endif // # ifdef CONFIG_TASKS_RCU
+ 
+ #ifdef CONFIG_TASKS_RUDE_RCU
+ struct task_struct *get_rcu_tasks_rude_gp_kthread(void);
+ #endif // # ifdef CONFIG_TASKS_RUDE_RCU
+ 
  #define RCU_SCHEDULER_INACTIVE        0
  #define RCU_SCHEDULER_INIT    1
  #define RCU_SCHEDULER_RUNNING 2