netdev - Re: linux-next: manual merge of the net-next tree with the infiniband 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <50B460FA.1080603@mellanox.com>
Date:	Tue, 27 Nov 2012 08:43:06 +0200
From:	Or Gerlitz <ogerlitz@...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>,
	Roland Dreier <roland@...nel.org>,
	<linux-rdma@...r.kernel.org>,
	Ben Hutchings <bhutchings@...arflare.com>,
	Amir Vadai <amirv@...lanox.com>
Subject: Re: linux-next: manual merge of the net-next tree with the infiniband
 tree

On 27/11/2012 02:47, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/ethernet/mellanox/mlx4/en_rx.c between commit 08ff32352d6f
> ("mlx4: 64-byte CQE/EQE support") from the infiniband tree and commit
> f1d29a3fa68b ("mlx4_en: Remove remnants of LRO support") from the
> net-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>

Acked-by: Or Geritz <ogerlitz@...lanox.com>
--
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