Messages in this thread | | | Date | Tue, 07 Apr 2015 14:42:14 +0300 | From | Ido Shamay <> | Subject | Re: linux-next: manual merge of the net-next tree with the net tree |
| |
On 4/7/2015 6:18 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/cmd.c between commit fde913e25496 > ("net/mlx4_core: Fix error message deprecation for ConnectX-2 cards") > from the net tree and commit a130b5905732 ("net/mlx4: Add SET_PORT > opcode modifiers enumeration") from the net-next tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Looks good, thanks.
| |