public inbox for linux-next@vger.kernel.org
 help / color / mirror / Atom feed
From: "Arnd Bergmann" <arnd@arndb.de>
To: "Mark Brown" <broonie@kernel.org>,
	"Stephen Rothwell" <sfr@canb.auug.org.au>
Cc: "Liam Girdwood" <lgirdwood@gmail.com>,
	"Olof Johansson" <olof@lixom.net>,
	ARM <linux-arm-kernel@lists.infradead.org>,
	"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
	linux-next <linux-next@vger.kernel.org>
Subject: Re: linux-next: duplicate patch in the sound-asoc tree
Date: Thu, 12 Sep 2024 12:28:56 +0000	[thread overview]
Message-ID: <b064ce64-1a44-4d93-ac06-248067cc2c47@app.fastmail.com> (raw)
In-Reply-To: <7e5c452c-61ec-421f-bd87-506d66a58f55@app.fastmail.com>

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

  reply	other threads:[~2024-09-12 12:29 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-12  4:44 linux-next: duplicate patch in the sound-asoc tree Stephen Rothwell
2024-09-12 11:07 ` Mark Brown
2024-09-12 12:08   ` Arnd Bergmann
2024-09-12 12:28     ` Arnd Bergmann [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-04-08  3:27 Stephen Rothwell
2025-04-08 12:18 ` Takashi Iwai
2024-01-04  3:11 Stephen Rothwell
2023-01-13  1:13 Stephen Rothwell
2023-01-20 15:52 ` Arnd Bergmann

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=b064ce64-1a44-4d93-ac06-248067cc2c47@app.fastmail.com \
    --to=arnd@arndb.de \
    --cc=broonie@kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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