linux-next: duplicate patches in the nvmem tree

linux-next: duplicate patches in the nvmem tree

[Stephen Rothwell]

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

Hi all,

The following commits are also in Linus Torvalds' tree as different
commits (but the same patches):

  82c6ba6a7d96 ("nvmem: brcm_nvram: store a copy of NVRAM content")
  a9d68bd9fc7a ("nvmem: stm32: add support for STM32MP25 BSEC to control OTP data")
  5bc8339a8af8 ("dt-bindings: nvmem: add new stm32mp25 compatible for stm32-romem")
  6deccfa25e3d ("dt-bindings: nvmem: mxs-ocotp: Document fsl,ocotp")
  e15e05ed845a ("nvmem: core: Expose cells through sysfs")
  38ebc72019b9 ("ABI: sysfs-nvmem-cells: Expose cells through sysfs")
  fc334e722496 ("nvmem: core: Rework layouts to become regular devices")
  d5827449f96c ("nvmem: Move and rename ->fixup_cell_info()")
  52be3c1543c4 ("nvmem: Simplify the ->add_cells() hook")
  26378491d343 ("nvmem: Create a header for internal sharing")
  c016e72f9346 ("nvmem: Move of_nvmem_layout_get_container() in another header")
  0e7ceb1551ee ("of: device: Export of_device_make_bus_id()")

These are commits

  1e37bf84afac ("nvmem: brcm_nvram: store a copy of NVRAM content")
  f0ac5b230396 ("nvmem: stm32: add support for STM32MP25 BSEC to control OTP data")
  a729c0f57dc8 ("dt-bindings: nvmem: add new stm32mp25 compatible for stm32-romem")
  a2a8aefecbd0 ("dt-bindings: nvmem: mxs-ocotp: Document fsl,ocotp")
  0331c611949f ("nvmem: core: Expose cells through sysfs")
  192048e5a5b6 ("ABI: sysfs-nvmem-cells: Expose cells through sysfs")
  fc29fd821d9a ("nvmem: core: Rework layouts to become regular devices")
  1172460e7167 ("nvmem: Move and rename ->fixup_cell_info()")
  1b7c298a4ecb ("nvmem: Simplify the ->add_cells() hook")
  ec9c08a1cb8d ("nvmem: Create a header for internal sharing")
  4a1a40233b4a ("nvmem: Move of_nvmem_layout_get_container() in another header")
  7f38b70042fc ("of: device: Export of_device_make_bus_id()")

in the char-misc tree.



-- 
Cheers,
Stephen Rothwell

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

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

[Greg KH]

On Mon, Dec 18, 2023 at 04:12:38PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> The following commits are also in Linus Torvalds' tree as different
> commits (but the same patches):
> 
>   82c6ba6a7d96 ("nvmem: brcm_nvram: store a copy of NVRAM content")
>   a9d68bd9fc7a ("nvmem: stm32: add support for STM32MP25 BSEC to control OTP data")
>   5bc8339a8af8 ("dt-bindings: nvmem: add new stm32mp25 compatible for stm32-romem")
>   6deccfa25e3d ("dt-bindings: nvmem: mxs-ocotp: Document fsl,ocotp")
>   e15e05ed845a ("nvmem: core: Expose cells through sysfs")
>   38ebc72019b9 ("ABI: sysfs-nvmem-cells: Expose cells through sysfs")
>   fc334e722496 ("nvmem: core: Rework layouts to become regular devices")
>   d5827449f96c ("nvmem: Move and rename ->fixup_cell_info()")
>   52be3c1543c4 ("nvmem: Simplify the ->add_cells() hook")
>   26378491d343 ("nvmem: Create a header for internal sharing")
>   c016e72f9346 ("nvmem: Move of_nvmem_layout_get_container() in another header")
>   0e7ceb1551ee ("of: device: Export of_device_make_bus_id()")
> 
> These are commits
> 
>   1e37bf84afac ("nvmem: brcm_nvram: store a copy of NVRAM content")
>   f0ac5b230396 ("nvmem: stm32: add support for STM32MP25 BSEC to control OTP data")
>   a729c0f57dc8 ("dt-bindings: nvmem: add new stm32mp25 compatible for stm32-romem")
>   a2a8aefecbd0 ("dt-bindings: nvmem: mxs-ocotp: Document fsl,ocotp")
>   0331c611949f ("nvmem: core: Expose cells through sysfs")
>   192048e5a5b6 ("ABI: sysfs-nvmem-cells: Expose cells through sysfs")
>   fc29fd821d9a ("nvmem: core: Rework layouts to become regular devices")
>   1172460e7167 ("nvmem: Move and rename ->fixup_cell_info()")
>   1b7c298a4ecb ("nvmem: Simplify the ->add_cells() hook")
>   ec9c08a1cb8d ("nvmem: Create a header for internal sharing")
>   4a1a40233b4a ("nvmem: Move of_nvmem_layout_get_container() in another header")
>   7f38b70042fc ("of: device: Export of_device_make_bus_id()")
> 
> in the char-misc tree.

