netdev - Re: net-next MERGE

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: <20171102205243.GC2024@nanopsycho>
Date:   Thu, 2 Nov 2017 21:52:43 +0100
From:   Jiri Pirko <jiri@...nulli.us>
To:     Cong Wang <xiyou.wangcong@...il.com>
Cc:     David Miller <davem@...emloft.net>,
        Linux Kernel Network Developers <netdev@...r.kernel.org>
Subject: Re: net-next MERGE

Thu, Nov 02, 2017 at 07:08:12PM CET, xiyou.wangcong@...il.com wrote:
>On Wed, Nov 1, 2017 at 11:51 PM, David Miller <davem@...emloft.net> wrote:
>>
>> Cong, I just did another net --> net-next merge.
>>
>> Please look at how I resolved the cls_api.c conflict.
>>
>> Thank you.
>
>Looks good to me.

Also looks fine to me.