aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm53xx
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2023-02-23 09:47:39 +0100
committerRafał Miłecki <rafal@milecki.pl>2023-02-23 09:50:01 +0100
commitb4ae914037e0ce900be53525c7058543e1ff9d64 (patch)
tree631c15108b7b201aa9f105f09029bdad4ef24a98 /target/linux/bcm53xx
parent9837f81baedaeda6a334d5ffead7bc1c731ae2df (diff)
downloadupstream-b4ae914037e0ce900be53525c7058543e1ff9d64.tar.gz
upstream-b4ae914037e0ce900be53525c7058543e1ff9d64.tar.bz2
upstream-b4ae914037e0ce900be53525c7058543e1ff9d64.zip
kernel: backport NVMEM late fixes from v6.2
They were backported to stable kernels but we backport more stuff on our own so we have to pick up few remaining. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/bcm53xx')
-rw-r--r--target/linux/bcm53xx/patches-5.10/800-0002-nvmem-brcm_nvram-provide-NVMEM-content-to-the-NVRAM-.patch2
-rw-r--r--target/linux/bcm53xx/patches-5.15/800-0002-nvmem-brcm_nvram-provide-NVMEM-content-to-the-NVRAM-.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/bcm53xx/patches-5.10/800-0002-nvmem-brcm_nvram-provide-NVMEM-content-to-the-NVRAM-.patch b/target/linux/bcm53xx/patches-5.10/800-0002-nvmem-brcm_nvram-provide-NVMEM-content-to-the-NVRAM-.patch
index ecc5f3974e..6648874bcf 100644
--- a/target/linux/bcm53xx/patches-5.10/800-0002-nvmem-brcm_nvram-provide-NVMEM-content-to-the-NVRAM-.patch
+++ b/target/linux/bcm53xx/patches-5.10/800-0002-nvmem-brcm_nvram-provide-NVMEM-content-to-the-NVRAM-.patch
@@ -20,7 +20,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
#include <linux/io.h>
#include <linux/mod_devicetable.h>
#include <linux/module.h>
-@@ -136,6 +137,8 @@ static int brcm_nvram_probe(struct platf
+@@ -139,6 +140,8 @@ static int brcm_nvram_probe(struct platf
if (err)
return err;
diff --git a/target/linux/bcm53xx/patches-5.15/800-0002-nvmem-brcm_nvram-provide-NVMEM-content-to-the-NVRAM-.patch b/target/linux/bcm53xx/patches-5.15/800-0002-nvmem-brcm_nvram-provide-NVMEM-content-to-the-NVRAM-.patch
index ecc5f3974e..6648874bcf 100644
--- a/target/linux/bcm53xx/patches-5.15/800-0002-nvmem-brcm_nvram-provide-NVMEM-content-to-the-NVRAM-.patch
+++ b/target/linux/bcm53xx/patches-5.15/800-0002-nvmem-brcm_nvram-provide-NVMEM-content-to-the-NVRAM-.patch
@@ -20,7 +20,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
#include <linux/io.h>
#include <linux/mod_devicetable.h>
#include <linux/module.h>
-@@ -136,6 +137,8 @@ static int brcm_nvram_probe(struct platf
+@@ -139,6 +140,8 @@ static int brcm_nvram_probe(struct platf
if (err)
return err;