Messages in this thread | | | Date | Thu, 12 Jul 2012 15:59:11 +0300 | From | Hadar Hen Zion <> | Subject | Re: linux-next: manual merge of the net-next tree with the infiniband tree |
| |
On 7/12/2012 5:09 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in > drivers/net/ethernet/mellanox/mlx4/main.c between commit 6634961c14d3 > ("mlx4: Put physical GID and P_Key table sizes in mlx4_phys_caps struct > and paravirtualize them") 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 think). I have fixed it up (see below) and can > carry the fix as necessary. >
Thanks Stephen.
Please add: Acked-by: Hadar Hen Zion <hadarh@mellanox.co.il>
Hadar
| |