Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 13 Jun 2023 11:43:59 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     David Miller <davem@davemloft.net>,
        Doug Ledford <dledford@redhat.com>,
        Jason Gunthorpe <jgg@mellanox.com>
Cc:     Networking <netdev@vger.kernel.org>,
        Daniel Jurgens <danielj@nvidia.com>,
        Leon Romanovsky <leon@kernel.org>,
        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: linux-next: manual merge of the net-next tree with the rdma-fixes
 tree
Message-ID: <20230613114359.59cadc05@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/iZAUV9bTPFy6JH/xdvbPhsh";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/iZAUV9bTPFy6JH/xdvbPhsh
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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.

--=20
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;
  }
 =20
 +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;
+ }
+=20
  static inline int mlx5_get_gid_table_len(u16 param)
  {
  	if (param > 4) {

--Sig_/iZAUV9bTPFy6JH/xdvbPhsh
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmSHyd8ACgkQAVBC80lX
0GxOtQgAjStFgSWvROQ22uyIcuGwkDpjCaUL9ezz/pvLyXO/Y5aF1NjHnnaMg+Du
wq4LI2ampmS+i+3YO5G9VgYbYFaq8lXO2Knxm+P8YV2aaaw0N3DkNF4PxMGMSV4n
C+whZvVQX4KknEZ0wa4wYOgJWT/tXtZau5cmuTXvbIr1XyvfaPoKwH1a0DWD2UAO
PeEITW5Now8KotnZSQJ3CYLihbYF7SUb7KwDawrZ+cyc/2CW//O9koUWAJ00mMTu
ot5zrVLnupLN4MQp2vw1zHFehR4D8N0xopvAqeA8cWTxddyzMefcayym3tA3Vm4S
AUIKFgQjBRyA3mKGjrYufmhgxt9EAg==
=v+/8
-----END PGP SIGNATURE-----

--Sig_/iZAUV9bTPFy6JH/xdvbPhsh--