Merge tag 'v5.17-rc5' into sched/core, to resolve conflicts

New conflicts in sched/core due to the following upstream fixes:

  44585f7bc0cb ("psi: fix "defined but not used" warnings when CONFIG_PROC_FS=n")
  a06247c6804f ("psi: Fix uaf issue when psi trigger is destroyed while being polled")

Conflicts:
	include/linux/psi_types.h
	kernel/sched/psi.c

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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc include/linux/psi_types.h
index dc3ec5e,1a3cef2..c7fe7c0
--- 1/include/linux/psi_types.h
--- 2/include/linux/psi_types.h
+++ b/include/linux/psi_types.h
@@@ -141,12 -141,6 +141,9 @@@ struct psi_trigger 
         * events to one per window
         */
        u64 last_event_time;
-       /* Refcounting to prevent premature destruction */
-       struct kref refcount;
- 
 +
 +      /* Deferred event(s) from previous ratelimit window */
 +      bool pending_event;
  };
  
  struct psi_group {

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

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

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

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

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

diff --cc kernel/sched/psi.c
index e9d623c,e143581..8fb08a1
--- 1/kernel/sched/psi.c
--- 2/kernel/sched/psi.c
+++ b/kernel/sched/psi.c
@@@ -1137,8 -1124,6 +1137,7 @@@ struct psi_trigger *psi_trigger_create(
        t->event = 0;
        t->last_event_time = 0;
        init_waitqueue_head(&t->event_wait);
-       kref_init(&t->refcount);
 +      t->pending_event = false;
  
        mutex_lock(&group->trigger_lock);