linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Arnd Bergmann <arnd@arndb.de>, Bartosz Golaszewski <brgl@bgdev.pl>
Cc: ARM <linux-arm-kernel@lists.infradead.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Stephen Rothwell <sfr@canb.auug.org.au>,
	linux-next <linux-next@vger.kernel.org>
Subject: Re: linux-next: duplicate patch in the fsl tree
Date: Wed, 30 Jul 2025 16:23:05 +0200	[thread overview]
Message-ID: <0b738b01-8574-49b1-b89c-3c96e9a56b28@csgroup.eu> (raw)
In-Reply-To: <6eac14b4-765b-4a29-b278-364dba47e0e9@app.fastmail.com>



Le 30/07/2025 à 15:55, Arnd Bergmann a écrit :
> On Wed, Jul 30, 2025, at 15:41, Christophe Leroy wrote:
>>
>> Le 23/07/2025 à 01:45, Stephen Rothwell a écrit :
>>
>> I was going to send a pull request for this fix but I see the duplicate
>> patch is already tagged in the soc tree:
>>
>> $ git tag --contains 12702f0c3834
>> next-20250728
>> next-20250730
>> soc-drivers-6.17
>>
>> Shall I do anything or just ignore it and drop it from my tree ?
> 
> Linus has already pulled the soc-drivers-6.17 tags, so I think
> both copies of the patch ended up in mainline and there is nothing
> left you can do to change that.

The one in my tree is in Linux next, nowhere else for the time being as 
far as I know, as it was not included in the pull request I sent three 
weeks ago.

Christophe


  reply	other threads:[~2025-07-30 14:53 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-07-22 23:45 linux-next: duplicate patch in the fsl tree Stephen Rothwell
2025-07-30 13:41 ` Christophe Leroy
2025-07-30 13:55   ` Arnd Bergmann
2025-07-30 14:23     ` Christophe Leroy [this message]
2025-07-30 14:37       ` Bartosz Golaszewski
2025-07-30 18:45       ` Arnd Bergmann
2025-08-12  1: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=0b738b01-8574-49b1-b89c-3c96e9a56b28@csgroup.eu \
    --to=christophe.leroy@csgroup.eu \
    --cc=arnd@arndb.de \
    --cc=brgl@bgdev.pl \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --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;
as well as URLs for NNTP newsgroup(s).