diff options
author | John Audia <graysky@archlinux.us> | 2021-07-14 18:20:29 -0400 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-07-17 13:21:03 +0200 |
commit | 2fe1b32156a2f28013c2807d1674dd1ced1a6fa1 (patch) | |
tree | 3d76ba0cf1eae9fdf7f2dd8d7a2deb92ce8e09e5 /target/linux/bcm63xx | |
parent | 269e49577b8d8c49a2694cb8e9939822cd7c9eb3 (diff) | |
download | upstream-2fe1b32156a2f28013c2807d1674dd1ced1a6fa1.tar.gz upstream-2fe1b32156a2f28013c2807d1674dd1ced1a6fa1.tar.bz2 upstream-2fe1b32156a2f28013c2807d1674dd1ced1a6fa1.zip |
kernel: bump 5.4 to 5.4.132
Manually rebased:
layerscape/patches-5.4/805-display-0002-drm-rockchip-prepare-common-code-for-cdns-and-rk-dpi.patch
All other patches automatically rebased.
Build system: x86_64
Build-tested: ipq806x/R7800
Run-tested: ipq806x/R7800
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/bcm63xx')
-rw-r--r-- | target/linux/bcm63xx/patches-5.4/400-bcm963xx_flashmap.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/bcm63xx/patches-5.4/400-bcm963xx_flashmap.patch b/target/linux/bcm63xx/patches-5.4/400-bcm963xx_flashmap.patch index f57950b44a..5a9532c321 100644 --- a/target/linux/bcm63xx/patches-5.4/400-bcm963xx_flashmap.patch +++ b/target/linux/bcm63xx/patches-5.4/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]; |