Messages in this thread | | | Subject | Re: linux-next: manual merge of the net-next tree with the net tree | From | Sergei Shtylyov <> | Date | Tue, 17 Oct 2017 14:30:29 +0300 |
| |
Hello!
On 10/16/2017 12:36 PM, Mark Brown wrote:
> Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/dsa/mv88e6060.c > > between commit: > > 3efc93c2bc243 ("net: dsa: mv88e6060: fix switch MAC address") > > from the net tree and commit: > > 56c3ff9bf23e1 ("net: dsa: mv88e6060: setup random mac address") > > from the net-next tree. > > I fixed it up (see below, the relevant code was deleted in net-next) 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. > > diff --cc drivers/net/dsa/mv88e6060.c > index f123ed57630d,6173be889d95..000000000000 > --- a/drivers/net/dsa/mv88e6060.c > +++ b/drivers/net/dsa/mv88e6060.c
Your mail ends here.
MBR, Sergei
| |