From aad34818b50029e07ed9221ae46f9770d6e29785 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 15 Apr 2023 01:35:17 +0100 Subject: kernel: backport fix for recently introduced UBI bug Import commit "ubi: Fix failure attaching when vid_hdr offset equals to (sub)page size" which did not yet make it to stable upstream Linux trees. Fixes: #12232 Fixes: #12339 Signed-off-by: Daniel Golle --- .../490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux/generic/pending-5.15') diff --git a/target/linux/generic/pending-5.15/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/pending-5.15/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch index 393308f717..2751da541a 100644 --- a/target/linux/generic/pending-5.15/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch +++ b/target/linux/generic/pending-5.15/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch @@ -8,7 +8,7 @@ Signed-off-by: Daniel Golle --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c -@@ -1191,6 +1191,73 @@ static struct mtd_info * __init open_mtd +@@ -1200,6 +1200,73 @@ static struct mtd_info * __init open_mtd return mtd; } @@ -82,7 +82,7 @@ Signed-off-by: Daniel Golle static int __init ubi_init(void) { int err, i, k; -@@ -1274,6 +1341,12 @@ static int __init ubi_init(void) +@@ -1283,6 +1350,12 @@ static int __init ubi_init(void) } } -- cgit v1.2.3