Hi all,
On Thu, 7 Jul 2022 15:28:31 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the soundwire tree got a conflict in:
>
> drivers/soundwire/intel.c
>
> between commit:
>
> ca68202098a4 ("soundwire: intel: Migrate to new style legacy DAI naming flag")
>
> from the sound-asoc tree and commit:
>
> 3e9c9f90573f ("soundwire: intel: use pm_runtime_resume() on component probe")
>
> from the soundwire tree.
>
> I fixed it up (see below) 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.
>
>
> diff --cc drivers/soundwire/intel.c
> index 0268fa527c0c,95ce292994cc..000000000000
> --- a/drivers/soundwire/intel.c
> +++ b/drivers/soundwire/intel.c
> @@@ -1097,9 -1114,9 +1114,10 @@@ static const struct snd_soc_dai_ops int
> };
>
> static const struct snd_soc_component_driver dai_component = {
> - .name = "soundwire",
> - .probe = intel_component_probe,
> - .suspend = intel_component_dais_suspend
> + .name = "soundwire",
> ++ .probe = intel_component_probe,
> + .suspend = intel_component_dais_suspend,
> + .legacy_dai_naming = 1,
> };
>
> static int intel_create_dai(struct sdw_cdns *cdns,
This is now a conflict between the char-misc tree and the sound tree.
--
Cheers,
Stephen Rothwell
Attachment:
pgpMsv_RXvc_O.pgp
Description: OpenPGP digital signature
