Merge remote-tracking branch 'rcu/rcu/next'

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

diff --cc MAINTAINERS
index 46579e064ef91cce0ab7c65fe83d98282ce92b1b,188809580d5e26d0bd1c06210c55b87f32eedf4a..0e092dc6428b6e7812ebb13924569c6acb0602fe
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -12688,12 -12523,12 +12684,12 @@@ M:        Fenghua Yu <fenghua.yu@intel.com
  M:    Reinette Chatre <reinette.chatre@intel.com>
  L:    linux-kernel@vger.kernel.org
  S:    Supported
 -F:    arch/x86/kernel/cpu/intel_rdt*
 -F:    arch/x86/include/asm/intel_rdt_sched.h
 -F:    Documentation/x86/intel_rdt*
 +F:    arch/x86/kernel/cpu/resctrl/
 +F:    arch/x86/include/asm/resctrl_sched.h
 +F:    Documentation/x86/resctrl*
  
  READ-COPY UPDATE (RCU)
- M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+ M:    "Paul E. McKenney" <paulmck@linux.ibm.com>
  M:    Josh Triplett <josh@joshtriplett.org>
  R:    Steven Rostedt <rostedt@goodmis.org>
  R:    Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --cc arch/powerpc/mm/hugetlbpage.c
Simple merge

diff --cc arch/s390/mm/pgalloc.c
Simple merge

diff --cc crypto/pcrypt.c
Simple merge

diff --cc drivers/cpufreq/intel_pstate.c
Simple merge

diff --cc drivers/net/ethernet/realtek/r8169.c
Simple merge

diff --cc drivers/vhost/net.c
Simple merge

diff --cc fs/userfaultfd.c
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc include/linux/tracepoint.h
Simple merge

diff --cc init/main.c
Simple merge

diff --cc kernel/cgroup/cgroup.c
Simple merge

diff --cc kernel/module.c
Simple merge

diff --cc kernel/sched/core.c
index 8050f266751a7af648217854418e3d85cb637500,ea12ebc57840ae93b9f206e6a347529edc2dfecd..383233782e150c49b6c81e6abd5bb0dc3829e8ff
--- 1/kernel/sched/core.c
--- 2/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@@ -5783,16 -5788,8 +5783,16 @@@ int sched_cpu_deactivate(unsigned int c
         *
         * Do sync before park smpboot threads to take care the rcu boost case.
         */
-       synchronize_rcu_mult(call_rcu, call_rcu_sched);
+       synchronize_rcu();
  
 +#ifdef CONFIG_SCHED_SMT
 +      /*
 +       * When going down, decrement the number of cores with SMT present.
 +       */
 +      if (cpumask_weight(cpu_smt_mask(cpu)) == 2)
 +              static_branch_dec_cpuslocked(&sched_smt_present);
 +#endif
 +
        if (!sched_smp_initialized)
                return 0;
  

diff --cc kernel/trace/ftrace.c
index 8ef9fc22603737337463669b522649b19cc36f95,5b4f73e4fd56b53ea36d615c5e0e3c8e36202024..f826f84329258ba9feefe2f8ec89561fbb319890
--- 1/kernel/trace/ftrace.c
--- 2/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@@ -1475,9 -1501,9 +1475,9 @@@ static bool hash_contains_ip(unsigned l
   * the ip is not in the ops->notrace_hash.
   *
   * This needs to be called with preemption disabled as
-  * the hashes are freed with call_rcu_sched().
+  * the hashes are freed with call_rcu().
   */
 -static int
 +int
  ftrace_ops_test(struct ftrace_ops *ops, unsigned long ip, void *regs)
  {
        struct ftrace_ops_hash hash;

diff --cc kernel/trace/ring_buffer.c
Simple merge

diff --cc kernel/trace/trace.c
Simple merge

diff --cc kernel/trace/trace_kprobe.c
Simple merge

diff --cc mm/khugepaged.c
Simple merge

diff --cc net/core/netpoll.c
Simple merge

diff --cc net/decnet/af_decnet.c
Simple merge

diff --cc net/sched/sch_api.c
Simple merge