diff options
author | John Audia <therealgraysky@proton.me> | 2022-06-11 08:50:59 -0400 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-06-27 22:34:07 +0200 |
commit | 81530d69ef582124f9cc657edacdca9727e805f8 (patch) | |
tree | acfe6765ab312df7f4b5b1ac513a482c808151be /target/linux/generic/pending-5.10/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch | |
parent | d8d8b82c599bd4578471478d79709bc2e3365630 (diff) | |
download | upstream-81530d69ef582124f9cc657edacdca9727e805f8.tar.gz upstream-81530d69ef582124f9cc657edacdca9727e805f8.tar.bz2 upstream-81530d69ef582124f9cc657edacdca9727e805f8.zip |
kernel: bump 5.10 to 5.10.121
Manually rebased:
oxnas/patches-5.10/100-oxnas-clk-plla-pllb.patch
All other patches automatically rebased.
Build system: x86_64
Build-tested: ipq806x/R7800
Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit 706a4ec40cce108f484b40805bfa48619a0a7f09)
Diffstat (limited to 'target/linux/generic/pending-5.10/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch')
-rw-r--r-- | target/linux/generic/pending-5.10/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/pending-5.10/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch b/target/linux/generic/pending-5.10/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch index eaf96e9534..f7ebedb44e 100644 --- a/target/linux/generic/pending-5.10/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch +++ b/target/linux/generic/pending-5.10/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch @@ -338,7 +338,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com> default y --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c -@@ -1075,6 +1075,8 @@ static u8 spi_nor_convert_3to4_erase(u8 +@@ -1084,6 +1084,8 @@ static u8 spi_nor_convert_3to4_erase(u8 static bool spi_nor_has_uniform_erase(const struct spi_nor *nor) { @@ -347,7 +347,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com> return !!nor->params->erase_map.uniform_erase_type; } -@@ -2560,6 +2562,7 @@ static int spi_nor_select_erase(struct s +@@ -2569,6 +2571,7 @@ static int spi_nor_select_erase(struct s { struct spi_nor_erase_map *map = &nor->params->erase_map; const struct spi_nor_erase_type *erase = NULL; @@ -355,7 +355,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com> struct mtd_info *mtd = &nor->mtd; u32 wanted_size = nor->info->sector_size; int i; -@@ -2592,8 +2595,9 @@ static int spi_nor_select_erase(struct s +@@ -2601,8 +2604,9 @@ static int spi_nor_select_erase(struct s */ for (i = SNOR_ERASE_TYPE_MAX - 1; i >= 0; i--) { if (map->erase_type[i].size) { @@ -367,7 +367,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com> } } -@@ -2601,6 +2605,8 @@ static int spi_nor_select_erase(struct s +@@ -2610,6 +2614,8 @@ static int spi_nor_select_erase(struct s return -EINVAL; mtd->erasesize = erase->size; |