Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35;
Date:   Mon, 30 Oct 2023 11:44:56 +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: Re: linux-next: manual merge of the sound tree with the
 sound-asoc-fixes tree
Message-ID: <20231030114456.650b1371@canb.auug.org.au>
In-Reply-To: <20231030114115.2a9f0260@canb.auug.org.au>
References: <20231030114115.2a9f0260@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/O9wvm+fA9xAlnfBAaoDmsSo";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/O9wvm+fA9xAlnfBAaoDmsSo
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Mon, 30 Oct 2023 11:41:15 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the sound tree got a conflict in:
>=20
>   sound/soc/soc-pcm.c
>=20
> between commit:
>=20
>   f0220575e65a ("ASoC: soc-dai: add flag to mute and unmute stream during=
 trigger")
>=20
> from the sound-asoc-fixes tree and commit:
>=20
>   3efcb471f871 ("ASoC: soc-pcm.c: Make sure DAI parameters cleared if the=
 DAI becomes inactive")
>=20
> from the sound tree.
>=20
> 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.

And then when I merged the sound-asoc tree, I used the version from that.

--=20
Cheers,
Stephen Rothwell

--Sig_/O9wvm+fA9xAlnfBAaoDmsSo
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmU+/IgACgkQAVBC80lX
0Gy3pAf9FNcHWr+r3gg0LVhzvKuWy/6tFt5amM/WJNBw2P9l0hVdas2UudgzaRUz
3cZTZ1wS1IanvIrz6YKFByW7llPYCnNN84Ge5PwUo+WLzRIUv57ZH8IMquj/gDPf
aKZPXphkl3IiczosHxaKabV3Kj6GkUEzktZY/BaSy5r+wbDbZD/XHlzhMeUSs5rm
3sRxHkuK+2r+Bc4Gsk7wkF59hiP6XSaeSKpwnekoRVUWLBo2oQT2keHb0zkaKNRF
4ki8AkedVzzd492ssYP1Uftu7Gag3/lxufXyee0+/PmL6RaoLN/r+HfxC7zGXtrF
nRFTPpW3ecFMPOwM2c4ykCtavW6CdA==
=/J4p
-----END PGP SIGNATURE-----

--Sig_/O9wvm+fA9xAlnfBAaoDmsSo--