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] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAM_iQpVS1C45_8zA6Qbke562ASrkCEgD1jzhachZwssCzejRmg@mail.gmail.com>
Date:   Thu, 2 Nov 2017 11:08:12 -0700
From:   Cong Wang <xiyou.wangcong@...il.com>
To:     David Miller <davem@...emloft.net>, Jiri Pirko <jiri@...nulli.us>
Cc:     Linux Kernel Network Developers <netdev@...r.kernel.org>
Subject: Re: net-next MERGE

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.

Thanks for solving the pain! ;)