generic: 6.6: refresh pending patches

Refresh pending patches with make target/linux/refresh.

Signed-off-by: Weijie Gao <hackpascal@gmail.com>
This commit is contained in:
Weijie Gao
2024-03-08 22:04:14 +08:00
committed by Robert Marko
parent 6bac820c0f
commit 293caa16a0
88 changed files with 293 additions and 293 deletions

View File

@@ -8,7 +8,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- a/drivers/mtd/ubi/block.c
+++ b/drivers/mtd/ubi/block.c
@@ -644,10 +644,47 @@ match_volume_desc(struct ubi_volume_info
@@ -609,10 +609,47 @@ match_volume_desc(struct ubi_volume_info
return true;
}
@@ -56,7 +56,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
struct ubiblock_param *p;
/*
@@ -660,6 +697,7 @@ ubiblock_create_from_param(struct ubi_vo
@@ -625,6 +662,7 @@ ubiblock_create_from_param(struct ubi_vo
if (!match_volume_desc(vi, p->name, p->ubi_num, p->vol_id))
continue;
@@ -64,7 +64,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
ret = ubiblock_create(vi);
if (ret) {
pr_err(
@@ -668,6 +706,10 @@ ubiblock_create_from_param(struct ubi_vo
@@ -633,6 +671,10 @@ ubiblock_create_from_param(struct ubi_vo
}
break;
}