linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell <hidden>
Date: 2016-02-18 22:50:37
Also in:
linux-next, lkml
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/phy/marvell.c
between commit:
79be1a1c9090 ("phy: marvell: Fix and unify reg-init behavior")
from the net tree and commit:
930b37ee8d84 ("net: phy: Add SGMII support for Marvell 88E1510/1512/1514/1518")
from the net-next tree.
OK, I didn't know how to resolve this, so I just used the net-next
tree version (which is probably wrong, but will build).
--
Cheers,
Stephen Rothwell