From b9736cb78c508dfeda7178973fe4fb9eb12c6a1b Mon Sep 17 00:00:00 2001 From: Rui Salvaterra Date: Sun, 30 Jan 2022 20:25:58 +0000 Subject: [PATCH] kernel: bump 5.10 to 5.10.95 Patches automatically rebased. Signed-off-by: Rui Salvaterra --- include/kernel-5.10 | 4 ++-- .../401-mtd-nor-support-mtd-name-from-device-tree.patch | 4 ++-- .../401-mtd-nor-support-mtd-name-from-device-tree.patch | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/kernel-5.10 b/include/kernel-5.10 index 46fe028757b..b21ac55771e 100644 --- a/include/kernel-5.10 +++ b/include/kernel-5.10 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.10 = .94 -LINUX_KERNEL_HASH-5.10.94 = 28ff44aa4a9a8a1ea52ae74e448da6174ca4ff042ddc202e36b157c951cd7508 +LINUX_VERSION-5.10 = .95 +LINUX_KERNEL_HASH-5.10.95 = c8d9daf94e2784ddc9cbb49936c89a20415aa02faa2c4ab4a832ab6d8c63fc23 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 b85ecef3837..3beca822b58 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 --- 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 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 b85ecef3837..3beca822b58 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 --- 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 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; -- 2.30.2