[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20170801.151220.241719275238287015.davem@davemloft.net>
Date: Tue, 01 Aug 2017 15:12:20 -0700 (PDT)
From: David Miller <davem@...emloft.net>
To: mst@...hat.com
CC: netdev@...r.kernel.org, jasowang@...hat.com
Subject: net-next virtio_net merge...
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.
Powered by blists - more mailing lists