From: Pierre Morel <pmorel@linux.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Joerg Roedel <joro@8bytes.org>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the iommu tree with the s390 tree
Date: Thu, 7 May 2020 13:29:01 +0200 [thread overview]
Message-ID: <275a85c9-0552-9725-c2fa-129d244ca261@linux.ibm.com> (raw)
In-Reply-To: <20200507135835.05e300b5@canb.auug.org.au>
On 2020-05-07 05:58, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the iommu tree got a conflict in:
>
> drivers/iommu/s390-iommu.c
>
> between commit:
>
> d08d6f5d7524 ("s390/pci: adaptation of iommu to multifunction")
>
> from the s390 tree and commit:
>
> 522af649e57b ("iommu/s390: Convert to probe/release_device() call-backs")
>
> from the iommu 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.
>
Hi Stephen,
Your proposition is correct for me.
I of course assume that the other parts of the
("s390/pci: adaptation of iommu to multifunction")
patch, not concerned by this merge problem, will be merged too at the end.
Thanks,
Pierre
--
Pierre Morel
IBM Lab Boeblingen
prev parent reply other threads:[~2020-05-07 11:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-07 3:58 linux-next: manual merge of the iommu tree with the s390 tree Stephen Rothwell
2020-05-07 11:29 ` Pierre Morel [this message]
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=275a85c9-0552-9725-c2fa-129d244ca261@linux.ibm.com \
--to=pmorel@linux.ibm.com \
--cc=borntraeger@de.ibm.com \
--cc=gor@linux.ibm.com \
--cc=heiko.carstens@de.ibm.com \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).