From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gleb Natapov Subject: Re: linux-next: manual merge of the kvm-arm tree Date: Thu, 17 Oct 2013 17:55:22 +0300 Message-ID: <20131017145522.GH30802@redhat.com> References: <1381949500-501-1-git-send-email-treding@nvidia.com> <1381949500-501-3-git-send-email-treding@nvidia.com> <525EE1BC.3050605@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mx1.redhat.com ([209.132.183.28]:59242 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757133Ab3JQOzf (ORCPT ); Thu, 17 Oct 2013 10:55:35 -0400 Content-Disposition: inline In-Reply-To: Sender: linux-next-owner@vger.kernel.org List-ID: To: Christoffer Dall Cc: Marc Zyngier , Thierry Reding , Jonathan Austin , Olof Johansson , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Paolo Bonzini On Wed, Oct 16, 2013 at 12:02:08PM -0700, Christoffer Dall wrote: > On 16 October 2013 11:58, Marc Zyngier wrote: > > On 16/10/13 19:51, Thierry Reding wrote: > >> Today's linux-next merge of the kvm-arm tree got conflicts in > >> > >> arch/arm/kvm/reset.c > >> > >> caused by commits e8c2d99 (KVM: ARM: Add support for Cortex-A7) and ac570e0 > >> (ARM: kvm: rename cpu_reset to avoid name clash). > >> > >> I've fixed them up (see below). Please verify that the resolution looks > >> good. > > > > Looks good to me (I have the same resolution in my own tree). > > > Yes, fix is good. > > This will stay a conflict until kvm/next and kvm/fixes merge, which > doesn't happen before after the merge window, usually. If that's So in this case it happened today because part of powerpc patches where based on commit after -rc4 and I had to merge to be able to pull them. Christoffer can you look at queue branch of kvm.git and see that the resolution is correct? -- Gleb.