Re: davinci vs. v4l2: lots of conflicts in merge for linux-next

2009-08-28 Thread Kevin Hilman
Karicheri, Muralidharan m-kariche...@ti.com writes: Kevin, Ok, I see you have merged vpif capture architecture part to master branch of davinci. So what you are suggesting is to remove all vpif/vpfe patches from arch/arm/davinci of v4l linux-next tree (So I guess this is what Mauro

davinci vs. v4l2: lots of conflicts in merge for linux-next

2009-08-26 Thread Kevin Hilman
OK, this has gotten a bit out of control, to the point where I cannot solve this myself. This is partially due to me being on the road and not keeping a close enough eye on the various video patches. I've pushed a new 'davinci-next' branch to davinci git[1] which is what I would like to make

RE: davinci vs. v4l2: lots of conflicts in merge for linux-next

2009-08-26 Thread Karicheri, Muralidharan
Kevin, Ok, I see you have merged vpif capture architecture part to master branch of davinci. So what you are suggesting is to remove all vpif/vpfe patches from arch/arm/davinci of v4l linux-next tree (So I guess this is what Mauro should do on linux-next). So architecture part of all future

Re: davinci vs. v4l2: lots of conflicts in merge for linux-next

2009-08-26 Thread Mauro Carvalho Chehab
Em Wed, 26 Aug 2009 11:00:22 -0500 Karicheri, Muralidharan m-kariche...@ti.com escreveu: Kevin, Ok, I see you have merged vpif capture architecture part to master branch of davinci. So what you are suggesting is to remove all vpif/vpfe patches from arch/arm/davinci of v4l linux-next

Re: davinci vs. v4l2: lots of conflicts in merge for linux-next

2009-08-26 Thread Mauro Carvalho Chehab
Em Wed, 26 Aug 2009 12:00:11 +0300 Kevin Hilman khil...@deeprootsystems.com escreveu: OK, this has gotten a bit out of control, to the point where I cannot solve this myself. This is partially due to me being on the road and not keeping a close enough eye on the various video patches. I've