The patch below does not apply to the 6.9-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable@xxxxxxxxxxxxxxx>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.9.y git checkout FETCH_HEAD git cherry-pick -x aaa18ff54b97706b84306b6613630262706b1f6b # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024071517-deepen-remedial-db3b@gregkh' --subject-prefix 'PATCH 6.9.y' HEAD^.. Possible dependencies: aaa18ff54b97 ("thermal: gov_power_allocator: Return early in manage if trip_max is NULL") ca0e9728d372 ("thermal: gov_power_allocator: Eliminate a redundant variable") 41ddbcc6fd2c ("thermal: gov_power_allocator: Use .manage() callback instead of .throttle()") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
