Re: linux-next: build failure after merge of the final tree (wireless & staging trees related)

Re: linux-next: build failure after merge of the final tree (wireless & staging trees related)

[Kalle Valo]

Hi Stephen,

On 08/11/2011 08:55 AM, Stephen Rothwell wrote:
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/staging/built-in.o: In function `aggr_recv_delba_req_evt':
> (.opd+0x23a60): multiple definition of `aggr_recv_delba_req_evt'
> drivers/net/built-in.o:(.opd+0x79980): first defined here
> drivers/staging/built-in.o: In function `.wlan_node_reclaim':
> (.text+0x303360): multiple definition of `.wlan_node_reclaim'
> drivers/net/built-in.o:(.text+0xdd0618): first defined here
> drivers/staging/built-in.o: In function `aggr_init':
> (.opd+0x23a00): multiple definition of `aggr_init'
> drivers/net/built-in.o:(.opd+0x79968): first defined here
> drivers/staging/built-in.o: In function `.aggr_recv_delba_req_evt':
> (.text+0x302614): multiple definition of `.aggr_recv_delba_req_evt'
> drivers/net/built-in.o:(.text+0xdc8b60): first defined here
> drivers/staging/built-in.o: In function `.wlan_node_table_cleanup':
> (.text+0x303888): multiple definition of `.wlan_node_table_cleanup'
> drivers/net/built-in.o:(.text+0xdd0a6c): first defined here
> 
> You get the idea. :-(  So, the ath6kl driver now exists in the wireless
> tree and the staging tree.
> 
> I applied this patch for today (I have elided the part from "rm -rf
> drivers/staging/ath6kl"):

Oh man, sorry about this (again). I did compile both drivers at the same
time, but only as modules and didn't realise the conflicts also with the
staging driver.

Yes, the cleaned up version of ath6kl is now in wireless-next and the
staging version can be removed in 3.2. Greg, how do you want to handle
removal of the staging version? Should I send a patch to you removing
it? Or should I send the patch to John?

Kalle

Re: linux-next: build failure after merge of the final tree (wireless & staging trees related)

[Greg KH]

On Thu, Aug 11, 2011 at 11:05:42AM +0300, Kalle Valo wrote:
> Hi Stephen,
> 
> On 08/11/2011 08:55 AM, Stephen Rothwell wrote:
> > After merging the final tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> > 
> > drivers/staging/built-in.o: In function `aggr_recv_delba_req_evt':
> > (.opd+0x23a60): multiple definition of `aggr_recv_delba_req_evt'
> > drivers/net/built-in.o:(.opd+0x79980): first defined here
> > drivers/staging/built-in.o: In function `.wlan_node_reclaim':
> > (.text+0x303360): multiple definition of `.wlan_node_reclaim'
> > drivers/net/built-in.o:(.text+0xdd0618): first defined here
> > drivers/staging/built-in.o: In function `aggr_init':
> > (.opd+0x23a00): multiple definition of `aggr_init'
> > drivers/net/built-in.o:(.opd+0x79968): first defined here
> > drivers/staging/built-in.o: In function `.aggr_recv_delba_req_evt':
> > (.text+0x302614): multiple definition of `.aggr_recv_delba_req_evt'
> > drivers/net/built-in.o:(.text+0xdc8b60): first defined here
> > drivers/staging/built-in.o: In function `.wlan_node_table_cleanup':
> > (.text+0x303888): multiple definition of `.wlan_node_table_cleanup'
> > drivers/net/built-in.o:(.text+0xdd0a6c): first defined here
> > 
> > You get the idea. :-(  So, the ath6kl driver now exists in the wireless
> > tree and the staging tree.
> > 
> > I applied this patch for today (I have elided the part from "rm -rf
> > drivers/staging/ath6kl"):
> 
> Oh man, sorry about this (again). I did compile both drivers at the same
> time, but only as modules and didn't realise the conflicts also with the
> staging driver.
> 
> Yes, the cleaned up version of ath6kl is now in wireless-next and the
> staging version can be removed in 3.2. Greg, how do you want to handle
> removal of the staging version? Should I send a patch to you removing
> it? Or should I send the patch to John?

Just tell me.  Should I really delete drivers/staging/ath6kl/ for the
3.2 kernel release?  If so, I'll gladly do so in my tree so linux-next
will be fine for issues like this in the future.

greg k-h

Re: linux-next: build failure after merge of the final tree (wireless & staging trees related)

[Kalle Valo]

On 08/11/2011 05:16 PM, Greg KH wrote:
> On Thu, Aug 11, 2011 at 11:05:42AM +0300, Kalle Valo wrote:
>
>> Yes, the cleaned up version of ath6kl is now in wireless-next and the
>> staging version can be removed in 3.2. Greg, how do you want to handle
>> removal of the staging version? Should I send a patch to you removing
>> it? Or should I send the patch to John?
> 
> Just tell me.  Should I really delete drivers/staging/ath6kl/ for the
> 3.2 kernel release?  If so, I'll gladly do so in my tree so linux-next
> will be fine for issues like this in the future.

Yes, please delete ath6kl from staging for the 3.2 release as the
cleanup version is now in wireless-next.

Thank you everyone and sorry for the mess.

Kalle

Re: linux-next: build failure after merge of the final tree (wireless & staging trees related)

[Stephen Rothwell]

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

Hi Kalle, Greg,

On Thu, 11 Aug 2011 18:50:57 +0300 Kalle Valo <kvalo@qca.qualcomm.com> wrote:
>
> On 08/11/2011 05:16 PM, Greg KH wrote:
> > On Thu, Aug 11, 2011 at 11:05:42AM +0300, Kalle Valo wrote:
> >
> >> Yes, the cleaned up version of ath6kl is now in wireless-next and the
> >> staging version can be removed in 3.2. Greg, how do you want to handle
> >> removal of the staging version? Should I send a patch to you removing
> >> it? Or should I send the patch to John?
> > 
> > Just tell me.  Should I really delete drivers/staging/ath6kl/ for the
> > 3.2 kernel release?  If so, I'll gladly do so in my tree so linux-next
> > will be fine for issues like this in the future.
> 
> Yes, please delete ath6kl from staging for the 3.2 release as the
> cleanup version is now in wireless-next.
> 
> Thank you everyone and sorry for the mess.

I think that the removal should be done in the wirelesss tree so that
Linus' tree is not broken during the next merge window.

I have added the removal patch as a merge fixup one the merge of the
wireless tree for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: build failure after merge of the final tree (wireless & staging trees related)

[John W. Linville]

On Fri, Aug 12, 2011 at 12:12:16PM +1000, Stephen Rothwell wrote:
> Hi Kalle, Greg,
> 
> On Thu, 11 Aug 2011 18:50:57 +0300 Kalle Valo <kvalo@qca.qualcomm.com> wrote:
> >
> > On 08/11/2011 05:16 PM, Greg KH wrote:
> > > On Thu, Aug 11, 2011 at 11:05:42AM +0300, Kalle Valo wrote:
> > >
> > >> Yes, the cleaned up version of ath6kl is now in wireless-next and the
> > >> staging version can be removed in 3.2. Greg, how do you want to handle
> > >> removal of the staging version? Should I send a patch to you removing
> > >> it? Or should I send the patch to John?
> > > 
> > > Just tell me.  Should I really delete drivers/staging/ath6kl/ for the
> > > 3.2 kernel release?  If so, I'll gladly do so in my tree so linux-next
> > > will be fine for issues like this in the future.
> > 
> > Yes, please delete ath6kl from staging for the 3.2 release as the
> > cleanup version is now in wireless-next.
> > 
> > Thank you everyone and sorry for the mess.
> 
> I think that the removal should be done in the wirelesss tree so that
> Linus' tree is not broken during the next merge window.
> 
> I have added the removal patch as a merge fixup one the merge of the
> wireless tree for today.

Makes sense to me -- probably also is more sane if there is some fool
out there relying on the ath6kl driver in staging that doesn't know
about the switch to the wireless tree.

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

Re: linux-next: build failure after merge of the final tree (wireless & staging trees related)

[Kalle Valo]

On 08/12/2011 04:51 PM, John W. Linville wrote:
> On Fri, Aug 12, 2011 at 12:12:16PM +1000, Stephen Rothwell wrote:
>> On Thu, 11 Aug 2011 18:50:57 +0300 Kalle Valo <kvalo@qca.qualcomm.com> wrote:
>>>
>>> Yes, please delete ath6kl from staging for the 3.2 release as the
>>> cleanup version is now in wireless-next.
>>>
>>> Thank you everyone and sorry for the mess.
>>
>> I think that the removal should be done in the wirelesss tree so that
>> Linus' tree is not broken during the next merge window.
>>
>> I have added the removal patch as a merge fixup one the merge of the
>> wireless tree for today.
> 
> Makes sense to me -- probably also is more sane if there is some fool
> out there relying on the ath6kl driver in staging that doesn't know
> about the switch to the wireless tree.

Ok, I'll send a patch to John which removes the staging driver.

Kalle

Re: linux-next: build failure after merge of the final tree (wireless & staging trees related)

[Greg KH]

On Fri, Aug 12, 2011 at 05:13:22PM +0300, Kalle Valo wrote:
> On 08/12/2011 04:51 PM, John W. Linville wrote:
> > On Fri, Aug 12, 2011 at 12:12:16PM +1000, Stephen Rothwell wrote:
> >> On Thu, 11 Aug 2011 18:50:57 +0300 Kalle Valo <kvalo@qca.qualcomm.com> wrote:
> >>>
> >>> Yes, please delete ath6kl from staging for the 3.2 release as the
> >>> cleanup version is now in wireless-next.
> >>>
> >>> Thank you everyone and sorry for the mess.
> >>
> >> I think that the removal should be done in the wirelesss tree so that
> >> Linus' tree is not broken during the next merge window.
> >>
> >> I have added the removal patch as a merge fixup one the merge of the
> >> wireless tree for today.
> > 
> > Makes sense to me -- probably also is more sane if there is some fool
> > out there relying on the ath6kl driver in staging that doesn't know
> > about the switch to the wireless tree.
> 
> Ok, I'll send a patch to John which removes the staging driver.

Ok, that is fine with me as well.

greg k-h

Re: linux-next: build failure after merge of the final tree (wireless & staging trees related)

[Kalle Valo]

On 08/12/2011 08:32 PM, Greg KH wrote:
> On Fri, Aug 12, 2011 at 05:13:22PM +0300, Kalle Valo wrote:
>> On 08/12/2011 04:51 PM, John W. Linville wrote:
>>> On Fri, Aug 12, 2011 at 12:12:16PM +1000, Stephen Rothwell wrote:
>>>> On Thu, 11 Aug 2011 18:50:57 +0300 Kalle Valo <kvalo@qca.qualcomm.com> wrote:
>>>>>
>>>>> Yes, please delete ath6kl from staging for the 3.2 release as the
>>>>> cleanup version is now in wireless-next.
>>>>>
>>>>> Thank you everyone and sorry for the mess.
>>>>
>>>> I think that the removal should be done in the wirelesss tree so that
>>>> Linus' tree is not broken during the next merge window.
>>>>
>>>> I have added the removal patch as a merge fixup one the merge of the
>>>> wireless tree for today.
>>>
>>> Makes sense to me -- probably also is more sane if there is some fool
>>> out there relying on the ath6kl driver in staging that doesn't know
>>> about the switch to the wireless tree.
>>
>> Ok, I'll send a patch to John which removes the staging driver.
> 
> Ok, that is fine with me as well.

Stephen&Greg: sorry, I accidentally sent you a 1.8 MB patch. I didn't
look at the size of the patch at all until I started to wonder why I
don't see it on linux-wireless. Man that driver was huge!

John, please take the patch from master.kernel.org:

/pub/linux/kernel/people/kvalo/ath6kl/staging-remove-ath6kl.patch

It will be available via HTTP once the mirrors have synced up:

http://www.kernel.org/pub/linux/kernel/people/kvalo/ath6kl/staging-remove-ath6kl.patch

Kalle

Re: [PATCH] staging: remove ath6kl

[Greg KH]

On Fri, Aug 12, 2011 at 10:08:00PM +0300, Kalle Valo wrote:
> ath6kl is now in drivers/net/wireless/ath so the staging driver
> is not supported anymore and should be removed.
> 
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Greg KH <gregkh@suse.de>

Acked-by: Greg Kroah-Hartman <gregkh@suse.de>

Re: linux-next: build failure after merge of the final tree (wireless & staging trees related)

[Greg KH]

On Fri, Aug 12, 2011 at 05:13:22PM +0300, Kalle Valo wrote:
> On 08/12/2011 04:51 PM, John W. Linville wrote:
> > On Fri, Aug 12, 2011 at 12:12:16PM +1000, Stephen Rothwell wrote:
> >> On Thu, 11 Aug 2011 18:50:57 +0300 Kalle Valo <kvalo@qca.qualcomm.com> wrote:
> >>>
> >>> Yes, please delete ath6kl from staging for the 3.2 release as the
> >>> cleanup version is now in wireless-next.
> >>>
> >>> Thank you everyone and sorry for the mess.
> >>
> >> I think that the removal should be done in the wirelesss tree so that
> >> Linus' tree is not broken during the next merge window.
> >>
> >> I have added the removal patch as a merge fixup one the merge of the
> >> wireless tree for today.
> > 
> > Makes sense to me -- probably also is more sane if there is some fool
> > out there relying on the ath6kl driver in staging that doesn't know
> > about the switch to the wireless tree.
> 
> Ok, I'll send a patch to John which removes the staging driver.

Note, I also applied this to the staging-next tree to keep people from
sending me cleanup patches against the driver.  git will resolve the
fact that it was deleted in both branches just fine when we merge with
Linus for 3.2.

thanks,

greg k-h

Re: linux-next: build failure after merge of the final tree (wireless & staging trees related)

[Stephen Rothwell]

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

Hi Greg,

On Tue, 23 Aug 2011 14:30:13 -0700 Greg KH <greg@kroah.com> wrote:
>
> Note, I also applied this to the staging-next tree to keep people from
> sending me cleanup patches against the driver.  git will resolve the
> fact that it was deleted in both branches just fine when we merge with
> Linus for 3.2.

Clearly, I should read ahead in my email before replying :-)
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]