* netvsc merge conflicts...
@ 2017-02-07 21:41 David Miller
2017-02-07 22:17 ` Stephen Hemminger
0 siblings, 1 reply; 3+ messages in thread
From: David Miller @ 2017-02-07 21:41 UTC (permalink / raw)
To: stephen; +Cc: netdev
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!
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: netvsc merge conflicts...
2017-02-07 21:41 netvsc merge conflicts David Miller
@ 2017-02-07 22:17 ` Stephen Hemminger
2017-02-07 22:23 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Hemminger @ 2017-02-07 22:17 UTC (permalink / raw)
To: David Miller; +Cc: netdev
On Tue, 07 Feb 2017 16:41:41 -0500 (EST)
David Miller <davem@davemloft.net> wrote:
> 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!
Sorry the init_cache_read_index came through greg's driver tree.
Your merge cleanup matches what I was doing manually.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: netvsc merge conflicts...
2017-02-07 22:17 ` Stephen Hemminger
@ 2017-02-07 22:23 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2017-02-07 22:23 UTC (permalink / raw)
To: stephen; +Cc: netdev
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Tue, 7 Feb 2017 14:17:40 -0800
> On Tue, 07 Feb 2017 16:41:41 -0500 (EST)
> David Miller <davem@davemloft.net> wrote:
>
>> 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!
>
> Sorry the init_cache_read_index came through greg's driver tree.
> Your merge cleanup matches what I was doing manually.
Great, thanks for checking it out for me.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-02-07 22:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-07 21:41 netvsc merge conflicts David Miller
2017-02-07 22:17 ` Stephen Hemminger
2017-02-07 22:23 ` David Miller
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).