* net-next virtio_net merge...
@ 2017-08-01 22:12 David Miller
2017-08-02 13:14 ` Michael S. Tsirkin
0 siblings, 1 reply; 2+ messages in thread
From: David Miller @ 2017-08-01 22:12 UTC (permalink / raw)
To: mst; +Cc: netdev, jasowang
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: net-next virtio_net merge...
2017-08-01 22:12 net-next virtio_net merge David Miller
@ 2017-08-02 13:14 ` Michael S. Tsirkin
0 siblings, 0 replies; 2+ messages in thread
From: Michael S. Tsirkin @ 2017-08-02 13:14 UTC (permalink / raw)
To: David Miller; +Cc: netdev, jasowang
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-08-02 13:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-01 22:12 net-next virtio_net merge David Miller
2017-08-02 13:14 ` Michael S. Tsirkin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).