[PATCH v4 1/2] ARM: clk-imx27: Add missing clock for mx2-camera

[Guennadi Liakhovetski]

On Wed, 31 Oct 2012, Fabio Estevam wrote:

> Hi Sascha,
> 
> On Wed, Oct 31, 2012 at 11:16 AM, Sascha Hauer <s.hauer at pengutronix.de> wrote:
> 
> > Quoting yourself:
> >
> >> Forgot to comment: as patch 2 relies on this change, the better, IMHO, is
> >> to send both via the same tree. If you decide to do so, please get arm
> >> maintainer's ack, instead, and we can merge both via my tree.
> >
> > That's why Fabio resent these patches with my Ack. You are free to take
> > these.
> 
> I have just realized that this patch (1/2) will not apply against
> media tree because it does not have commit 27b76486a3 (media:
> mx2_camera: remove cpu_is_xxx by using platform_device_id), which
> changes from mx2_camera.0 to imx27-camera.0.

This is exactly the reason why I wasn't able to merge it. The problem was, 
that this "media: mx2_camera: remove cpu_is_xxx by using 
platform_device_id" patch non-trivially touched both arch/arm/ and 
drivers/media/ directories. And being patch 27/34 I didn't feel like 
asking the author to redo it again:-) This confirms, that it's better to 
avoid such overlapping patches whenever possible.

> So it seems to be better to merge this via arm tree to avoid such conflict.

Thanks
Guennadi

> Regards,
> 
> Fabio Estevam

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