From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BAD76376BCC for ; Thu, 19 Mar 2026 09:48:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773913718; cv=none; b=WmIOFVBjZiUTWozIqnFbKuCERs8EuZ9gdLBaXwJlPH/VppHrE+R6VR4YjT8i7Zr58bdwonIh++yJ5Eqbi1Z+dkjDnOgJ/cFPdP+lkaa5OCkaynRkDFLxghEWJ6d+sCW64wzrFH8KsLqolwI/epB7n1DDhKuG6vK223cYp7bLMrk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773913718; c=relaxed/simple; bh=cTjDn07bhiZYnY0791588heZa+B5zkZmp9NZrT+nyOA=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=DappxT21mkFwXqZCw1CJqbD6oIQOSXCJBfnM6lL9wsJKE2iKiBd+gUEGjTYYWkk5+gMxb0TU6oWAXuTH6TnCwu31Y/ppiTDrIjlpAJdIpzuyisPJTRj8o68k+e5g14nTj1lbafxEhpeRZsteDLIib517knkoG17j5hnUNDfngRs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=O+GIjHNy; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="O+GIjHNy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DB2E7C19424; Thu, 19 Mar 2026 09:48:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1773913718; bh=cTjDn07bhiZYnY0791588heZa+B5zkZmp9NZrT+nyOA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=O+GIjHNyQEpPcLLykQ6exY3l1QMQawXd8vbdzH5ZX7KFGu+eXL86H3rI0ZU5HEK5W wzWTGT6PZCjMlIzp7GeJKA8A4gY5Ol70GvZxunngtX2HJle77Z/pxahWHKROnToDUi 3xZyNBG+kxXu2a+okXUymJUodKxOLSq684wW2Ei8= Date: Thu, 19 Mar 2026 10:48:33 +0100 From: "gregkh@linuxfoundation.org" To: "Lin, Shuicheng" Cc: "Brost, Matthew" , "Vivi, Rodrigo" , "stable@vger.kernel.org" Subject: Re: FAILED: patch "[PATCH] drm/xe/sync: Cleanup partially initialized sync on parse" failed to apply to 6.12-stable tree Message-ID: <2026031924-headache-catnip-cfd6@gregkh> References: <2026031732-size-unfasten-2bf3@gregkh> <2026031748-huskiness-autistic-5186@gregkh> <2026031851-glamour-unusual-8513@gregkh> <2026031828-dyslexic-retract-a423@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: 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 . > > > > > > > > > > > > > > > > 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 > > > > > > > > # git commit -s git > > > > > > > > send-email --to '' --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 '' --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