Patches automatically rebased.
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
-LINUX_VERSION-5.10 = .94
-LINUX_KERNEL_HASH-5.10.94 = 28ff44aa4a9a8a1ea52ae74e448da6174ca4ff042ddc202e36b157c951cd7508
+LINUX_VERSION-5.10 = .95
+LINUX_KERNEL_HASH-5.10.95 = c8d9daf94e2784ddc9cbb49936c89a20415aa02faa2c4ab4a832ab6d8c63fc23
--- 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);
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;
--- 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);
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;