On Tue, Jun 13, 2023 at 11:43:59AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> include/linux/mlx5/driver.h
>
> between commit:
>
> 617f5db1a626 ("RDMA/mlx5: Fix affinity assignment")
>
> from the rdma-fixes tree and commit:
>
> dc13180824b7 ("net/mlx5: Enable devlink port for embedded cpu VF vports")
>
> from the net-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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc include/linux/mlx5/driver.h
> index e0156b54d0b3,18a608a1f567..000000000000
> --- a/include/linux/mlx5/driver.h
> +++ b/include/linux/mlx5/driver.h
> @@@ -1228,18 -1246,11 +1236,23 @@@ static inline u16 mlx5_core_max_vfs(con
> return dev->priv.sriov.max_vfs;
> }
>
> +static inline int mlx5_lag_is_lacp_owner(struct mlx5_core_dev *dev)
> +{
> + /* LACP owner conditions:
> + * 1) Function is physical.
> + * 2) LAG is supported by FW.
> + * 3) LAG is managed by driver (currently the only option).
> + */
> + return MLX5_CAP_GEN(dev, vport_group_manager) &&
> + (MLX5_CAP_GEN(dev, num_lag_ports) > 1) &&
> + MLX5_CAP_GEN(dev, lag_master);
> +}
> +
> + static inline u16 mlx5_core_max_ec_vfs(const struct mlx5_core_dev *dev)
> + {
> + return dev->priv.sriov.max_ec_vfs;
> + }
> +
Thanks for the resolution. Looks good.
> static inline int mlx5_get_gid_table_len(u16 param)
> {
> if (param > 4) {
