Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1741890 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2017-09-29 03:40 +0200 |
| Last post | 2017-09-29 04:10 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: build failure after merge of the net-next tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-09-29 03:40 +0200
Re: linux-next: build failure after merge of the net-next tree Florian Fainelli <f.fainelli@gmail.com> - 2017-09-29 04:10 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2017-09-29 03:40 +0200 |
| Subject | linux-next: build failure after merge of the net-next tree |
| Message-ID | <uuSrv-84e-3@gated-at.bofh.it> |
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):
From: Stephen Rothwell <sfr@canb.auug.org.au>
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 <sfr@canb.auug.org.au>
---
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:
--
2.14.1
--
Cheers,
Stephen Rothwell
[toc] | [next] | [standalone]
| From | Florian Fainelli <f.fainelli@gmail.com> |
|---|---|
| Date | 2017-09-29 04:10 +0200 |
| Message-ID | <uuSUx-8te-1@gated-at.bofh.it> |
| In reply to | #1741890 |
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!
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> 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 <sfr@canb.auug.org.au>
> ---
> 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
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web