[PATCH 00/14] V4L2 DT support

Guennadi Liakhovetski g.liakhovetski at gmx.de
Sat Oct 6 00:41:14 EST 2012


Hi Sylwester

On Fri, 5 Oct 2012, Sylwester Nawrocki wrote:

> Hi Guennadi,
> 
> Any chance for a GIT tree including this patch series ? I'd like
> to see all these pieces put together and I don't seem to find any
> base tree that this series would have applied cleanly to.

Ok, I pushed the patches to

git://linuxtv.org/gliakhovetski/v4l-dvb.git dt-soc_camera

Please, give it a go.

Thanks
Guennadi

> 
> ...(20121005_media_for_v3.7-dt)$ git am -3 \[PATCH\ *
> Applying: i2c: add dummy inline functions for when CONFIG_OF_I2C(_MODULE) isn't defined
> Applying: of: add a dummy inline function for when CONFIG_OF is not defined
> Applying: OF: make a function pointer argument const
> Applying: media: add V4L2 DT binding documentation
> Applying: media: add a V4L2 OF parser
> Applying: media: soc-camera: prepare for asynchronous client probing
> Applying: media: soc-camera: support deferred probing of clients
> fatal: sha1 information is lacking or useless (drivers/media/platform/soc_camera/soc_camera.c).
> Repository lacks necessary blobs to fall back on 3-way merge.
> Cannot fall back to three-way merge.
> Patch failed at 0007 media: soc-camera: support deferred probing of clients
> When you have resolved this problem run "git am --resolved".
> If you would prefer to skip this patch, instead run "git am --skip".
> To restore the original branch and stop patching run "git am --abort".
> 
> --
> 
> Thanks,
> Sylwester
> 

---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/


More information about the devicetree-discuss mailing list