Re: linux-next: manual merge of the net-next tree with the infiniband tree

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 <redacted>

Hadar