All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	Joerg Roedel <joro@8bytes.org>
Cc: 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: Wed, 27 Feb 2019 11:30:27 +0000	[thread overview]
Message-ID: <2370af99-9dc1-b694-9f1c-1951d1e70435@arm.com> (raw)
In-Reply-To: <20190227152506.4696a59f@canb.auug.org.au>

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 commit:
> 
>   d906f4225497 ("iommu: Add virtio-iommu driver")
> 
> from the vhost tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
Thanks Stephen, sorry about the extra work. The virtio-iommu driver was
helpfully added to the vhost tree to ensure it doesn't break anything,
but since Joerg has some reservations, only the hyper-v change will be
merged in v5.1. I'd welcome a change of heart however, in which case the
driver should probably go via the iommu tree to avoid conflicts.

Thanks,
Jean

  reply	other threads:[~2019-02-27 11:30 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 [this message]
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
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=2370af99-9dc1-b694-9f1c-1951d1e70435@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.