On Tue, 2018-12-04 at 10:34 +0200, Leon Romanovsky wrote:
> Hi Doug and Jason,
>
> I merged mlx5-next into latest rdma/wip/dl-for-next branch and saw the
> following merge conflict, which is worth to mention:
Thanks Leon, I've copied this into my merge.
> diff --cc drivers/infiniband/hw/mlx5/main.c
> index 5236169c42d0,96515a8c9d2c..b3986bc961ca
> --- a/drivers/infiniband/hw/mlx5/main.c
> +++ b/drivers/infiniband/hw/mlx5/main.c
> @@@ -6238,6 -6336,12 +6328,9 @@@ static const struct mlx5_ib_profile pf_
> STAGE_CREATE(MLX5_IB_STAGE_PRE_IB_REG_UMR,
> NULL,
> mlx5_ib_stage_pre_ib_reg_umr_cleanup),
> - STAGE_CREATE(MLX5_IB_STAGE_SPECS,
> - mlx5_ib_stage_populate_specs,
> - NULL),
> + STAGE_CREATE(MLX5_IB_STAGE_WHITELIST_UID,
> + mlx5_ib_stage_devx_init,
> + mlx5_ib_stage_devx_cleanup),
> STAGE_CREATE(MLX5_IB_STAGE_IB_REG,
> mlx5_ib_stage_ib_reg_init,
> mlx5_ib_stage_ib_reg_cleanup),
> diff --cc drivers/infiniband/hw/mlx5/mlx5_ib.h
> index 93772434b9e3,861b68f2e330..59e1664a107f
> --- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
> +++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
> @@@ -783,6 -784,8 +786,7 @@@ enum mlx5_ib_stages
> MLX5_IB_STAGE_UAR,
> MLX5_IB_STAGE_BFREG,
> MLX5_IB_STAGE_PRE_IB_REG_UMR,
> - MLX5_IB_STAGE_SPECS,
> + MLX5_IB_STAGE_WHITELIST_UID,
> MLX5_IB_STAGE_IB_REG,
> MLX5_IB_STAGE_POST_IB_REG_UMR,
> MLX5_IB_STAGE_DELAY_DROP,
> @@@ -892,7 -896,9 +897,8 @@@ struct mlx5_ib_pf_eq
>
> struct mlx5_ib_dev {
> struct ib_device ib_dev;
> - const struct uverbs_object_tree_def *driver_trees[7];
> struct mlx5_core_dev *mdev;
> + struct notifier_block mdev_events;
> struct mlx5_roce roce[MLX5_MAX_PORTS];
> int num_ports;
> /* serialize update of capability mask
>
> Thanks
--
Doug Ledford <dledford@xxxxxxxxxx>
GPG KeyID: B826A3330E572FDD
Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD
Attachment:
signature.asc
Description: This is a digitally signed message part
