linux-kernel - Re: [GIT] Networking

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: <56F019D5.9040907@dev.mellanox.co.il>
Date:	Mon, 21 Mar 2016 17:57:09 +0200
From:	Yishai Hadas <yishaih@....mellanox.co.il>
To:	David Miller <davem@...emloft.net>
Cc:	torvalds@...ux-foundation.org, akpm@...ux-foundation.org,
	netdev@...r.kernel.org, linux-kernel@...r.kernel.org,
	"yishaih@...lanox.com" <yishaih@...lanox.com>,
	Majd Dibbiny <majd@...lanox.com>
Subject: Re: [GIT] Networking

On 3/19/2016 6:42 AM, David Miller wrote:
>
> There is a merge conflict against the RDMA tree pull wrt the mlx4 driver,
> which I don't know how to resolve.

Can you please point on the conflict ? is it still open that needs our 
input ?