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

From: Stephen Rothwell
Date: Wed Dec 19 2018 - 21:07:50 EST

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:


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. This is now fixed as far as linux-next is concerned,
but any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging. You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.

Stephen Rothwell

Attachment: pgpy8a3hLGVoG.pgp
Description: OpenPGP digital signature