Re: linux-next: manual merge of the vhost tree with the iommu tree

2019-05-27 Thread Michael S. Tsirkin
On Mon, May 27, 2019 at 11:27:18AM +0200, Joerg Roedel wrote: > On Sun, May 12, 2019 at 01:16:26PM -0400, Michael S. Tsirkin wrote: > > 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 i

Re: linux-next: manual merge of the vhost tree with the iommu tree

2019-05-27 Thread Joerg Roedel
On Sun, May 12, 2019 at 01:16:26PM -0400, Michael S. Tsirkin wrote: > 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? I'd prefer it in my tree, if you are fine with the spec.

Re: linux-next: manual merge of the vhost tree with the iommu tree

2019-05-13 Thread Jean-Philippe Brucker
On 12/05/2019 18:16, Michael S. Tsirkin wrote: > 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

Re: linux-next: manual merge of the vhost tree with the iommu tree

2019-05-12 Thread Michael S. Tsirkin
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

Re: linux-next: manual merge of the vhost tree with the iommu tree

2019-02-28 Thread Joerg Roedel
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? An

Re: linux-next: manual merge of the vhost tree with the iommu tree

2019-02-27 Thread Michael S. Tsirkin
On Wed, Feb 27, 2019 at 11:30:27AM +, Jean-Philippe Brucker wrote: > On 27/02/2019 04:25, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the vhost tree got conflicts in: > > > > drivers/iommu/Kconfig > > drivers/iommu/Makefile > > > > between commit: > > > > 0

Re: linux-next: manual merge of the vhost tree with the iommu tree

2019-02-27 Thread Jean-Philippe Brucker
On 27/02/2019 04:25, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the vhost tree got conflicts in: > > drivers/iommu/Kconfig > drivers/iommu/Makefile > > between commit: > > 004240dcc222 ("iommu/hyper-v: Add Hyper-V stub IOMMU driver") > > from the iommu tree and com

linux-next: manual merge of the vhost tree with the iommu tree

2019-02-26 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the vhost tree got conflicts in: drivers/iommu/Kconfig drivers/iommu/Makefile between commit: 004240dcc222 ("iommu/hyper-v: Add Hyper-V stub IOMMU driver") from the iommu tree and commit: d906f4225497 ("iommu: Add virtio-iommu driver") from the vho