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

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 for Android: free password hash cracker in your pocket

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

Message-ID: <5523C296.9090508@dev.mellanox.co.il>
Date:	Tue, 07 Apr 2015 14:42:14 +0300
From:	Ido Shamay <idos@....mellanox.co.il>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	David Miller <davem@...emloft.net>, netdev@...r.kernel.org
CC:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jack Morgenstein <jackm@....mellanox.co.il>,
	Ido Shamay <idos@...lanox.com>,
	Or Gerlitz <ogerlitz@...lanox.com>
Subject: Re: linux-next: manual merge of the net-next tree with the net tree

On 4/7/2015 6:18 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/ethernet/mellanox/mlx4/cmd.c between commit fde913e25496
> ("net/mlx4_core: Fix error message deprecation for ConnectX-2 cards")
> from the net tree and commit a130b5905732 ("net/mlx4: Add SET_PORT
> opcode modifiers enumeration") from the net-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html