linux-kernel - Re: linux-next: manual merge of the mlx5-next tree with the kspp-gustavo 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]

Message-ID: <585d76be-a2e7-1da6-9a9a-f46f14aea222@embeddedor.com>
Date:   Thu, 30 Apr 2020 22:54:33 -0500
From:   "Gustavo A. R. Silva" <gustavo@...eddedor.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>
Cc:     Leon Romanovsky <leon@...nel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Huy Nguyen <huyn@...lanox.com>,
        Saeed Mahameed <saeedm@...lanox.com>,
        Raed Salem <raeds@...lanox.com>
Subject: Re: linux-next: manual merge of the mlx5-next tree with the
 kspp-gustavo tree

Stephen,

On 4/30/20 22:30, Gustavo A. R. Silva wrote:

>> This is now a conflict between the net-next and kspp-gustavo trees.
>>
> 
> Thanks for reporting this. I think the best solution, for now, is to remove the
> changes from my tree. I'll do it right away.
> 

I just updated my -next tree. This conflict should be resolved now. :)

Thanks
--
Gustavo