Merge tag 'v6.12-rc4' into android-mainline

Linux 6.12-rc4

Change-Id: I90e653f10aa32734dc451ff75a3ea5a9f11ecbb2
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

kernel/rcu/tasks.h

@@ -985,6 +985,15 @@ static bool rcu_tasks_is_holdout(struct task_struct *t)
 	if (!READ_ONCE(t->on_rq))
 		return false;
 
+	/*
+	 * t->on_rq && !t->se.sched_delayed *could* be considered sleeping but
+	 * since it is a spurious state (it will transition into the
+	 * traditional blocked state or get woken up without outside
+	 * dependencies), not considering it such should only affect timing.
+	 *
+	 * Be conservative for now and not include it.
+	 */
+
 	/*
 	 * Idle tasks (or idle injection) within the idle loop are RCU-tasks
 	 * quiescent states. But CPU boot code performed by the idle task