From: David Miller <davem@davemloft.net>
To: stephen@networkplumber.org
Cc: netdev@vger.kernel.org
Subject: netvsc merge conflicts...
Date: Tue, 07 Feb 2017 16:41:41 -0500 (EST) [thread overview]
Message-ID: <20170207.164141.2253747431048804570.davem@davemloft.net> (raw)
Stephen, I just did a merge of net into net-next and had to
resolve a merge conflict in the netvsc driver.
The problem was that in 'net' the hyperv bug fix that added
the calls to "init_cache_read_index()" in netvsc_channel_cb()
collided with your RX path cleanups.
Please double check my work and send me any needed fixups.
Thanks!
next reply other threads:[~2017-02-07 21:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-07 21:41 David Miller [this message]
2017-02-07 22:17 ` netvsc merge conflicts Stephen Hemminger
2017-02-07 22:23 ` David Miller
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=20170207.164141.2253747431048804570.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=stephen@networkplumber.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).