Date:   Mon, 29 Nov 2021 11:35:54 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Mark Brown <broonie@kernel.org>,
        Liam Girdwood <lgirdwood@gmail.com>,
        Takashi Iwai <tiwai@suse.de>
Cc:     Kai Vehmanen <kai.vehmanen@linux.intel.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Subject: linux-next: manual merge of the sound-asoc tree with the
 sound-current tree
Message-ID: <20211129113554.59416109@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/SvKsVSNlUPT52W9WQh_cqp0";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

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

  sound/soc/sof/intel/hda.c

between commit:

  86f74ba3fef5 ("ASoC: SOF: hda: reset DAI widget before reconfiguring it")

from the sound-current tree and commit:

  a0f84dfb3f6d ("ASoC: SOF: IPC: dai: Expand DAI_CONFIG IPC flags")

from the sound-asoc tree.

I fixed it up (I just used the latter version) 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_/SvKsVSNlUPT52W9WQh_cqp0
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmGkIGoACgkQAVBC80lX
0GwNSAf+J2qDyq+mS1R35JbvYe1Qawjt7g03hJLkgtKFKafI+BQcKo6kDknymXfo
fkx0H6RwZksJJjVeP1sE2Tddmn2tQiJcv1aqQWaR4CbMOfSMZ8HvcWyKPylAnYlh
vb0JMU1cMkv7QOFghYNqUp4TP8gcwCof71qhqNGWeaAosD7dewVpz3Pk21jn9yDI
3gIh5FCVKn3VXVKfNFb6cHHd9SaZW3+IRVJ0nfCkrAsZv2zQLE1ZU7IcoZVzG+BS
GzUTXdbnGgz2yRIzTqVSwGNwvFcVv1bUdIqSwh20h9Idx0WahNcaKKhom/It+oUB
mpzcE5/isUWjQ7tMxo1nTC/H8ZgXQQ==
=E5O7
-----END PGP SIGNATURE-----

--Sig_/SvKsVSNlUPT52W9WQh_cqp0--