The patch titled printk: fix wrong format string iter has been added to the -mm tree. Its filename is printk-fix-wrong-format-string-iter.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: printk: fix wrong format string iter From: Zhaolei <zhaolei@xxxxxxxxxxxxxx> printk("%Q"); Output before patch: %QQ Output after patch: %Q Signed-off-by: Zhao Lei <zhaolei@xxxxxxxxxxxxxx> Reviewed-by: Lai Jiangshan <laijs@xxxxxxxxxxxxxx> Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- lib/vsprintf.c | 16 ---------------- 1 file changed, 16 deletions(-) diff -puN lib/vsprintf.c~printk-fix-wrong-format-string-iter lib/vsprintf.c --- a/lib/vsprintf.c~printk-fix-wrong-format-string-iter +++ a/lib/vsprintf.c @@ -1062,13 +1062,6 @@ int vsnprintf(char *buf, size_t size, co if (str < end) *str = '%'; ++str; - if (*fmt) { - if (str < end) - *str = *fmt; - ++str; - } else { - --fmt; - } break; case FORMAT_TYPE_NRCHARS: { @@ -1356,8 +1349,6 @@ do { \ break; case FORMAT_TYPE_INVALID: - if (!*fmt) - --fmt; break; case FORMAT_TYPE_NRCHARS: { @@ -1544,13 +1535,6 @@ int bstr_printf(char *buf, size_t size, if (str < end) *str = '%'; ++str; - if (*fmt) { - if (str < end) - *str = *fmt; - ++str; - } else { - --fmt; - } break; case FORMAT_TYPE_NRCHARS: _ Patches currently in -mm which might be from zhaolei@xxxxxxxxxxxxxx are origin.patch printk-add-support-for-the-of-hh-length-modifier.patch printk-fix-wrong-format-string-iter.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