From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0CB96C3DA78 for ; Tue, 17 Jan 2023 13:17:32 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 7430F3F04; Tue, 17 Jan 2023 14:16:40 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 7430F3F04 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1673961450; bh=4lKWJb/mXJGzfCNp2rf7nwCDRK7HqTC6ZXMnC4L14SM=; h=Date:From:To:Subject:References:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=CNOJ09ehdHwZ80Mb5tug2hDGZhrYTQH4ShPoc0JAK5hCqd8yVoiyusEFZlIV+U8cJ gAi+oxJLP8obOB8XI9Pb+W9tiD4WZw/SmAzgMgR969PK/Uz6jLAqmQIILmXw+QSSBF HSOwdUyEI9TKLG0BNAx2zSCqkUb9/oyAHPBzLDT0= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 16638F8026D; Tue, 17 Jan 2023 14:16:40 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id F3C4EF8026D; Tue, 17 Jan 2023 14:16:37 +0100 (CET) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 3FA99F8022D for ; Tue, 17 Jan 2023 14:16:35 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 3FA99F8022D Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=Ixj2JGhz Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A83006137B; Tue, 17 Jan 2023 13:16:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7EF68C433AC; Tue, 17 Jan 2023 13:16:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673961393; bh=4lKWJb/mXJGzfCNp2rf7nwCDRK7HqTC6ZXMnC4L14SM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Ixj2JGhzPMyRnMt97j0QufhiXrBvR7KjxQT+jIL6N4f2xKj8dXaAE3u0jDEynSXyq KziKgQMu6ZTm7iRHeJ7ld6pQDzSklI6dPV8GjAaSmq8LCr6NpqdfA38FETVvYszsMw bP3uYxeax6BIkCkErQrpDKNxDaNpkVNhfeptTxR4IFJM2n2Z5fOwv1zx8xpBEE7Mfy tU7Zr8U5VOXUSev2aaRqEJrsBXmuJ0qedxyHhKFF5dNKJ9i6t8nrqxo/P4irWTBmGs zLiMZl+6UxfRTUVWE1ft7PCjU4BVcFPApxcTs/uLRUV6ulPT6AbS/8E2sfHnySKaAA r509fCeGjuDJw== Date: Tue, 17 Jan 2023 13:16:29 +0000 From: Mark Brown To: Peter Ujfalusi Subject: Re: [PATCH v2 0/3] ASoC: SOF: sof-audio: Fixes for widget prepare and unprepare Message-ID: References: <20230116125506.27989-1-peter.ujfalusi@linux.intel.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="UkJ9iMLTMGBEewyA" Content-Disposition: inline In-Reply-To: <20230116125506.27989-1-peter.ujfalusi@linux.intel.com> X-Cookie: Serving suggestion. X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" --UkJ9iMLTMGBEewyA Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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... 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 --UkJ9iMLTMGBEewyA Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmPGn6wACgkQJNaLcl1U h9DkFwf+L3Xv9gXE8N+5OePoYG+sKgXW0ccZqjae1yAusNpDIuCqj9/mHZ8bCbVd 8/EdH+XeVAhrKM+Me8VMBB/8oez+6gZiH3eLMRomG5fhNV03Ok/pvGDONyTIalW6 qiFMZzkX/T/VklI9WKtwZFBn3t78k8ybQ1zGgwRdCrdvH5TGzmYqdnB8SyVpc7sQ s09HTvI85fTTQQinCd5dsov46Z1zT1K+spIa0WyRT1iiUTwouIHBSWmjtwBz5vc1 2q1ixJ1wM2D+edBGqYfIj16zJ4pndKLiCw8FaP3WpsDw5XQBoZAa1Ra2lLU1xudn kTsJJAOloytYO2aIRfAKttI4cZhCeA== =LorA -----END PGP SIGNATURE----- --UkJ9iMLTMGBEewyA--