That's because the nvmem maintainer sent these to me for inclusion, odd.

greg k-h

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

[Srinivas Kandagatla]

Thanks Stephen,
On 18/12/2023 05:12, Stephen Rothwell wrote:
> Hi all,
> 
> The following commits are also in Linus Torvalds' tree as different
> commits (but the same patches):
> 
>    82c6ba6a7d96 ("nvmem: brcm_nvram: store a copy of NVRAM content")
>    a9d68bd9fc7a ("nvmem: stm32: add support for STM32MP25 BSEC to control OTP data")
>    5bc8339a8af8 ("dt-bindings: nvmem: add new stm32mp25 compatible for stm32-romem")
>    6deccfa25e3d ("dt-bindings: nvmem: mxs-ocotp: Document fsl,ocotp")
>    e15e05ed845a ("nvmem: core: Expose cells through sysfs")
>    38ebc72019b9 ("ABI: sysfs-nvmem-cells: Expose cells through sysfs")
>    fc334e722496 ("nvmem: core: Rework layouts to become regular devices")
>    d5827449f96c ("nvmem: Move and rename ->fixup_cell_info()")
>    52be3c1543c4 ("nvmem: Simplify the ->add_cells() hook")
>    26378491d343 ("nvmem: Create a header for internal sharing")
>    c016e72f9346 ("nvmem: Move of_nvmem_layout_get_container() in another header")
>    0e7ceb1551ee ("of: device: Export of_device_make_bus_id()")
> 
This should be fixed now

--srini


> These are commits
> 
>    1e37bf84afac ("nvmem: brcm_nvram: store a copy of NVRAM content")
>    f0ac5b230396 ("nvmem: stm32: add support for STM32MP25 BSEC to control OTP data")
>    a729c0f57dc8 ("dt-bindings: nvmem: add new stm32mp25 compatible for stm32-romem")
>    a2a8aefecbd0 ("dt-bindings: nvmem: mxs-ocotp: Document fsl,ocotp")
>    0331c611949f ("nvmem: core: Expose cells through sysfs")
>    192048e5a5b6 ("ABI: sysfs-nvmem-cells: Expose cells through sysfs")
>    fc29fd821d9a ("nvmem: core: Rework layouts to become regular devices")
>    1172460e7167 ("nvmem: Move and rename ->fixup_cell_info()")
>    1b7c298a4ecb ("nvmem: Simplify the ->add_cells() hook")
>    ec9c08a1cb8d ("nvmem: Create a header for internal sharing")
>    4a1a40233b4a ("nvmem: Move of_nvmem_layout_get_container() in another header")
>    7f38b70042fc ("of: device: Export of_device_make_bus_id()")
> 
> in the char-misc tree.
> 
> 
> 

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

[Srinivas Kandagatla]

