Re: FAILED: patch "[PATCH] pwm: imx-tpm: Count the number of enabled channels in probe" failed to apply to 6.1-stable tree

[Greg KH <gregkh@linuxfoundation.org>]

On Fri, May 08, 2026 at 10:14:19PM +0200, Uwe Kleine-König wrote:
> Hello Greg,
> 
> On Sun, May 03, 2026 at 01:46:32PM +0200, gregkh@linuxfoundation.org wrote:
> > 
> > The patch below does not apply to the 6.1-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@vger.kernel.org>.
> > 
> > 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.1.y
> > git checkout FETCH_HEAD
> > git cherry-pick -x 3962c24f2d14e8a7f8a23f56b7ce320523947342
> > # <resolve conflicts, build, test, etc.>
> > git commit -s
> > git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2026050332-washer-legislate-ef0e@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
> > 
> 
> You wrote already on 2026-05-03 about this patch that failed to apply to
> 6.6, 6.1, 5.15 and 5.10. I replied to the 6.6 one with the exact patch
> that Sasha now recreated in reply to this new 6.1 failure. I would have
> expected that the 6.6 backport is tried to be applied to 6.1 and the
> other older versions given the mainline original doesn't apply cleanly.
> 
> :-( that this resulted in duplicate work being done

I've now taken your backport for both, but we have no idea that a commit
you send for 6.6.y and says "backport for 6.6.y" should be applied to
6.1.y :)

thanks,

greg k-h