From: "Péter Ujfalusi" <peter.ujfalusi@linux.intel.com>
To: Mark Brown <broonie@kernel.org>
Cc: pierre-louis.bossart@linux.intel.com,
alsa-devel@alsa-project.org, kai.vehmanen@linux.intel.com,
ranjani.sridharan@linux.intel.com, lgirdwood@gmail.com,
rander.wang@intel.com, yung-chuan.liao@linux.intel.com,
angelogioacchino.delregno@collabora.com
Subject: Re: [PATCH v2 0/3] ASoC: SOF: sof-audio: Fixes for widget prepare and unprepare
Date: Tue, 17 Jan 2023 15:48:39 +0200 [thread overview]
Message-ID: <675f42a7-1d26-10bd-5862-f758d8b41849@linux.intel.com> (raw)
In-Reply-To: <Y8afrS+wfZujFRHS@sirena.org.uk>
On 17/01/2023 15:16, Mark Brown wrote:
> On Mon, Jan 16, 2023 at 02:55:03PM +0200, Peter Ujfalusi wrote:
>
>> Mark: can these be picked for 6.2?
>
> Well, patch 2 doesn't apply so not right now...
oh.
Let me see what is missing.
>
> Applying: ASoC: SOF: sof-audio: Unprepare when swidget->use_count > 0
> Using index info to reconstruct a base tree...
> M sound/soc/sof/sof-audio.c
> Falling back to patching base and 3-way merge...
> Auto-merging sound/soc/sof/sof-audio.c
> Applying: ASoC: SOF: sof-audio: skip prepare/unprepare if swidget is NULL
> Using index info to reconstruct a base tree...
> M sound/soc/sof/sof-audio.c
> Falling back to patching base and 3-way merge...
> Auto-merging sound/soc/sof/sof-audio.c
> CONFLICT (content): Merge conflict in sound/soc/sof/sof-audio.c
>
--
Péter
next prev parent reply other threads:[~2023-01-17 13:49 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-16 12:55 [PATCH v2 0/3] ASoC: SOF: sof-audio: Fixes for widget prepare and unprepare Peter Ujfalusi
2023-01-16 12:55 ` [PATCH v2 1/3] ASoC: SOF: sof-audio: Unprepare when swidget->use_count > 0 Peter Ujfalusi
2023-01-16 12:55 ` [PATCH v2 2/3] ASoC: SOF: sof-audio: skip prepare/unprepare if swidget is NULL Peter Ujfalusi
2023-01-17 12:44 ` AngeloGioacchino Del Regno
2023-01-16 12:55 ` [PATCH v2 3/3] ASoC: SOF: sof-audio: keep prepare/unprepare widgets in sink path Peter Ujfalusi
2023-01-17 13:16 ` [PATCH v2 0/3] ASoC: SOF: sof-audio: Fixes for widget prepare and unprepare Mark Brown
2023-01-17 13:48 ` Péter Ujfalusi [this message]
2023-01-17 14:05 ` Péter Ujfalusi
2023-01-17 14:18 ` Mark Brown
2023-01-17 14:30 ` Péter Ujfalusi
2023-01-17 15:21 ` Mark Brown
2023-01-18 15:46 ` Mark Brown
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=675f42a7-1d26-10bd-5862-f758d8b41849@linux.intel.com \
--to=peter.ujfalusi@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=angelogioacchino.delregno@collabora.com \
--cc=broonie@kernel.org \
--cc=kai.vehmanen@linux.intel.com \
--cc=lgirdwood@gmail.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=rander.wang@intel.com \
--cc=ranjani.sridharan@linux.intel.com \
--cc=yung-chuan.liao@linux.intel.com \
/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