From: "Michael S. Tsirkin" <mst@redhat.com>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, jasowang@redhat.com
Subject: Re: net-next virtio_net merge...
Date: Wed, 2 Aug 2017 16:14:54 +0300 [thread overview]
Message-ID: <20170802161436-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <20170801.151220.241719275238287015.davem@davemloft.net>
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
prev parent reply other threads:[~2017-08-02 13:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-01 22:12 net-next virtio_net merge David Miller
2017-08-02 13:14 ` Michael S. Tsirkin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170802161436-mutt-send-email-mst@kernel.org \
--to=mst@redhat.com \
--cc=davem@davemloft.net \
--cc=jasowang@redhat.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).