On 18/12/2023 10:26, Greg KH wrote:
> On Mon, Dec 18, 2023 at 04:12:38PM +1100, Stephen Rothwell wrote:
>> Hi all,
>>
>> The following commits are also in Linus Torvalds' tree as different
>> commits (but the same patches):
>>
>>    82c6ba6a7d96 ("nvmem: brcm_nvram: store a copy of NVRAM content")
>>    a9d68bd9fc7a ("nvmem: stm32: add support for STM32MP25 BSEC to control OTP data")
>>    5bc8339a8af8 ("dt-bindings: nvmem: add new stm32mp25 compatible for stm32-romem")
>>    6deccfa25e3d ("dt-bindings: nvmem: mxs-ocotp: Document fsl,ocotp")
>>    e15e05ed845a ("nvmem: core: Expose cells through sysfs")
>>    38ebc72019b9 ("ABI: sysfs-nvmem-cells: Expose cells through sysfs")
>>    fc334e722496 ("nvmem: core: Rework layouts to become regular devices")
>>    d5827449f96c ("nvmem: Move and rename ->fixup_cell_info()")
>>    52be3c1543c4 ("nvmem: Simplify the ->add_cells() hook")
>>    26378491d343 ("nvmem: Create a header for internal sharing")
>>    c016e72f9346 ("nvmem: Move of_nvmem_layout_get_container() in another header")
>>    0e7ceb1551ee ("of: device: Export of_device_make_bus_id()")
>>
>> These are commits
>>
>>    1e37bf84afac ("nvmem: brcm_nvram: store a copy of NVRAM content")
>>    f0ac5b230396 ("nvmem: stm32: add support for STM32MP25 BSEC to control OTP data")
>>    a729c0f57dc8 ("dt-bindings: nvmem: add new stm32mp25 compatible for stm32-romem")
>>    a2a8aefecbd0 ("dt-bindings: nvmem: mxs-ocotp: Document fsl,ocotp")
>>    0331c611949f ("nvmem: core: Expose cells through sysfs")
>>    192048e5a5b6 ("ABI: sysfs-nvmem-cells: Expose cells through sysfs")
>>    fc29fd821d9a ("nvmem: core: Rework layouts to become regular devices")
>>    1172460e7167 ("nvmem: Move and rename ->fixup_cell_info()")
>>    1b7c298a4ecb ("nvmem: Simplify the ->add_cells() hook")
>>    ec9c08a1cb8d ("nvmem: Create a header for internal sharing")
>>    4a1a40233b4a ("nvmem: Move of_nvmem_layout_get_container() in another header")
>>    7f38b70042fc ("of: device: Export of_device_make_bus_id()")
>>
>> in the char-misc tree.
> 
> That's because the nvmem maintainer sent these to me for inclusion, odd.

Am happy to send a PR next time if it helps.

thanks,
srini
> 
> greg k-h

linux-next: duplicate patches in the nvmem tree

[Stephen Rothwell]

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

Hi all,

The following commits are also in the char-misc tree as different
commits (but the same patches):

  9e29a1dba59b ("nvmem: meson-mx-efuse: Remove nvmem_device from efuse struct")
  2ce7240c076f ("dt-bindings: nvmem: Add compatible for SC8280XP")
  af868167a709 ("dt-bindings: nvmem: qcom,spmi-sdam: update maintainer")
  e5630036dab1 ("dt-bindings: nvmem: Add compatible for sm8450, sm8550 and sm8650")
  04075398ec4f ("nvmem: lpc18xx_eeprom: Convert to platform remove callback returning void")
  ea8f9ec2bbb7 ("nvmem: core: switch to use device_add_groups()")
  fbd0d725d4fa ("nvmem: sprd: fix module autoloading")
  fc7d05b8e427 ("nvmem: sc27xx: fix module autoloading")
  3575d48e5d2f ("nvmem: layouts: sl28vpd: drop driver owner initialization")
  995b22c48ed0 ("nvmem: layouts: onie-tlv: drop driver owner initialization")
  e428f11ae8fb ("nvmem: layouts: store owner from modules with nvmem_layout_driver_register()")

