aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2022-01-30 20:25:58 +0000
committerDaniel Golle <daniel@makrotopia.org>2022-02-01 23:34:07 +0000
commitb9736cb78c508dfeda7178973fe4fb9eb12c6a1b (patch)
tree2a51c287b5263d8099ee5e30d8f06fe12337d55f /target
parent1343acc8cd9e5c4206c2f65f1897c7be5660f046 (diff)
downloadupstream-b9736cb78c508dfeda7178973fe4fb9eb12c6a1b.tar.gz
upstream-b9736cb78c508dfeda7178973fe4fb9eb12c6a1b.tar.bz2
upstream-b9736cb78c508dfeda7178973fe4fb9eb12c6a1b.zip
kernel: bump 5.10 to 5.10.95
Patches automatically rebased. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target')
-rw-r--r--target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch4
-rw-r--r--target/linux/pistachio/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch4
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch
index b85ecef383..3beca822b5 100644
--- a/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch
+++ b/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch
@@ -10,7 +10,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
-@@ -3189,6 +3189,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -3147,6 +3147,7 @@ int spi_nor_scan(struct spi_nor *nor, co
struct device *dev = nor->dev;
struct mtd_info *mtd = &nor->mtd;
struct device_node *np = spi_nor_get_flash_node(nor);
@@ -18,7 +18,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
int ret;
int i;
-@@ -3243,7 +3244,12 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -3201,7 +3202,12 @@ int spi_nor_scan(struct spi_nor *nor, co
if (ret)
return ret;
diff --git a/target/linux/pistachio/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/pistachio/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch
index b85ecef383..3beca822b5 100644
--- a/target/linux/pistachio/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch
+++ b/target/linux/pistachio/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch
@@ -10,7 +10,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
-@@ -3189,6 +3189,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -3147,6 +3147,7 @@ int spi_nor_scan(struct spi_nor *nor, co
struct device *dev = nor->dev;
struct mtd_info *mtd = &nor->mtd;
struct device_node *np = spi_nor_get_flash_node(nor);
@@ -18,7 +18,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
int ret;
int i;
-@@ -3243,7 +3244,12 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -3201,7 +3202,12 @@ int spi_nor_scan(struct spi_nor *nor, co
if (ret)
return ret;