Hi all,
On Tue, 15 Aug 2023 12:37:25 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the mlx5-next tree got a conflict in:
>
> drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_fs.c
>
> between commit:
>
> aeb660171b06 ("net/mlx5e: fix double free in macsec_fs_tx_create_crypto_table_groups")
>
> from Linus' tree and commit:
>
> cb5ebe4896f9 ("net/mlx5e: Move MACsec flow steering operations to be used as core library")
>
> from the mlx5-next tree.
>
> I fixed it up (I removed this file and added the following patch) 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.
>
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Tue, 15 Aug 2023 12:34:29 +1000
> Subject: [PATCH] fix up for "net/mlx5e: Move MACsec flow steering operations to be used as core library"
>
> interacting with commit
>
> aeb660171b06 ("net/mlx5e: fix double free in macsec_fs_tx_create_crypto_table_groups")
>
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> ---
> drivers/net/ethernet/mellanox/mlx5/core/lib/macsec_fs.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/macsec_fs.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/macsec_fs.c
> index 2f2cb67717cd..4a078113e292 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/lib/macsec_fs.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/macsec_fs.c
> @@ -278,6 +278,7 @@ static int macsec_fs_tx_create_crypto_table_groups(struct mlx5_macsec_flow_table
>
> if (!in) {
> kfree(ft->g);
> + ft->g = NULL;
> return -ENOMEM;
> }
>
> --
> 2.40.1
Was the second part of this resolution (i.e. the update to
drivers/net/ethernet/mellanox/mlx5/core/lib/macsec_fs.c) missed, or
deemed unnecessary after the mlx5-next tree was merged into the
net-next tree?
--
Cheers,
Stephen Rothwell
Attachment:
pgp1j5l2uFcxW.pgp
Description: OpenPGP digital signature
