From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Joerg Roedel <joro@8bytes•org>,
Doug Ledford <dledford@redhat•com>,
Jason Gunthorpe <jgg@mellanox•com>
Cc: Jason Gunthorpe <jgg@nvidia•com>, Jason Gunthorpe <jgg@ziepe•ca>,
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: linux-next: manual merge of the iommu tree with the rdma-fixes tree
Date: Wed, 1 Feb 2023 12:14:02 +1100 [thread overview]
Message-ID: <20230201121402.15715aaa@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2071 bytes --]
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.
--
Cheers,
Stephen Rothwell
diff --cc drivers/infiniband/hw/usnic/usnic_uiom.c
index a2857accc427,aeeaca65ace9..000000000000
--- a/drivers/infiniband/hw/usnic/usnic_uiom.c
+++ b/drivers/infiniband/hw/usnic/usnic_uiom.c
@@@ -276,8 -276,8 +276,8 @@@ iter_chunk
size = pa_end - pa_start + PAGE_SIZE;
usnic_dbg("va 0x%lx pa %pa size 0x%zx flags 0x%x",
va_start, &pa_start, size, flags);
- err = iommu_map_atomic(pd->domain, va_start,
- pa_start, size, flags);
+ err = iommu_map(pd->domain, va_start, pa_start,
- size, flags, GFP_KERNEL);
++ size, flags, GFP_ATOMIC);
if (err) {
usnic_err("Failed to map va 0x%lx pa %pa size 0x%zx with err %d\n",
va_start, &pa_start, size, err);
@@@ -293,8 -293,8 +293,8 @@@
size = pa - pa_start + PAGE_SIZE;
usnic_dbg("va 0x%lx pa %pa size 0x%zx flags 0x%x\n",
va_start, &pa_start, size, flags);
- err = iommu_map_atomic(pd->domain, va_start,
- pa_start, size, flags);
+ err = iommu_map(pd->domain, va_start, pa_start,
- size, flags, GFP_KERNEL);
++ size, flags, GFP_ATOMIC);
if (err) {
usnic_err("Failed to map va 0x%lx pa %pa size 0x%zx with err %d\n",
va_start, &pa_start, size, err);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-02-01 1:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-01 1:14 Stephen Rothwell [this message]
2023-02-01 2:17 ` linux-next: manual merge of the iommu tree with the rdma-fixes tree Jason Gunthorpe
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=20230201121402.15715aaa@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dledford@redhat$(echo .)com \
--cc=jgg@mellanox$(echo .)com \
--cc=jgg@nvidia$(echo .)com \
--cc=jgg@ziepe$(echo .)ca \
--cc=joro@8bytes$(echo .)org \
--cc=jroedel@suse$(echo .)de \
--cc=leon@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=yangyingliang@huawei$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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