diff options
| author | John Audia <therealgraysky@proton.me> | 2023-01-12 07:19:14 -0500 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-01-13 22:04:22 +0100 |
| commit | 843e3dace75ccd0af1b0c82433f306f4df253082 (patch) | |
| tree | 01a42525387b2121ba071ed1be083fc48e6f76a8 /target/linux/generic/pending-5.15/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch | |
| parent | c051693ef4873162801ebcaff17c55628e6a8482 (diff) | |
| download | upstream-843e3dace75ccd0af1b0c82433f306f4df253082.tar.gz upstream-843e3dace75ccd0af1b0c82433f306f4df253082.tar.bz2 upstream-843e3dace75ccd0af1b0c82433f306f4df253082.zip | |
kernel: bump 5.15 to 5.15.87
Removed upstreamed:
generic/hack-5.15/290-net-dsa-mv88e6xxx-depend-on-PTP-conditionally.patch[1]
Build system: x86_64
Build-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod
Run-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.87&id=945e58bdaf6faf6e3f957d182244fa830acddab4
Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/generic/pending-5.15/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch')
| -rw-r--r-- | target/linux/generic/pending-5.15/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/pending-5.15/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch b/target/linux/generic/pending-5.15/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch index 60605ec05e..f600976065 100644 --- a/target/linux/generic/pending-5.15/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch +++ b/target/linux/generic/pending-5.15/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch @@ -202,7 +202,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com> return !!nor->params->erase_map.uniform_erase_type; } -@@ -2389,6 +2391,7 @@ static int spi_nor_select_erase(struct s +@@ -2391,6 +2393,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; @@ -210,7 +210,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com> struct mtd_info *mtd = &nor->mtd; u32 wanted_size = nor->info->sector_size; int i; -@@ -2421,8 +2424,9 @@ static int spi_nor_select_erase(struct s +@@ -2423,8 +2426,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) { @@ -222,7 +222,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com> } } -@@ -2430,6 +2434,9 @@ static int spi_nor_select_erase(struct s +@@ -2432,6 +2436,9 @@ static int spi_nor_select_erase(struct s return -EINVAL; mtd->erasesize = erase->size; |