From: Jason Gunthorpe <jgg@ziepe.ca>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Joerg Roedel <joro@8bytes.org>,
Doug Ledford <dledford@redhat.com>,
Joerg Roedel <jroedel@suse.de>, Leon Romanovsky <leon@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Yang Yingliang <yangyingliang@huawei.com>
Subject: Re: linux-next: manual merge of the iommu tree with the rdma-fixes tree
Date: Tue, 31 Jan 2023 22:17:37 -0400 [thread overview]
Message-ID: <Y9nLwemhReecdLpr@ziepe.ca> (raw)
In-Reply-To: <20230201121402.15715aaa@canb.auug.org.au>
On Wed, Feb 01, 2023 at 12:14:02PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the iommu tree got a conflict in:
>
> drivers/infiniband/hw/usnic/usnic_uiom.c
>
> between commit:
>
> b7e08a5a63a1 ("RDMA/usnic: use iommu_map_atomic() under spin_lock()")
>
> from the rdma-fixes tree and commits:
>
> 1369459b2e21 ("iommu: Add a gfp parameter to iommu_map()")
> 4dc6376af596 ("iommu: Remove iommu_map_atomic()")
>
> 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.
Looks good thank you
Jason
prev parent reply other threads:[~2023-02-01 2:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-01 1:14 linux-next: manual merge of the iommu tree with the rdma-fixes tree Stephen Rothwell
2023-02-01 2:17 ` Jason Gunthorpe [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=Y9nLwemhReecdLpr@ziepe.ca \
--to=jgg@ziepe.ca \
--cc=dledford@redhat.com \
--cc=joro@8bytes.org \
--cc=jroedel@suse.de \
--cc=leon@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=yangyingliang@huawei.com \
/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).