linux-next: manual merge of the mlx5-next tree with Linus' tree

linux-next: manual merge of the mlx5-next tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1587 bytes --]

Hi Leon,

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

  include/linux/mlx5/eswitch.h

between commit:

  02f3afd97556 ("net/mlx5: E-Switch, Correct type to u16 for vport_num and int for vport_index")

from Linus' tree and commit:

  82b11f071936 ("net/mlx5: Expose eswitch encap mode")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc include/linux/mlx5/eswitch.h
index e9a55c0d50fd,174eec0871d9..000000000000
--- a/include/linux/mlx5/eswitch.h
+++ b/include/linux/mlx5/eswitch.h
@@@ -61,5 -62,16 +62,16 @@@ void *mlx5_eswitch_uplink_get_proto_dev
  u8 mlx5_eswitch_mode(struct mlx5_eswitch *esw);
  struct mlx5_flow_handle *
  mlx5_eswitch_add_send_to_vport_rule(struct mlx5_eswitch *esw,
 -				    int vport, u32 sqn);
 +				    u16 vport_num, u32 sqn);
+ 
+ #ifdef CONFIG_MLX5_ESWITCH
+ enum devlink_eswitch_encap_mode
+ mlx5_eswitch_get_encap_mode(const struct mlx5_core_dev *dev);
+ #else  /* CONFIG_MLX5_ESWITCH */
+ static inline enum devlink_eswitch_encap_mode
+ mlx5_eswitch_get_encap_mode(const struct mlx5_core_dev *dev)
+ {
+ 	return DEVLINK_ESWITCH_ENCAP_MODE_NONE;
+ }
+ #endif /* CONFIG_MLX5_ESWITCH */
  #endif

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the mlx5-next tree with Linus' tree

[Leon Romanovsky]

On Mon, Jun 17, 2019 at 12:19:59PM +1000, Stephen Rothwell wrote:
> Hi Leon,
>
> Today's linux-next merge of the mlx5-next tree got a conflict in:
>
>   include/linux/mlx5/eswitch.h
>
> between commit:
>
>   02f3afd97556 ("net/mlx5: E-Switch, Correct type to u16 for vport_num and int for vport_index")
>
> from Linus' tree and commit:
>
>   82b11f071936 ("net/mlx5: Expose eswitch encap mode")
>
> 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.
>
> --
> Cheers,
> Stephen Rothwell
>

Thanks

Re: linux-next: manual merge of the mlx5-next tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1881 bytes --]

Hi all,

On Mon, 17 Jun 2019 12:19:59 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Leon,
> 
> Today's linux-next merge of the mlx5-next tree got a conflict in:
> 
>   include/linux/mlx5/eswitch.h
> 
> between commit:
> 
>   02f3afd97556 ("net/mlx5: E-Switch, Correct type to u16 for vport_num and int for vport_index")
> 
> from Linus' tree and commit:
> 
>   82b11f071936 ("net/mlx5: Expose eswitch encap mode")
> 
> 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.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc include/linux/mlx5/eswitch.h
> index e9a55c0d50fd,174eec0871d9..000000000000
> --- a/include/linux/mlx5/eswitch.h
> +++ b/include/linux/mlx5/eswitch.h
> @@@ -61,5 -62,16 +62,16 @@@ void *mlx5_eswitch_uplink_get_proto_dev
>   u8 mlx5_eswitch_mode(struct mlx5_eswitch *esw);
>   struct mlx5_flow_handle *
>   mlx5_eswitch_add_send_to_vport_rule(struct mlx5_eswitch *esw,
>  -				    int vport, u32 sqn);
>  +				    u16 vport_num, u32 sqn);
> + 
> + #ifdef CONFIG_MLX5_ESWITCH
> + enum devlink_eswitch_encap_mode
> + mlx5_eswitch_get_encap_mode(const struct mlx5_core_dev *dev);
> + #else  /* CONFIG_MLX5_ESWITCH */
> + static inline enum devlink_eswitch_encap_mode
> + mlx5_eswitch_get_encap_mode(const struct mlx5_core_dev *dev)
> + {
> + 	return DEVLINK_ESWITCH_ENCAP_MODE_NONE;
> + }
> + #endif /* CONFIG_MLX5_ESWITCH */
>   #endif

This is now a conflict between Linus' tree and the rdma tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the mlx5-next tree with Linus' tree

[Jakub Kicinski]

On Fri, 25 Aug 2023 11:05:36 +1000 Stephen Rothwell wrote:
> 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?

Ugh, I should have caught it. Let me apply your fix from the list.

Re: linux-next: manual merge of the mlx5-next tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2223 bytes --]

Hi all,

On Tue, 15 Aug 2023 12:37:25 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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@canb.auug.org.au>
> 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@canb.auug.org.au>
> ---
>  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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the mlx5-next tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1829 bytes --]

Hi all,

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@canb.auug.org.au>
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@canb.auug.org.au>
---
 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

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the mlx5-next tree with Linus' tree

[Leon Romanovsky]

On Tue, Jul 02, 2019 at 01:13:27PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the mlx5-next tree got a conflict in:
>
>   drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
>
> between commit:
>
>   955858009708 ("net/mlx5e: Fix number of vports for ingress ACL configuration")
>
> from Linus' tree and commit:
>
>   062f4bf4aab5 ("net/mlx5: E-Switch, Consolidate eswitch function number of VFs")
>
> from the mlx5-next tree.
>
> I fixed it up (I just used the latter version) 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.

Thanks Stephen,

I expect this conflict will vanish once both rdma and netdev pull
mlx5-next branch, which is based on -rc2.

Thanks

>
> --
> Cheers,
> Stephen Rothwell

linux-next: manual merge of the mlx5-next tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 822 bytes --]

Hi all,

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

  drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c

between commit:

  955858009708 ("net/mlx5e: Fix number of vports for ingress ACL configuration")

from Linus' tree and commit:

  062f4bf4aab5 ("net/mlx5: E-Switch, Consolidate eswitch function number of VFs")

from the mlx5-next tree.

I fixed it up (I just used the latter version) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the mlx5-next tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1344 bytes --]

Hi all,

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

  drivers/net/ethernet/mellanox/mlx5/core/eswitch.c

between commits:

  02f3afd97556 ("net/mlx5: E-Switch, Correct type to u16 for vport_num and int for vport_index")

from Linus' tree and commit:

  5f5d2536be8d ("net/mlx5: E-Switch, Use correct flags when configuring vlan")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
index 67e76979bb42,89f52370e770..000000000000
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@@ -1552,7 -1552,8 +1552,8 @@@ static void node_guid_gen_from_mac(u64 
  static void esw_apply_vport_conf(struct mlx5_eswitch *esw,
  				 struct mlx5_vport *vport)
  {
 -	int vport_num = vport->vport;
 +	u16 vport_num = vport->vport;
+ 	int flags;
  
  	if (esw->manager_vport == vport_num)
  		return;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]