linux-next: manual merge of the rdma tree with the rdma-fixes tree

From: Mark Brown

Date: Thu Nov 19 2026 - 10:45:57 EST


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: signature.asc
Description: PGP signature