On 26/02/2013 02:45, Stephen Rothwell wrote:
Hi all,Today's linux-next merge of the infiniband tree got a conflict in drivers/net/ethernet/mellanox/mlx4/mlx4.h between commit 23537b732f5d ("net/mlx4_core: Use firmware driven flow steering hash mode") from Linus' tree and commit e448834e3545 ("mlx4_core: Enable memory windows in {INIT, QUERY}_HCA") from the infiniband tree. I fixed it up (see below) and can carry the fix as necessary (no action is required).
thanks, Acked-by: Or Gerlitz <[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/
