linux-next: build failure after merge of the wireless-drivers-next tree

linux-next: build failure after merge of the wireless-drivers-next tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2068 bytes --]

Hi all,

After merging the wireless-drivers-next tree, today's linux-next build
(powerpc allyesconfig) failed like this:

ld: drivers/net/wireless/realtek/rtw88/rtw8822ce.o:(.rodata.rtw_pm_ops+0x0): multiple definition of `rtw_pm_ops'; drivers/net/wireless/realtek/rtw88/rtw8822be.o:(.rodata.rtw_pm_ops+0x0): first defined here
ld: drivers/net/wireless/realtek/rtw88/rtw8723de.o:(.rodata.rtw_pm_ops+0x0): multiple definition of `rtw_pm_ops'; drivers/net/wireless/realtek/rtw88/rtw8822be.o:(.rodata.rtw_pm_ops+0x0): first defined here
ld: drivers/net/wireless/realtek/rtw88/rtw8821ce.o:(.rodata.rtw_pm_ops+0x0): multiple definition of `rtw_pm_ops'; drivers/net/wireless/realtek/rtw88/rtw8822be.o:(.rodata.rtw_pm_ops+0x0): first defined here
ld: drivers/net/wireless/realtek/rtw88/pci.o:(.rodata.rtw_pm_ops+0x0): multiple definition of `rtw_pm_ops'; drivers/net/wireless/realtek/rtw88/rtw8822be.o:(.rodata.rtw_pm_ops+0x0): first defined here

Caused by commit

  2e86ef413ab3 ("rtw88: pci: Add prototypes for .probe, .remove and .shutdown")

I have applied the following patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 8 Dec 2020 19:35:18 +1100
Subject: [PATCH] rtw88: pci: "extern" is necessary for header declarations of data

Fixes: 2e86ef413ab3 ("rtw88: pci: Add prototypes for .probe, .remove and .shutdown")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/wireless/realtek/rtw88/pci.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/realtek/rtw88/pci.h b/drivers/net/wireless/realtek/rtw88/pci.h
index cda56919a5f0..7cdefe229824 100644
--- a/drivers/net/wireless/realtek/rtw88/pci.h
+++ b/drivers/net/wireless/realtek/rtw88/pci.h
@@ -214,7 +214,7 @@ struct rtw_pci {
 	void __iomem *mmap;
 };
 
-const struct dev_pm_ops rtw_pm_ops;
+extern const struct dev_pm_ops rtw_pm_ops;
 
 int rtw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id);
 void rtw_pci_remove(struct pci_dev *pdev);
-- 
2.29.2

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the wireless-drivers-next tree

[Kalle Valo]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> After merging the wireless-drivers-next tree, today's linux-next build
> (powerpc allyesconfig) failed like this:
>
> ld: drivers/net/wireless/realtek/rtw88/rtw8822ce.o:(.rodata.rtw_pm_ops+0x0): multiple definition of `rtw_pm_ops'; drivers/net/wireless/realtek/rtw88/rtw8822be.o:(.rodata.rtw_pm_ops+0x0): first defined here
> ld: drivers/net/wireless/realtek/rtw88/rtw8723de.o:(.rodata.rtw_pm_ops+0x0): multiple definition of `rtw_pm_ops'; drivers/net/wireless/realtek/rtw88/rtw8822be.o:(.rodata.rtw_pm_ops+0x0): first defined here
> ld: drivers/net/wireless/realtek/rtw88/rtw8821ce.o:(.rodata.rtw_pm_ops+0x0): multiple definition of `rtw_pm_ops'; drivers/net/wireless/realtek/rtw88/rtw8822be.o:(.rodata.rtw_pm_ops+0x0): first defined here
> ld: drivers/net/wireless/realtek/rtw88/pci.o:(.rodata.rtw_pm_ops+0x0): multiple definition of `rtw_pm_ops'; drivers/net/wireless/realtek/rtw88/rtw8822be.o:(.rodata.rtw_pm_ops+0x0): first defined here
>
> Caused by commit
>
>   2e86ef413ab3 ("rtw88: pci: Add prototypes for .probe, .remove and .shutdown")
>
> I have applied the following patch:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 8 Dec 2020 19:35:18 +1100
> Subject: [PATCH] rtw88: pci: "extern" is necessary for header declarations of data
>
> Fixes: 2e86ef413ab3 ("rtw88: pci: Add prototypes for .probe, .remove and .shutdown")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/net/wireless/realtek/rtw88/pci.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/realtek/rtw88/pci.h b/drivers/net/wireless/realtek/rtw88/pci.h
> index cda56919a5f0..7cdefe229824 100644
> --- a/drivers/net/wireless/realtek/rtw88/pci.h
> +++ b/drivers/net/wireless/realtek/rtw88/pci.h
> @@ -214,7 +214,7 @@ struct rtw_pci {
>  	void __iomem *mmap;
>  };
>  
> -const struct dev_pm_ops rtw_pm_ops;
> +extern const struct dev_pm_ops rtw_pm_ops;

Thanks, just an hour ago I applied an identical patch from Ping:

https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git/commit/?id=91aeaf09a6eed83cae0d0fad20a97699b1c8b812

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Re: linux-next: build failure after merge of the wireless-drivers-next tree

[Stanislaw Gruszka]

On Fri, Aug 03, 2018 at 11:11:40AM +0200, Stanislaw Gruszka wrote:
> Hi
> 
> On Fri, Aug 03, 2018 at 06:29:42PM +1000, Stephen Rothwell wrote:
> > After merging the wireless-drivers-next tree, today's linux-next build
> > (powerpc allyesconfig) failed like this:
> [snip]
> > diff --git a/drivers/net/wireless/mediatek/mt76/Kconfig b/drivers/net/wireless/mediatek/mt76/Kconfig
> > index 850611ad347a..ad56b3ed2be2 100644
> > --- a/drivers/net/wireless/mediatek/mt76/Kconfig
> > +++ b/drivers/net/wireless/mediatek/mt76/Kconfig
> > @@ -13,6 +13,7 @@ config MT76x0U
> >  	tristate "MediaTek MT76x0U (USB) support"
> >  	depends on MAC80211
> >  	depends on USB
> > +	depends on BROKEN
> Would be better to limit driver to be build as module.
> Hopefully that will fix the issue. I'll post patch in a moment.

Ok, I made config allyesconfig and .config file looks like this:

CONFIG_WLAN_VENDOR_MEDIATEK=y
CONFIG_MT7601U=y
CONFIG_MT76_CORE=y
CONFIG_MT76_USB=y
CONFIG_MT76x2_COMMON=y
CONFIG_MT76x0U=m

However I still not sure if kernel will build this way.
Because there can be conflict between kernel symbols
and module symbols. So looks as part of quick fix
mt7601u should be build also as module. And slower
fix will be to rename symbosl names in mt76x0 driver.

Regards
Stanislaw

Re: linux-next: build failure after merge of the wireless-drivers-next tree

[Stanislaw Gruszka]

Hi

