diff options
| author | Petr Štetiar <ynezz@true.cz> | 2022-08-22 22:45:53 +0200 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2022-08-28 07:24:59 +0200 |
| commit | 4209c33ae27d6bb53722e79d7c1a696ea02e25ad (patch) | |
| tree | 3cdceede555fa6e21fa8b693a578c3cf2890949e /target/linux/bcm63xx | |
| parent | a901a13505e13f2d0e60ceaa85d19feea15d4cd4 (diff) | |
| download | upstream-4209c33ae27d6bb53722e79d7c1a696ea02e25ad.tar.gz upstream-4209c33ae27d6bb53722e79d7c1a696ea02e25ad.tar.bz2 upstream-4209c33ae27d6bb53722e79d7c1a696ea02e25ad.zip | |
kernel: bump 5.10 to 5.10.137
Removed following upstreamed patch:
* bcm53xx: 081-next-ARM_dts_BCM53015-add-mr26.patch
All other patches automagically rebased.
Signed-off-by: Petr Štetiar <ynezz@true.cz>
(cherry picked from commit d1163fd13f6498826d202f0b58cedf32d7891d52)
Diffstat (limited to 'target/linux/bcm63xx')
| -rw-r--r-- | target/linux/bcm63xx/patches-5.10/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch | 2 | ||||
| -rw-r--r-- | target/linux/bcm63xx/patches-5.10/400-bcm963xx_flashmap.patch | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/bcm63xx/patches-5.10/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch b/target/linux/bcm63xx/patches-5.10/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch index 045a3bc826..47677075ed 100644 --- a/target/linux/bcm63xx/patches-5.10/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch +++ b/target/linux/bcm63xx/patches-5.10/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch @@ -99,7 +99,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> if (ret < 0) { pr_err("%s: failed to add hogs for %pOF\n", __func__, rd->dn); -@@ -1035,9 +1045,11 @@ int of_gpiochip_add(struct gpio_chip *ch +@@ -1037,9 +1047,11 @@ int of_gpiochip_add(struct gpio_chip *ch of_node_get(chip->of_node); 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 5a9532c321..bb43576b85 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 -@@ -84,6 +84,7 @@ static int parse_redboot_partitions(stru +@@ -85,6 +85,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 -@@ -190,6 +191,16 @@ static int parse_redboot_partitions(stru +@@ -191,6 +192,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; -@@ -210,10 +221,10 @@ static int parse_redboot_partitions(stru +@@ -211,10 +222,10 @@ static int parse_redboot_partitions(stru goto out; } new_fl->img = &buf[i]; |