From: Ingo Molnar <mingo@kernel.org>
Date: Mon, 21 Feb 2022 10:53:51 +0000 (+0100)
Subject: Merge tag 'v5.17-rc5' into sched/core, to resolve conflicts
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6255b48aebfd4dff375e97fc8b075a235848db0b;p=linux.git

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>
---

6255b48aebfd4dff375e97fc8b075a235848db0b
diff --cc include/linux/psi_types.h
index dc3ec5e4b9eea,1a3cef26d129d..c7fe7c0897183
--- a/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 kernel/sched/psi.c
index e9d623cb8d1bd,e143581788497..8fb08a12f602b
--- a/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);