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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <b064ce64-1a44-4d93-ac06-248067cc2c47@app.fastmail.com>
Date: Thu, 12 Sep 2024 12:28:56 +0000
From: "Arnd Bergmann" <arnd@...db.de>
To: "Mark Brown" <broonie@...nel.org>,
 "Stephen Rothwell" <sfr@...b.auug.org.au>
Cc: "Liam Girdwood" <lgirdwood@...il.com>, "Olof Johansson" <olof@...om.net>,
 ARM <linux-arm-kernel@...ts.infradead.org>,
 "Linux Kernel Mailing List" <linux-kernel@...r.kernel.org>,
 linux-next <linux-next@...r.kernel.org>
Subject: Re: linux-next: duplicate patch in the sound-asoc tree

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@...uefel.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