Hi Takashi/Randy, Em Tue, 21 Oct 2014 18:15:26 +0200 Takashi Iwai <tiwai@xxxxxxx> escreveu: > At Tue, 21 Oct 2014 14:07:14 -0200, > Mauro Carvalho Chehab wrote: > > > > Em Tue, 21 Oct 2014 17:41:25 +0200 > > Takashi Iwai <tiwai@xxxxxxx> escreveu: > > > > > The "V4L2 in Linux 3.18" should be rather in a new section, as the > > > original commit was intended. > > > > Hi Takashi, > > > > Thanks for the patch, but I just merged one that did exactly that > > (and also added the missing /orderedlist): > > http://git.linuxtv.org/cgit.cgi/media_tree.git/commit/?h=fixes&id=b832e749f0c750b06deece320489e8a9e6ae9e80 > > Oh this conflicts with Randy's fix that has been already on > linux-next... My fix was on top of Randy's commit. Ah, I was not aware that his fix went via some other tree. I understood that the Randy's fix would be dropped in favor of the above patch, but I'm OK with whatever approach is taken. Just let me know if I need to drop the patch I merged there. If you prefer to keep your patch and Takashi one: Acked-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx> Just let me know for me to drop the other patch. Regards, Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
