Re: [PATCH 1/9] ARM: dts: imx6qdl: remove the use of pingrp macros

On Mon, Jan 27, 2014 at 03:16:39PM +0000, Russell King - ARM Linux wrote:

On Mon, Jan 27, 2014 at 11:05:11PM +0800, Shawn Guo wrote:

quoted

On Mon, Jan 27, 2014 at 02:37:45PM +0000, Russell King - ARM Linux wrote:

quoted

On Sun, Jan 26, 2014 at 12:43:03AM +0800, Shawn Guo wrote:

quoted

 arch/arm/boot/dts/imx6dl-hummingboard.dts  |    5 +-
 arch/arm/boot/dts/imx6qdl-microsom.dtsi    |    5 +-

I've merged your changes here into my local copy of these just to reduce
the conflicts - unfortunately, it's taken soo long to deal with the above
that the cubox-i has now been released, which has prompted some
reorganisation between the above two files.

I would much rather you dropped these two entirely, and let me push them
upstream, rather than having some nasty conflicts which result from this.

So you're basically asking me to drop patch [1] from imx/dt branch (tag
imx-dt-3.14), which I have sent to Olof for 3.14 inclusion.  Yes, I
still hope Olof can pull it with this turn-around series applied on top.
So please let's wait for Olof's word to see if we can make it.  If it's
still a NO for some reason, I will be certainly fine with you pushing
hummingboard stuff upstream, and will drop it from my tree.

My point is that the DT files I _now_ have are quite different in
organisation to the ones I submitted to you, so there's going to be
conflicts if your version goes in.

Moreover, I don't want the old ones in 3.14 as-is, because I don't want
declarations which should not have been in the microsom file but in the
hummingboard file being in a final release of the mainline kernel.

We can take care of them with incremental patches during early -rc.

Shawn

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html