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

[Mark Brown <broonie@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 1564 bytes --]

Hi all,

Today's linux-next merge of the mlx5-next tree got a conflict in:

  drivers/infiniband/hw/mlx5/mr.c

between commit:

  36680ef7bceb0 ("RDMA/mlx5: Switch from MR cache to FRMR pools")

from the rdma tree and commit:

  4dd2115f43594 ("net/mlx5: Expose MLX5_UMR_ALIGN definition")

from the mlx5-next 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/mr.c
index cbe34251e340b,ff56948597ddb..0000000000000
--- a/drivers/infiniband/hw/mlx5/mr.c
+++ b/drivers/infiniband/hw/mlx5/mr.c
@@@ -46,15 -46,14 +46,14 @@@
  #include "data_direct.h"
  #include "dmah.h"
  
- #define MLX5_UMR_ALIGN 2048
 -enum {
 -	MAX_PENDING_REG_MR = 8,
 -};
  
 -#define MLX5_MR_CACHE_PERSISTENT_ENTRY_MIN_DESCS 4
 +static int mkey_max_umr_order(struct mlx5_ib_dev *dev)
 +{
 +	if (MLX5_CAP_GEN(dev->mdev, umr_extended_translation_offset))
 +		return MLX5_MAX_UMR_EXTENDED_SHIFT;
 +	return MLX5_MAX_UMR_SHIFT;
 +}
  
 -static void
 -create_mkey_callback(int status, struct mlx5_async_work *context);
  static struct mlx5_ib_mr *reg_create(struct ib_pd *pd, struct ib_umem *umem,
  				     u64 iova, int access_flags,
  				     unsigned long page_size, bool populate,

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]