netdev - Re: net-next virtio

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: <20170802161436-mutt-send-email-mst@kernel.org>
Date:   Wed, 2 Aug 2017 16:14:54 +0300
From:   "Michael S. Tsirkin" <mst@...hat.com>
To:     David Miller <davem@...emloft.net>
Cc:     netdev@...r.kernel.org, jasowang@...hat.com
Subject: Re: net-next virtio_net merge...

On Tue, Aug 01, 2017 at 03:12:20PM -0700, David Miller wrote:
> 
> I just merged net into net-next and one of the conflicts had to do with
> the truesize bug fix in 'net' conflicting with the changes in 'net-next'
> which encode the headroom into the contexts for mergeable buffers.
> 
> I did my best to resolve this, but if you two would take a closer
> look and test out the result I would really appreciate it!
> 
> Thanks.

Looks good to me. Will test later today or tomorrow.

-- 
MST