* Li Zefan <lizf@xxxxxxxxxxxxxx> wrote: > Hi Ingo, > > Though Carl <chlunde@xxxxxxxxxxx>'s patch has been applied, > (a4b3ada83d06554d307dd54abdc62b2e5648264a), this patch hasn't > been dropped, thus the code in -tip looks like: > > static ssize_t blk_msg_write(...) > { > ... > if (copy_from_user(msg, buffer, count)) { > kfree(msg); > return -EFAULT; > } > msg[count] = '\0'; <--- > > msg[count] = '\0'; <--- > ... > } indeed - that's a (harmless) merge artifact in tip/master, it has not propagated into the tracing topics and will go away on the next reintegration. Thanks for letting me know, i'll keep an eye on it. Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html