Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36;
Date:   Mon, 30 Oct 2023 11:41:15 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Takashi Iwai <tiwai@suse.de>, Mark Brown <broonie@kernel.org>,
        Liam Girdwood <lgirdwood@gmail.com>
Cc:     Chancel Liu <chancel.liu@nxp.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Subject: linux-next: manual merge of the sound tree with the
 sound-asoc-fixes tree
Message-ID: <20231030114115.2a9f0260@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/YTcNVtsuLsAfrlM/dTk9jrF";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/YTcNVtsuLsAfrlM/dTk9jrF
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the sound tree got a conflict in:

  sound/soc/soc-pcm.c

between commit:

  f0220575e65a ("ASoC: soc-dai: add flag to mute and unmute stream during t=
rigger")

from the sound-asoc-fixes tree and commit:

  3efcb471f871 ("ASoC: soc-pcm.c: Make sure DAI parameters cleared if the D=
AI becomes inactive")

from the sound tree.

I fixed it up (I just used the latter) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

--=20
Cheers,
Stephen Rothwell

--Sig_/YTcNVtsuLsAfrlM/dTk9jrF
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmU++6sACgkQAVBC80lX
0GzexQf/XDnUjeGEtQ8E1cL0tGs6pJdgaxJ+0BYY0/zSRZm3BsDvXZCpCWzelXCc
uEtJ8ChFt0aAzzvUyIvyqffUQyw/o9hMV/DUP8KMNeM7fEzpbc3d1zIANngCDeNM
9DusmEc0fSDn4pR8TUyHb54b4wdj/ivCW+llatxYGcFzUbtQlYwKtWkuRv/vmq2y
VucivRBUdq+fjYil6wxHhJ3iI7D/5vg4XF4Do4M4R84vgcUSmK6sgOHbW9crhkOS
CG41uO+h+/2+O0X2YqXkFBVjjg8anz6qNmHQf+PvGc3cgu712R8GzBSvaQ+m+RGH
mQ1kYKkqzPjJoRy4eX5AqvmLYCNDZg==
=Ucar
-----END PGP SIGNATURE-----

--Sig_/YTcNVtsuLsAfrlM/dTk9jrF--