From: Leon Romanovsky <leon@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>,
Doug Ledford <dledford@redhat.com>,
Jason Gunthorpe <jgg@mellanox.com>,
Networking <netdev@vger.kernel.org>,
Daniel Jurgens <danielj@nvidia.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Mark Bloch <mbloch@nvidia.com>,
Saeed Mahameed <saeedm@nvidia.com>
Subject: Re: linux-next: manual merge of the net-next tree with the rdma-fixes tree
Date: Tue, 13 Jun 2023 15:39:32 +0300 [thread overview]
Message-ID: <20230613123932.GA12152@unreal> (raw)
In-Reply-To: <20230613114359.59cadc05@canb.auug.org.au>
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) {
next prev parent reply other threads:[~2023-06-13 12:40 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-13 1:43 linux-next: manual merge of the net-next tree with the rdma-fixes tree Stephen Rothwell
2023-06-13 12:39 ` Leon Romanovsky [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-03-16 0:56 Stephen Rothwell
2018-03-16 1:18 ` Doug Ledford
2018-03-16 2:05 ` Jason Gunthorpe
2018-03-16 6:54 ` Saeed Mahameed
2018-03-23 4:19 ` David Miller
2018-03-23 4:33 ` Jason Gunthorpe
2018-03-23 14:22 ` David Miller
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=20230613123932.GA12152@unreal \
--to=leon@kernel.org \
--cc=danielj@nvidia.com \
--cc=davem@davemloft.net \
--cc=dledford@redhat.com \
--cc=jgg@mellanox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mbloch@nvidia.com \
--cc=netdev@vger.kernel.org \
--cc=saeedm@nvidia.com \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).