linux-next: duplicate patch in the nvmem tree

linux-next: duplicate patch in the nvmem tree

[Mark Brown]

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

Hi all,

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

  18f2b79951a9e ("nvmem: qcom: Unify user-visible "Qualcomm" name")
  512946cf0f32e ("nvmem: rockchip-otp: alloc clks with main struct")
  5a2bba5b74227 ("dt-bindings: nvmem: lan9662-otpc: Add LAN969x series")
  68628e84bc61e ("dt-bindings: nvmem: airoha: add SMC eFuses schema")
  7089170e1df16 ("nvmem: apple-spmi-nvmem: wrap regmap calls to satisfy CFI")
  7106dcb57aa1b ("nvmem: core: Default to read-only if wp-gpios present")
  7592c50152619 ("nvmem: lan9662-otp: add support for LAN969x")
  9f902e68cfe33 ("dt-bindings: nvmem: qfprom: Add Milos compatible")
  a3122a19f00b7 ("nvmem: layouts: u-boot-env: check earlier for ethaddr length")
  ac0a5d17aa3cc ("dt-bindings: nvmem: qcom,qfprom: Add Shikra compatible")
  b13e7886c2e16 ("nvmem: airoha: Add support for SMC eFUSE")
  c00ca6cc2fc96 ("nvmem: layouts: Add fixed-layout driver")
  c33862c0a3a9a ("dt-bindings: nvmem: qfprom: Add glymur compatible")
  c896d1c34f2bb ("dt-bindings: nvmem: qfprom: qcom: Add Hawi compatible")
  d5bd22d9d2032 ("nvmem: cleanup dead code in Kconfig")

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

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

[Srinivas Kandagatla]

On 7/31/26 4:10 PM, Mark Brown wrote:
> Hi all,
> 
> The following commit is also in the char-misc tree as a different commit
> (but the same patch):
> 

I will drop these patches Mark, normally all the nvmem patches go via
Greg's char-misc tree, so there is a overlap for few days while Greg
applies this to char-misc tree.

--srini

>   18f2b79951a9e ("nvmem: qcom: Unify user-visible "Qualcomm" name")
>   512946cf0f32e ("nvmem: rockchip-otp: alloc clks with main struct")
>   5a2bba5b74227 ("dt-bindings: nvmem: lan9662-otpc: Add LAN969x series")
>   68628e84bc61e ("dt-bindings: nvmem: airoha: add SMC eFuses schema")
>   7089170e1df16 ("nvmem: apple-spmi-nvmem: wrap regmap calls to satisfy CFI")
>   7106dcb57aa1b ("nvmem: core: Default to read-only if wp-gpios present")
>   7592c50152619 ("nvmem: lan9662-otp: add support for LAN969x")
>   9f902e68cfe33 ("dt-bindings: nvmem: qfprom: Add Milos compatible")
>   a3122a19f00b7 ("nvmem: layouts: u-boot-env: check earlier for ethaddr length")
>   ac0a5d17aa3cc ("dt-bindings: nvmem: qcom,qfprom: Add Shikra compatible")
>   b13e7886c2e16 ("nvmem: airoha: Add support for SMC eFUSE")
>   c00ca6cc2fc96 ("nvmem: layouts: Add fixed-layout driver")
>   c33862c0a3a9a ("dt-bindings: nvmem: qfprom: Add glymur compatible")
>   c896d1c34f2bb ("dt-bindings: nvmem: qfprom: qcom: Add Hawi compatible")
>   d5bd22d9d2032 ("nvmem: cleanup dead code in Kconfig")

linux-next: duplicate patch in the nvmem tree

[Mark Brown]

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

Hi all,

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

  b13e7886c2e16 (nvmem: airoha: Add support for SMC eFUSE)
  d5bd22d9d2032 (nvmem: cleanup dead code in Kconfig)

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

linux-next: duplicate patch in the nvmem tree

[Stephen Rothwell]

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

Hi all,

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

  8b6322da3c1f ("nvmem: layouts: fix nvmem_layout_bus_uevent")

This is commit

  03bc4831ef06 ("nvmem: layouts: fix nvmem_layout_bus_uevent")

in the char-misc.current 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

[Greg KH]

On Tue, Nov 25, 2025 at 05:17:05PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> The following commit is also in the char-misc.current tree as a different
> commit (but the same patch):
> 
>   8b6322da3c1f ("nvmem: layouts: fix nvmem_layout_bus_uevent")
> 
> This is commit
> 
>   03bc4831ef06 ("nvmem: layouts: fix nvmem_layout_bus_uevent")
> 
> in the char-misc.current tree.

This should be fine, as I was asked to take it in the char-misc tree.

thanks,

greg k-h

linux-next: duplicate patch in the nvmem tree

[Stephen Rothwell]

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

Hi all,

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

  d102a7924f44 ("nvmem: imx-ocotp: fix MAC address byte length")

This is commit

  2aa4ad626ee7 ("nvmem: imx-ocotp: fix MAC address byte length")

in the char-misc.current 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

[Greg KH]

On Mon, Jul 14, 2025 at 05:34:46PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> The following commit is also in the char-misc.current tree as a different
> commit (but the same patch):
> 
>   d102a7924f44 ("nvmem: imx-ocotp: fix MAC address byte length")
> 
> This is commit
> 
>   2aa4ad626ee7 ("nvmem: imx-ocotp: fix MAC address byte length")
> 
> in the char-misc.current tree.

That's due to the nvmem tree sending them to me in patch format.  Should
be fine, thanks!

greg k-h

linux-next: duplicate patch in the nvmem tree

[Stephen Rothwell]

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

Hi all,

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

  89ca7c2d13bf ("dt-bindings: nvmem: mediatek: efuse: add support for MT7981")

This is commit

  ee96c0a8d12f ("dt-bindings: nvmem: mediatek: efuse: add support for MT7981")

in the devicetree 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

[Rob Herring]

On Wed, Jun 12, 2024 at 12:28 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> The following commit is also in the devicetree tree as a different
> commit (but the same patch):
>
>   89ca7c2d13bf ("dt-bindings: nvmem: mediatek: efuse: add support for MT7981")
>
> This is commit
>
>   ee96c0a8d12f ("dt-bindings: nvmem: mediatek: efuse: add support for MT7981")

Now dropped.

Rob

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