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 <[email protected]> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
