Emilio López emilio@elopez.com.ar writes:
Hi,
El 11/03/14 06:39, Maxime Ripard escribió:
Hi,
On Sun, Mar 09, 2014 at 11:58:04PM -0700, Kevin's boot bot wrote:
Automated DT boot report for various ARM defconfigs.
Tree/Branch: arm-soc Git describe: v3.14-rc4-695-g7c79649 Failed boot tests (console logs at the end) =========================================== sun7i-a20-cubieboard2: FAIL: multi_lpae_defconfig sun7i-a20-cubieboard2: FAIL: sunxi_defconfig sun4i-a10-cubieboard: FAIL: sunxi_defconfig ste-snowball: FAIL: multi_v7_defconfig sun7i-a20-cubieboard2: FAIL: multi_v7_defconfig sun4i-a10-cubieboard: FAIL: multi_v7_defconfig
Hmmm, I think I handled this one badly.
This is actually because of the commit bf6534a180d6d596521b0bfa6de29da5e18314a6, merged through arm-soc, while the associated commit has been taken through the clk tree. Obviously this doesn't work very well.
I guess the easiest would be to revert the DT patch in arm-soc, and have Emilio merge it in his clk tree. Emilio, are you ok doing so?
If Mike and the arm-soc guys are OK with it, I'm ok with it. My only fear is that doing this may bring conflicts galore between the trees (considering we also renamed nodes and other stuff).
Yeah, I'd rather keep the DT changes in the arm-soc tree.
As long as Mike has merged these, the better way is for us to just track the dependency in a depends/* branch of arm-soc, which is how we normally handle this.
Please let us know a stable point of Mike's tree (or the pull request that you sent to Mike if Mike's branch isn't stable) and we can track the dependency in arm-soc.
Thanks,
Kevin