On 7/12/2012 5:13 AM, Stephen Rothwell wrote:
Hi all,Today's linux-next merge of the net-next tree got a conflict in include/linux/mlx4/device.h between commit 396f2feb05d7 ("mlx4_core: Implement mechanism for reserved Q_Keys") from the infiniband tree and commit 0ff1fb654bec ("{NET, IB}/mlx4: Add device managed flow steering firmware API") from the net-next tree. Just context changes. I fixed it up (see below) and can carry the fix as necessary.
Thanks Stephen. Please add: Acked-by: Hadar Hen Zion <[email protected]> Hadar -- 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/
