linux-next: duplicate patch in the nvmem tree

linux-next: duplicate patch in the nvmem tree

[Stephen Rothwell]

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

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

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

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

[Miquel Raynal]

Hi Stephen,

sfr@canb.auug.org.au 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

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

[Srinivas Kandagatla]

On 11/12/2023 10:34, Miquel Raynal wrote:
> Hi Stephen,
> 
> sfr@canb.auug.org.au 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

linux-next: duplicate patch in the nvmem tree

[Stephen Rothwell]

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

Hi all,

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

  ca7384334d9b ("Revert "nvmem: add new config option"")

This is commit

  f4cf4e5db331 ("Revert "nvmem: add new config option"")

in the char-misc tree.

-- 
Cheers,
Stephen Rothwell

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

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

[Rafał Miłecki]

Hi,

On 2023-10-30 05:10, Stephen Rothwell wrote:
> The following commit is also in char-misc tree as a different commit
> (but the same patch):
> 
>   ca7384334d9b ("Revert "nvmem: add new config option"")
> 
> This is commit
> 
>   f4cf4e5db331 ("Revert "nvmem: add new config option"")
> 
> in the char-misc tree.

please ignore patch in nvmem.git, it's an old version applied on top of
outdated code.

Code in char-misc.git which is meant to go to Linus is all good, we're
all safe :)

-- 
Rafał Miłecki