Subject: [folded-merged] kernel-printk-printkc-enable-boot-delay-for-earlyprintk-fix.patch removed from -mm tree
To: dyoung@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Tue, 12 Nov 2013 14:37:32 -0800
The patch titled
Subject: kernel/printk/printk.c: boot_delay return value fix
has been removed from the -mm tree. Its filename was
kernel-printk-printkc-enable-boot-delay-for-earlyprintk-fix.patch
This patch was dropped because it was folded into kernel-printk-printkc-enable-boot-delay-for-earlyprintk.patch
------------------------------------------------------
From: Dave Young <dyoung@xxxxxxxxxx>
Subject: kernel/printk/printk.c: boot_delay return value fix
Kernel report "Malformed early option boot_delay" because it returns
non-zero value. Move to 'return 0' now because there's no reason it
should return 1.
Signed-off-by: Dave Young <dyoung@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/printk/printk.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN kernel/printk/printk.c~kernel-printk-printkc-enable-boot-delay-for-earlyprintk-fix kernel/printk/printk.c
--- a/kernel/printk/printk.c~kernel-printk-printkc-enable-boot-delay-for-earlyprintk-fix
+++ a/kernel/printk/printk.c
@@ -820,7 +820,7 @@ static int __init boot_delay_setup(char
pr_debug("boot_delay: %u, preset_lpj: %ld, lpj: %lu, "
"HZ: %d, loops_per_msec: %llu\n",
boot_delay, preset_lpj, lpj, HZ, loops_per_msec);
- return 1;
+ return 0;
}
early_param("boot_delay", boot_delay_setup);
_
Patches currently in -mm which might be from dyoung@xxxxxxxxxx are
kernel-printk-printkc-enable-boot-delay-for-earlyprintk.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
