From: "Leon Romanovsky" <leon@kernel•org>
To: "Stephen Rothwell" <sfr@canb•auug.org.au>,
"Jason Gunthorpe" <jgg@nvidia•com>,
"Leon Romanovsky" <leonro@nvidia•com>
Cc: "Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Michael Guralnik" <michaelgur@nvidia•com>,
"Yishai Hadas" <yishaih@nvidia•com>
Subject: Re: linux-next: manual merge of the rdma tree with Linus' tree
Date: Thu, 20 Mar 2025 08:35:32 +0200 [thread overview]
Message-ID: <64f58e2e-3081-4523-af37-b6c344ea301d@app.fastmail.com> (raw)
In-Reply-To: <20250320120823.588aa58e@canb.auug.org.au>
On Thu, Mar 20, 2025, at 03:08, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the rdma tree got a conflict in:
>
> drivers/infiniband/hw/mlx5/mr.c
>
> between commit:
>
> cc668a11e6ac ("RDMA/mlx5: Fix a race for DMABUF MR which can lead to
> CQE with error")
>
> from Linus' tree and commit:
>
> 24d693cf6c89 ("RDMA/mlx5: Fix cache entry update on dereg error")
>
> from the rdma 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/mlx5/mr.c
> index 753faa9ad06a,2080458cabd1..000000000000
> --- a/drivers/infiniband/hw/mlx5/mr.c
> +++ b/drivers/infiniband/hw/mlx5/mr.c
> @@@ -2023,8 -2031,7 +2032,9 @@@ static int mlx5_revoke_mr(struct mlx5_i
> struct mlx5_ib_dev *dev = to_mdev(mr->ibmr.device);
> struct mlx5_cache_ent *ent = mr->mmkey.cache_ent;
> bool is_odp = is_odp_mr(mr);
> + bool is_odp_dma_buf = is_dmabuf_mr(mr) &&
> + !to_ib_umem_dmabuf(mr->umem)->pinned;
> + bool from_cache = !!ent;
> int ret = 0;
LGTM, Thanks a lot.
>
> if (is_odp)
next prev parent reply other threads:[~2025-03-20 6:35 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-20 1:08 linux-next: manual merge of the rdma tree with Linus' tree Stephen Rothwell
2025-03-20 6:35 ` Leon Romanovsky [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-09-11 2:23 Stephen Rothwell
2025-09-11 11:03 ` Leon Romanovsky
2025-05-14 2:24 Stephen Rothwell
2025-05-14 8:17 ` Leon Romanovsky
2025-04-22 4:30 Stephen Rothwell
2025-01-06 0:13 Stephen Rothwell
2025-01-14 20:48 ` Jason Gunthorpe
2025-01-14 21:27 ` Stephen Rothwell
2025-01-15 0:41 ` Jason Gunthorpe
2025-01-15 1:07 ` Stephen Rothwell
2025-01-15 11:17 ` Bernard Metzler
2025-01-05 23:51 Stephen Rothwell
2025-01-06 1:02 ` Stephen Rothwell
2025-01-06 14:16 ` Zhu Yanjun
2023-06-22 1:52 Stephen Rothwell
2021-05-21 0:34 Stephen Rothwell
2021-04-15 2:05 Stephen Rothwell
2021-02-10 2:15 Stephen Rothwell
2021-02-10 18:57 ` Pearson, Robert B
2021-02-10 20:36 ` Jason Gunthorpe
2021-02-10 22:08 ` Pearson, Robert B
2021-02-11 20:03 ` Martin Wilck
2019-11-05 1:17 Stephen Rothwell
2019-11-05 2:21 ` Jason Gunthorpe
2019-11-05 2:28 ` Stephen Rothwell
2019-10-24 0:01 Stephen Rothwell
2019-10-28 19:30 ` Jason Gunthorpe
2019-06-20 2:10 Stephen Rothwell
2019-06-20 3:25 ` Doug Ledford
2019-06-20 2:06 Stephen Rothwell
2019-06-20 3:24 ` Doug Ledford
2019-06-14 3:00 Stephen Rothwell
2019-06-14 13:11 ` Doug Ledford
2018-09-28 0:01 Stephen Rothwell
2018-09-29 2:57 ` Parav Pandit
2018-08-06 2:01 Stephen Rothwell
2018-08-06 19:41 ` Jason Gunthorpe
2018-08-06 21:49 ` Stephen Rothwell
2017-08-08 2:11 Stephen Rothwell
2017-07-14 1:14 Stephen Rothwell
2017-07-14 1:17 ` Doug Ledford
2017-07-14 3:34 ` Leon Romanovsky
2017-07-14 3:50 ` Stephen Rothwell
2017-07-14 4:55 ` Leon Romanovsky
2017-07-14 12:03 ` Doug Ledford
2017-07-14 13:46 ` Leon Romanovsky
2017-07-14 4:12 ` Doug Ledford
2017-07-14 4:54 ` Leon Romanovsky
2017-07-14 14:33 ` Doug Ledford
2017-07-14 15:10 ` Leon Romanovsky
2016-12-15 0:47 Stephen Rothwell
2016-10-10 0:59 Stephen Rothwell
2016-10-10 0:54 Stephen Rothwell
2016-08-05 1:05 Stephen Rothwell
2016-08-05 1:01 Stephen Rothwell
2016-08-05 0:52 Stephen Rothwell
2016-05-19 1:45 Stephen Rothwell
2016-03-22 0:33 Stephen Rothwell
2016-03-22 0:29 Stephen Rothwell
2016-03-22 0:24 Stephen Rothwell
2016-03-22 0:17 Stephen Rothwell
2015-11-01 7:48 Stephen Rothwell
2015-11-02 10:40 ` Sagi Grimberg
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=64f58e2e-3081-4523-af37-b6c344ea301d@app.fastmail.com \
--to=leon@kernel$(echo .)org \
--cc=jgg@nvidia$(echo .)com \
--cc=leonro@nvidia$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=michaelgur@nvidia$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=yishaih@nvidia$(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