Re: FAILED: patch "[PATCH] drm/tilcdc: Fix removal actions in case of failed probe" failed to apply to 6.12-stable tree

[Greg KH <gregkh@linuxfoundation.org>]

On Mon, Jan 05, 2026 at 05:47:32PM +0100, Kory Maincent wrote:
> On Mon, 5 Jan 2026 17:30:39 +0100
> Greg KH <gregkh@linuxfoundation.org> wrote:
> 
> > On Mon, Jan 05, 2026 at 03:47:01PM +0100, Kory Maincent wrote:
> > > On Mon, 05 Jan 2026 14:26:29 +0100
> > > <gregkh@linuxfoundation.org> wrote:
> > >   
> > > > The patch below does not apply to the 6.12-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:  
> > > 
> > > No conflict on my side on current linux-6.12.y.
> > > Have you more informations?  
> > 
> > Did you try building it?  I don't remember why this failed, sorry.
> 
> Yes, and I didn't face any errors.

Fails due to other stable patches in the queue in this same area:
	Applying drm-tilcdc-fix-removal-actions-in-case-of-failed-probe.patch to linux-6.12.y
	Applying patch drm-tilcdc-fix-removal-actions-in-case-of-failed-probe.patch
	patching file drivers/gpu/drm/tilcdc/tilcdc_crtc.c
	patching file drivers/gpu/drm/tilcdc/tilcdc_drv.c
	Hunk #1 succeeded at 171 (offset -1 lines).
	Hunk #2 succeeded at 218 (offset -1 lines).
	Hunk #3 succeeded at 311 (offset -1 lines).
	Hunk #4 succeeded at 322 (offset -1 lines).
	Hunk #5 FAILED at 371.
	1 out of 5 hunks FAILED -- rejects in file drivers/gpu/drm/tilcdc/tilcdc_drv.c
	patching file drivers/gpu/drm/tilcdc/tilcdc_drv.h
	Patch drm-tilcdc-fix-removal-actions-in-case-of-failed-probe.patch does not apply (enforce with -f)

Care to rebase on the next release and send it then?

thanks,

greg k-h