netdev - net merged into net-next

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

Message-Id: <20181220.120608.1115550863086705266.davem@davemloft.net>
Date:   Thu, 20 Dec 2018 12:06:08 -0800 (PST)
From:   David Miller <davem@...emloft.net>
To:     netdev@...r.kernel.org
CC:     saeedm@...lanox.com, daniel@...earbox.net,
        alexei.starovoitov@...il.com
Subject: net merged into net-next

There were a bunch of conflicts, but the issue seemed to be more about
quantity than difficulty in resolution.

Saeed, thanks for the conflict resolution guidance it helped a lot.  I
always like to do the resolutions by hand so I can double check things,
rather than pull a resolution from a GIT tree.  However I do use those
kinds of things to make sure I do the resolution correctly, so it is
helpful when you provide that for me.

Daniel and Alexei, there were some test case overlaps in the verifier
and stuff like that.  Please double check my work.

As stated the net-next tree is freezing tonight, please get your
changes in on time.

Thanks.