From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sylwester Nawrocki Subject: Re: [PATCH 00/14] V4L2 DT support Date: Fri, 05 Oct 2012 14:32:04 +0200 Message-ID: <506ED344.2020407@gmail.com> References: <1348754853-28619-1-git-send-email-g.liakhovetski@gmx.de> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1348754853-28619-1-git-send-email-g.liakhovetski@gmx.de> Sender: linux-sh-owner@vger.kernel.org To: Guennadi Liakhovetski Cc: linux-media@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, Laurent Pinchart , Hans Verkuil , Magnus Damm , linux-sh@vger.kernel.org, Mark Brown , Stephen Warren , Arnd Bergmann , Grant Likely List-Id: devicetree@vger.kernel.org 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. ...(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