netdev - Re: linux-next: manual merge of the net-next tree with the nettree

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]

Date:	Tue, 12 Jan 2016 11:12:33 +0200
From:	Ido Schimmel <idosch@...lanox.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>,
	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	Jiri Pirko <jiri@...lanox.com>
Subject: Re: linux-next: manual merge of the net-next tree with the nettree

Tue, Jan 12, 2016 at 04:15:07AM IST, sfr@...b.auug.org.au wrote:
>Hi all,
>
>Today's linux-next merge of the net-next tree got a conflict in:
>
>  drivers/net/ethernet/mellanox/mlxsw/spectrum.h
>
>between commit:
>
>  366ce6031529 ("mlxsw: spectrum: Add FDB lock to prevent session interleaving")
>
>from the net tree and commit:
>
>  0d65fc13042f ("mlxsw: spectrum: Implement LAG port join/leave")
>
>from the net-next tree.
>
>I fixed it up (see below) and can carry the fix as necessary (no action
>is required).

Acked-by: Ido Schimmel <idosch@...lanox.com>

Thanks!