Build failed for mvebu in linux-next due to duplicate commit for RTC

[Olof Johansson]

On Tue, Feb 26, 2013 at 10:05 AM, Jason Cooper <jason at lakedaemon.net> wrote:
> On Tue, Feb 26, 2013 at 06:24:58PM +0100, Gregory CLEMENT wrote:
>> Hello,
>>
>> when I tried to use the linux-next git tree (next-20130226), I
>> encountered this error during build:
>>
>> ERROR (duplicate_node_names): Duplicate node name /soc/rtc at 10300
>
> Nice catch!
>
>> I found it was because 2 version of the same patch have been submitted
>> to linux-next,
>> git log v3.8..HEAD --grep=RTC  arch/arm/boot/dts/armada-370-xp.dtsi
>>
>> commit 25fe89035eb81ea8be7ebb98eba18a8da744d3a2
>> Author: Gregory CLEMENT <gregory.clement at free-electrons.com>
>> Date:   Wed Feb 20 13:15:47 2013 +1100
>>
>>     arm: mvebu: add RTC support for Armada 370 and Armada XP
>>
>>     The Armada 370 and Armada XP Socs have the same controller that the one
>>     used in the orion platforms.  This patch updates the device tree for these
>>     SoCs.
>>
>>     Signed-off-by: Gregory CLEMENT <gregory.clement at free-electrons.com>
>>     Acked-by: Andrew Lunn <andrew at lunn.ch>
>>     Cc: Russell King <linux at arm.linux.org.uk>
>>     Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
>>
>> commit f70a08ce13cdec674eae271a2e76554ff20bf5f3
>> Author: Gregory CLEMENT <gregory.clement at free-electrons.com>
>> Date:   Wed Dec 12 10:06:24 2012 +0100
>>
>>     arm: mvebu: Add RTC support for Armada 370 and Armada XP
>>
>>     The Armada 370 and Armada XP Socs have the same controller that the
>>     one used in the orion platforms. This patch updates the device tree
>>     for these SoCs.
>>
>>     Signed-off-by: Gregory CLEMENT <gregory.clement at free-electrons.com>
>>     Acked-by: Andrew Lunn <andrew at lunn.ch>
>>     Tested-by: Florian Fainelli <florian at openwrt.org>
>>     Acked-by: Arnd Bergmann <arnd at arndb.de>
>>     Signed-off-by: Jason Cooper <jason at lakedaemon.net>
>>
>> I think that the commit 25fe89 came through Andrew Morton and my
>> second version f70a08ce came through Jason Cooper and then arm-soc.
>>
>> First, what I have to do to fix this? The best solution should be to
>> remove the commit 25fe890 as it is the less recent. How can we
>> proceed ?
>
> Is the diffstat different between the versions?
>
>> Then I am sorry to not have figure out this before. I thought the
>> automatic email I received from Andrew Morton where due to Jason that
>> have been pushed the patch to Andrew Morton. I wasn't aware that
>> Andrew Morton took care of the RTC subsystem a well.
>
> At this point, it's moot which path was correct.  Whichever is easiest
> to revert should be reverted.  Thankfully it's not C code causing a
> build breakage.  The patch was just adding a devicetree node.
>
> Arnd/Olof, what do you recommend here?

We can revert it on top of our branches, but rebasing for it would be
a bit awkward. Andrew, I think it might be easier for you to drop it
in this case? We can do either though.

I'll make sure rtc driver patches go through you from here on out,
they might have fallen between chairs a bit. The device tree updates
for them should ideally still go through the arm subplatform
maintainer and arm-soc though, since it tends to be conflict-prone.


-Olof