From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752226AbaKZLjZ (ORCPT ); Wed, 26 Nov 2014 06:39:25 -0500 Received: from mail-qa0-f53.google.com ([209.85.216.53]:52114 "EHLO mail-qa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750848AbaKZLjX (ORCPT ); Wed, 26 Nov 2014 06:39:23 -0500 MIME-Version: 1.0 In-Reply-To: <20141126171914.19ad9151@canb.auug.org.au> References: <20141126171914.19ad9151@canb.auug.org.au> Date: Wed, 26 Nov 2014 12:39:14 +0100 Message-ID: Subject: Re: linux-next: manual merge of the kvm-arm tree with the kvm tree From: Christoffer Dall To: Stephen Rothwell Cc: Marc Zyngier , Marcelo Tosatti , Gleb Natapov , "linux-next@vger.kernel.org" , linux-kernel , Paolo Bonzini , Ard Biesheuvel Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Thanks Stephen, it was (obviously) the right fix. -Christoffer On Wed, Nov 26, 2014 at 7:19 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kvm-arm tree got a conflict in > arch/ia64/kvm/kvm-ia64.c between commit 003f7de62589 ("KVM: ia64: > remove") from the kvm tree and commit bf4bea8e9a90 ("kvm: fix > kvm_is_mmio_pfn() and rename to kvm_is_reserved_pfn()") from the > kvm-arm tree. > > I fixed it up (the former removed the file, so I did that) and can > carry the fix as necessary (no action is required). > > -- > Cheers, > Stephen Rothwell sfr@canb.auug.org.au