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 others updated automatically.

Compile-tested on: ramips/mt7621
Runtime-tested on: ramips/mt7621

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Hauke Mehrtens
2021-07-18 23:51:48 +02:00
parent 88c8d0a219
commit a1d50e7b45
42 changed files with 131 additions and 131 deletions

View File

@@ -1,6 +1,6 @@
--- a/drivers/mtd/parsers/redboot.c
+++ b/drivers/mtd/parsers/redboot.c
@@ -85,12 +85,18 @@ static int parse_redboot_partitions(stru
@@ -90,12 +90,18 @@ static int parse_redboot_partitions(stru
parse_redboot_of(master);
@@ -19,7 +19,7 @@
return -EIO;
}
offset -= master->erasesize;
@@ -103,10 +109,6 @@ static int parse_redboot_partitions(stru
@@ -108,10 +114,6 @@ static int parse_redboot_partitions(stru
goto nogood;
}
}
@@ -30,7 +30,7 @@
printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n",
master->name, offset);
@@ -179,6 +181,11 @@ static int parse_redboot_partitions(stru
@@ -184,6 +186,11 @@ static int parse_redboot_partitions(stru
}
if (i == numslots) {
/* Didn't find it */