On Mon, Jan 27, 2014 at 02:37:45PM +0000, Russell King - ARM Linux wrote: > On Sun, Jan 26, 2014 at 12:43:03AM +0800, Shawn Guo wrote: > > 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. Shawn [1] https://git.linaro.org/people/shawn.guo/linux-2.6.git/commit/8544f6c92801b1ba70f790cc17f543f7aa13f17f -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
