From: Ingo Molnar <mingo@kernel.org>
Date: Thu, 11 Jul 2024 08:42:33 +0000 (+0200)
Subject: Merge branch 'sched/urgent' into sched/core, to pick up fixes and refresh the branch
X-Git-Tag: v6.11-rc1~169^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=011b1134b82c2750d83a299a1369c678845de45a;p=thirdparty%2Fkernel%2Fstable.git

Merge branch 'sched/urgent' into sched/core, to pick up fixes and refresh the branch

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

011b1134b82c2750d83a299a1369c678845de45a
diff --cc kernel/sched/psi.c
index 368139c64f3d7,507d7b8d79afa..020d58967d4e8
--- a/kernel/sched/psi.c
+++ b/kernel/sched/psi.c
@@@ -774,8 -770,10 +774,9 @@@ static void psi_group_change(struct psi
  {
  	struct psi_group_cpu *groupc;
  	unsigned int t, m;
 -	enum psi_states s;
  	u32 state_mask;
  
+ 	lockdep_assert_rq_held(cpu_rq(cpu));
  	groupc = per_cpu_ptr(group->pcpu, cpu);
  
  	/*