* [PATCH net-next] net: dsa: bcm_sf2: Fix build module
@ 2017-01-31 3:17 Florian Fainelli
2017-01-31 5:32 ` David Miller
0 siblings, 1 reply; 5+ messages in thread
From: Florian Fainelli @ 2017-01-31 3:17 UTC (permalink / raw)
To: netdev; +Cc: davem, andrew, vivien.didelot, Florian Fainelli
Commit 7318166cacad ("net: dsa: bcm_sf2: Add support for
ethtool::rxnfc") added a new object to build: bcm_sf2_cfp.o, but in
doing so, we essentially just built this object and no longer bcm_sf2.o.
Fix this by creating a module named bcm-sf2.ko which links in bcm_sf2.o
and bcm_sf2_cfp.o.
Fixes: 7318166cacad ("net: dsa: bcm_sf2: Add support for ethtool::rxnfc")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/net/dsa/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/dsa/Makefile b/drivers/net/dsa/Makefile
index da9893478e21..a3c941632217 100644
--- a/drivers/net/dsa/Makefile
+++ b/drivers/net/dsa/Makefile
@@ -1,6 +1,6 @@
obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o
-obj-$(CONFIG_NET_DSA_BCM_SF2) += bcm_sf2.o
-bcm_sf2-objs += bcm_sf2_cfp.o
+obj-$(CONFIG_NET_DSA_BCM_SF2) += bcm-sf2.o
+bcm-sf2-objs := bcm_sf2.o bcm_sf2_cfp.o
obj-$(CONFIG_NET_DSA_QCA8K) += qca8k.o
obj-y += b53/
--
2.9.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH net-next] net: dsa: bcm_sf2: Fix build module
2017-01-31 3:17 [PATCH net-next] net: dsa: bcm_sf2: Fix build module Florian Fainelli
@ 2017-01-31 5:32 ` David Miller
2017-01-31 18:32 ` Florian Fainelli
0 siblings, 1 reply; 5+ messages in thread
From: David Miller @ 2017-01-31 5:32 UTC (permalink / raw)
To: f.fainelli; +Cc: netdev, andrew, vivien.didelot
From: Florian Fainelli <f.fainelli@gmail.com>
Date: Mon, 30 Jan 2017 19:17:16 -0800
> Commit 7318166cacad ("net: dsa: bcm_sf2: Add support for
> ethtool::rxnfc") added a new object to build: bcm_sf2_cfp.o, but in
> doing so, we essentially just built this object and no longer bcm_sf2.o.
>
> Fix this by creating a module named bcm-sf2.ko which links in bcm_sf2.o
> and bcm_sf2_cfp.o.
>
> Fixes: 7318166cacad ("net: dsa: bcm_sf2: Add support for ethtool::rxnfc")
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH net-next] net: dsa: bcm_sf2: Fix build module
2017-01-31 5:32 ` David Miller
@ 2017-01-31 18:32 ` Florian Fainelli
2017-01-31 18:37 ` David Miller
0 siblings, 1 reply; 5+ messages in thread
From: Florian Fainelli @ 2017-01-31 18:32 UTC (permalink / raw)
To: David Miller; +Cc: netdev, andrew, vivien.didelot
On 01/30/2017 09:32 PM, David Miller wrote:
> From: Florian Fainelli <f.fainelli@gmail.com>
> Date: Mon, 30 Jan 2017 19:17:16 -0800
>
>> Commit 7318166cacad ("net: dsa: bcm_sf2: Add support for
>> ethtool::rxnfc") added a new object to build: bcm_sf2_cfp.o, but in
>> doing so, we essentially just built this object and no longer bcm_sf2.o.
>>
>> Fix this by creating a module named bcm-sf2.ko which links in bcm_sf2.o
>> and bcm_sf2_cfp.o.
>>
>> Fixes: 7318166cacad ("net: dsa: bcm_sf2: Add support for ethtool::rxnfc")
>> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
>
> Applied, thanks.
I don't see it showing up on next-next yet, is it just queued locally?
Thanks!
--
Florian
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH net-next] net: dsa: bcm_sf2: Fix build module
2017-01-31 18:32 ` Florian Fainelli
@ 2017-01-31 18:37 ` David Miller
2017-01-31 18:47 ` Florian Fainelli
0 siblings, 1 reply; 5+ messages in thread
From: David Miller @ 2017-01-31 18:37 UTC (permalink / raw)
To: f.fainelli; +Cc: netdev, andrew, vivien.didelot
From: Florian Fainelli <f.fainelli@gmail.com>
Date: Tue, 31 Jan 2017 10:32:38 -0800
> On 01/30/2017 09:32 PM, David Miller wrote:
>> From: Florian Fainelli <f.fainelli@gmail.com>
>> Date: Mon, 30 Jan 2017 19:17:16 -0800
>>
>>> Commit 7318166cacad ("net: dsa: bcm_sf2: Add support for
>>> ethtool::rxnfc") added a new object to build: bcm_sf2_cfp.o, but in
>>> doing so, we essentially just built this object and no longer bcm_sf2.o.
>>>
>>> Fix this by creating a module named bcm-sf2.ko which links in bcm_sf2.o
>>> and bcm_sf2_cfp.o.
>>>
>>> Fixes: 7318166cacad ("net: dsa: bcm_sf2: Add support for ethtool::rxnfc")
>>> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
>>
>> Applied, thanks.
>
> I don't see it showing up on next-next yet, is it just queued locally?
> Thanks!
The perils of working on different machines during the day :-)
It should be there now, sorry about that.
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH net-next] net: dsa: bcm_sf2: Fix build module
2017-01-31 18:37 ` David Miller
@ 2017-01-31 18:47 ` Florian Fainelli
0 siblings, 0 replies; 5+ messages in thread
From: Florian Fainelli @ 2017-01-31 18:47 UTC (permalink / raw)
To: David Miller; +Cc: netdev, andrew, vivien.didelot
On 01/31/2017 10:37 AM, David Miller wrote:
> From: Florian Fainelli <f.fainelli@gmail.com>
> Date: Tue, 31 Jan 2017 10:32:38 -0800
>
>> On 01/30/2017 09:32 PM, David Miller wrote:
>>> From: Florian Fainelli <f.fainelli@gmail.com>
>>> Date: Mon, 30 Jan 2017 19:17:16 -0800
>>>
>>>> Commit 7318166cacad ("net: dsa: bcm_sf2: Add support for
>>>> ethtool::rxnfc") added a new object to build: bcm_sf2_cfp.o, but in
>>>> doing so, we essentially just built this object and no longer bcm_sf2.o.
>>>>
>>>> Fix this by creating a module named bcm-sf2.ko which links in bcm_sf2.o
>>>> and bcm_sf2_cfp.o.
>>>>
>>>> Fixes: 7318166cacad ("net: dsa: bcm_sf2: Add support for ethtool::rxnfc")
>>>> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
>>>
>>> Applied, thanks.
>>
>> I don't see it showing up on next-next yet, is it just queued locally?
>> Thanks!
>
> The perils of working on different machines during the day :-)
>
> It should be there now, sorry about that.
>
No worries, thanks for the prompt fix!
--
Florian
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-01-31 18:56 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-31 3:17 [PATCH net-next] net: dsa: bcm_sf2: Fix build module Florian Fainelli
2017-01-31 5:32 ` David Miller
2017-01-31 18:32 ` Florian Fainelli
2017-01-31 18:37 ` David Miller
2017-01-31 18:47 ` Florian Fainelli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).