From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754014AbcHCGpw (ORCPT ); Wed, 3 Aug 2016 02:45:52 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:35913 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752128AbcHCGpn (ORCPT ); Wed, 3 Aug 2016 02:45:43 -0400 Subject: Re: [GIT PULL] KVM changes for 4.8 merge window To: Michael Ellerman , torvalds@linux-foundation.org References: <1470141468-120437-1-git-send-email-pbonzini@redhat.com> <87vazilepe.fsf@concordia.ellerman.id.au> Cc: linux-kernel@vger.kernel.org, rkrcmar@redhat.com, kvm@vger.kernel.org, Christian Borntraeger , Christoffer Dall , Dan Williams , Marc Zyngier , Paul Mackerras From: Paolo Bonzini Message-ID: <12aabe49-09c5-35db-e15c-bf2b75bd3f67@redhat.com> Date: Wed, 3 Aug 2016 08:26:34 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.1.1 MIME-Version: 1.0 In-Reply-To: <87vazilepe.fsf@concordia.ellerman.id.au> 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 03/08/2016 05:21, Michael Ellerman wrote: > Paolo Bonzini writes: > ... >> - arch/powerpc: what a mess. For the idle_book3s.S conflict, the KVM >> tree is the right one; everything else is trivial. In this case I am >> not quite sure what went wrong. The commit that is causing the mess >> (fd7bacbca47a, "KVM: PPC: Book3S HV: Fix TB corruption in guest exit >> path on HMI interrupt", 2016-05-15) touches both arch/powerpc/kernel/ >> and arch/powerpc/kvm/. It's large, but at 396 insertions/5 deletions >> I guessed that it wasn't really possible to split it and that the 5 >> deletions wouldn't conflict. That wasn't the case. > > In fact I think the problem is that this patch shouldn't have gone via the KVM > tree at all. > > If you look at the diffstat, it doesn't touch anything in generic KVM, but lots > of arch code: The KVM tree merges all arch/*/kvm code from submaintainers. Only Radim and I send patches directly to Linus. Considering the h in "hmi" is for hypervisor, actual non-virt code in that patch was this: arch/powerpc/include/asm/paca.h | 6 +++ arch/powerpc/kernel/Makefile | 2 +- arch/powerpc/kernel/exceptions-64s.S | 4 +- arch/powerpc/kernel/idle_power7.S | 5 ++- arch/powerpc/kernel/traps.c | 5 +++ So the changes are pretty small, yet apart from paca.h every file ended up having a conflict with the PPC tree. So I think it's just very bad luck in this case. Having this patch in a topic branch merged by both PPC and KVM maintainers would have still been a good idea, because I guess Paul knew of Ben's idle_power7.S cleanup. Paolo