netdev - Re: netvsc merge conflicts...

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20170207141740.5a3c4ee9@xeon-e3>
Date:   Tue, 7 Feb 2017 14:17:40 -0800
From:   Stephen Hemminger <stephen@...workplumber.org>
To:     David Miller <davem@...emloft.net>
Cc:     netdev@...r.kernel.org
Subject: Re: netvsc merge conflicts...

On Tue, 07 Feb 2017 16:41:41 -0500 (EST)
David Miller <davem@...emloft.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.