* linux-next: manual merge of the vfio tree with the net-next tree
@ 2022-09-09 4:44 Stephen Rothwell
2022-09-12 1:24 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2022-09-09 4:44 UTC (permalink / raw)
To: Alex Williamson, David Miller
Cc: Networking, Leon Romanovsky, Linux Kernel Mailing List,
Linux Next Mailing List, Lior Nahmanson, Raed Salem,
Saeed Mahameed, Yishai Hadas
[-- Attachment #1: Type: text/plain, Size: 1963 bytes --]
Hi all,
Today's linux-next merge of the vfio tree got conflicts in:
drivers/net/ethernet/mellanox/mlx5/core/fw.c
drivers/net/ethernet/mellanox/mlx5/core/main.c
between commit:
8ff0ac5be144 ("net/mlx5: Add MACsec offload Tx command support")
from the net-next tree and commit:
939838632b91 ("net/mlx5: Query ADV_VIRTUALIZATION capabilities")
from the vfio 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/fw.c
index c63ce03e79e0,483a51870505..000000000000
--- a/drivers/net/ethernet/mellanox/mlx5/core/fw.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fw.c
@@@ -273,13 -273,12 +273,19 @@@ int mlx5_query_hca_caps(struct mlx5_cor
return err;
}
+ if (MLX5_CAP_GEN_64(dev, general_obj_types) &
+ MLX5_GENERAL_OBJ_TYPES_CAP_MACSEC_OFFLOAD) {
+ err = mlx5_core_get_caps(dev, MLX5_CAP_MACSEC);
+ if (err)
+ return err;
+ }
+
+ if (MLX5_CAP_GEN(dev, adv_virtualization)) {
+ err = mlx5_core_get_caps(dev, MLX5_CAP_ADV_VIRTUALIZATION);
+ if (err)
+ return err;
+ }
+
return 0;
}
diff --cc drivers/net/ethernet/mellanox/mlx5/core/main.c
index b45cef89370e,de9c315a85fc..000000000000
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@@ -1507,7 -1488,7 +1507,8 @@@ static const int types[] =
MLX5_CAP_IPSEC,
MLX5_CAP_PORT_SELECTION,
MLX5_CAP_DEV_SHAMPO,
+ MLX5_CAP_MACSEC,
+ MLX5_CAP_ADV_VIRTUALIZATION,
};
static void mlx5_hca_caps_free(struct mlx5_core_dev *dev)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the vfio tree with the net-next tree
2022-09-09 4:44 linux-next: manual merge of the vfio tree with the net-next tree Stephen Rothwell
@ 2022-09-12 1:24 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2022-09-12 1:24 UTC (permalink / raw)
To: Alex Williamson, David Miller
Cc: Networking, Leon Romanovsky, Linux Kernel Mailing List,
Linux Next Mailing List, Lior Nahmanson, Raed Salem,
Saeed Mahameed, Yishai Hadas
[-- Attachment #1: Type: text/plain, Size: 591 bytes --]
Hi all,
On Fri, 9 Sep 2022 14:44:36 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the vfio tree got conflicts in:
>
> drivers/net/ethernet/mellanox/mlx5/core/fw.c
> drivers/net/ethernet/mellanox/mlx5/core/main.c
>
> between commit:
>
> 8ff0ac5be144 ("net/mlx5: Add MACsec offload Tx command support")
>
> from the net-next tree and commit:
>
> 939838632b91 ("net/mlx5: Query ADV_VIRTUALIZATION capabilities")
>
> from the vfio tree.
This latter commit is now also in the mlx5 tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-09-12 1:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-09 4:44 linux-next: manual merge of the vfio tree with the net-next tree Stephen Rothwell
2022-09-12 1:24 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox