Re: linux-next: build failure after merge of the net-next tree
From: Florian Fainelli <f.fainelli@gmail.com>
Date: 2017-09-29 02:07:48
Also in:
linux-next, lkml
Le 09/28/17 à 18:36, Stephen Rothwell a écrit :
Hi all,
After merging the net-next tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
net/dsa/slave.c: In function 'dsa_slave_create':
net/dsa/slave.c:1191:18: error: 'struct dsa_slave_priv' has no member named 'phy'
phy_disconnect(p->phy);
^
Caused by commit
0115dcd1787d ("net: dsa: use slave device phydev")
Interacting with commit
e804441cfe0b ("net: dsa: Fix network device registration order")
from the net tree.
I applied the following merge fix patch (which I am not sure about):Your resolution looks fine to me, thanks Stephen!
quoted hunk ↗ jump to hunk
From: Stephen Rothwell <redacted> Date: Fri, 29 Sep 2017 11:28:45 +1000 Subject: [PATCH] net: dsa: merge fix patch for removal of phy Signed-off-by: Stephen Rothwell <redacted> --- net/dsa/slave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 8869954485db..9191c929c6c8 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c@@ -1188,7 +1188,7 @@ int dsa_slave_create(struct dsa_port *port, const char *name) return 0; out_phy: - phy_disconnect(p->phy); + phy_disconnect(slave_dev->phydev); if (of_phy_is_fixed_link(p->dp->dn)) of_phy_deregister_fixed_link(p->dp->dn); out_free:
-- Florian