From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754151AbcBVJYW (ORCPT ); Mon, 22 Feb 2016 04:24:22 -0500 Received: from foss.arm.com ([217.140.101.70]:55067 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752448AbcBVJYT (ORCPT ); Mon, 22 Feb 2016 04:24:19 -0500 Date: Mon, 22 Feb 2016 09:24:15 +0000 From: Catalin Marinas To: Stephen Rothwell Cc: Christoffer Dall , Marc Zyngier , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Will Deacon , James Morse Subject: Re: linux-next: manual merge of the kvm-arm tree with the arm64 tree Message-ID: <20160222092414.GA24203@e104818-lin.cambridge.arm.com> References: <20160222132829.2b4cf53e@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160222132829.2b4cf53e@canb.auug.org.au> 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 Hi Stephen, On Mon, Feb 22, 2016 at 01:28:29PM +1100, Stephen Rothwell wrote: > Today's linux-next merge of the kvm-arm tree got a conflict in: > > arch/arm64/include/asm/cpufeature.h > arch/arm64/kernel/cpufeature.c > > between commit: > > d5370f754875 ("arm64: prefetch: add alternative pattern for CPUs without a prefetcher") > 57f4959bad0a ("arm64: kernel: Add support for User Access Override") > 705441960033 ("arm64: kernel: Don't toggle PAN on systems with UAO") > > from the arm64 tree and commit: > > d0be74f771d5 ("arm64: Add ARM64_HAS_VIRT_HOST_EXTN feature") > > from the kvm-arm tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). The fix-up looks correct indeed. Thanks. -- Catalin