From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1757640AbcBXSGT (ORCPT <rfc822;w@1wt.eu>);
	Wed, 24 Feb 2016 13:06:19 -0500
Received: from foss.arm.com ([217.140.101.70]:46076 "EHLO foss.arm.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752085AbcBXSGS (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Wed, 24 Feb 2016 13:06:18 -0500
Date: Wed, 24 Feb 2016 18:06:26 +0000
From: Will Deacon <will.deacon@arm.com>
To: David Daney <ddaney@caviumnetworks.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>,
        Catalin Marinas <catalin.marinas@arm.com>,
        David Daney <ddaney.cavm@gmail.com>,
        linux-arm-kernel@lists.infradead.org,
        Mark Rutland <mark.rutland@arm.com>, linux-kernel@vger.kernel.org,
        Andrew Pinski <apinski@cavium.com>,
        David Daney <david.daney@cavium.com>
Subject: Re: [PATCH v3] arm64: Add workaround for Cavium erratum 27456
Message-ID: <20160224180626.GF12471@arm.com>
References: <1456272534-21692-1-git-send-email-ddaney.cavm@gmail.com>
 <20160224134016.GH28310@arm.com>
 <56CDB912.6000300@arm.com>
 <56CDF056.8020408@caviumnetworks.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <56CDF056.8020408@caviumnetworks.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

On Wed, Feb 24, 2016 at 10:03:02AM -0800, David Daney wrote:
> On 02/24/2016 06:07 AM, Marc Zyngier wrote:
> >On 24/02/16 13:40, Will Deacon wrote:
> >
> >[...]
> >
> >>(and Catalin, if you pick this up, watch out for the conflicts in
> >>cpufeature.h)
> >
> >Yup, that one is about to become a minefield (ARM64_HAS_NO_HW_PREFETCH,
> >ARM64_HAS_UAO, ARM64_ALT_PAN_NOT_UAO and ARM64_HAS_VIRT_HOST_EXTN are
> >already happily clashing into -next). But hey, the more the merrier! ;-)
> >
> 
> Would you like me to rebase it to for-next/core ?

I think ARM64_HAS_VIRT_HOST_EXTN is in the KVM tree, so you're probably
best off looking at linux-next and choosing your feature number based on
that, whilst basing the patch on either for-next/core or mainline.

Will