linux-next: duplicate patch in the fsl tree

linux-next: duplicate patch in the fsl tree

[Stephen Rothwell]

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

Hi all,

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

  8b3da0519ae6 ("soc: fsl: qe: convert set_multiple() to returning an integer")

This is commit

  12702f0c3834 ("soc: fsl: qe: convert set_multiple() to returning an integer")

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 fsl tree

[Christophe Leroy]

Hi all,

Le 23/07/2025 à 01:45, Stephen Rothwell a écrit :
> Hi all,
> 
> The following commit is also in the arm-soc tree as a different commit
> (but the same patch):
> 
>    8b3da0519ae6 ("soc: fsl: qe: convert set_multiple() to returning an integer")
> 
> This is commit
> 
>    12702f0c3834 ("soc: fsl: qe: convert set_multiple() to returning an integer")
> 
> in the arm-soc tree.
> 


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 ?

Thanks
Christophe

Re: linux-next: duplicate patch in the fsl tree

[Arnd Bergmann]

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.

    Arnd

Re: linux-next: duplicate patch in the fsl tree

[Christophe Leroy]

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

Re: linux-next: duplicate patch in the fsl tree

[Bartosz Golaszewski]

On Wed, Jul 30, 2025 at 4:23 PM Christophe Leroy
<christophe.leroy@csgroup.eu> wrote:
>
>
>
> 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.
>

Arnd kindly picked it up directly into his tree when you were on
vacation in order to make sure it makes the v6.17 merge window.

Bartosz

Re: linux-next: duplicate patch in the fsl tree

[Arnd Bergmann]

On Wed, Jul 30, 2025, at 16:23, Christophe Leroy wrote:
> 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.

Ah right. I thought I saw it included in the branch I pulled
from you when I looked earlier today, but I see I made a mistake
now, as I had checked out a branch based on top of linux-next that
included yours.

      Arnd

Re: linux-next: duplicate patch in the fsl tree

[Stephen Rothwell]

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

Hi Christophe,

On Wed, 23 Jul 2025 09:45:58 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> The following commit is also in the arm-soc tree as a different commit
> (but the same patch):
> 
>   8b3da0519ae6 ("soc: fsl: qe: convert set_multiple() to returning an integer")
> 
> This is commit
> 
>   12702f0c3834 ("soc: fsl: qe: convert set_multiple() to returning an integer")
> 
> in the arm-soc tree.

Since 8b3da0519ae6 is the only commit in the fsl tree and the
duplication is now causing a conflict due to another commit touching
the same file, you could just reset the fsl tree to v6.17-rc1.

-- 
Cheers,
Stephen Rothwell

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