Messages in this thread |  | | | From | Jack Morgenstein <> | | Subject | Re: linux-next: manual merge of the net-next tree with the infiniband tree | | Date | Mon, 16 Jul 2012 11:33:16 +0300 |
| |
On Thursday 12 July 2012 05:09, 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!
Ack for IB side.
-Jack
|  |