From: shawnguo@kernel.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v6 2/4] arm64: dts: Add timer erratum property for LS2080A and LS1043A
Date: Sat, 24 Sep 2016 22:08:17 +0800 [thread overview]
Message-ID: <20160924140817.GA11051@tiger> (raw)
In-Reply-To: <20160923162755.GG6397@arm.com>
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:
> > 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
next prev parent reply other threads:[~2016-09-24 14:08 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-22 8:35 [PATCH v6 1/4] arm64: arch_timer: Add device tree binding for A-008585 erratum Scott Wood
2016-09-22 8:35 ` [PATCH v6 2/4] arm64: dts: Add timer erratum property for LS2080A and LS1043A Scott Wood
2016-09-23 14:44 ` Marc Zyngier
2016-09-24 14:11 ` Shawn Guo
2016-09-23 16:27 ` Will Deacon
2016-09-24 14:08 ` Shawn Guo [this message]
2016-09-22 8:35 ` [PATCH v6 3/4] arm64: arch_timer: Work around QorIQ Erratum A-008585 Scott Wood
2016-09-23 13:17 ` Marc Zyngier
2016-09-22 8:35 ` [PATCH v6 4/4] arm/arm64: arch_timer: Use archdata to indicate vdso suitability Scott Wood
2016-09-23 14:32 ` Russell King - ARM Linux
2016-09-23 14:41 ` Marc Zyngier
2016-09-23 14:41 ` [PATCH v6 1/4] arm64: arch_timer: Add device tree binding for A-008585 erratum Marc Zyngier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160924140817.GA11051@tiger \
--to=shawnguo@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).