On Fri, Aug 03, 2018 at 06:29:42PM +1000, Stephen Rothwell wrote:
> After merging the wireless-drivers-next tree, today's linux-next build
> (powerpc allyesconfig) failed like this:
[snip]
> diff --git a/drivers/net/wireless/mediatek/mt76/Kconfig b/drivers/net/wireless/mediatek/mt76/Kconfig
> index 850611ad347a..ad56b3ed2be2 100644
> --- a/drivers/net/wireless/mediatek/mt76/Kconfig
> +++ b/drivers/net/wireless/mediatek/mt76/Kconfig
> @@ -13,6 +13,7 @@ config MT76x0U
>  	tristate "MediaTek MT76x0U (USB) support"
>  	depends on MAC80211
>  	depends on USB
> +	depends on BROKEN
Would be better to limit driver to be build as module.
Hopefully that will fix the issue. I'll post patch in a moment.

Thanks
Stanislaw

Re: linux-next: build failure after merge of the wireless-drivers-next tree

[Kalle Valo]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> After merging the wireless-drivers-next tree, today's linux-next build
> (powerpc allyesconfig) failed like this:
>
> ld: drivers/net/wireless/mediatek/mt76/mt76x0/trace.o:(__tracepoints+0x0): multiple definition of `__tracepoint_set_shared_key'; drivers/net/wireless/mediatek/mt7601u/trace.o:(__tracepoints+0x0): first defined here

[...]

> Caused by commit
>
>   7b4859026ccd ("mt76x0: core files")
>
> and following ones.
>
> I have just marked that driver broken for now:

Thanks Stephen for the report. Odd that kbuild bot didn't catch this, I
did have these patches in my pending branch for several days.

Stanislaw, could you please send a fix for this ASAP? I can't submit a
pull request to Dave until this is fixed.

-- 
Kalle Valo

linux-next: build failure after merge of the wireless-drivers-next tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 9201 bytes --]

Hi all,

After merging the wireless-drivers-next tree, today's linux-next build
(powerpc allyesconfig) failed like this:

ld: drivers/net/wireless/mediatek/mt76/mt76x0/trace.o:(__tracepoints+0x0): multiple definition of `__tracepoint_set_shared_key'; drivers/net/wireless/mediatek/mt7601u/trace.o:(__tracepoints+0x0): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/trace.o:(__tracepoints+0x30): multiple definition of `__tracepoint_set_key'; drivers/net/wireless/mediatek/mt7601u/trace.o:(__tracepoints+0x30): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/trace.o:(__tracepoints+0x60): multiple definition of `__tracepoint_mt_rx_dma_aggr'; drivers/net/wireless/mediatek/mt7601u/trace.o:(__tracepoints+0x60): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/trace.o:(__tracepoints+0x90): multiple definition of `__tracepoint_mt_tx_status'; drivers/net/wireless/mediatek/mt7601u/trace.o:(__tracepoints+0x90): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/trace.o:(__tracepoints+0xc0): multiple definition of `__tracepoint_mt_tx_status_cleaned'; drivers/net/wireless/mediatek/mt7601u/trace.o:(__tracepoints+0xc0): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/trace.o:(__tracepoints+0xf0): multiple definition of `__tracepoint_mt_tx_dma_done'; drivers/net/wireless/mediatek/mt7601u/trace.o:(__tracepoints+0xf0): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/trace.o:(__tracepoints+0x120): multiple definition of `__tracepoint_mt_tx'; drivers/net/wireless/mediatek/mt7601u/trace.o:(__tracepoints+0x120): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/trace.o:(__tracepoints+0x150): multiple definition of `__tracepoint_mt_rx'; drivers/net/wireless/mediatek/mt7601u/trace.o:(__tracepoints+0x150): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/trace.o:(__tracepoints+0x180): multiple definition of `__tracepoint_read_temp'; drivers/net/wireless/mediatek/mt7601u/trace.o:(__tracepoints+0x1e0): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/trace.o:(__tracepoints+0x1b0): multiple definition of `__tracepoint_temp_mode'; drivers/net/wireless/mediatek/mt7601u/trace.o:(__tracepoints+0x210): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/trace.o:(__tracepoints+0x1e0): multiple definition of `__tracepoint_bbp_write'; drivers/net/wireless/mediatek/mt7601u/trace.o:(__tracepoints+0x240): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/trace.o:(__tracepoints+0x210): multiple definition of `__tracepoint_bbp_read'; drivers/net/wireless/mediatek/mt7601u/trace.o:(__tracepoints+0x270): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/trace.o:(__tracepoints+0x240): multiple definition of `__tracepoint_rf_write'; drivers/net/wireless/mediatek/mt7601u/trace.o:(__tracepoints+0x2a0): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/trace.o:(__tracepoints+0x270): multiple definition of `__tracepoint_rf_read'; drivers/net/wireless/mediatek/mt7601u/trace.o:(__tracepoints+0x2d0): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/trace.o:(__tracepoints+0x2a0): multiple definition of `__tracepoint_ee_read'; drivers/net/wireless/mediatek/mt7601u/trace.o:(__tracepoints+0x300): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/trace.o:(__tracepoints+0x2d0): multiple definition of `__tracepoint_mt_vend_req'; drivers/net/wireless/mediatek/mt7601u/trace.o:(__tracepoints+0x330): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/trace.o:(__tracepoints+0x300): multiple definition of `__tracepoint_mt_mcu_msg_send'; drivers/net/wireless/mediatek/mt7601u/trace.o:(__tracepoints+0x360): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/trace.o:(__tracepoints+0x330): multiple definition of `__tracepoint_mt_submit_urb'; drivers/net/wireless/mediatek/mt7601u/trace.o:(__tracepoints+0x390): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/trace.o:(__tracepoints+0x360): multiple definition of `__tracepoint_reg_write'; drivers/net/wireless/mediatek/mt7601u/trace.o:(__tracepoints+0x3c0): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/trace.o:(__tracepoints+0x390): multiple definition of `__tracepoint_reg_read'; drivers/net/wireless/mediatek/mt7601u/trace.o:(__tracepoints+0x3f0): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/mac.o:(.opd+0x30): multiple definition of `mt76_mac_tx_rate_val'; drivers/net/wireless/mediatek/mt7601u/mac.o:(.opd+0x30): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/mac.o: in function `.mt76_mac_tx_rate_val':
mac.c:(.text.mt76_mac_tx_rate_val+0x0): multiple definition of `.mt76_mac_tx_rate_val'; drivers/net/wireless/mediatek/mt7601u/mac.o:mac.c:(.text.mt76_mac_tx_rate_val+0x0): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/mac.o:(.opd+0x48): multiple definition of `mt76_mac_wcid_set_rate'; drivers/net/wireless/mediatek/mt7601u/mac.o:(.opd+0x48): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/mac.o: in function `.mt76_mac_wcid_set_rate':
mac.c:(.text.mt76_mac_wcid_set_rate+0x0): multiple definition of `.mt76_mac_wcid_set_rate'; drivers/net/wireless/mediatek/mt7601u/mac.o:mac.c:(.text.mt76_mac_wcid_set_rate+0x0): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/mac.o:(.opd+0x78): multiple definition of `mt76_send_tx_status'; drivers/net/wireless/mediatek/mt7601u/mac.o:(.opd+0x78): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/mac.o: in function `.mt76_send_tx_status':
mac.c:(.text.mt76_send_tx_status+0x0): multiple definition of `.mt76_send_tx_status'; drivers/net/wireless/mediatek/mt7601u/mac.o:mac.c:(.text.mt76_send_tx_status+0x0): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/mac.o:(.opd+0x120): multiple definition of `mt76_mac_process_rx'; drivers/net/wireless/mediatek/mt7601u/mac.o:(.opd+0x120): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/mac.o: in function `.mt76_mac_process_rx':
mac.c:(.text.mt76_mac_process_rx+0x0): multiple definition of `.mt76_mac_process_rx'; drivers/net/wireless/mediatek/mt7601u/mac.o:mac.c:(.text.mt76_mac_process_rx+0x0): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/mac.o:(.opd+0x138): multiple definition of `mt76_mac_wcid_set_key'; drivers/net/wireless/mediatek/mt7601u/mac.o:(.opd+0x138): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/mac.o: in function `.mt76_mac_wcid_set_key':
mac.c:(.text.mt76_mac_wcid_set_key+0x0): multiple definition of `.mt76_mac_wcid_set_key'; drivers/net/wireless/mediatek/mt7601u/mac.o:mac.c:(.text.mt76_mac_wcid_set_key+0x0): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/mac.o:(.opd+0x150): multiple definition of `mt76_mac_shared_key_setup'; drivers/net/wireless/mediatek/mt7601u/mac.o:(.opd+0x150): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/mac.o: in function `.mt76_mac_shared_key_setup':
mac.c:(.text.mt76_mac_shared_key_setup+0x0): multiple definition of `.mt76_mac_shared_key_setup'; drivers/net/wireless/mediatek/mt7601u/mac.o:mac.c:(.text.mt76_mac_shared_key_setup+0x0): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/util.o:(.opd+0x0): multiple definition of `mt76_remove_hdr_pad'; drivers/net/wireless/mediatek/mt7601u/util.o:(.opd+0x0): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/util.o: in function `.mt76_remove_hdr_pad':
util.c:(.text.mt76_remove_hdr_pad+0x0): multiple definition of `.mt76_remove_hdr_pad'; drivers/net/wireless/mediatek/mt7601u/util.o:util.c:(.text.mt76_remove_hdr_pad+0x0): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/util.o:(.opd+0x18): multiple definition of `mt76_insert_hdr_pad'; drivers/net/wireless/mediatek/mt7601u/util.o:(.opd+0x18): first defined here
ld: drivers/net/wireless/mediatek/mt76/mt76x0/util.o: in function `.mt76_insert_hdr_pad':
util.c:(.text.mt76_insert_hdr_pad+0x0): multiple definition of `.mt76_insert_hdr_pad'; drivers/net/wireless/mediatek/mt7601u/util.o:util.c:(.text.mt76_insert_hdr_pad+0x0): first defined here