These are commits

  2a1ad6b75292 ("nvmem: meson-mx-efuse: Remove nvmem_device from efuse struct")
  a5888ae5b3c3 ("dt-bindings: nvmem: Add compatible for SC8280XP")
  dc5d4043510b ("dt-bindings: nvmem: qcom,spmi-sdam: update maintainer")
  e2c7d6e02382 ("dt-bindings: nvmem: Add compatible for sm8450, sm8550 and sm8650")
  693d2f629962 ("nvmem: lpc18xx_eeprom: Convert to platform remove callback returning void")
  8d8fc146dd7a ("nvmem: core: switch to use device_add_groups()")
  154c1ec943e3 ("nvmem: sprd: fix module autoloading")
  dc3d88ade857 ("nvmem: sc27xx: fix module autoloading")
  23fd602f2195 ("nvmem: layouts: sl28vpd: drop driver owner initialization")
  21833338eccb ("nvmem: layouts: onie-tlv: drop driver owner initialization")
  6d0ca4a2a7e2 ("nvmem: layouts: store owner from modules with nvmem_layout_driver_register()")

in the char-misc tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the nvmem tree

[Stephen Rothwell]

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

Hi all,

The following commits are also in the char-misc tree as different
commits (but the same patches):

  24bd074c417b ("nvmem: Use device_get_match_data()")
  8beb2ec54b65 ("dt-bindings: nvmem: u-boot,env: Add missing additionalProperties on child node schemas")
  6d25308bb9de ("dt-bindings: nvmem: move deprecated cells binding to its own file")
  ee73a9fae540 ("nvmem: add explicit config option to read old syntax fixed OF cells")
  c52b640214d7 ("nvmem: qfprom: Mark core clk as optional")

-- 
Cheers,
Stephen Rothwell

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

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

[Srinivas Kandagatla]

Thanks Stephen,

This is now fixed for both nvmem and fastrpc tree.

--srini
On 17/10/2023 05:07, Stephen Rothwell wrote:
> Hi all,
> 
> The following commits are also in the char-misc.current tree as different
> commits (but the same patches):
> 
>    d0b450caca6f ("nvmem: imx: correct nregs for i.MX6ULL")
>    f46cfdaf5c07 ("nvmem: imx: correct nregs for i.MX6UL")
>    e898831a6683 ("nvmem: imx: correct nregs for i.MX6SLL")
> 
> These are commits
> 
>    2382c1b04423 ("nvmem: imx: correct nregs for i.MX6ULL")
>    7d6e10f5d254 ("nvmem: imx: correct nregs for i.MX6UL")
>    414a98abbefd ("nvmem: imx: correct nregs for i.MX6SLL")
> 
> in the char-misc.current tree.
> 

linux-next: duplicate patches in the nvmem tree

[Stephen Rothwell]

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

Hi all,

The following commits are also in the char-misc.current tree as different
commits (but the same patches):

  d0b450caca6f ("nvmem: imx: correct nregs for i.MX6ULL")
  f46cfdaf5c07 ("nvmem: imx: correct nregs for i.MX6UL")
  e898831a6683 ("nvmem: imx: correct nregs for i.MX6SLL")

These are commits

  2382c1b04423 ("nvmem: imx: correct nregs for i.MX6ULL")
  7d6e10f5d254 ("nvmem: imx: correct nregs for i.MX6UL")
  414a98abbefd ("nvmem: imx: correct nregs for i.MX6SLL")

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 patches in the nvmem tree

[Srinivas Kandagatla]

Thanks Stephen for reporting this.

Its fixed now.


