Messages in this thread | | | From | Or Gerlitz <> | Date | Thu, 20 Dec 2018 08:54:25 +0200 | Subject | Re: linux-next: manual merge of the net-next tree with the net tree |
| |
On Thu, Dec 20, 2018 at 4:47 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/mellanox/mlx5/core/en_rep.c > > between commit: > > 8956f0014ea5 ("net/mlx5e: Fix default amount of channels for VF representors") > > from the net tree and commit: > > d9ee0491c2ff ("net/mlx5e: Use dedicated uplink vport netdev representor") > > from the net-next tree. > > I fixed it up (I just used the net-next tree version) and can carry the > fix as necessary. [..]
Yes, this is correct, thanks!
| |