Caused by commit

  7b4859026ccd ("mt76x0: core files")

and following ones.

I have just marked that driver broken for now:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 3 Aug 2018 18:18:01 +1000
Subject: [PATCH] mt76x0: mark MediaTek MT76x0U (USB) support broken for now

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/wireless/mediatek/mt76/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/wireless/mediatek/mt76/Kconfig b/drivers/net/wireless/mediatek/mt76/Kconfig
index 850611ad347a..ad56b3ed2be2 100644
--- a/drivers/net/wireless/mediatek/mt76/Kconfig
+++ b/drivers/net/wireless/mediatek/mt76/Kconfig
@@ -13,6 +13,7 @@ config MT76x0U
 	tristate "MediaTek MT76x0U (USB) support"
 	depends on MAC80211
 	depends on USB
+	depends on BROKEN
 	help
 	  This adds support for MT7610U-based wireless USB dongles.
 
-- 
2.18.0

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the wireless-drivers-next tree

[Stephen Rothwell]

Hi Dave,

On Thu, 15 Jun 2017 12:08:08 -0400 (EDT) David Miller <davem@davemloft.net> wrote:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 13 Jun 2017 12:00:24 +1000
> 
> > On Thu, 8 Jun 2017 12:27:59 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:  
> >>
> >> After merging the wireless-drivers-next tree, today's linux-next build
> >> (x86_64 allmodconfig) failed like this:
> >> 
> >> drivers/net/wireless/quantenna/qtnfmac/core.c: In function 'qtnf_core_net_attach':
> >> drivers/net/wireless/quantenna/qtnfmac/core.c:319:5: error: 'struct net_device' has no member named 'destructor'
> >>   dev->destructor = free_netdev;
> >>      ^
> >> 
> >> Caused by commit
> >> 
> >>   98f44cb0655c ("qtnfmac: introduce new FullMAC driver for Quantenna chipsets")  
> > 
> > This commit is now in the net-next tree ...
> >   
> >> interacting with commit
> >> 
> >>   cf124db566e6 ("net: Fix inconsistent teardown and release of private netdev state.")
> >> 
> >> from the net tree.
> >> 
> >> I applied this merge fix patch for today.  
> > 
> > So this merge fix patch is needed when the net and net-next trees are merged.  
> 
> This is now all resolved, thanks!

Thanks for letting me know.

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the wireless-drivers-next tree

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Jun 2017 12:00:24 +1000

> Hi Dave,
> 
> On Thu, 8 Jun 2017 12:27:59 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> After merging the wireless-drivers-next tree, today's linux-next build
>> (x86_64 allmodconfig) failed like this:
>> 
>> drivers/net/wireless/quantenna/qtnfmac/core.c: In function 'qtnf_core_net_attach':
>> drivers/net/wireless/quantenna/qtnfmac/core.c:319:5: error: 'struct net_device' has no member named 'destructor'
>>   dev->destructor = free_netdev;
>>      ^
>> 
>> Caused by commit
>> 
>>   98f44cb0655c ("qtnfmac: introduce new FullMAC driver for Quantenna chipsets")
> 
> This commit is now in the net-next tree ...
> 
>> interacting with commit
>> 
>>   cf124db566e6 ("net: Fix inconsistent teardown and release of private netdev state.")
>> 
>> from the net tree.
>> 
>> I applied this merge fix patch for today.
> 
> So this merge fix patch is needed when the net and net-next trees are merged.

This is now all resolved, thanks!

Re: linux-next: build failure after merge of the wireless-drivers-next tree

[Stephen Rothwell]

Hi Dave,

On Thu, 8 Jun 2017 12:27:59 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the wireless-drivers-next tree, today's linux-next build
> (x86_64 allmodconfig) failed like this:
> 
> drivers/net/wireless/quantenna/qtnfmac/core.c: In function 'qtnf_core_net_attach':
> drivers/net/wireless/quantenna/qtnfmac/core.c:319:5: error: 'struct net_device' has no member named 'destructor'
>   dev->destructor = free_netdev;
>      ^
> 
> Caused by commit
> 
>   98f44cb0655c ("qtnfmac: introduce new FullMAC driver for Quantenna chipsets")

