2023-12-10 21:49:12

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: duplicate patch in the nvmem tree

Hi all,

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

05349b48e254 ("nvmem: Do not expect fixed layouts to grab a layout driver")

This is commit

b7c1e53751cb ("nvmem: Do not expect fixed layouts to grab a layout driver")

in Linus' tree.

Also, please keep all the commit message tags together at the end of
the commit message.

--
Cheers,
Stephen Rothwell


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2023-12-11 10:34:29

by Miquel Raynal

[permalink] [raw]
Subject: Re: linux-next: duplicate patch in the nvmem tree

Hi Stephen,

[email protected] wrote on Mon, 11 Dec 2023 08:48:41 +1100:

> Hi all,
>
> The following commit is also in Linus Torvalds' tree as a different commit
> (but the same patch):
>
> 05349b48e254 ("nvmem: Do not expect fixed layouts to grab a layout driver")
>
> This is commit
>
> b7c1e53751cb ("nvmem: Do not expect fixed layouts to grab a layout driver")
>
> in Linus' tree.
>
> Also, please keep all the commit message tags together at the end of
> the commit message.
>

This is actually fine, Srinivas needs this fix in his tree for
applying other patches, but he anyway sends a big "series" to GKH at
-rc6 who finally applies the content of the nvmem-next branch.

Thanks for the reports,
Miquèl

2023-12-11 11:09:45

by Srinivas Kandagatla

[permalink] [raw]
Subject: Re: linux-next: duplicate patch in the nvmem tree



On 11/12/2023 10:34, Miquel Raynal wrote:
> Hi Stephen,
>
> [email protected] wrote on Mon, 11 Dec 2023 08:48:41 +1100:
>
>> Hi all,
>>
>> The following commit is also in Linus Torvalds' tree as a different commit
>> (but the same patch):
>>
>> 05349b48e254 ("nvmem: Do not expect fixed layouts to grab a layout driver")
>>
>> This is commit
>>
>> b7c1e53751cb ("nvmem: Do not expect fixed layouts to grab a layout driver")
>>
>> in Linus' tree.
>>
>> Also, please keep all the commit message tags together at the end of
>> the commit message.
>>
>
> This is actually fine, Srinivas needs this fix in his tree for
> applying other patches, but he anyway sends a big "series" to GKH at
> -rc6 who finally applies the content of the nvmem-next branch.
Or I can merge or rebase on rc5 which should ensure that there are no
duplicates.

--srini
>
> Thanks for the reports,
> Miquèl