From 4209c33ae27d6bb53722e79d7c1a696ea02e25ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Mon, 22 Aug 2022 22:45:53 +0200 Subject: kernel: bump 5.10 to 5.10.137 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removed following upstreamed patch: * bcm53xx: 081-next-ARM_dts_BCM53015-add-mr26.patch All other patches automagically rebased. Signed-off-by: Petr Štetiar (cherry picked from commit d1163fd13f6498826d202f0b58cedf32d7891d52) --- target/linux/ath25/patches-5.10/141-redboot_partition_scan.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/ath25/patches-5.10/141-redboot_partition_scan.patch') diff --git a/target/linux/ath25/patches-5.10/141-redboot_partition_scan.patch b/target/linux/ath25/patches-5.10/141-redboot_partition_scan.patch index 343eedc075..68019f90ea 100644 --- a/target/linux/ath25/patches-5.10/141-redboot_partition_scan.patch +++ b/target/linux/ath25/patches-5.10/141-redboot_partition_scan.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/parsers/redboot.c +++ b/drivers/mtd/parsers/redboot.c -@@ -93,12 +93,18 @@ static int parse_redboot_partitions(stru +@@ -94,12 +94,18 @@ static int parse_redboot_partitions(stru parse_redboot_of(master); @@ -19,7 +19,7 @@ return -EIO; } offset -= master->erasesize; -@@ -111,10 +117,6 @@ static int parse_redboot_partitions(stru +@@ -112,10 +118,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); -@@ -187,6 +189,11 @@ static int parse_redboot_partitions(stru +@@ -188,6 +190,11 @@ static int parse_redboot_partitions(stru } if (i == numslots) { /* Didn't find it */ -- cgit v1.2.3