netdev - Re: linux-next: manual merge of the vfio tree with the net-next tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Mon, 12 Sep 2022 11:24:58 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Alex Williamson <alex.williamson@...hat.com>,
        David Miller <davem@...emloft.net>
Cc:     Networking <netdev@...r.kernel.org>,
        Leon Romanovsky <leon@...nel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Lior Nahmanson <liorna@...dia.com>,
        Raed Salem <raeds@...dia.com>,
        Saeed Mahameed <saeedm@...dia.com>,
        Yishai Hadas <yishaih@...dia.com>
Subject: Re: linux-next: manual merge of the vfio tree with the net-next
 tree

Hi all,

On Fri, 9 Sep 2022 14:44:36 +1000 Stephen Rothwell <sfr@...b.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

Content of type "application/pgp-signature" skipped