From: Gabor Juhos Date: Tue, 19 Dec 2017 08:11:24 +0000 (+0100) Subject: kernel/4.4: add missing newline character to UBI messages X-Git-Tag: v18.06.0-rc1~1480 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bb51193acd4e1046fe731199a19b46ffcd461de5;p=oweals%2Fopenwrt.git kernel/4.4: add missing newline character to UBI messages A few UBI messages lacks the trailing newline character which leads to ugly lines in the bootlog like this: [ 6.649159] UBI error: no valid UBI magic found inside mtd6[ 6.667751] Freeing unused kernel memory: 2196K Add a newline character to the end of the messages to fix it. After the fix the line from above looks better in the log: [ 6.609182] UBI error: no valid UBI magic found inside mtd6 [ 6.627599] Freeing unused kernel memory: 2132K Signed-off-by: Gabor Juhos --- diff --git a/target/linux/generic/pending-4.4/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/pending-4.4/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch index f08f9b4a7c..b15066f757 100644 --- a/target/linux/generic/pending-4.4/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch +++ b/target/linux/generic/pending-4.4/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch @@ -36,7 +36,7 @@ Signed-off-by: Daniel Golle + /* check for a valid ubi magic */ + err = mtd_read(mtd, 0, 4, &len, (void *) magic); + if (!err && len == 4 && strncmp(magic, "UBI#", 4)) { -+ pr_err("UBI error: no valid UBI magic found inside mtd%d", mtd->index); ++ pr_err("UBI error: no valid UBI magic found inside mtd%d\n", mtd->index); + put_mtd_device(mtd); + return; + } @@ -47,11 +47,11 @@ Signed-off-by: Daniel Golle + mtd->type == MTD_DATAFLASH || + mtd->type == MTD_MLCNANDFLASH) { + mutex_lock(&ubi_devices_mutex); -+ pr_notice("UBI: auto-attach mtd%d", mtd->index); ++ pr_notice("UBI: auto-attach mtd%d\n", mtd->index); + err = ubi_attach_mtd_dev(mtd, UBI_DEV_NUM_AUTO, 0, 0); + mutex_unlock(&ubi_devices_mutex); + if (err < 0) { -+ pr_err("UBI error: cannot attach mtd%d", mtd->index); ++ pr_err("UBI error: cannot attach mtd%d\n", mtd->index); + put_mtd_device(mtd); + } + } diff --git a/target/linux/generic/pending-4.4/494-mtd-ubi-add-EOF-marker-support.patch b/target/linux/generic/pending-4.4/494-mtd-ubi-add-EOF-marker-support.patch index dd5ee306ef..749232a396 100644 --- a/target/linux/generic/pending-4.4/494-mtd-ubi-add-EOF-marker-support.patch +++ b/target/linux/generic/pending-4.4/494-mtd-ubi-add-EOF-marker-support.patch @@ -27,7 +27,7 @@ + return err; + + if (ec_hdr_has_eof(ech)) { -+ pr_notice("UBI: EOF marker found, PEBs from %d will be erased", ++ pr_notice("UBI: EOF marker found, PEBs from %d will be erased\n", + pnum); + ai->eof_found = true; + }