2016-04-18 01:30:42

by Stephen Rothwell

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

Hi all,

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

drivers/net/dsa/mv88e6xxx.c

between commit:

207afda1b503 ("net: dsa: mv88e6xxx: share the same default FDB")

from the net tree and commit:

009a2b9843bf ("net: dsa: mv88e6xxx: add number of ports to info")

from the net-next tree.

I fixed it up (the former removed some of the code updated by the latter)
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.

--
Cheers,
Stephen Rothwell

2016-04-21 23:54:29

by Vivien Didelot

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

Hi David,

Stephen Rothwell <[email protected]> writes:

> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> drivers/net/dsa/mv88e6xxx.c
>
> between commit:
>
> 207afda1b503 ("net: dsa: mv88e6xxx: share the same default FDB")
>
> from the net tree and commit:
>
> 009a2b9843bf ("net: dsa: mv88e6xxx: add number of ports to info")
>
> from the net-next tree.
>
> I fixed it up (the former removed some of the code updated by the latter)
> 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.

I have another series to send to net-next which will also conflict with this
fix from net. As it is also required in net-next, can the fix be merged
in net-next as well?

This fix is the 3 commits:

65fa40276ac1 ("net: dsa: mv88e6xxx: unlock DSA and CPU ports")
996ecb824667 ("net: dsa: mv88e6xxx: enable SA learning on DSA ports")
207afda1b503 ("net: dsa: mv88e6xxx: share the same default FDB")

For the merge commit:

cf6b5fb2514d ("Merge branch 'dsa-mv88e6xxx-fix-cross-chip-bridging'")

Regards,
Vivien