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

From: Jean-Philippe Brucker
Date: Mon May 13 2019 - 10:30:59 EST


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 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?

I'll resend the driver for v5.3 with some changes. They should be minor
but one of the changes (domain bits -> domain range) touches UAPI and
isn't backward compatible, so it would be better not to merge it this
time around.

Thanks,
Jean