On Mon, Aug 24, 2009 at 6:09 AM, Mauro Carvalho Chehab<mchehab@xxxxxxxxxxxxx> wrote: > Em Thu, 20 Aug 2009 16:27:40 -0500 > "Karicheri, Muralidharan" <m-karicheri2@xxxxxx> escreveu: > >> Kevin & Mauro, >> >> Do I need to wait or this can be resolved by either of you for my work to proceed? > > Murali, > > If I fix your patch in order to apply it on my tree, backporting it to the old > arch header files, we'll have merge troubles upstream, when Kevin merge his > changes. It will also mean that he'll need to apply a diff patch on his tree, > in order to convert the patch to the new headers, and that git bisect may > break. I might merge his tree here, but this means that, if he needs to rebase > his tree (and sometimes people need to rebase their linux-next trees), I'll > have troubles here, and I'll loose my work. > > So, the better solution is if he could apply this specific patch, merging his > tree upstream before your patches. OK, this is applied to DaVinci git master, and will add it to my 'for-next' branch which will be pulled into linux-next. Kevin -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