This commit is now in the net-next tree ...

> interacting with commit
> 
>   cf124db566e6 ("net: Fix inconsistent teardown and release of private netdev state.")
> 
> from the net tree.
> 
> I applied this merge fix patch for today.

So this merge fix patch is needed when the net and net-next trees are merged.

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 8 Jun 2017 12:24:08 +1000
> Subject: [PATCH] qtnfmac: fix up for "net: Fix inconsistent teardown and
>  release of private netdev state."
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/net/wireless/quantenna/qtnfmac/core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/wireless/quantenna/qtnfmac/core.c b/drivers/net/wireless/quantenna/qtnfmac/core.c
> index c5ac252464f4..f053532c0e87 100644
> --- a/drivers/net/wireless/quantenna/qtnfmac/core.c
> +++ b/drivers/net/wireless/quantenna/qtnfmac/core.c
> @@ -316,7 +316,7 @@ int qtnf_core_net_attach(struct qtnf_wmac *mac, struct qtnf_vif *vif,
>  	vif->netdev = dev;
>  
>  	dev->netdev_ops = &qtnf_netdev_ops;
> -	dev->destructor = free_netdev;
> +	dev->needs_free_netdev = true;
>  	dev_net_set(dev, wiphy_net(wiphy));
>  	dev->ieee80211_ptr = &vif->wdev;
>  	dev->ieee80211_ptr->iftype = iftype;
> -- 
> 2.11.0

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the wireless-drivers-next tree

[Stephen Rothwell]

Hi Kalle,

On Thu, 08 Jun 2017 15:07:00 +0300 Kalle Valo <kvalo@codeaurora.org> wrote:
>
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
> 
> > On Wed, 7 Jun 2017 19:43:18 -0700 Igor Mitsyanko <igor.mitsyanko.os@quantenna.com> wrote:  
> >>
> >> thanks. As I understand, you've applied this patch during a merge and no 
> >> further actions are required, correct?  
> >
> > Dave Miller will need to apply that patch (or something similar) when
> > he merges the wireless-drivers-next tree into the net-next tree.  I
> > will keep applying the patch each day until then.  
> 
> Thanks, I'll remind Dave about this when i submit the pull request (very
> soon now).

It occurred to me just after I wrote the previous message that it would
only be true after he merges the current net tree into the net-next tree.

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the wireless-drivers-next tree

[Kalle Valo]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi Igor,
>
> On Wed, 7 Jun 2017 19:43:18 -0700 Igor Mitsyanko <igor.mitsyanko.os@quantenna.com> wrote:
>>
>> thanks. As I understand, you've applied this patch during a merge and no 
>> further actions are required, correct?
>
> Dave Miller will need to apply that patch (or something similar) when
> he merges the wireless-drivers-next tree into the net-next tree.  I
> will keep applying the patch each day until then.

Thanks, I'll remind Dave about this when i submit the pull request (very
soon now).

-- 
Kalle Valo

Re: linux-next: build failure after merge of the wireless-drivers-next tree

[Stephen Rothwell]

Hi Igor,

On Wed, 7 Jun 2017 19:43:18 -0700 Igor Mitsyanko <igor.mitsyanko.os@quantenna.com> wrote:
>
> thanks. As I understand, you've applied this patch during a merge and no 
> further actions are required, correct?

Dave Miller will need to apply that patch (or something similar) when
he merges the wireless-drivers-next tree into the net-next tree.  I
will keep applying the patch each day until then.
-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the wireless-drivers-next tree

[Igor Mitsyanko]

On 06/07/2017 07:27 PM, Stephen Rothwell wrote:
> 
> External Email
> 
> 
> Hi all,
> 
> After merging the wireless-drivers-next tree, today's linux-next build
> (x86_64 allmodconfig) failed like this:
> 
> drivers/net/wireless/quantenna/qtnfmac/core.c: In function 'qtnf_core_net_attach':
> drivers/net/wireless/quantenna/qtnfmac/core.c:319:5: error: 'struct net_device' has no member named 'destructor'
>    dev->destructor = free_netdev;
>       ^
> 
> Caused by commit
> 
>    98f44cb0655c ("qtnfmac: introduce new FullMAC driver for Quantenna chipsets")
> 
> interacting with commit
> 
>    cf124db566e6 ("net: Fix inconsistent teardown and release of private netdev state.")
> 
> from the net tree.
> 
> I applied this merge fix patch for today.

Hi Stephen,
thanks. As I understand, you've applied this patch during a merge and no 
further actions are required, correct?


> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 8 Jun 2017 12:24:08 +1000
> Subject: [PATCH] qtnfmac: fix up for "net: Fix inconsistent teardown and
>   release of private netdev state."
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Acked-by: Igor Mitsyanko <igor.mitsyanko.os@quantenna.com>

