From: "Péter Ujfalusi" <peter.ujfalusi@linux.intel.com>
To: Greg KH <gregkh@linuxfoundation.org>
Cc: broonie@kernel.org, kai.vehmanen@linux.intel.com,
liam.r.girdwood@intel.com, stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] ASoC: SOF: ipc4-topology: Refresh copier IPC payload before" failed to apply to 7.1-stable tree
Date: Thu, 20 Aug 2026 15:50:42 +0300 [thread overview]
Message-ID: <6e773e06-ab3a-40fd-aeb2-f411ed51e412@linux.intel.com> (raw)
In-Reply-To: <2026082057-sulfite-daunting-34da@gregkh>
On 20/08/2026 14:49, Greg KH wrote:
> On Thu, Aug 20, 2026 at 02:45:30PM +0300, Péter Ujfalusi wrote:
> 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)
I see no such conflicts on top of 7.1.9 tag, checking the original and
picked patch with -U20 I don't see any difference in the surrounding either.
I have sent my version of cherry-pick as per instructions in original mail.
--
Péter
next prev parent reply other threads:[~2026-08-20 12:50 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-20 11:06 FAILED: patch "[PATCH] ASoC: SOF: ipc4-topology: Refresh copier IPC payload before" failed to apply to 7.1-stable tree gregkh
2026-08-20 11:45 ` Péter Ujfalusi
2026-08-20 11:49 ` Greg KH
2026-08-20 12:50 ` Péter Ujfalusi [this message]
2026-08-20 12:48 ` [PATCH 7.1.y] ASoC: SOF: ipc4-topology: Refresh copier IPC payload before widget setup Peter Ujfalusi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6e773e06-ab3a-40fd-aeb2-f411ed51e412@linux.intel.com \
--to=peter.ujfalusi@linux.intel.com \
--cc=broonie@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=kai.vehmanen@linux.intel.com \
--cc=liam.r.girdwood@intel.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox