Merge branch 'ctxt.2022.07.05a' into HEAD

ctxt.2022.07.05a: Linux-kernel memory model development branch.

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

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

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

diff --cc kernel/rcu/Kconfig
Simple merge

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

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

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

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

diff --cc kernel/rcu/tree_plugin.h
index 7ae1551479a2aee737c5341e612d69f1f07f00a4,4a53aa013f823206e31f9e1b7eb057d5284e03a5..438ecae6bd7e7ab8cea93e4ac97b65bb1cff1066
--- 1/kernel/rcu/tree_plugin.h
--- 2/kernel/rcu/tree_plugin.h
+++ b/kernel/rcu/tree_plugin.h
@@@ -595,7 -595,7 +595,7 @@@ static notrace bool rcu_preempt_need_de
   * evaluate safety in terms of interrupt, softirq, and preemption
   * disabling.
   */
- static notrace void rcu_preempt_deferred_qs(struct task_struct *t)
 -void rcu_preempt_deferred_qs(struct task_struct *t)
++notrace void rcu_preempt_deferred_qs(struct task_struct *t)
  {
        unsigned long flags;
  
@@@ -935,7 -935,7 +935,7 @@@ static notrace bool rcu_preempt_need_de
  // period for a quiescent state from this CPU.  Note that requests from
  // tasks are handled when removing the task from the blocked-tasks list
  // below.
- static notrace void rcu_preempt_deferred_qs(struct task_struct *t)
 -void rcu_preempt_deferred_qs(struct task_struct *t)
++notrace void rcu_preempt_deferred_qs(struct task_struct *t)
  {
        struct rcu_data *rdp = this_cpu_ptr(&rcu_data);
  

diff --cc kernel/rcu/update.c
Simple merge

diff --cc kernel/sched/core.c
Simple merge