Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Fri, 1 May 2020 13:12:30 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     "Gustavo A. R. Silva" <gustavo@embeddedor.com>,
        David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>
Cc:     Leon Romanovsky <leon@kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Huy Nguyen <huyn@mellanox.com>,
        Saeed Mahameed <saeedm@mellanox.com>,
        Raed Salem <raeds@mellanox.com>
Subject: Re: linux-next: manual merge of the mlx5-next tree with the
 kspp-gustavo tree
Message-ID: <20200501131230.58835994@canb.auug.org.au>
In-Reply-To: <20200429120625.2b5bb507@canb.auug.org.au>
References: <20200429120625.2b5bb507@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/3Wm6hv7q_O_SNduvacDF_Oj";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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

Hi all,

On Wed, 29 Apr 2020 12:06:25 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the mlx5-next tree got a conflict in:
>=20
>   include/linux/mlx5/mlx5_ifc.h
>=20
> between commit:
>=20
>   3ba225b506a2 ("treewide: Replace zero-length array with flexible-array =
member")
>=20
> from the kspp-gustavo tree and commit:
>=20
>   d65dbedfd298 ("net/mlx5: Add support for COPY steering action")
>=20
> from the mlx5-next tree.
>=20
> 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
> --=20
> Cheers,
> Stephen Rothwell
>=20
> diff --cc include/linux/mlx5/mlx5_ifc.h
> index 8d30f18dcdee,fb243848132d..000000000000
> --- a/include/linux/mlx5/mlx5_ifc.h
> +++ b/include/linux/mlx5/mlx5_ifc.h
> @@@ -5743,7 -5771,7 +5771,7 @@@ struct mlx5_ifc_alloc_modify_header_con
>   	u8         reserved_at_68[0x10];
>   	u8         num_of_actions[0x8];
>  =20
> - 	union mlx5_ifc_set_action_in_add_action_in_auto_bits actions[];
>  -	union mlx5_ifc_set_add_copy_action_in_auto_bits actions[0];
> ++	union mlx5_ifc_set_add_copy_action_in_auto_bits actions[];
>   };
>  =20
>   struct mlx5_ifc_dealloc_modify_header_context_out_bits {
> @@@ -9677,9 -9705,32 +9705,32 @@@ struct mlx5_ifc_mcda_reg_bits=20
>  =20
>   	u8         reserved_at_60[0x20];
>  =20
>  -	u8         data[0][0x20];
>  +	u8         data[][0x20];
>   };
>  =20
> + enum {
> + 	MLX5_MFRL_REG_RESET_TYPE_FULL_CHIP =3D BIT(0),
> + 	MLX5_MFRL_REG_RESET_TYPE_NET_PORT_ALIVE =3D BIT(1),
> + };
> +=20
> + enum {
> + 	MLX5_MFRL_REG_RESET_LEVEL0 =3D BIT(0),
> + 	MLX5_MFRL_REG_RESET_LEVEL3 =3D BIT(3),
> + 	MLX5_MFRL_REG_RESET_LEVEL6 =3D BIT(6),
> + };
> +=20
> + struct mlx5_ifc_mfrl_reg_bits {
> + 	u8         reserved_at_0[0x20];
> +=20
> + 	u8         reserved_at_20[0x2];
> + 	u8         pci_sync_for_fw_update_start[0x1];
> + 	u8         pci_sync_for_fw_update_resp[0x2];
> + 	u8         rst_type_sel[0x3];
> + 	u8         reserved_at_28[0x8];
> + 	u8         reset_type[0x8];
> + 	u8         reset_level[0x8];
> + };
> +=20
>   struct mlx5_ifc_mirc_reg_bits {
>   	u8         reserved_at_0[0x18];
>   	u8         status_code[0x8];

This is now a conflict between the net-next and kspp-gustavo trees.

--=20
Cheers,
Stephen Rothwell

--Sig_/3Wm6hv7q_O_SNduvacDF_Oj
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl6rk54ACgkQAVBC80lX
0GziZwgAktgIhS4cVUIEemnKH5jbGZPN+B2zibbUeQKdPPIadgrs8r617rsu7F51
Tr2M89lznsENYuY2VpBAuyl3uU+aIzLDlM9ufs1Euw9Id0IypyGG6SABFQTo+6jL
tU7qHfPcprdVtF9ZcWtHhEf6FHgeqvcXtFHRn9wavB9pOZYjN+xfQ9rAUP8vkded
kcKSqpxxk3Ifr2CriSr45uV2NCCWBFDRGRM8EZ54XZkNdl2z1+3l0qaAZFKyQxrR
+xIcTwcXuuTVA9Z1eO5PyznZUv0vq+XpOIww8Evkww6V2jLJi7bE//WxDVPvbU2j
zkbPvJl5Pu2a5Af1yUir49bsvsDKbA==
=uGS7
-----END PGP SIGNATURE-----

--Sig_/3Wm6hv7q_O_SNduvacDF_Oj--