> ---
>   drivers/net/wireless/quantenna/qtnfmac/core.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/wireless/quantenna/qtnfmac/core.c b/drivers/net/wireless/quantenna/qtnfmac/core.c
> index c5ac252464f4..f053532c0e87 100644
> --- a/drivers/net/wireless/quantenna/qtnfmac/core.c
> +++ b/drivers/net/wireless/quantenna/qtnfmac/core.c
> @@ -316,7 +316,7 @@ int qtnf_core_net_attach(struct qtnf_wmac *mac, struct qtnf_vif *vif,
>          vif->netdev = dev;
> 
>          dev->netdev_ops = &qtnf_netdev_ops;
> -       dev->destructor = free_netdev;
> +       dev->needs_free_netdev = true;
>          dev_net_set(dev, wiphy_net(wiphy));
>          dev->ieee80211_ptr = &vif->wdev;
>          dev->ieee80211_ptr->iftype = iftype;
> --
> 2.11.0
> 
> --
> Cheers,
> Stephen Rothwell
> 

linux-next: build failure after merge of the wireless-drivers-next tree

[Stephen Rothwell]

Hi all,

After merging the wireless-drivers-next tree, today's linux-next build
(x86_64 allmodconfig) failed like this:

drivers/net/wireless/quantenna/qtnfmac/core.c: In function 'qtnf_core_net_attach':
drivers/net/wireless/quantenna/qtnfmac/core.c:319:5: error: 'struct net_device' has no member named 'destructor'
  dev->destructor = free_netdev;
     ^

Caused by commit

  98f44cb0655c ("qtnfmac: introduce new FullMAC driver for Quantenna chipsets")

interacting with commit

  cf124db566e6 ("net: Fix inconsistent teardown and release of private netdev state.")

from the net tree.

I applied this merge fix patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 8 Jun 2017 12:24:08 +1000
Subject: [PATCH] qtnfmac: fix up for "net: Fix inconsistent teardown and
 release of private netdev state."

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/wireless/quantenna/qtnfmac/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/quantenna/qtnfmac/core.c b/drivers/net/wireless/quantenna/qtnfmac/core.c
index c5ac252464f4..f053532c0e87 100644
--- a/drivers/net/wireless/quantenna/qtnfmac/core.c
+++ b/drivers/net/wireless/quantenna/qtnfmac/core.c
@@ -316,7 +316,7 @@ int qtnf_core_net_attach(struct qtnf_wmac *mac, struct qtnf_vif *vif,
 	vif->netdev = dev;
 
 	dev->netdev_ops = &qtnf_netdev_ops;
-	dev->destructor = free_netdev;
+	dev->needs_free_netdev = true;
 	dev_net_set(dev, wiphy_net(wiphy));
 	dev->ieee80211_ptr = &vif->wdev;
 	dev->ieee80211_ptr->iftype = iftype;
-- 
2.11.0

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the wireless-drivers-next tree

[Kalle Valo]

Brian Norris <computersforpeace@gmail.com> writes:

> Just to head this off, since I noticed it...
>
> On Tue, Jul 19, 2016 at 05:08:59PM +0300, Kalle Valo wrote:
>> Rafał Miłecki <zajec5@gmail.com> writes:
>> > I sent a patch seconds ago, you may just take a look at it. If you
>> > still prefer to revert my commit, go ahead.
>> 
>> Ok, let's try your fix. We still have few days. I applied the patch[1]
>> to the pending branch this morning and if I don't see any errors I apply
>> it later tonight and hopefully it will be in tomorrow's linux-next
>> build. Thanks for the quick fix, very much appreciated.
>> 
>> [1] "mtd: add arch dependency for MTD_BCM47XXSFLASH symbol"
>>     https://patchwork.kernel.org/patch/9236053/
>
> I applied a trivial change to this same Kconfig entry:
>
> Subject: mtd: update description of MTD_BCM47XXSFLASH symbol
> http://git.infradead.org/l2-mtd.git/commitdiff/0a526341fee054c1e2b9f0e4b2b424ae81707d4c
>
> It's a trivial conflict, so should we just let Linus work it out? I can
> note it my MTD pull request, if wireless lands first.

Sounds good to me. Do note that Linus doesn't pull wireless-drivers-next
directly, it goes through net-next. But I'll let Dave also know about
this when I send him the pull request.

-- 
Kalle Valo

Re: linux-next: build failure after merge of the wireless-drivers-next tree

[Stephen Rothwell]

Hi Brian,

On Tue, 19 Jul 2016 11:39:13 -0700 Brian Norris <computersforpeace@gmail.com> wrote:
>
> I applied a trivial change to this same Kconfig entry:
> 
> Subject: mtd: update description of MTD_BCM47XXSFLASH symbol
> http://git.infradead.org/l2-mtd.git/commitdiff/0a526341fee054c1e2b9f0e4b2b424ae81707d4c
> 
> It's a trivial conflict, so should we just let Linus work it out? I can
> note it my MTD pull request, if wireless lands first.

Linus and I should be able to cope.  I will send my usual notification today.

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the wireless-drivers-next tree

[Brian Norris]

Just to head this off, since I noticed it...

On Tue, Jul 19, 2016 at 05:08:59PM +0300, Kalle Valo wrote:
> Rafał Miłecki <zajec5@gmail.com> writes:
> > I sent a patch seconds ago, you may just take a look at it. If you
> > still prefer to revert my commit, go ahead.
> 
> Ok, let's try your fix. We still have few days. I applied the patch[1]
> to the pending branch this morning and if I don't see any errors I apply
> it later tonight and hopefully it will be in tomorrow's linux-next
> build. Thanks for the quick fix, very much appreciated.
> 
> [1] "mtd: add arch dependency for MTD_BCM47XXSFLASH symbol"
>     https://patchwork.kernel.org/patch/9236053/

I applied a trivial change to this same Kconfig entry:

Subject: mtd: update description of MTD_BCM47XXSFLASH symbol
http://git.infradead.org/l2-mtd.git/commitdiff/0a526341fee054c1e2b9f0e4b2b424ae81707d4c

It's a trivial conflict, so should we just let Linus work it out? I can
note it my MTD pull request, if wireless lands first.

Brian

Re: linux-next: build failure after merge of the wireless-drivers-next tree

[Kalle Valo]

Rafał Miłecki <zajec5@gmail.com> writes:

> On 19 July 2016 at 09:09, Kalle Valo <kvalo@codeaurora.org> wrote:
>> Rafał Miłecki <zajec5@gmail.com> writes:
>>
>>> On 19 July 2016 at 08:30, Kalle Valo <kvalo@codeaurora.org> wrote:
>>>> Stephen Rothwell <sfr@canb.auug.org.au> writes:
>>>>
>>>>> After merging the wireless-drivers-next tree, today's linux-next build
>>>>> (powerpc allyesconfig) failed like this:
>>>>>
>>>>> drivers/mtd/devices/bcm47xxsflash.c: In function 'bcm47xxsflash_bcma_probe':
>>>>> drivers/mtd/devices/bcm47xxsflash.c:299:17: error: implicit declaration of function 'ioremap_cache' [-Werror=implicit-function-declaration]
>>>>>   b47s->window = ioremap_cache(res->start, resource_size(res));
>>>>>                  ^
>>>>> drivers/mtd/devices/bcm47xxsflash.c:299:15: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
>>>>>   b47s->window = ioremap_cache(res->start, resource_size(res));
>>>>>                ^
>>>>>
>>>>> Caused by commit
>>>>>
>>>>>   57d8f7dd2132 ("bcma: allow enabling serial flash support on non-MIPS SoCs")
>>>>>
>>>>> I have reverted that commit for today.
>>>>
>>>> Thanks, kbuild bot also notified about this.
>>>>
>>>> Rafał, as the merge window is getting really close I would like to
>>>> revert this for now and we can reapply it once we the problem is fully
>>>> solved. And we can use my pending branch for build testing the patch
>>>> with kbuild bot. What do you think?
>>>
>>> The simplest fix sounds pretty much as simple as the revert.
>>
>> The problem is that I don't have much time, I need to send the pull
>> request to Dave within next few days. The fix might create other
>> problems so I'm not enthusiastic about iterating with this patch at the
>> moment. I think it can wait for 4.9.
>
> I sent a patch seconds ago, you may just take a look at it. If you
> still prefer to revert my commit, go ahead.

Ok, let's try your fix. We still have few days. I applied the patch[1]
to the pending branch this morning and if I don't see any errors I apply
it later tonight and hopefully it will be in tomorrow's linux-next
build. Thanks for the quick fix, very much appreciated.

[1] "mtd: add arch dependency for MTD_BCM47XXSFLASH symbol"
    https://patchwork.kernel.org/patch/9236053/

-- 
Kalle Valo

Re: linux-next: build failure after merge of the wireless-drivers-next tree

[Rafał Miłecki]

On 19 July 2016 at 09:09, Kalle Valo <kvalo@codeaurora.org> wrote:
> Rafał Miłecki <zajec5@gmail.com> writes:
>
>> On 19 July 2016 at 08:30, Kalle Valo <kvalo@codeaurora.org> wrote:
>>> Stephen Rothwell <sfr@canb.auug.org.au> writes:
>>>
>>>> After merging the wireless-drivers-next tree, today's linux-next build
>>>> (powerpc allyesconfig) failed like this:
>>>>
>>>> drivers/mtd/devices/bcm47xxsflash.c: In function 'bcm47xxsflash_bcma_probe':
>>>> drivers/mtd/devices/bcm47xxsflash.c:299:17: error: implicit declaration of function 'ioremap_cache' [-Werror=implicit-function-declaration]
>>>>   b47s->window = ioremap_cache(res->start, resource_size(res));
>>>>                  ^
>>>> drivers/mtd/devices/bcm47xxsflash.c:299:15: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
>>>>   b47s->window = ioremap_cache(res->start, resource_size(res));
>>>>                ^
>>>>
>>>> Caused by commit
>>>>
>>>>   57d8f7dd2132 ("bcma: allow enabling serial flash support on non-MIPS SoCs")
>>>>
>>>> I have reverted that commit for today.
>>>
>>> Thanks, kbuild bot also notified about this.
>>>
>>> Rafał, as the merge window is getting really close I would like to
>>> revert this for now and we can reapply it once we the problem is fully
>>> solved. And we can use my pending branch for build testing the patch
>>> with kbuild bot. What do you think?
>>
>> The simplest fix sounds pretty much as simple as the revert.
>
> The problem is that I don't have much time, I need to send the pull
> request to Dave within next few days. The fix might create other
> problems so I'm not enthusiastic about iterating with this patch at the
> moment. I think it can wait for 4.9.

I sent a patch seconds ago, you may just take a look at it. If you
still prefer to revert my commit, go ahead.

-- 
Rafał

Re: linux-next: build failure after merge of the wireless-drivers-next tree

[Kalle Valo]

Rafał Miłecki <zajec5@gmail.com> writes:

> On 19 July 2016 at 08:30, Kalle Valo <kvalo@codeaurora.org> wrote:
>> Stephen Rothwell <sfr@canb.auug.org.au> writes:
>>
>>> After merging the wireless-drivers-next tree, today's linux-next build
>>> (powerpc allyesconfig) failed like this:
>>>
>>> drivers/mtd/devices/bcm47xxsflash.c: In function 'bcm47xxsflash_bcma_probe':
>>> drivers/mtd/devices/bcm47xxsflash.c:299:17: error: implicit declaration of function 'ioremap_cache' [-Werror=implicit-function-declaration]
>>>   b47s->window = ioremap_cache(res->start, resource_size(res));
>>>                  ^
>>> drivers/mtd/devices/bcm47xxsflash.c:299:15: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
>>>   b47s->window = ioremap_cache(res->start, resource_size(res));
>>>                ^
>>>
>>> Caused by commit
>>>
>>>   57d8f7dd2132 ("bcma: allow enabling serial flash support on non-MIPS SoCs")
>>>
>>> I have reverted that commit for today.
>>
>> Thanks, kbuild bot also notified about this.
>>
>> Rafał, as the merge window is getting really close I would like to
>> revert this for now and we can reapply it once we the problem is fully
>> solved. And we can use my pending branch for build testing the patch
>> with kbuild bot. What do you think?
>
> The simplest fix sounds pretty much as simple as the revert.

The problem is that I don't have much time, I need to send the pull
request to Dave within next few days. The fix might create other
problems so I'm not enthusiastic about iterating with this patch at the
moment. I think it can wait for 4.9.

-- 
Kalle Valo

Re: linux-next: build failure after merge of the wireless-drivers-next tree

[Rafał Miłecki]

On 19 July 2016 at 08:30, Kalle Valo <kvalo@codeaurora.org> wrote:
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
>
>> After merging the wireless-drivers-next tree, today's linux-next build
>> (powerpc allyesconfig) failed like this:
>>
>> drivers/mtd/devices/bcm47xxsflash.c: In function 'bcm47xxsflash_bcma_probe':
>> drivers/mtd/devices/bcm47xxsflash.c:299:17: error: implicit declaration of function 'ioremap_cache' [-Werror=implicit-function-declaration]
>>   b47s->window = ioremap_cache(res->start, resource_size(res));
>>                  ^
>> drivers/mtd/devices/bcm47xxsflash.c:299:15: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
>>   b47s->window = ioremap_cache(res->start, resource_size(res));
>>                ^
>>
>> Caused by commit
>>
>>   57d8f7dd2132 ("bcma: allow enabling serial flash support on non-MIPS SoCs")
>>
>> I have reverted that commit for today.
>
> Thanks, kbuild bot also notified about this.
>
> Rafał, as the merge window is getting really close I would like to
> revert this for now and we can reapply it once we the problem is fully
> solved. And we can use my pending branch for build testing the patch
> with kbuild bot. What do you think?

The simplest fix sounds pretty much as simple as the revert. In the
seconds thread I was considering two fixes: switching to memremap and
adding depends on.

What about trying a simple "depends on"?

-- 
Rafał

Re: linux-next: build failure after merge of the wireless-drivers-next tree

[Kalle Valo]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> After merging the wireless-drivers-next tree, today's linux-next build
> (powerpc allyesconfig) failed like this:
>
> drivers/mtd/devices/bcm47xxsflash.c: In function 'bcm47xxsflash_bcma_probe':
> drivers/mtd/devices/bcm47xxsflash.c:299:17: error: implicit declaration of function 'ioremap_cache' [-Werror=implicit-function-declaration]
>   b47s->window = ioremap_cache(res->start, resource_size(res));
>                  ^
> drivers/mtd/devices/bcm47xxsflash.c:299:15: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
>   b47s->window = ioremap_cache(res->start, resource_size(res));
>                ^
>
> Caused by commit
>
>   57d8f7dd2132 ("bcma: allow enabling serial flash support on non-MIPS SoCs")
>
> I have reverted that commit for today.

Thanks, kbuild bot also notified about this.

Rafał, as the merge window is getting really close I would like to
revert this for now and we can reapply it once we the problem is fully
solved. And we can use my pending branch for build testing the patch
with kbuild bot. What do you think?

-- 
Kalle Valo

linux-next: build failure after merge of the wireless-drivers-next tree

[Stephen Rothwell]

Hi all,

After merging the wireless-drivers-next tree, today's linux-next build
(powerpc allyesconfig) failed like this:

drivers/mtd/devices/bcm47xxsflash.c: In function 'bcm47xxsflash_bcma_probe':
drivers/mtd/devices/bcm47xxsflash.c:299:17: error: implicit declaration of function 'ioremap_cache' [-Werror=implicit-function-declaration]
  b47s->window = ioremap_cache(res->start, resource_size(res));
                 ^
drivers/mtd/devices/bcm47xxsflash.c:299:15: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
  b47s->window = ioremap_cache(res->start, resource_size(res));
               ^

Caused by commit

  57d8f7dd2132 ("bcma: allow enabling serial flash support on non-MIPS SoCs")

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the wireless-drivers-next tree

[Kalle Valo]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> After merging the wireless-drivers-next tree, today's linux-next build
> failed the same way as the net-next tree did yesterday (suprise! :-)).
>
> I have used the version from next-20160218 for today.

Yeah, not a surprise as yesterday I fast forwarded wireless-drivers-next
to current net-next (at the time). I understood from the discussion in
the other thread that this commit should fix it:

376471a7b6e9 bnx2x: Add missing HSI for big-endian machines

I now fast forwarded wireless-next-next again and it contains the commit
so everything should be ok again, I hope :) If not, please let me know.

