On Sun, 20 Sep 2009, Mauro Carvalho Chehab wrote: > Em Sun, 20 Sep 2009 10:57:34 +0200 (CEST) > Guennadi Liakhovetski <g.liakhovetski@xxxxxx> escreveu: > > > Hi Mauro > > > > On Sat, 19 Sep 2009, Mauro Carvalho Chehab wrote: > > > > > Em Sat, 19 Sep 2009 01:06:02 -0300 > > > Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx> escreveu: > > > > > > > Hi Guennadi, > > > > > > > > I'm about to send our pull request. > > > > > > > > While doing my last checks, I noticed a difference between our tree and > > > > upstream. I'm not sure what happens. Could you please check? > > > > > > > > The enclosed patch is the diff from upstream to -hg. > > > > > > Ok, I discovered the cause of the conflict: > > > git patch 6d1386c6b8db54ac8d94c01194e0c27cd538532b were applied before the > > > soc_camera conversion to v4l dev/subdev. > > > > > > I've applied the patch on our development tree. Still, we have a few diffs, > > > probably meaning that I solved it at the wrong way at git. > > > > No, please, don't change anything in our trees. Pual should have pushed > > his tree after v4l to Linus, but he has done it before. The idea is we > > should push our tree as is and then solve the conflict on merge. That > > should be easy. But if you start patching the v4l tree, that can make > > things much more complicated. BTW, your patch below is not the correct > > fix. > > That patch bellow is the diff between -hg tree and what we have at -git, after the > conflict solve. If it is wrong, it shows that the conflict were solved in a wrong > direction. Both your and Magnus patch touched at the same context lines of the > code, making the resolution not trivial. > > If that patch is not correct, we need to apply it on our tree and write a patch > fixing it. The fix patch should be then added at another git push request. Paul Mundt (added to CC), the maintainer of the sh Linux port is aware of the problem and has a correct fix, and will take care of it, he also suggested, that we should just push our current state, have I understood it right, Paul? Thanks Guennadi --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/ -- 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
