linux-next: duplicate patch in the sound-asoc tree

linux-next: duplicate patch in the sound-asoc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 259 bytes --]

Hi all,

The following commit is also in the arm-soc tree as a different commit
(but the same patch):

  5eab9265759e ("ASoC: PXA: make SND_PXA2XX_SOC_AC97 user-selectable")

(commit 350a6eb412d3 in the arm-soc tree)

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patch in the sound-asoc tree

[Arnd Bergmann]

On Fri, Jan 13, 2023, at 02:13, Stephen Rothwell wrote:
> Hi all,
>
> The following commit is also in the arm-soc tree as a different commit
> (but the same patch):
>
>   5eab9265759e ("ASoC: PXA: make SND_PXA2XX_SOC_AC97 user-selectable")
>
> (commit 350a6eb412d3 in the arm-soc tree)

I dropped it from my tree now, as I had to rebase this branch
for hopefully the last time.

     Arnd

linux-next: duplicate patch in the sound-asoc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 368 bytes --]

Hi all,

The following commit is also in the sound-current tree as a different
commit (but the same patch):

  ce17aa4cf2db ("ASoC: SOF: Intel: hda-codec: Delay the codec device registration")

This is commit

  c344ef36dbc2 ("ASoC: SOF: Intel: hda-codec: Delay the codec device registration")

in the sound-current tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: duplicate patch in the sound-asoc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 336 bytes --]

Hi all,

The following commit is also in the arm-soc tree as a different commit
(but the same patch):

  7817eb1ad353 ("ASoC: dt-bindings: cirrus,cs4271: Convert to dtschema")

This is commit

  cf700e558e1d ("ASoC: dt-bindings: cirrus,cs4271: Convert to dtschema")

from the arm-soc tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patch in the sound-asoc tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 491 bytes --]

On Thu, Sep 12, 2024 at 02:44:59PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> The following commit is also in the arm-soc tree as a different commit
> (but the same patch):
> 
>   7817eb1ad353 ("ASoC: dt-bindings: cirrus,cs4271: Convert to dtschema")
> 
> This is commit
> 
>   cf700e558e1d ("ASoC: dt-bindings: cirrus,cs4271: Convert to dtschema")
> 
> from the arm-soc tree.

I wonder how that ended up in the arm-soc tree...  anyway, shouldn't
matter if it's the same.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patch in the sound-asoc tree

[Arnd Bergmann]

On Thu, Sep 12, 2024, at 11:07, Mark Brown wrote:
> On Thu, Sep 12, 2024 at 02:44:59PM +1000, Stephen Rothwell wrote:
>> Hi all,
>> 
>> The following commit is also in the arm-soc tree as a different commit
>> (but the same patch):
>> 
>>   7817eb1ad353 ("ASoC: dt-bindings: cirrus,cs4271: Convert to dtschema")
>> 
>> This is commit
>> 
>>   cf700e558e1d ("ASoC: dt-bindings: cirrus,cs4271: Convert to dtschema")
>> 
>> from the arm-soc tree.
>
> I wonder how that ended up in the arm-soc tree...  anyway, shouldn't
> matter if it's the same.

I merged the entire ep93xx DT conversion series in one branch
that I plan to send as a separate pull request after the normal
soc/dt, soc/drivers etc branches, in order to finally get the
work done.

This patch it not needed for bisecting through the series, so
I've now dropped it again.

     Arnd

Re: linux-next: duplicate patch in the sound-asoc tree

[Arnd Bergmann]

On Thu, Sep 12, 2024, at 12:08, Arnd Bergmann wrote:
> On Thu, Sep 12, 2024, at 11:07, Mark Brown wrote:
>> On Thu, Sep 12, 2024 at 02:44:59PM +1000, Stephen Rothwell wrote:
>>> Hi all,
>>> 
>>> The following commit is also in the arm-soc tree as a different commit
>>> (but the same patch):
>>> 
>>>   7817eb1ad353 ("ASoC: dt-bindings: cirrus,cs4271: Convert to dtschema")
>>> 
>>> This is commit
>>> 
>>>   cf700e558e1d ("ASoC: dt-bindings: cirrus,cs4271: Convert to dtschema")
>>> 
>>> from the arm-soc tree.
>>
>> I wonder how that ended up in the arm-soc tree...  anyway, shouldn't
>> matter if it's the same.
>
> I merged the entire ep93xx DT conversion series in one branch
> that I plan to send as a separate pull request after the normal
> soc/dt, soc/drivers etc branches, in order to finally get the
> work done.

Hmm, I now see that this patch and 20240904-devm_clk_hw_register_fixed_rate_parent_data-v1-1-7f14d6b456e5@maquefel.me
were both picked up by my script even though they were not actually
part of the series but instead listed as dependencies in
https://lore.kernel.org/lkml/20240909-ep93xx-v12-0-e86ab2423d4b@maquefel.me/

Presumably these both got merged correctly into my tree by b4 and
then I accidentally flattened the branch when I applied Dan's bugfix
in front of the rest.

     Arnd

linux-next: duplicate patch in the sound-asoc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 320 bytes --]

Hi all,

The following commit is also in the sound tree as a different commit
(but the same patch):

  7288aa73e5cf ("ASoC: loongson: Replace deprecated PCI functions")

This is commit

  a81aca6f8ed8 ("ASoC: loongson: Replace deprecated PCI functions")

in the sound tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patch in the sound-asoc tree

[Takashi Iwai]

On Tue, 08 Apr 2025 05:27:29 +0200,
Stephen Rothwell wrote:
> 
> Hi all,
> 
> The following commit is also in the sound tree as a different commit
> (but the same patch):
> 
>   7288aa73e5cf ("ASoC: loongson: Replace deprecated PCI functions")
> 
> This is commit
> 
>   a81aca6f8ed8 ("ASoC: loongson: Replace deprecated PCI functions")
> 
> in the sound tree.

Yes, it's an oversight.  Since the doubly commits shouldn't bring too
much problem for this small change, we decided to keep as is.


thanks,

Takashi