[openwrt/openwrt] kernel: backport upstream brcm_nvram fix for NAND controller

[LEDE Commits]

rmilecki pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/facaa13a3fbd4cbe443e1428e96d5df407e53441

commit facaa13a3fbd4cbe443e1428e96d5df407e53441
Author: Rafał Miłecki <rafal at milecki.pl>
AuthorDate: Sun Dec 17 21:23:44 2023 +0100

    kernel: backport upstream brcm_nvram fix for NAND controller
    
    Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
---
 ...v6.7-0006-nvmem-brcm_nvram-store-a-copy-of-NVRAM-content.patch} | 7 ++++++-
 ...v6.7-0006-nvmem-brcm_nvram-store-a-copy-of-NVRAM-content.patch} | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/target/linux/bcm53xx/patches-5.15/181-nvmem-brcm_nvram-store-a-copy-of-NVRAM-content.patch b/target/linux/generic/backport-5.15/820-v6.7-0006-nvmem-brcm_nvram-store-a-copy-of-NVRAM-content.patch
similarity index 95%
rename from target/linux/bcm53xx/patches-5.15/181-nvmem-brcm_nvram-store-a-copy-of-NVRAM-content.patch
rename to target/linux/generic/backport-5.15/820-v6.7-0006-nvmem-brcm_nvram-store-a-copy-of-NVRAM-content.patch
index cceb3635ac..d49a20599d 100644
--- a/target/linux/bcm53xx/patches-5.15/181-nvmem-brcm_nvram-store-a-copy-of-NVRAM-content.patch
+++ b/target/linux/generic/backport-5.15/820-v6.7-0006-nvmem-brcm_nvram-store-a-copy-of-NVRAM-content.patch
@@ -1,5 +1,6 @@
+From 1e37bf84afacd5ba17b7a13a18ca2bc78aff05c0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal at milecki.pl>
-Date: Thu, 14 Sep 2023 07:59:09 +0200
+Date: Fri, 15 Dec 2023 11:13:58 +0000
 Subject: [PATCH] nvmem: brcm_nvram: store a copy of NVRAM content
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -21,11 +22,15 @@ allocating so much memory check for actual data length.
 
 Link: https://lore.kernel.org/linux-mtd/CACna6rwf3_9QVjYcM+847biTX=K0EoWXuXcSMkJO1Vy_5vmVqA@mail.gmail.com/
 Fixes: 3fef9ed0627a ("nvmem: brcm_nvram: new driver exposing Broadcom's NVRAM")
+Cc:  <Stable at vger.kernel.org>
 Cc: Arınç ÜNAL <arinc.unal at arinc9.com>
 Cc: Florian Fainelli <florian.fainelli at broadcom.com>
 Cc: Scott Branden <scott.branden at broadcom.com>
 Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
 Acked-by: Arınç ÜNAL <arinc.unal at arinc9.com>
+Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla at linaro.org>
+Link: https://lore.kernel.org/r/20231215111358.316727-3-srinivas.kandagatla@linaro.org
+Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
 ---
  drivers/nvmem/brcm_nvram.c | 134 ++++++++++++++++++++++++++-----------
  1 file changed, 94 insertions(+), 40 deletions(-)
diff --git a/target/linux/bcm53xx/patches-6.1/181-nvmem-brcm_nvram-store-a-copy-of-NVRAM-content.patch b/target/linux/generic/backport-6.1/816-v6.7-0006-nvmem-brcm_nvram-store-a-copy-of-NVRAM-content.patch
similarity index 95%
rename from target/linux/bcm53xx/patches-6.1/181-nvmem-brcm_nvram-store-a-copy-of-NVRAM-content.patch
rename to target/linux/generic/backport-6.1/816-v6.7-0006-nvmem-brcm_nvram-store-a-copy-of-NVRAM-content.patch
index cceb3635ac..d49a20599d 100644
--- a/target/linux/bcm53xx/patches-6.1/181-nvmem-brcm_nvram-store-a-copy-of-NVRAM-content.patch
+++ b/target/linux/generic/backport-6.1/816-v6.7-0006-nvmem-brcm_nvram-store-a-copy-of-NVRAM-content.patch
@@ -1,5 +1,6 @@
+From 1e37bf84afacd5ba17b7a13a18ca2bc78aff05c0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal at milecki.pl>
-Date: Thu, 14 Sep 2023 07:59:09 +0200
+Date: Fri, 15 Dec 2023 11:13:58 +0000
 Subject: [PATCH] nvmem: brcm_nvram: store a copy of NVRAM content
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -21,11 +22,15 @@ allocating so much memory check for actual data length.
 
 Link: https://lore.kernel.org/linux-mtd/CACna6rwf3_9QVjYcM+847biTX=K0EoWXuXcSMkJO1Vy_5vmVqA@mail.gmail.com/
 Fixes: 3fef9ed0627a ("nvmem: brcm_nvram: new driver exposing Broadcom's NVRAM")
+Cc:  <Stable at vger.kernel.org>
 Cc: Arınç ÜNAL <arinc.unal at arinc9.com>
 Cc: Florian Fainelli <florian.fainelli at broadcom.com>
 Cc: Scott Branden <scott.branden at broadcom.com>
 Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
 Acked-by: Arınç ÜNAL <arinc.unal at arinc9.com>
+Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla at linaro.org>
+Link: https://lore.kernel.org/r/20231215111358.316727-3-srinivas.kandagatla@linaro.org
+Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
 ---
  drivers/nvmem/brcm_nvram.c | 134 ++++++++++++++++++++++++++-----------
  1 file changed, 94 insertions(+), 40 deletions(-)