Hello Arun, I've tried again after receiving your mail. It seems to be weired but it works this time. Difference between last time is I cloned linux-omap repo again and tried pulled Sakari's repo into that. It could be my fault maybe ;( Strange day. Sorry for making you confused. Nate On Mon, Mar 9, 2009 at 7:18 PM, Arun KS <getarunks@xxxxxxxxx> wrote: > 2009/3/9 DongSoo(Nathaniel) Kim <dongsoo.kim@xxxxxxxxx>: >> Hi Sakari, >> >> I've been trying to pull your gitorious patchset into my linux-omap >> repository (which is completely clean and up-to-date), but I'm having >> some problem. >> Please find following messages. I captured my git repository messages. >> >> kdsoo@chromatix:/home/share/GIT/OMAP_REF/kernel_org/linux-omap-2.6$ git pull >> >> Already up-to-date. >> >> kdsoo@chromatix:/home/share/GIT/OMAP_REF/kernel_org/linux-omap-2.6$ git status >> >> # On branch master >> >> nothing to commit (working directory clean) >> >> kdsoo@chromatix:/home/share/GIT/OMAP_REF/kernel_org/linux-omap-2.6$ >> git pull http://git.gitorious.org/omap3camera/mainline.git v4l iommu >> omap3camera base >> >> error: Could not read 5b007183d51543624bc9f582966f245a64157b57 >> >> error: Could not read fa8977215db5ab6139379e95efc193e45833afa3 >> >> error: Could not read 7de046a6a8446358001c38ad1d0b2b829ca0c98c >> >> error: Could not read 5b007183d51543624bc9f582966f245a64157b57 >> >> Unable to find common commit with dc05ee10583dca44e0f8d4109bd1397ee3c5ffae >> >> Automatic merge failed; fix conflicts and then commit the result. >> >> >> >> >> I guess other people should also have the same issue with it. or am I >> doing wrong way? >> Please let me know > > Hi Nate, > > I tried this git pull git://git.gitorious.org/omap3camera/mainline.git > v4l iommu omap3camera base > and it works for me. > > Thanks, > Arun >> >> >> On Sat, Mar 7, 2009 at 12:32 AM, Sakari Ailus >> <sakari.ailus@xxxxxxxxxxxxxxxxxxxxxxxxxx> wrote: >>> Hi, >>> >>> I've updated the patchset in Gitorious. >>> >>> <URL:http://www.gitorious.org/projects/omap3camera> >>> >>> Changes include >>> >>> - Power management support. ISP suspend/resume should work now. >>> >>> - Reindented and cleaned up everything. There are still some warnings from >>> checkpatch.pl from the CSI2 code. >>> >>> - Fix for crash in device registration, posted to list already. (Thanks, >>> Vaibhav, Alexey!) >>> >>> - LSC errors should be handled properly now. >>> >>> I won't post the modified patches to the list this time since I guess it >>> wouldn't be much of use, I guess. Or does someone want that? :) >>> >>> -- >>> Sakari Ailus >>> sakari.ailus@xxxxxxxxxxxxxxxxxxxxxxxxxx >>> >> >> >> >> -- >> ======================================================== >> DongSoo(Nathaniel), Kim >> Engineer >> Mobile S/W Platform Lab. S/W Team. >> DMC >> 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 >> > -- ======================================================== 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
