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] [day] [month] [year] [list]

Message-Id: <20170207.172309.929698282416047936.davem@davemloft.net>
Date:   Tue, 07 Feb 2017 17:23:09 -0500 (EST)
From:   David Miller <davem@...emloft.net>
To:     stephen@...workplumber.org
Cc:     netdev@...r.kernel.org
Subject: Re: netvsc merge conflicts...

From: Stephen Hemminger <stephen@...workplumber.org>
Date: Tue, 7 Feb 2017 14:17:40 -0800

> 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.

Great, thanks for checking it out for me.