Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4;
Date:   Tue, 3 Oct 2023 10:37:12 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Leon Romanovsky <leon@kernel.org>,
        David Miller <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>
Cc:     Networking <netdev@vger.kernel.org>, Jiri Pirko <jiri@nvidia.com>,
        Jiri Pirko <jiri@resnulli.us>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Patrisious Haddad <phaddad@nvidia.com>
Subject: linux-next: manual merge of the mlx5-next tree with the net-next
 tree
Message-ID: <20231003103712.5703b5e0@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/audx8+6=rD2Db8A9QbMBV5E";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/audx8+6=rD2Db8A9QbMBV5E
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  include/linux/mlx5/device.h

between commit:

  ac5f395685bd ("net/mlx5: SF, Implement peer devlink set for SF represento=
r devlink port")

from the net-next tree and commit:

  0d293714ac32 ("RDMA/mlx5: Send events from IB driver about device affilia=
tion state")

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.

--=20
Cheers,
Stephen Rothwell

diff --cc include/linux/mlx5/device.h
index 8fbe22de16ef,26333d602a50..000000000000
--- a/include/linux/mlx5/device.h
+++ b/include/linux/mlx5/device.h
@@@ -366,7 -366,8 +366,9 @@@ enum mlx5_driver_event=20
  	MLX5_DRIVER_EVENT_UPLINK_NETDEV,
  	MLX5_DRIVER_EVENT_MACSEC_SA_ADDED,
  	MLX5_DRIVER_EVENT_MACSEC_SA_DELETED,
 +	MLX5_DRIVER_EVENT_SF_PEER_DEVLINK,
+ 	MLX5_DRIVER_EVENT_AFFILIATION_DONE,
+ 	MLX5_DRIVER_EVENT_AFFILIATION_REMOVED,
  };
 =20
  enum {

--Sig_/audx8+6=rD2Db8A9QbMBV5E
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUbVCgACgkQAVBC80lX
0GwXlQf/Ta0GYkWCHnuXhPZD4IN/SWBGyNK6uxsf9Pfsr0JfvwYZ0XvQ0nx5QD8g
w6h5inIBuLaEH8zSqJzXAxCPuBaN4JSorgRT4rZb7SHhn1J7PvHbEA8lqMyDOcit
0+G86x8rhz9E5hyUmq65x7UBr1/fIHOOks9D3G0wJ63DIoQqCbhRJBRxJuFnNrsf
DmdOEwxJetQF23cpt6Pgxq85+hgtb6itt9+l6NfM0tHMetlkKWe8FAOWRCv4utrq
eL20KbA73N+pNEm41XMIc6IzplkHuuZSxSLxzT7jBtwvoC8gWkE6Z5lgsgpQMFIs
qhKdk7V72zP/4vuo77OSDLowRMKMxQ==
=6jwz
-----END PGP SIGNATURE-----

--Sig_/audx8+6=rD2Db8A9QbMBV5E--