Re: FAILED: patch "[PATCH] ASoC: SOF: ipc4-topology: Refresh copier IPC payload before" failed to apply to 7.1-stable tree

[Greg KH <gregkh@linuxfoundation.org>]

On Thu, Aug 20, 2026 at 02:45:30PM +0300, Péter Ujfalusi wrote:
> 
> 
> On 20/08/2026 14:06, gregkh@linuxfoundation.org wrote:
> > 
> > The patch below does not apply to the 7.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-7.1.y
> > git checkout FETCH_HEAD
> > git cherry-pick -x 0c0e418dbcf0582bf80d8dbfd9b306607c065992
> > # <resolve conflicts, build, test, etc.>
> 
> I'm not sure what might be the issue, but it is clean here:
> HEAD ffc82ed66531 tag: v7.1.9, Linux 7.1.9
> 
> git cherry-pick -x 0c0e418dbcf0582bf80d8dbfd9b306607c065992
> Auto-merging sound/soc/sof/ipc4-topology.c
> [peter/upstream/host-copier-refresh-7.1 ffe9d6156740] ASoC: SOF: ipc4-topology: Refresh copier IPC payload before widget setup
>  Date: Thu Jul 30 08:48:22 2026 +0300
>  1 file changed, 33 insertions(+)
> 
> > git commit -s
> > git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2026082016-frisk-riches-3e59@gregkh' --subject-prefix 'PATCH 7.1.y' 'HEAD^..'
> 
> Since there are no conflicts to resolve, should I still send the patch?

I see major conflicts here:

Applying patch asoc-sof-ipc4-topology-refresh-copier-ipc-payload-before-widget-setup.patch
patching file sound/soc/sof/ipc4-topology.c
Hunk #1 succeeded at 3167 (offset -37 lines).
Hunk #2 FAILED at 3221.
Hunk #3 FAILED at 3229.
2 out of 3 hunks FAILED -- rejects in file sound/soc/sof/ipc4-topology.c
Patch asoc-sof-ipc4-topology-refresh-copier-ipc-payload-before-widget-setup.patch does not apply (enforce with -f)

thanks,

greg k-h