Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751432AbaGaOas (ORCPT ); Thu, 31 Jul 2014 10:30:48 -0400 Received: from fw-tnat.austin.arm.com ([217.140.110.23]:42848 "EHLO collaborate-mta1.arm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750852AbaGaOar convert rfc822-to-8bit (ORCPT ); Thu, 31 Jul 2014 10:30:47 -0400 From: Marc Zyngier To: Christoffer Dall Cc: Christoffer Dall , Stephen Rothwell , "linux-next\@vger.kernel.org" , linux-kernel , Will Deacon Subject: Re: linux-next: manual merge of the kvm-arm tree with Linus' tree In-Reply-To: <20140731142347.GB589@cbox> (Christoffer Dall's message of "Thu, 31 Jul 2014 15:23:47 +0100") Organization: ARM Ltd References: <20140731163004.474501fb@canb.auug.org.au> <87mwbpiv0z.fsf@approximate.cambridge.arm.com> <20140731142347.GB589@cbox> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) Date: Thu, 31 Jul 2014 15:30:32 +0100 Message-ID: <86mwbpwqgn.fsf@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jul 31 2014 at 03:23:47 PM, Christoffer Dall wrote: > On Thu, Jul 31, 2014 at 01:15:40PM +0100, Marc Zyngier wrote: >> On Thu, Jul 31 2014 at 12:53:03 pm BST, Christoffer Dall >> wrote: >> >> Hi Christoffer, >> >> > On Thu, Jul 31, 2014 at 8:30 AM, Stephen Rothwell >> > wrote: >> > >> > Hi all, >> > >> > Today's linux-next merge of the kvm-arm tree got a conflict in >> > virt/kvm/arm/vgic.c between commit 63afbe7a0ac1 ("kvm: arm64: vgic: fix >> > hyp panic with 64k pages on juno platform") from Linus' tree and commit >> > 8f186d522c69 ("KVM: ARM: vgic: split GICv2 backend from the main vgic >> > code") and others from the kvm-arm tree. >> > >> > I fixed it up (the latter extensively rewrites the function, so I just >> > used that) and can carry the fix as necessary (no action is required). >> > >> > Hmm that doesn't look correct, the checks  for >> > PAGE_ALIGNED(vcpu_res.start) and PAGE_ALIGNED(resource_size(vcpu_res)) >> > still need to be enforced for both vgic-v2 and vgic-v3.  How do we >> > provide a correct fix for Linux-next? >> >> I've provided a resolution for GICv2 in a separate email. For GICv3, I >> have the following patch in my tree, which can be added at a later time. >> > The GICv3 build fix and the GICv3 fix you provided here are now both > in kvmarm/next. Excellent, thanks Christoffer. Cheers, M. -- Jazz is not dead. It just smells funny. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/