aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm53xx
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2022-03-08 17:01:48 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2022-03-13 19:24:13 +0100
commit3f5b2d25eef9a252c54adcad18ba65a0d19d69b2 (patch)
treebee277fa320dcb1f1928b9b1aa4ca079b6469b5e /target/linux/bcm53xx
parent9c290ad498326c06a8e9dabe19dfb1b1c709e651 (diff)
downloadupstream-3f5b2d25eef9a252c54adcad18ba65a0d19d69b2.tar.gz
upstream-3f5b2d25eef9a252c54adcad18ba65a0d19d69b2.tar.bz2
upstream-3f5b2d25eef9a252c54adcad18ba65a0d19d69b2.zip
kernel: bump 5.10 to 5.10.104
All patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/bcm53xx')
-rw-r--r--target/linux/bcm53xx/patches-5.10/140-mtd-parsers-trx-parse-firmware-MTD-partitions-only.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/bcm53xx/patches-5.10/140-mtd-parsers-trx-parse-firmware-MTD-partitions-only.patch b/target/linux/bcm53xx/patches-5.10/140-mtd-parsers-trx-parse-firmware-MTD-partitions-only.patch
index fa86303637..e1933e75c7 100644
--- a/target/linux/bcm53xx/patches-5.10/140-mtd-parsers-trx-parse-firmware-MTD-partitions-only.patch
+++ b/target/linux/bcm53xx/patches-5.10/140-mtd-parsers-trx-parse-firmware-MTD-partitions-only.patch
@@ -30,9 +30,9 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
--- a/drivers/mtd/parsers/parser_trx.c
+++ b/drivers/mtd/parsers/parser_trx.c
-@@ -85,6 +85,10 @@ static int parser_trx_parse(struct mtd_i
- uint8_t curr_part = 0, i = 0;
- int err;
+@@ -92,6 +92,10 @@ static int parser_trx_parse(struct mtd_i
+ if (err != 0 && err != -EINVAL)
+ pr_err("failed to parse \"brcm,trx-magic\" DT attribute, using default: %d\n", err);
+ /* Don't parse any failsafe / backup partitions */
+ if (strcmp(mtd->name, "firmware"))