Hi Sakari, I'm also having problem pulling your git now. I've pulled prior version of yours and this is second time of pulling your repository. Here you are a part of git diff message of mine after pulling your TUESDAY MARCH 10 version. Looks like all about indent thing. What should I do? If I want to pull your repository in my repository and merging automatically. I don't have any clue ;-( kdsoo@chromatix:/home/share/GIT/OMAP3430/linux-2.6.29-rc3-omap_sakari$ git diff diff --cc drivers/media/video/isp/isp.c index 12a545c,54c839b..0000000 --- a/drivers/media/video/isp/isp.c +++ b/drivers/media/video/isp/isp.c @@@ -47,7 -47,7 +47,11 @@@ static struct isp_device *omap3isp; static int isp_try_size(struct v4l2_pix_format *pix_input, ++<<<<<<< .merge_file_S5fkv9 + struct v4l2_pix_format *pix_output); ++======= + struct v4l2_pix_format *pix_output); ++>>>>>>> .merge_file_ygq1qZ On Tue, Mar 10, 2009 at 6:07 PM, Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxxxxxxxxxxxxx> wrote: > Aguirre Rodriguez, Sergio Alberto wrote: >> >> Hi Sakari, > > Hello, Sergio! > >> Doing a pull like you suggested in past release: >> $ git pull http://git.gitorious.org/omap3camera/mainline.git v4l \ >> iommu omap3camera base >> >> Brings the same code than before... > > Oops. Could you try again now? > >> I see that omap3isp branch is updated on gitorious, but trying to pull >> that branch gives merge errors. > > Are you pulling it on top of linux-omap? > > I've replaced the whole patchset so git tries to apply the new patches on > top of the old ones. > > -- > Sakari Ailus > sakari.ailus@xxxxxxxxxxxxxxxxxxxxxxxxxx > -- ======================================================== DongSoo, Nathaniel Kim Engineer Mobile S/W Platform Lab. Digital Media & Communications R&D Centre Samsung Electronics CO., LTD. e-mail : dongsoo.kim@xxxxxxxxx dongsoo45.kim@xxxxxxxxxxx ======================================================== -- 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
