Merge branch 'linus' into sched/core, to resolve semantic conflict

Signed-off-by: Ingo Molnar <mingo@kernel.org>

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

diff --cc kernel/exit.c
Simple merge

diff --cc kernel/kthread.c
Simple merge

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

diff --cc kernel/sched/core.c
index b943b459b77a6c4fc4a0c298d1526435d2dae123,e7e453492cffc0082ef11ba3e826257f6324db35..a7abbba98083217697b13fb13e568110f04eeb8d
--- 1/kernel/sched/core.c
--- 2/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@@ -3436,8 -2961,13 +3436,13 @@@ try_to_wake_up(struct task_struct *p, u
         */
        smp_cond_load_acquire(&p->on_cpu, !VAL);
  
 -      cpu = select_task_rq(p, p->wake_cpu, SD_BALANCE_WAKE, wake_flags);
 +      cpu = select_task_rq(p, p->wake_cpu, wake_flags | WF_TTWU);
        if (task_cpu(p) != cpu) {
+               if (p->in_iowait) {
+                       delayacct_blkio_end(p);
+                       atomic_dec(&task_rq(p)->nr_iowait);
+               }
+ 
                wake_flags |= WF_MIGRATED;
                psi_ttwu_dequeue(p);
                set_task_cpu(p, cpu);

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

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

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

diff --cc kernel/smp.c
index faf1a3ace6a9984a0f53a72e13892b3ac0b51e75,4d17501433be7fe2a3c70f889dc9c40a4ddc857b..1b6070bf97bb01f76cea0a7a51bee0c59f3c15ec
--- 1/kernel/smp.c
--- 2/kernel/smp.c
+++ b/kernel/smp.c
@@@ -130,7 -130,7 +130,7 @@@ static __always_inline int csd_lock_wai
  
        csd_type = CSD_TYPE(csd);
        if (csd_type == CSD_TYPE_ASYNC || csd_type == CSD_TYPE_SYNC)
--              return csd->dst; /* Other CSD_TYPE_ values might not have ->dst. */
++              return csd->node.dst; /* Other CSD_TYPE_ values might not have ->dst. */
        return -1;
  }
  

diff --cc kernel/stop_machine.c
Simple merge

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