Kevin, How do we handle this? Murali Karicheri Software Design Engineer Texas Instruments Inc. Germantown, MD 20874 new phone: 301-407-9583 Old Phone : 301-515-3736 (will be deprecated) email: m-karicheri2@xxxxxx >-----Original Message----- >From: Mauro Carvalho Chehab [mailto:mchehab@xxxxxxxxxxxxx] >Sent: Sunday, August 23, 2009 11:10 PM >To: Karicheri, Muralidharan >Cc: Kevin Hilman; Mauro Carvalho Chehab; linux-media@xxxxxxxxxxxxxxx; Hans >Verkuil >Subject: Re: [PATCH v1 - 1/5] DaVinci - restructuring code to support vpif >capture driver > >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. > >Cheers, >Mauro -- 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
