Re: FAILED: patch "[PATCH] drm/xe/sync: Cleanup partially initialized sync on parse" failed to apply to 6.12-stable tree

["gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>]

On Wed, Mar 18, 2026 at 05:20:05PM +0000, Lin, Shuicheng wrote:
> On Wed, Mar 18, 2026 9:59 AM greg k-h wrote:
> > On Wed, Mar 18, 2026 at 04:26:44PM +0000, Lin, Shuicheng wrote:
> > > On Wed, Mar 18, 2026 5:25 AM gregkh wrote:
> > > > On Tue, Mar 17, 2026 at 05:10:53PM +0000, Lin, Shuicheng wrote:
> > > > > On Tue, Mar 17, 2026 9:32 AM greg k-h wrote:
> > > > > > On Tue, Mar 17, 2026 at 04:27:46PM +0000, Lin, Shuicheng wrote:
> > > > > > > On Tue, Mar 17, 2026 4:48 AM gregkh 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:
> > > > > > > >
> > > > > > > > git fetch
> > > > > > > > https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux
> > > > > > > > .git / linux-6.12.y git checkout FETCH_HEAD git cherry-pick
> > > > > > > > -x
> > > > > > > > 1bfd7575092420ba5a0b944953c95b74a5646ff8
> > > > > > > > # <resolve conflicts, build, test, etc.> git commit -s git
> > > > > > > > send-email --to '<stable@vger.kernel.org>' --in-reply-to
> > > > > > > > '2026031732-size-unfasten- 2bf3@gregkh' --subject-prefix
> > > > > > > > 'PATCH
> > > > 6.12.y'
> > > > > > HEAD^..
> > > > > > >
> > > > > > > I cannot reproduce the failure with upper cmd.
> > > > > > > The patch could be applied successfully without conflict.
> > > > > > > Anyway, I follow the instructions re-send the patch.
> > > > > > > Let me know if it still has issue.
> > > > > >
> > > > > > Try building it after it is applied and notice how it breaks the
> > > > > > build :(
> > > > >
> > > > > I tried to do it, and it could build successfully.
> > > > > I checked the code and cannot find what will cause the build failure.
> > > > > Could you please share me the failure signature?
> > > >
> > > >   CC [M]  drivers/gpu/drm/xe/xe_sync.o
> > > > drivers/gpu/drm/xe/xe_sync.c: In function ‘xe_sync_entry_parse’:
> > > > drivers/gpu/drm/xe/xe_sync.c:182:33: error: label ‘free_sync’ used
> > > > but not defined
> > > >   182 |                                 goto free_sync;
> > > >       |                                 ^~~~
> > >
> > > Thanks for the log.
> > > It seems the patch is not applied correctly and cause the build failure.
> > > For the original patch 1bfd75750924 ("drm/xe/sync: Cleanup partially
> > > initialized sync on parse failure"), all the change is within function
> > xe_sync_entry_parse().
> > > This "free_sync" label is added at the end of xe_sync_entry_parse(), and
> > some error path use goto to jump to this label.
> > >
> > > For this and below err, it seems the last part of this patch is applied to
> > function xe_sync_entry_add_deps(), which is the function after
> > xe_sync_entry_parse().
> > > The err should be due to "free_sync" label is added to function
> > xe_sync_entry_add_deps() instead of xe_sync_entry_parse().
> > > Could you please help me confirm it?
> > 
> > It's best if you can send a properly backported patch for us to apply.
> 
> Yes. I did re-send the patch yesterday following below cmd. The problem is that I cannot reproduce the failure.
> "
> git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y 
> git checkout FETCH_HEAD 
> git cherry-pick -x 1bfd7575092420ba5a0b944953c95b74a5646ff8
> git commit -s --amend
> git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2026031732-size-unfasten-2bf3@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^..
> "
> There is no conflict and I could pass build.
> Not sure what is the difference and lead to the issue.
> Could you please have a try again with the patch I sent yesterday?

Your patch applied properly, thanks.

greg k-h