From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752288AbdAaOa2 (ORCPT ); Tue, 31 Jan 2017 09:30:28 -0500 Received: from foss.arm.com ([217.140.101.70]:39460 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752340AbdAaOaV (ORCPT ); Tue, 31 Jan 2017 09:30:21 -0500 Date: Tue, 31 Jan 2017 14:29:07 +0000 From: Will Deacon To: Mark Rutland Cc: daniel.lezcano@linaro.org, catalin.marinas@arm.com, dingtianhong@huawei.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, tglx@linutronix.de Subject: Re: [PATCH 6/7] arm64: arch_timer: document Hisilicon erratum 161010101 Message-ID: <20170131142906.GB22283@arm.com> References: <1485865196-12742-1-git-send-email-mark.rutland@arm.com> <1485865196-12742-7-git-send-email-mark.rutland@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1485865196-12742-7-git-send-email-mark.rutland@arm.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jan 31, 2017 at 12:19:55PM +0000, Mark Rutland wrote: > From: Ding Tianhong > > Now that we have a workaround for Hisilicon erratum 161010101, notes > this in the arm64 silicon-errata document. > > The new config option is too long to fit in the existing kconfig column, > so this is widened to accomodate it. > > Signed-off-by: Ding Tianhong > [Mark: split patch, reword commit message] > Signed-off-by: Mark Rutland > --- > Documentation/arm64/silicon-errata.txt | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/Documentation/arm64/silicon-errata.txt b/Documentation/arm64/silicon-errata.txt > index 4a5e6cc..e12c926 100644 > --- a/Documentation/arm64/silicon-errata.txt > +++ b/Documentation/arm64/silicon-errata.txt > @@ -63,3 +63,5 @@ stable kernels. > | Cavium | ThunderX SMMUv2 | #27704 | N/A | > | | | | | > | Freescale/NXP | LS2080A/LS1043A | A-008585 | FSL_ERRATUM_A008585 | > +| | | | | > +| Hisilicon | Hip0{5,6,7} | #161010101 | HISILICON_ERRATUM_161010101 | > -- > 1.9.1 I'd like to take this one via arm64, then you can drop it along with the first patch in the series and I can deal with the conflicts in the text file. Daniel, are you ok with that? This file isn't part of the clocksource code and is purely an informative document that we maintain to help ARM vendors know which errata we're working around. Will