From: Stephen Hemminger <step...@networkplumber.org> Date: Tue, 7 Feb 2017 14:17:40 -0800
> On Tue, 07 Feb 2017 16:41:41 -0500 (EST) > David Miller <da...@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.
