Hi all,
On Fri, 9 Sep 2022 14:44:36 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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:
pgp1GpHdzZkPy.pgp
Description: OpenPGP digital signature
