Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752010AbaLQKuH (ORCPT ); Wed, 17 Dec 2014 05:50:07 -0500 Received: from cantor2.suse.de ([195.135.220.15]:43397 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750894AbaLQKuF (ORCPT ); Wed, 17 Dec 2014 05:50:05 -0500 Date: Wed, 17 Dec 2014 11:50:00 +0100 From: Joerg Roedel To: Paolo Bonzini Cc: "Chen, Tiejun" , Joerg Roedel , Gleb Natapov , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] kvm: iommu: Add cond_resched to legacy device assignment code Message-ID: <20141217105000.GB9373@suse.de> References: <1418744846-12868-1-git-send-email-joro@8bytes.org> <5490DEB1.30305@intel.com> <20141217103500.GA9373@suse.de> <54915F00.5010304@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <54915F00.5010304@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Dec 17, 2014 at 11:46:24AM +0100, Paolo Bonzini wrote: > > > On 17/12/2014 11:35, Joerg Roedel wrote: > >> > > >> > This file is already gone after one latest commit c274e03af705, > >> > "kvm: x86: move assigned-dev.c and iommu.c to arch/x86/" is > >> > introduced, so you need to pull your tree firstly :) > > Hmm, I based the patch on kvm/master, where the file is still present. > > What is the branch to base kvm patches on these days? > > kvm/master in the -rc period, kvm/next during the merge window and for > the next release. But it's not a problem, I can sort it out. Great, thanks Paolo. So I will base my future patches on kvm/next. Joerg -- 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/