All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
To: "Michael S. Tsirkin" <mst@redhat.com>, Joerg Roedel <joro@8bytes.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Lan Tianyu <Tianyu.Lan@microsoft.com>
Subject: Re: linux-next: manual merge of the vhost tree with the iommu tree
Date: Mon, 13 May 2019 15:29:01 +0100	[thread overview]
Message-ID: <7b10be49-f379-c586-d8fd-d67bb932fabd@arm.com> (raw)
In-Reply-To: <20190512131410-mutt-send-email-mst@kernel.org>

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

  reply	other threads:[~2019-05-13 14:29 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-27  4:25 linux-next: manual merge of the vhost tree with the iommu tree Stephen Rothwell
2019-02-27 11:30 ` Jean-Philippe Brucker
2019-02-27 13:58   ` Michael S. Tsirkin
2019-02-28 10:04     ` Joerg Roedel
2019-05-12 17:16       ` Michael S. Tsirkin
2019-05-13 14:29         ` Jean-Philippe Brucker [this message]
2019-05-27  9:27         ` Joerg Roedel
2019-05-27 15:16           ` Michael S. Tsirkin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7b10be49-f379-c586-d8fd-d67bb932fabd@arm.com \
    --to=jean-philippe.brucker@arm.com \
    --cc=Tianyu.Lan@microsoft.com \
    --cc=joro@8bytes.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mst@redhat.com \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.