--srini
On 25/09/2023 23:34, Stephen Rothwell wrote:
> Hi all,
> 
> The following commits are also in Linus Torvalds' tree as different
> commits (but the same patches):
> 
>    0991afbe4b18 ("nvmem: core: Notify when a new layout is registered")
>    b8257f61b4dd ("nvmem: core: Do not open-code existing functions")
>    6c7f48ea2e66 ("nvmem: core: Return NULL when no nvmem layout is found")
>    104af6a5b199 ("nvmem: core: Create all cells before adding the nvmem device")
>    c32f2186acc9 ("nvmem: u-boot-env:: Replace zero-length array with DECLARE_FLEX_ARRAY() helper")
>    0a9ec38c47c1 ("nvmem: sec-qfprom: Add Qualcomm secure QFPROM support")
>    050cd7f49580 ("dt-bindings: nvmem: sec-qfprom: Add bindings for secure qfprom")
>    4b71b2a44d7d ("dt-bindings: nvmem: Add compatible for QCM2290")
>    9d53d595f688 ("nvmem: Kconfig: Fix typo "drive" -> "driver"")
>    3e0558db94db ("nvmem: Explicitly include correct DT includes")
>    c8efcf7a86eb ("nvmem: add new NXP QorIQ eFuse driver")
>    0401edffa338 ("dt-bindings: nvmem: Add t1023-sfp efuse support")
>    8fd85ce6cfdf ("dt-bindings: nvmem: qfprom: Add compatible for MSM8226")
>    97edd4c6ba34 ("nvmem: uniphier: Use devm_platform_get_and_ioremap_resource()")
>    431f08ed0ba5 ("nvmem: qfprom: do some cleanup")
>    77803ef86379 ("nvmem: stm32-romem: Use devm_platform_get_and_ioremap_resource()")
>    e75d23cf347d ("nvmem: rockchip-efuse: Use devm_platform_get_and_ioremap_resource()")
>    ad065ae27bd1 ("nvmem: meson-mx-efuse: Convert to devm_platform_ioremap_resource()")
>    67f919120705 ("nvmem: lpc18xx_otp: Convert to devm_platform_ioremap_resource()
> ")
>    5f41033e4154 ("nvmem: brcm_nvram: Use devm_platform_get_and_ioremap_resource()")
>    6870b4a37343 ("nvmem: sunxi_sid: Convert to devm_platform_ioremap_resource()")
>    31c8217bc34a ("dt-bindings: nvmem: fixed-cell: add compatible for MAC cells")
> 

linux-next: duplicate patches in the nvmem tree

[Stephen Rothwell]

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

Hi all,

The following commits are also in Linus Torvalds' tree as different
commits (but the same patches):

  0991afbe4b18 ("nvmem: core: Notify when a new layout is registered")
  b8257f61b4dd ("nvmem: core: Do not open-code existing functions")
  6c7f48ea2e66 ("nvmem: core: Return NULL when no nvmem layout is found")
  104af6a5b199 ("nvmem: core: Create all cells before adding the nvmem device")
  c32f2186acc9 ("nvmem: u-boot-env:: Replace zero-length array with DECLARE_FLEX_ARRAY() helper")
  0a9ec38c47c1 ("nvmem: sec-qfprom: Add Qualcomm secure QFPROM support")
  050cd7f49580 ("dt-bindings: nvmem: sec-qfprom: Add bindings for secure qfprom")
  4b71b2a44d7d ("dt-bindings: nvmem: Add compatible for QCM2290")
  9d53d595f688 ("nvmem: Kconfig: Fix typo "drive" -> "driver"")
  3e0558db94db ("nvmem: Explicitly include correct DT includes")
  c8efcf7a86eb ("nvmem: add new NXP QorIQ eFuse driver")
  0401edffa338 ("dt-bindings: nvmem: Add t1023-sfp efuse support")
  8fd85ce6cfdf ("dt-bindings: nvmem: qfprom: Add compatible for MSM8226")
  97edd4c6ba34 ("nvmem: uniphier: Use devm_platform_get_and_ioremap_resource()")
  431f08ed0ba5 ("nvmem: qfprom: do some cleanup")
  77803ef86379 ("nvmem: stm32-romem: Use devm_platform_get_and_ioremap_resource()")
  e75d23cf347d ("nvmem: rockchip-efuse: Use devm_platform_get_and_ioremap_resource()")
  ad065ae27bd1 ("nvmem: meson-mx-efuse: Convert to devm_platform_ioremap_resource()")
  67f919120705 ("nvmem: lpc18xx_otp: Convert to devm_platform_ioremap_resource()
")
  5f41033e4154 ("nvmem: brcm_nvram: Use devm_platform_get_and_ioremap_resource()")
  6870b4a37343 ("nvmem: sunxi_sid: Convert to devm_platform_ioremap_resource()")
  31c8217bc34a ("dt-bindings: nvmem: fixed-cell: add compatible for MAC cells")

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the nvmem tree

[Stephen Rothwell]

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

Hi all,

The following commits are also in Linus Torvalds' tree as different
commits (but the same patches):

  0401edffa338 ("dt-bindings: nvmem: Add t1023-sfp efuse support")
  050cd7f49580 ("dt-bindings: nvmem: sec-qfprom: Add bindings for secure qfprom")
  0991afbe4b18 ("nvmem: core: Notify when a new layout is registered")
  0a9ec38c47c1 ("nvmem: sec-qfprom: Add Qualcomm secure QFPROM support")
  104af6a5b199 ("nvmem: core: Create all cells before adding the nvmem device")
  31c8217bc34a ("dt-bindings: nvmem: fixed-cell: add compatible for MAC cells")
  3e0558db94db ("nvmem: Explicitly include correct DT includes")
  431f08ed0ba5 ("nvmem: qfprom: do some cleanup")
  4b71b2a44d7d ("dt-bindings: nvmem: Add compatible for QCM2290")
  5f41033e4154 ("nvmem: brcm_nvram: Use devm_platform_get_and_ioremap_resource()")
  67f919120705 ("nvmem: lpc18xx_otp: Convert to devm_platform_ioremap_resource()")
  6870b4a37343 ("nvmem: sunxi_sid: Convert to devm_platform_ioremap_resource()")
  6c7f48ea2e66 ("nvmem: core: Return NULL when no nvmem layout is found")
  77803ef86379 ("nvmem: stm32-romem: Use devm_platform_get_and_ioremap_resource()")
  8fd85ce6cfdf ("dt-bindings: nvmem: qfprom: Add compatible for MSM8226")
  97edd4c6ba34 ("nvmem: uniphier: Use devm_platform_get_and_ioremap_resource()")
  9d53d595f688 ("nvmem: Kconfig: Fix typo "drive" -> "driver"")
  ad065ae27bd1 ("nvmem: meson-mx-efuse: Convert to devm_platform_ioremap_resource()")
  b8257f61b4dd ("nvmem: core: Do not open-code existing functions")
  c32f2186acc9 ("nvmem: u-boot-env:: Replace zero-length array with DECLARE_FLEX_ARRAY() helper")
  c8efcf7a86eb ("nvmem: add new NXP QorIQ eFuse driver")
  e75d23cf347d ("nvmem: rockchip-efuse: Use devm_platform_get_and_ioremap_resource()")

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the nvmem tree

[Stephen Rothwell]

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

Hi all,

The following commits are also in Linus Torvalds' tree as different
commits (but the same patches):

  05f53e3c22a7 ("dt-bindings: nvmem: mediatek: efuse: add support for mt7986")
  0ce8763ca284 ("nvmem: brcm_nvram: add .read_post_process() for MACs")
  103066fdb0de ("dt-bindings: nvmem: sunplus,sp7021-ocotp: drop unneeded address/size-cells")
  17baab60780b ("nvmem: rockchip-otp: Improve probe error handling")
  1bef72e31567 ("dt-bindings: nvmem: rmem: Add raspberrypi,bootloader-public-key")
  2881bbe70740 ("dt-bindings: nvmem: qcom,spmi-sdam: drop unneeded address/size-cells")
  366916db4af4 ("nvmem: imx-ocotp: Reverse MAC addresses on all i.MX derivates")
  3a0134e21d90 ("nvmem: rockchip-otp: Add support for RK3588")
  426b30ed585c ("dt-bindings: nvmem: qcom,qfprom: drop unneeded address/size-cells")
  42d033c4e47b ("dt-bindings: nvmem: imx-ocotp: support i.MX93")
  4d0c9ce1a7a2 ("dt-bindings: nvmem: layouts: add fixed-layout")
  4d47e9a76d5f ("nvmem: imx: support i.MX93 OCOTP")
  5dede99d255a ("dt-bindings: nvmem: Convert rockchip-otp.txt to dt-schema")
  619b1fa6c76c ("nvmem: rmem: Use NVMEM_DEVID_AUTO")
  6c1eb6948575 ("dt-bindings: nvmem: mxs-ocotp: drop unneeded address/size-cells")
  71f1b0883907 ("nvmem: rockchip-otp: Add clks and reg_read to rockchip_data")
  75dd9c7a421a ("dt-bindings: nvmem: convert base example to use NVMEM fixed cells layout")
  945b20bee348 ("nvmem: imx-ocotp: set varaiable imx_ocotp_layout storage-class-specifier to static")
  ac1c0d15aedc ("nvmem: core: add support for fixed cells *layout*")
  bb7a2f40d773 ("dt-bindings: nvmem: socionext,uniphier-efuse: drop unneeded address/size-cells")
  cdaa055cdc73 ("dt-bindings: nvmem: rockchip,otp: Add compatible for RK3588")
  da5c9b4fcf32 ("nvmem: rockchip-otp: Generalize rockchip_otp_wait_status()")
  e86fba9eb891 ("nvmem: rockchip-otp: Use devm_reset_control_array_get_exclusive()")
  f724ffe47544 ("dt-bindings: nvmem: brcm,nvram: add #nvmem-cell-cells for MACs")
  fe0b59882c02 ("nvmem: zynqmp: Switch @xilinx.com emails to @amd.com")

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the nvmem tree

[Stephen Rothwell]

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

Hi all,

The following commits are also in Linus Torvalds' tree as different
commits (but the same patches):

  16faa4d80802 ("dt-bindings: nvmem: convert amlogic-efuse.txt to dt-schema")
  1fc7a13bb731 ("dt-bindings: nvmem: Drop unneeded quotes")
  288c1a9fe80c ("nvmem: u-boot-env: post-process "ethaddr" env variable")
  2a2d632546b0 ("nvmem: mtk-efuse: Support postprocessing for GPU speed binning data")
  31041798820c ("dt-bindings: nvmem: qcom,spmi-sdam: fix example 'reg' property")
  31193db9eb5a ("MAINTAINERS: add myself as sl28vpd nvmem layout driver")
  3d1431431ce2 ("nvmem: layouts: sl28vpd: set varaiable sl28vpd_layout storage-class-specifier to static")
  3d6ee188e379 ("nvmem: core: provide own priv pointer in post process callback")
  428773c09cff ("nvmem: nintendo-otp: Use devm_platform_ioremap_resource()")
  4918e974941f ("dt-bindings: nvmem: Add compatible for SM6375")
  4976f5118fad ("nvmem: core: add per-cell post processing")
  4e0fded75a6b ("nvmem: stm32-romem: mark OF related data as maybe unused")
  4ea39c120414 ("dt-bindings: nvmem: convert amlogic-meson-mx-efuse.txt to dt-schema")
  5c859c752509 ("of: Move of_modalias() to module.c")
  5ffaa8952e8a ("of: Fix modalias string generation")
  6861ff20b635 ("MAINTAINERS: Add myself as ONIE tlv NVMEM layout maintainer")
  6c0ba03da802 ("nvmem: core: introduce NVMEM layouts")
  767af398b9b2 ("nvmem: core: allow to modify a cell before adding it")
  78872a4a8d11 ("of: Rename of_modalias_node()")
  7a7370e37795 ("nvmem: bcm-ocotp: Use devm_platform_ioremap_resource()")
  7f34d9b1e9fa ("dt-bindings: nvmem: Add compatible for SM6350")
  819e1c034bf5 ("nvmem: imx-ocotp: replace global post processing with layouts")
  8311c5234776 ("nvmem: core: support specifying both: cell raw data & post read lengths")
  85dadc8012c6 ("of: Update of_device_get_modalias()")
  93797d122cc9 ("nvmem: cell: drop global cell_post_process")
  98cc732187db ("nvmem: core: handle the absence of expected layouts")
  a000203f2348 ("usb: ulpi: Use of_request_module()")
  a7c3fcac3703 ("firmware: xilinx: nvmem: zynqmp: make modular")
  ac9c852c8eda ("nvmem: layouts: sl28vpd: Add new layout driver")
  b06041e2f94b ("nvmem: core: request layout modules loading")
  c60363be9b76 ("nvmem: layouts: onie-tlv: Drop wrong module alias")
  c90221f303ba ("dt-bindings: nvmem: u-boot,env: add MAC's #nvmem-cell-cells")
  cd804ecf3da6 ("of: Move the request module helper logic to module.c")
  ddeb62c833fb ("nvmem: layouts: onie-tlv: Add new layout driver")
  e61131ac0765 ("of: device: Kill of_device_request_module()")
  ed688cdd43e0 ("nvmem: layouts: sl28vpd: Use module_nvmem_layout_driver()")
  f37f76f47c8e ("nvmem: layouts: onie-tlv: Use module_nvmem_layout_driver()")
  f4276728c089 ("nvmem: vf610-ocotp: Use devm_platform_get_and_ioremap_resource()")
  f55b96d3f8b9 ("nvmem: Add macro to register nvmem layout drivers")
  f77d82b82db1 ("dt-bindings: nvmem: Fix spelling mistake "platforn" -> "platform"")

-- 
Cheers,
Stephen Rothwell

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

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

[Stephen Rothwell]

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

Hi,

On Mon, 6 Feb 2023 08:32:15 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> The following commits are also in Linus Torvalds' tree as different
> commits (but the same patches):
> 
>   03b6f71ceeb1 ("nvmem: core: fix cleanup after dev_set_name()")
>   6b868c1a2ec0 ("nvmem: sunxi_sid: Always use 32-bit MMIO reads")
>   957b1f840ce0 ("nvmem: brcm_nvram: Add check for kzalloc")
>   9afef75ce71c ("nvmem: core: remove nvmem_config wp_gpio")
>   a895af2746e3 ("nvmem: core: fix return value")
>   b02c75889942 ("nvmem: core: fix registration vs use race")
>   b3a9be9040b7 ("nvmem: core: initialise nvmem->id early")
>   ba716d020bc8 ("nvmem: qcom-spmi-sdam: fix module autoloading")
>   c976fd0b6970 ("nvmem: core: fix device node refcounting")
>   ee29286033ef ("nvmem: core: fix cell removal on error")

This duplication has now started causing conflicts ... please clean up
your tree now that v6.3-rc1 is out.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the nvmem tree

[Stephen Rothwell]

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

Hi all,

The following commits are also in Linus Torvalds' tree as different
commits (but the same patches):

  03b6f71ceeb1 ("nvmem: core: fix cleanup after dev_set_name()")
  6b868c1a2ec0 ("nvmem: sunxi_sid: Always use 32-bit MMIO reads")
  957b1f840ce0 ("nvmem: brcm_nvram: Add check for kzalloc")
  9afef75ce71c ("nvmem: core: remove nvmem_config wp_gpio")
  a895af2746e3 ("nvmem: core: fix return value")
  b02c75889942 ("nvmem: core: fix registration vs use race")
  b3a9be9040b7 ("nvmem: core: initialise nvmem->id early")
  ba716d020bc8 ("nvmem: qcom-spmi-sdam: fix module autoloading")
  c976fd0b6970 ("nvmem: core: fix device node refcounting")
  ee29286033ef ("nvmem: core: fix cell removal on error")

-- 
Cheers,
Stephen Rothwell

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