2 messages, 2 authors, 2017-08-02 · open the first message on its own page
From: David Miller <davem@davemloft.net>
Date: 2017-08-01 22:12:21
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.
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: 2017-08-02 13:15:25
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