Re: netvsc merge conflicts...

2017-02-07 Thread David Miller
From: Stephen Hemminger Date: Tue, 7 Feb 2017 14:17:40 -0800 > On Tue, 07 Feb 2017 16:41:41 -0500 (EST) > David Miller 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 fi

Re: netvsc merge conflicts...

2017-02-07 Thread Stephen Hemminger
On Tue, 07 Feb 2017 16:41:41 -0500 (EST) David Miller 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_c