From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael S. Tsirkin" Subject: Re: linux-next: manual merge of the vhost tree with the iommu tree Date: Sun, 12 May 2019 13:16:26 -0400 Message-ID: <20190512131410-mutt-send-email-mst@kernel.org> References: <20190227152506.4696a59f@canb.auug.org.au> <2370af99-9dc1-b694-9f1c-1951d1e70435@arm.com> <20190227085546-mutt-send-email-mst@kernel.org> <20190228100442.GB1594@8bytes.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20190228100442.GB1594@8bytes.org> Sender: linux-kernel-owner@vger.kernel.org To: Joerg Roedel Cc: Jean-Philippe Brucker , Stephen Rothwell , Linux Next Mailing List , Linux Kernel Mailing List , Lan Tianyu List-Id: linux-next.vger.kernel.org On Thu, Feb 28, 2019 at 11:04:42AM +0100, Joerg Roedel wrote: > On Wed, Feb 27, 2019 at 08:58:36AM -0500, Michael S. Tsirkin wrote: > > Even though it's not going into 5.1 I feel it's helpful to keep it in > > the vhost tree until the next cycle, it helps make sure unrelated > > changes don't break it. > > It is not going to 5.1, so it shouldn't be in linux-next, no? And when > it is going upstream, it should do so through the iommu tree. If you > keep it separatly in the vhost tree for testing purposes, please make > sure it is not included into your linux-next branch. > > Regards, > > Joerg Joerg, what are we doing with these patches? It was tested in next with no bad effects. I sent an ack - do you want to pick it up? Or have me include it in my pull? Thanks! -- MST