On Tue, Jul 23, 2024 at 02:17:02PM +0200, gregkh@xxxxxxxxxxxxxxxxxxx wrote: > > The patch below does not apply to the 6.10-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.10.y > git checkout FETCH_HEAD > git cherry-pick -x e528be3c87be953b73e7826a2d7e4b837cbad39d > # <resolve conflicts, build, test, etc.> > git commit -s > git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024072302-policy-spleen-3156@gregkh' --subject-prefix 'PATCH 6.10.y' HEAD^.. > > Possible dependencies: > > e528be3c87be ("thermal: core: Allow thermal zones to tell the core to ignore them") > 7c8267275de6 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net") Nevermind, I fixed this up by hand. greg k-h