-- 
Kalle Valo

linux-next: build failure after merge of the wireless-drivers-next tree

[Stephen Rothwell]

Hi Kalle,

After merging the wireless-drivers-next tree, today's linux-next build
failed the same way as the net-next tree did yesterday (suprise! :-)).

I have used the version from next-20160218 for today.

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the wireless-drivers-next tree

[Kalle Valo]

Hi Stephen,

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> After merging the wireless-drivers-next tree, today's linux-next build
> (x86_64 allmodconfig) failed like this:
>
> drivers/net/wireless/ath/ath9k/debug_sta.c: In function 'read_file_node_aggr':
> drivers/net/wireless/ath/ath9k/debug_sta.c:54:25: error: 'struct ath_node' has no member named 'ac'
>   for (acno = 0, ac = &an->ac[acno];
>                          ^

[...]

> Caused by commits
>
>   592fa228f213 ("ath9k: remove struct ath_atx_ac")
>   d70d848a75fd ("ath9k: remove the sched field in struct ath_atx_tid")
>
> I have used the wireless-drivers-next tree from next-20150806 for today.

Sorry about that, the commit below should fix the issue. This seems to
be a frequent problem, I think I need to start running more extensive
build tests before applying wireless-drivers patches.

commit 12e035968191c05a574c9c20367cb3090bc7d99d
Author: Felix Fietkau <nbd@openwrt.org>
Date:   Thu Aug 6 12:44:30 2015 +0200

    ath9k: fix build with CONFIG_ATH9K_STATION_STATISTICS=y
    
    kbuild bot reported that commit 592fa228f213 ("ath9k: remove struct
    ath_atx_ac") broke the build when CONFIG_ATH9K_STATION_STATISTICS is y.
    
    Reported-by: kbuild test robot <fengguang.wu@intel.com>
    Fixes: 592fa228f213 ("ath9k: remove struct ath_atx_ac")
    Signed-off-by: Felix Fietkau <nbd@openwrt.org>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>


-- 
Kalle Valo

linux-next: build failure after merge of the wireless-drivers-next tree

[Stephen Rothwell]

Hi Kalle,

After merging the wireless-drivers-next tree, today's linux-next build
(x86_64 allmodconfig) failed like this:

drivers/net/wireless/ath/ath9k/debug_sta.c: In function 'read_file_node_aggr':
drivers/net/wireless/ath/ath9k/debug_sta.c:54:25: error: 'struct ath_node' has no member named 'ac'
  for (acno = 0, ac = &an->ac[acno];
                         ^
drivers/net/wireless/ath/ath9k/debug_sta.c:55:43: error: increment of pointer to unknown structure
       acno < IEEE80211_NUM_ACS; acno++, ac++) {
                                           ^
drivers/net/wireless/ath/ath9k/debug_sta.c:55:7: error: arithmetic on pointer to an incomplete type
       acno < IEEE80211_NUM_ACS; acno++, ac++) {
       ^
drivers/net/wireless/ath/ath9k/debug_sta.c:56:11: error: dereferencing pointer to incomplete type
   txq = ac->txq;
           ^
drivers/net/wireless/ath/ath9k/debug_sta.c:60:14: error: dereferencing pointer to incomplete type
      acno, ac->sched);
              ^
drivers/net/wireless/ath/ath9k/debug_sta.c:71:12: error: 'struct ath_atx_tid' has no member named 'ac'
   txq = tid->ac->txq;
            ^
drivers/net/wireless/ath/ath9k/debug_sta.c:83:10: error: 'struct ath_atx_tid' has no member named 'sched'
       tid->sched);
          ^

Caused by commits

  592fa228f213 ("ath9k: remove struct ath_atx_ac")
  d70d848a75fd ("ath9k: remove the sched field in struct ath_atx_tid")

I have used the wireless-drivers-next tree from next-20150806 for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

Re: linux-next: build failure after merge of the wireless-drivers-next tree

[Stephen Rothwell]

Hi Kalle,

On Mon, 27 Jul 2015 08:41:49 +0300 Kalle Valo <kvalo@codeaurora.org> wrote:
>
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
> 
> > After merging the wireless-drivers-next tree, today's linux-next build
> > (x86_64 allmodconfig) failed like this:
> >
> > ERROR: "of_default_bus_match_table" [drivers/bcma/bcma.ko] undefined!
> >
> > Caused by commit
> >
> >   cae761b5a6bd ("bcma: populate bus DT subnodes as platform_device-s")
> >
> > I have used the wireless-drivers-next tree from next-20150721 for today.
> 
> Yesterday I pushed the commit below which should fix this issue. Please
> let me know if you still have any problems.
> 
> commit 92ff7a698badec3938edd3ba6b3e3ae035555365
> Author: Hauke Mehrtens <hauke@hauke-m.de>
> Date:   Sat Jul 25 21:10:27 2015 +0200
> 
>     bcma: fix build error when build as module

It is fixed today, thanks.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

Re: linux-next: build failure after merge of the wireless-drivers-next tree

[Kalle Valo]

Hi Stephen,

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> After merging the wireless-drivers-next tree, today's linux-next build
> (x86_64 allmodconfig) failed like this:
>
> ERROR: "of_default_bus_match_table" [drivers/bcma/bcma.ko] undefined!
>
> Caused by commit
>
>   cae761b5a6bd ("bcma: populate bus DT subnodes as platform_device-s")
>
> I have used the wireless-drivers-next tree from next-20150721 for today.

Yesterday I pushed the commit below which should fix this issue. Please
let me know if you still have any problems.

commit 92ff7a698badec3938edd3ba6b3e3ae035555365
Author: Hauke Mehrtens <hauke@hauke-m.de>
Date:   Sat Jul 25 21:10:27 2015 +0200

    bcma: fix build error when build as module
    
    Currently of_default_bus_match_table is not exported so we can only use
    this feature when bcma is build into the kernel. This patch removes
    support for child buses when bcma is build as a module as a temporary
    fix for a build problem introduces in this commit:
    
    commit cae761b5a6bdc597ba476a040fdcd5b4bc559b85
    Author: Rafal Milecki <zajec5@gmail.com>
    Date:   Sun Jun 28 17:17:13 2015 +0200
    
        bcma: populate bus DT subnodes as platform_device-s
    
    Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Fixes: cae761b5a6bd ("bcma: populate bus DT subnodes as platform_device-s")
    Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>


-- 
Kalle Valo

Re: linux-next: build failure after merge of the wireless-drivers-next tree

[Kalle Valo]

Hi Stephen,

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> After merging the wireless-drivers-next tree, today's linux-next build
> (x86_64 allmodconfig) failed like this:
>
> ERROR: "of_default_bus_match_table" [drivers/bcma/bcma.ko] undefined!
>
> Caused by commit
>
>   cae761b5a6bd ("bcma: populate bus DT subnodes as platform_device-s")
>
> I have used the wireless-drivers-next tree from next-20150721 for today.

Sorry about that.

Rafal, can you please send a patch to fix this? I'll apply it ASAP.

-- 
Kalle Valo

linux-next: build failure after merge of the wireless-drivers-next tree

[Stephen Rothwell]

Hi Kalle,

After merging the wireless-drivers-next tree, today's linux-next build
(x86_64 allmodconfig) failed like this:

ERROR: "of_default_bus_match_table" [drivers/bcma/bcma.ko] undefined!

Caused by commit

  cae761b5a6bd ("bcma: populate bus DT subnodes as platform_device-s")

I have used the wireless-drivers-next tree from next-20150721 for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

Re: linux-next: build failure after merge of the wireless-drivers-next tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 961 bytes --]

