From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Arnd Bergmann <arnd@arndb•de>,
Takashi Iwai <tiwai@suse•de>
Cc: Vinod Koul <vkoul@kernel•org>, Mark Brown <broonie@kernel•org>,
Liam Girdwood <lgirdwood@gmail•com>,
Charles Keepax <ckeepax@opensource•cirrus.com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Pierre-Louis Bossart <pierre-louis.bossart@linux•intel.com>
Subject: Re: linux-next: manual merge of the soundwire tree with the sound-asoc tree
Date: Mon, 18 Jul 2022 18:29:55 +1000 [thread overview]
Message-ID: <20220718182955.050c9678@canb.auug.org.au> (raw)
In-Reply-To: <20220707152831.57f1e92d@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1636 bytes --]
Hi all,
On Thu, 7 Jul 2022 15:28:31 +1000 Stephen Rothwell <sfr@canb•auug.org.au> 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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2022-07-18 8:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-07 5:28 linux-next: manual merge of the soundwire tree with the sound-asoc tree Stephen Rothwell
2022-07-18 8:29 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-11-15 4:01 Stephen Rothwell
2024-11-19 6:25 ` Vinod Koul
2026-01-05 4:03 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220718182955.050c9678@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=broonie@kernel$(echo .)org \
--cc=ckeepax@opensource$(echo .)cirrus.com \
--cc=greg@kroah$(echo .)com \
--cc=lgirdwood@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=pierre-louis.bossart@linux$(echo .)intel.com \
--cc=tiwai@suse$(echo .)de \
--cc=vkoul@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox