aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm63xx/patches-5.10
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2021-07-14 17:42:28 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2021-07-17 13:27:03 +0200
commitb71767d8e047b06668ca8b7b7922f6df238ab659 (patch)
tree87915374bb00d4482bce6e654b1d4a0876c3d347 /target/linux/bcm63xx/patches-5.10
parent2e324c0a2c927461ab74f688fd878dce8fa52af2 (diff)
downloadupstream-b71767d8e047b06668ca8b7b7922f6df238ab659.tar.gz
upstream-b71767d8e047b06668ca8b7b7922f6df238ab659.tar.bz2
upstream-b71767d8e047b06668ca8b7b7922f6df238ab659.zip
kernel: bump 5.10 to 5.10.50
No deleted or manually refreshed patches. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/bcm63xx/patches-5.10')
-rw-r--r--target/linux/bcm63xx/patches-5.10/400-bcm963xx_flashmap.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/bcm63xx/patches-5.10/400-bcm963xx_flashmap.patch b/target/linux/bcm63xx/patches-5.10/400-bcm963xx_flashmap.patch
index f57950b44a..5a9532c321 100644
--- a/target/linux/bcm63xx/patches-5.10/400-bcm963xx_flashmap.patch
+++ b/target/linux/bcm63xx/patches-5.10/400-bcm963xx_flashmap.patch
@@ -23,7 +23,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
.width = 2,
--- a/drivers/mtd/parsers/redboot.c
+++ b/drivers/mtd/parsers/redboot.c
-@@ -79,6 +79,7 @@ static int parse_redboot_partitions(stru
+@@ -84,6 +84,7 @@ static int parse_redboot_partitions(stru
int nulllen = 0;
int numslots;
unsigned long offset;
@@ -31,7 +31,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
static char nullstring[] = "unallocated";
#endif
-@@ -185,6 +186,16 @@ static int parse_redboot_partitions(stru
+@@ -190,6 +191,16 @@ static int parse_redboot_partitions(stru
goto out;
}
@@ -48,7 +48,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
for (i = 0; i < numslots; i++) {
struct fis_list *new_fl, **prev;
-@@ -205,10 +216,10 @@ static int parse_redboot_partitions(stru
+@@ -210,10 +221,10 @@ static int parse_redboot_partitions(stru
goto out;
}
new_fl->img = &buf[i];