Re: linux-next: manual merge of the net-next tree with the infiniband tree
From: Or Gerlitz <hidden>
Date: 2012-11-27 06:46:33
Also in:
linux-next, linux-rdma, lkml
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 <redacted>