[PATCH v6 2/4] arm64: dts: Add timer erratum property for LS2080A and LS1043A

On Fri, Sep 23, 2016 at 05:27:56PM +0100, Will Deacon wrote:

On Thu, Sep 22, 2016 at 03:35:16AM -0500, Scott Wood wrote:

quoted

Signed-off-by: Scott Wood <oss@buserror.net>
---
 arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 1 +
 arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 1 +
 2 files changed, 2 insertions(+)

This patch conflicts with mainline,

Thanks for the heads-up.

but I've queued the other three
patches in the series in the arm64 tree.

Please send the updated .dts changes via arm-soc.

I will send this to arm-soc when v4.9-rc1 comes out with driver changes
in place.

Shawn