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/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.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/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch')
| -rw-r--r-- | target/linux/generic/pending-5.10/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-5.10/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch b/target/linux/generic/pending-5.10/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch index 2748192dd2..b79c6bb3de 100644 --- a/target/linux/generic/pending-5.10/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch +++ b/target/linux/generic/pending-5.10/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch @@ -39,7 +39,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> endif # MTD_SPI_NOR --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c -@@ -2792,6 +2792,21 @@ static void spi_nor_info_init_params(str +@@ -2801,6 +2801,21 @@ static void spi_nor_info_init_params(str */ erase_mask = 0; i = 0; @@ -61,7 +61,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (info->flags & SECT_4K_PMC) { erase_mask |= BIT(i); spi_nor_set_erase_type(&map->erase_type[i], 4096u, -@@ -2803,6 +2818,7 @@ static void spi_nor_info_init_params(str +@@ -2812,6 +2827,7 @@ static void spi_nor_info_init_params(str SPINOR_OP_BE_4K); i++; } |