Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in:
Documentation/devicetree/bindings/net/brcm,unimac-mdio.txt
between commit:
0ce5aa1d6c97 ("dt-bindings: net: update bcmgenet binding for GENETv5")
from the net-next tree and patch:
"scripts/spelling.txt: Add regsiter -> register spelling mistake"
from the akpm tree.
I fixed it up (the former also fixed the typo from the latter, so I just
used that) 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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
