From: Mark Brown <broonie@kernel.org>
To: Jason Gunthorpe <jgg@nvidia.com>, Leon Romanovsky <leonro@nvidia.com>
Cc: Dezhen Lu <dezhen.lu@student.uni-tuebingen.de>,
Edward Srouji <edwards@nvidia.com>,
Leon Romanovsky <leon@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Uri Dar <udar@nvidia.com>
Subject: linux-next: manual merge of the rdma tree with the rdma-fixes tree
Date: Thu, 19 Nov 2026 15:45:43 +0000 [thread overview]
Message-ID: <av8Zp9_kHuIN-wHt@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1179 bytes --]
Hi all,
Today's linux-next merge of the rdma tree got a conflict in:
drivers/infiniband/hw/mlx5/devx.c
between commit:
b5c11bf975983 ("RDMA/mlx5: Fix DevX umem page size truncation for pages >= 4G")
from the rdma-fixes tree and commit:
bbd8ba74c5a37 ("RDMA/mlx5: Fix DEVX UMEM mailbox size truncation")
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.
diff --cc drivers/infiniband/hw/mlx5/devx.c
index 2277160d9a33b,5ba783bc7f9b7..0000000000000
--- a/drivers/infiniband/hw/mlx5/devx.c
+++ b/drivers/infiniband/hw/mlx5/devx.c
@@@ -2333,7 -2337,9 +2337,9 @@@ static int devx_umem_reg_cmd_alloc(stru
int access)
{
unsigned long pgsz_bitmap;
- unsigned int page_size;
+ unsigned long page_size;
+ size_t num_mtt;
+ size_t inlen;
__be64 *mtt;
void *umem;
int ret;
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-11-19 15:45 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-19 15:45 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-11-19 15:45 Mark Brown
2025-03-06 1:37 Stephen Rothwell
2025-03-06 10:24 ` Zhu Yanjun
2025-03-06 11:35 ` Zhu Yanjun
[not found] ` <4d66668a-ff8e-48f6-a5e3-98ada08c5037@linux.dev>
2025-03-06 20:33 ` Stephen Rothwell
2023-09-28 1:38 Stephen Rothwell
2023-09-28 9:59 ` Leon Romanovsky
2022-01-06 0:44 Stephen Rothwell
2021-09-30 1:35 Stephen Rothwell
2021-10-01 13:52 ` Jason Gunthorpe
2019-08-23 2:22 Stephen Rothwell
2019-08-23 15:02 ` Jason Gunthorpe
2018-07-10 1:17 Stephen Rothwell
2018-07-10 5:19 ` Leon Romanovsky
2018-06-27 0:07 Stephen Rothwell
2018-06-27 5:50 ` Leon Romanovsky
2018-05-01 0:10 Stephen Rothwell
2018-05-01 0:55 ` Doug Ledford
2018-05-02 10:22 ` Leon Romanovsky
2018-05-02 14:00 ` Doug Ledford
2018-05-02 17:50 ` Jason Gunthorpe
2018-03-22 0:45 Stephen Rothwell
2018-01-17 1:51 Stephen Rothwell
2018-01-17 1:55 ` Stephen Rothwell
2018-01-17 3:03 ` 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=av8Zp9_kHuIN-wHt@sirena.org.uk \
--to=broonie@kernel.org \
--cc=dezhen.lu@student.uni-tuebingen.de \
--cc=edwards@nvidia.com \
--cc=jgg@nvidia.com \
--cc=leon@kernel.org \
--cc=leonro@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=udar@nvidia.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
all inboxes | Powered by JetHome®