On Tuesday 26 April 2016 09:30:45 Geert Uytterhoeven wrote:
>
> Commit 93fafa81cad3da9c ("Merge branches 'next/dt' and 'next/dt64' into
> for-next") accidentally re-added the line
>
> clock-output-names = "can_clk";
>
> to arch/arm/boot/dts/r8a7791.dtsi, which was removed in commit
> f617604fe5d74b9c ("ARM: dts: r8a7791: Remove unnecessary
> clock-output-names properties") before. It seems the same wrong
> conflict resolution was made before in commit ef3b08c6c0d85753 ("Merge
> branch 'fixes' into for-next").
>
> While this won't cause failures, can you please remove the offending
> line?
>
I've merged renesas-fixes-for-v4.6 into next/dt now to resolve
the conflict there, otherwise Linus would have to do the same resolution
during the merge window.
Thanks for letting us know. If you want to verify my new resolution,
please look at next/dt, which is the more important branch.
Arnd