Hi Arend,

On Wed, 27 May 2015 11:08:35 +0200 Arend van Spriel <arend@broadcom.com> wrote:
>
> On 05/27/15 04:03, Stephen Rothwell wrote:
> >
> > After merging the wireless-drivers-next tree, today's linux-next build
> > (arm multi_v7_defconfig) failed like this:
> >
> > drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c: In function 'brcmf_ops_sdio_probe':
> > drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c:1139:7: error: dereferencing pointer to incomplete type
> >     adev->flags.power_manageable = 0;
> >         ^
> >
> > Caused by commit f0992ace680c ("brcmfmac: prohibit ACPI power
> > management for brcmfmac driver").
> >
> > I have used the wireless-drivers-next from next-20150526 for today.
> 
> Crap. struct acpi_device details are only known when CONFIG_ACPI is set. 
> The attached patch should fix the issue.

I put that into linux-next today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the wireless-drivers-next tree

[Arend van Spriel]

[-- Attachment #1: Type: text/plain, Size: 730 bytes --]

On 05/27/15 04:03, Stephen Rothwell wrote:
> Hi Kalle,
>
> After merging the wireless-drivers-next tree, today's linux-next build
> (arm multi_v7_defconfig) failed like this:
>
> drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c: In function 'brcmf_ops_sdio_probe':
> drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c:1139:7: error: dereferencing pointer to incomplete type
>     adev->flags.power_manageable = 0;
>         ^
>
> Caused by commit f0992ace680c ("brcmfmac: prohibit ACPI power
> management for brcmfmac driver").
>
> I have used the wireless-drivers-next from next-20150526 for today.

Crap. struct acpi_device details are only known when CONFIG_ACPI is set. 
The attached patch should fix the issue.

Regards,
Arend

[-- Attachment #2: 0001-brcmfmac-fix-invalid-access-to-struct-acpi_device-fi.patch --]
[-- Type: text/plain, Size: 2353 bytes --]

>From fd56b4446c613ceec15c11758ed817d13efb9bba Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Wed, 27 May 2015 10:48:46 +0200
Subject: [PATCH] brcmfmac: fix invalid access to struct acpi_device fields

The fields of struct acpi_device are only known when CONFIG_ACPI is
defined. Fix this by using a helper function. This will resolve the
issue found in linux-next:

 ../brcmfmac/bcmsdh.c: In function 'brcmf_ops_sdio_probe':
 ../brcmfmac/bcmsdh.c:1139:7: error: dereferencing pointer to incomplete type
   adev->flags.power_manageable = 0;
       ^

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
---
 drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
index b0d0ff5..71779b9 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
@@ -1117,6 +1117,18 @@ MODULE_DEVICE_TABLE(sdio, brcmf_sdmmc_ids);
 static struct brcmfmac_sdio_platform_data *brcmfmac_sdio_pdata;
 
 
+static void brcmf_sdiod_acpi_set_power_manageable(struct device *dev,
+						  int val)
+{
+#if IS_ENABLED(CONFIG_ACPI)
+	struct acpi_device *adev;
+
+	adev = ACPI_COMPANION(dev);
+	if (adev)
+		adev->flags.power_manageable = 0;
+#endif
+}
+
 static int brcmf_ops_sdio_probe(struct sdio_func *func,
 				const struct sdio_device_id *id)
 {
@@ -1124,7 +1136,6 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
 	struct brcmf_sdio_dev *sdiodev;
 	struct brcmf_bus *bus_if;
 	struct device *dev;
-	struct acpi_device *adev;
 
 	brcmf_dbg(SDIO, "Enter\n");
 	brcmf_dbg(SDIO, "Class=%x\n", func->class);
@@ -1132,11 +1143,9 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
 	brcmf_dbg(SDIO, "sdio device ID: 0x%04x\n", func->device);
 	brcmf_dbg(SDIO, "Function#: %d\n", func->num);
 
-	/* prohibit ACPI power management for this device */
 	dev = &func->dev;
-	adev = ACPI_COMPANION(dev);
-	if (adev)
-		adev->flags.power_manageable = 0;
+	/* prohibit ACPI power management for this device */
+	brcmf_sdiod_acpi_set_power_manageable(dev, 0);
 
 	/* Consume func num 1 but dont do anything with it. */
 	if (func->num == 1)
-- 
1.9.1

linux-next: build failure after merge of the wireless-drivers-next tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 615 bytes --]

Hi Kalle,

After merging the wireless-drivers-next tree, today's linux-next build
(arm multi_v7_defconfig) failed like this:

drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c: In function 'brcmf_ops_sdio_probe':
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c:1139:7: error: dereferencing pointer to incomplete type
   adev->flags.power_manageable = 0;
       ^

Caused by commit f0992ace680c ("brcmfmac: prohibit ACPI power
management for brcmfmac driver").

I have used the wireless-drivers-next from next-20150526 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the wireless-drivers-next tree

[Kalle Valo]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> After merging the wireless-drivers-next tree, today's linux-next build
> (powerpc allyesconfig) failed like this:
>
> drivers/net/wireless/ath/ath9k/ath9k_htc.o:(.data+0x29d0): multiple definition of `led_blink'
> drivers/net/wireless/ath/ath9k/ath9k.o:(.bss+0x1654): first defined here
>
> Caused by commit 3a939a671225 ("ath9k_htc: Add a module parameter to
> disable blink").
>
> I have reverted that commit for today.

Sorry about that, we have a patch pending to fix it:

https://patchwork.kernel.org/patch/5699001/

-- 
Kalle Valo

linux-next: build failure after merge of the wireless-drivers-next tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 502 bytes --]

Hi Kalle,

After merging the wireless-drivers-next tree, today's linux-next build
(powerpc allyesconfig) failed like this:

drivers/net/wireless/ath/ath9k/ath9k_htc.o:(.data+0x29d0): multiple definition of `led_blink'
drivers/net/wireless/ath/ath9k/ath9k.o:(.bss+0x1654): first defined here

Caused by commit 3a939a671225 ("ath9k_htc: Add a module parameter to
disable blink").

I have reverted that commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]