Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S934438AbdDFQ13 (ORCPT <rfc822;w@1wt.eu>);
        Thu, 6 Apr 2017 12:27:29 -0400
Received: from foss.arm.com ([217.140.101.70]:45816 "EHLO foss.arm.com"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S934234AbdDFQ1U (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Thu, 6 Apr 2017 12:27:20 -0400
Date: Thu, 6 Apr 2017 17:27:14 +0100
From: Catalin Marinas <catalin.marinas@arm.com>
To: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Marc Zyngier <marc.zyngier@arm.com>,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
        Mark Rutland <mark.rutland@arm.com>, Will Deacon <will.deacon@arm.com>,
        Scott Wood <oss@buserror.net>, Hanjun Guo <hanjun.guo@linaro.org>,
        Ding Tianhong <dingtianhong@huawei.com>,
        dann frazier <dann.frazier@canonical.com>,
        Thomas Gleixner <tglx@linutronix.de>
Subject: Re: [PATCH v3 00/18] clocksource/arch_timer: Errata workaround
 infrastructure rework
Message-ID: <20170406162714.GC7705@e104818-lin.cambridge.arm.com>
References: <20170404171826.25030-1-marc.zyngier@arm.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20170404171826.25030-1-marc.zyngier@arm.com>
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1508
Lines: 35

Hi Daniel,

On Tue, Apr 04, 2017 at 06:18:08PM +0100, Marc Zyngier wrote:
> Marc Zyngier (18):
>   arm64: Allow checking of a CPU-local erratum
>   arm64: Add CNTVCT_EL0 trap handler
>   arm64: Define Cortex-A73 MIDR
>   arm64: cpu_errata: Allow an erratum to be match for all revisions of a
>     core
>   arm64: cpu_errata: Add capability to advertise Cortex-A73 erratum
>     858921
>   arm64: arch_timer: Add infrastructure for multiple erratum detection
>     methods
>   arm64: arch_timer: Add erratum handler for CPU-specific capability
>   arm64: arch_timer: Move arch_timer_reg_read/write around
>   arm64: arch_timer: Get rid of erratum_workaround_set_sne
>   arm64: arch_timer: Rework the set_next_event workarounds
>   arm64: arch_timer: Make workaround methods optional
>   arm64: arch_timer: Allows a CPU-specific erratum to only affect a
>     subset of CPUs
>   arm64: arch_timer: Move clocksource_counter and co around
>   arm64: arch_timer: Save cntkctl_el1 as a per-cpu variable
>   arm64: arch_timer: Enable CNTVCT_EL0 trap if workaround is enabled
>   arm64: arch_timer: Workaround for Cortex-A73 erratum 858921
>   arm64: arch_timer: Allow erratum matching with ACPI OEM information
>   arm64: arch_timer: Add HISILICON_ERRATUM_161010101 ACPI matching data

Are you happy to take the arch_timer patches above? If yes, Marc can
create a common branch with the first 5 patches which I will merge in
the arm64 tree. You can then pull the whole series into your tree.

Thanks.

-- 
Catalin