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

linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* linux-next: build failure after merge of the final tree (wireless & staging trees related)
@ 2011-08-11  5:55 Stephen Rothwell
  2011-08-11  8:05 ` Kalle Valo
  0 siblings, 1 reply; 11+ messages in thread
From: Stephen Rothwell @ 2011-08-11  5:55 UTC (permalink / raw)
  To: John W. Linville
  Cc: linux-next, linux-kernel, Kalle Valo, Vasanthakumar Thiagarajan,
	Raja Mani

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

Hi all,

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"):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 11 Aug 2011 15:49:40 +1000
Subject: [PATCH] staging: remove the ath6kl driver

since it is now in the main tree

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/staging/Kconfig                            |    2 -
 drivers/staging/Makefile                           |    1 -
 drivers/staging/ath6kl/Kconfig                     |  158 -
 drivers/staging/ath6kl/Makefile                    |  122 -
 drivers/staging/ath6kl/TODO                        |   25 -
 drivers/staging/ath6kl/bmi/include/bmi_internal.h  |   54 -
 drivers/staging/ath6kl/bmi/src/bmi.c               | 1010 ---
 .../staging/ath6kl/hif/common/hif_sdio_common.h    |   87 -
 .../hif/sdio/linux_sdio/include/hif_internal.h     |  131 -
 .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c   | 1273 ----
 .../ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c   |  393 --
 drivers/staging/ath6kl/htc2/AR6000/ar6k.c          | 1479 -----
 drivers/staging/ath6kl/htc2/AR6000/ar6k.h          |  401 --
 drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c   |  783 ---
 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c    |  755 ---
 .../ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c        | 1284 ----
 drivers/staging/ath6kl/htc2/htc.c                  |  575 --
 drivers/staging/ath6kl/htc2/htc_debug.h            |   38 -
 drivers/staging/ath6kl/htc2/htc_internal.h         |  211 -
 drivers/staging/ath6kl/htc2/htc_recv.c             | 1572 -----
 drivers/staging/ath6kl/htc2/htc_send.c             | 1018 ---
 drivers/staging/ath6kl/htc2/htc_services.c         |  450 --
 drivers/staging/ath6kl/include/a_config.h          |   31 -
 drivers/staging/ath6kl/include/a_debug.h           |  195 -
 drivers/staging/ath6kl/include/a_drv.h             |   32 -
 drivers/staging/ath6kl/include/a_drv_api.h         |  204 -
 drivers/staging/ath6kl/include/a_osapi.h           |   32 -
 drivers/staging/ath6kl/include/aggr_recv_api.h     |  140 -
 drivers/staging/ath6kl/include/ar3kconfig.h        |   65 -
 drivers/staging/ath6kl/include/ar6000_api.h        |   32 -
 drivers/staging/ath6kl/include/ar6000_diag.h       |   48 -
 drivers/staging/ath6kl/include/ar6kap_common.h     |   44 -
 drivers/staging/ath6kl/include/athbtfilter.h       |  135 -
 drivers/staging/ath6kl/include/bmi.h               |  134 -
 .../ath6kl/include/common/AR6002/AR6K_version.h    |   52 -
 .../staging/ath6kl/include/common/AR6002/addrs.h   |   90 -
 .../common/AR6002/hw4.0/hw/apb_athr_wlan_map.h     |   40 -
 .../include/common/AR6002/hw4.0/hw/apb_map.h       |   40 -
 .../include/common/AR6002/hw4.0/hw/mbox_host_reg.h |   24 -
 .../include/common/AR6002/hw4.0/hw/mbox_reg.h      |  552 --
 .../common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h    |  471 --
 .../include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h |  589 --
 .../include/common/AR6002/hw4.0/hw/rtc_reg.h       |  187 -
 .../include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h  |  162 -
 .../include/common/AR6002/hw4.0/hw/uart_reg.h      |   40 -
 drivers/staging/ath6kl/include/common/athdefs.h    |   75 -
 drivers/staging/ath6kl/include/common/bmi_msg.h    |  233 -
 drivers/staging/ath6kl/include/common/cnxmgmt.h    |   36 -
 drivers/staging/ath6kl/include/common/dbglog.h     |  126 -
 drivers/staging/ath6kl/include/common/dbglog_id.h  |  558 --
 drivers/staging/ath6kl/include/common/discovery.h  |   75 -
 .../staging/ath6kl/include/common/epping_test.h    |  111 -
 drivers/staging/ath6kl/include/common/gmboxif.h    |   70 -
 drivers/staging/ath6kl/include/common/gpio_reg.h   |    9 -
 drivers/staging/ath6kl/include/common/htc.h        |  227 -
 .../staging/ath6kl/include/common/htc_services.h   |   52 -
 drivers/staging/ath6kl/include/common/pkt_log.h    |   45 -
 drivers/staging/ath6kl/include/common/roaming.h    |   41 -
 drivers/staging/ath6kl/include/common/targaddrs.h  |  395 --
 drivers/staging/ath6kl/include/common/testcmd.h    |  185 -
 drivers/staging/ath6kl/include/common/tlpm.h       |   38 -
 drivers/staging/ath6kl/include/common/wlan_defs.h  |   79 -
 drivers/staging/ath6kl/include/common/wmi.h        | 3220 ----------
 drivers/staging/ath6kl/include/common/wmix.h       |  271 -
 drivers/staging/ath6kl/include/common_drv.h        |  104 -
 drivers/staging/ath6kl/include/dbglog_api.h        |   52 -
 drivers/staging/ath6kl/include/dl_list.h           |  153 -
 drivers/staging/ath6kl/include/dset_api.h          |   65 -
 drivers/staging/ath6kl/include/hci_transport_api.h |  259 -
 drivers/staging/ath6kl/include/hif.h               |  456 --
 drivers/staging/ath6kl/include/host_version.h      |   52 -
 drivers/staging/ath6kl/include/htc_api.h           |  575 --
 drivers/staging/ath6kl/include/htc_packet.h        |  227 -
 drivers/staging/ath6kl/include/wlan_api.h          |  128 -
 drivers/staging/ath6kl/include/wmi_api.h           |  441 --
 drivers/staging/ath6kl/miscdrv/ar3kconfig.c        |  565 --
 .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c   |  572 --
 .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h   |   75 -
 .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c   |  969 ---
 .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h   |  113 -
 drivers/staging/ath6kl/miscdrv/common_drv.c        |  910 ---
 drivers/staging/ath6kl/miscdrv/credit_dist.c       |  417 --
 drivers/staging/ath6kl/miscdrv/miscdrv.h           |   42 -
 drivers/staging/ath6kl/os/linux/ar6000_drv.c       | 6267 -------------------
 drivers/staging/ath6kl/os/linux/ar6000_pm.c        |  626 --
 drivers/staging/ath6kl/os/linux/ar6000_raw_if.c    |  455 --
 drivers/staging/ath6kl/os/linux/cfg80211.c         | 1892 ------
 .../staging/ath6kl/os/linux/export_hci_transport.c |  124 -
 drivers/staging/ath6kl/os/linux/hci_bridge.c       | 1141 ----
 .../staging/ath6kl/os/linux/include/ar6000_drv.h   |  776 ---
 drivers/staging/ath6kl/os/linux/include/ar6k_pal.h |   36 -
 .../ath6kl/os/linux/include/ar6xapi_linux.h        |  190 -
 .../staging/ath6kl/os/linux/include/athdrv_linux.h | 1217 ----
 drivers/staging/ath6kl/os/linux/include/cfg80211.h |   61 -
 .../staging/ath6kl/os/linux/include/config_linux.h |   51 -
 .../staging/ath6kl/os/linux/include/debug_linux.h  |   50 -
 .../ath6kl/os/linux/include/export_hci_transport.h |   76 -
 .../ath6kl/os/linux/include/ieee80211_ioctl.h      |  177 -
 .../staging/ath6kl/os/linux/include/osapi_linux.h  |  339 -
 .../staging/ath6kl/os/linux/include/wlan_config.h  |  108 -
 .../ath6kl/os/linux/include/wmi_filter_linux.h     |  300 -
 drivers/staging/ath6kl/os/linux/netbuf.c           |  231 -
 drivers/staging/ath6kl/reorder/aggr_rx_internal.h  |  117 -
 drivers/staging/ath6kl/reorder/rcv_aggr.c          |  661 --
 drivers/staging/ath6kl/wlan/include/ieee80211.h    |  397 --
 .../staging/ath6kl/wlan/include/ieee80211_node.h   |   93 -
 drivers/staging/ath6kl/wlan/src/wlan_node.c        |  636 --
 drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c |  199 -
 drivers/staging/ath6kl/wlan/src/wlan_utils.c       |   58 -
 drivers/staging/ath6kl/wmi/wmi.c                   | 6444 --------------------
 drivers/staging/ath6kl/wmi/wmi_host.h              |  102 -
 111 files changed, 0 insertions(+), 50006 deletions(-)
 delete mode 100644 drivers/staging/ath6kl/Kconfig
 delete mode 100644 drivers/staging/ath6kl/Makefile
 delete mode 100644 drivers/staging/ath6kl/TODO
 delete mode 100644 drivers/staging/ath6kl/bmi/include/bmi_internal.h
 delete mode 100644 drivers/staging/ath6kl/bmi/src/bmi.c
 delete mode 100644 drivers/staging/ath6kl/hif/common/hif_sdio_common.h
 delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
 delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
 delete mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
 delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k.c
 delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k.h
 delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
 delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
 delete mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
 delete mode 100644 drivers/staging/ath6kl/htc2/htc.c
 delete mode 100644 drivers/staging/ath6kl/htc2/htc_debug.h
 delete mode 100644 drivers/staging/ath6kl/htc2/htc_internal.h
 delete mode 100644 drivers/staging/ath6kl/htc2/htc_recv.c
 delete mode 100644 drivers/staging/ath6kl/htc2/htc_send.c
 delete mode 100644 drivers/staging/ath6kl/htc2/htc_services.c
 delete mode 100644 drivers/staging/ath6kl/include/a_config.h
 delete mode 100644 drivers/staging/ath6kl/include/a_debug.h
 delete mode 100644 drivers/staging/ath6kl/include/a_drv.h
 delete mode 100644 drivers/staging/ath6kl/include/a_drv_api.h
 delete mode 100644 drivers/staging/ath6kl/include/a_osapi.h
 delete mode 100644 drivers/staging/ath6kl/include/aggr_recv_api.h
 delete mode 100644 drivers/staging/ath6kl/include/ar3kconfig.h
 delete mode 100644 drivers/staging/ath6kl/include/ar6000_api.h
 delete mode 100644 drivers/staging/ath6kl/include/ar6000_diag.h
 delete mode 100644 drivers/staging/ath6kl/include/ar6kap_common.h
 delete mode 100644 drivers/staging/ath6kl/include/athbtfilter.h
 delete mode 100644 drivers/staging/ath6kl/include/bmi.h
 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/AR6K_version.h
 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/addrs.h
 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_athr_wlan_map.h
 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_map.h
 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_host_reg.h
 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_reg.h
 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h
 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h
 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_reg.h
 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h
 delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/uart_reg.h
 delete mode 100644 drivers/staging/ath6kl/include/common/athdefs.h
 delete mode 100644 drivers/staging/ath6kl/include/common/bmi_msg.h
 delete mode 100644 drivers/staging/ath6kl/include/common/cnxmgmt.h
 delete mode 100644 drivers/staging/ath6kl/include/common/dbglog.h
 delete mode 100644 drivers/staging/ath6kl/include/common/dbglog_id.h
 delete mode 100644 drivers/staging/ath6kl/include/common/discovery.h
 delete mode 100644 drivers/staging/ath6kl/include/common/epping_test.h
 delete mode 100644 drivers/staging/ath6kl/include/common/gmboxif.h
 delete mode 100644 drivers/staging/ath6kl/include/common/gpio_reg.h
 delete mode 100644 drivers/staging/ath6kl/include/common/htc.h
 delete mode 100644 drivers/staging/ath6kl/include/common/htc_services.h
 delete mode 100644 drivers/staging/ath6kl/include/common/pkt_log.h
 delete mode 100644 drivers/staging/ath6kl/include/common/roaming.h
 delete mode 100644 drivers/staging/ath6kl/include/common/targaddrs.h
 delete mode 100644 drivers/staging/ath6kl/include/common/testcmd.h
 delete mode 100644 drivers/staging/ath6kl/include/common/tlpm.h
 delete mode 100644 drivers/staging/ath6kl/include/common/wlan_defs.h
 delete mode 100644 drivers/staging/ath6kl/include/common/wmi.h
 delete mode 100644 drivers/staging/ath6kl/include/common/wmix.h
 delete mode 100644 drivers/staging/ath6kl/include/common_drv.h
 delete mode 100644 drivers/staging/ath6kl/include/dbglog_api.h
 delete mode 100644 drivers/staging/ath6kl/include/dl_list.h
 delete mode 100644 drivers/staging/ath6kl/include/dset_api.h
 delete mode 100644 drivers/staging/ath6kl/include/hci_transport_api.h
 delete mode 100644 drivers/staging/ath6kl/include/hif.h
 delete mode 100644 drivers/staging/ath6kl/include/host_version.h
 delete mode 100644 drivers/staging/ath6kl/include/htc_api.h
 delete mode 100644 drivers/staging/ath6kl/include/htc_packet.h
 delete mode 100644 drivers/staging/ath6kl/include/wlan_api.h
 delete mode 100644 drivers/staging/ath6kl/include/wmi_api.h
 delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kconfig.c
 delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
 delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
 delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
 delete mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
 delete mode 100644 drivers/staging/ath6kl/miscdrv/common_drv.c
 delete mode 100644 drivers/staging/ath6kl/miscdrv/credit_dist.c
 delete mode 100644 drivers/staging/ath6kl/miscdrv/miscdrv.h
 delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_drv.c
 delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_pm.c
 delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
 delete mode 100644 drivers/staging/ath6kl/os/linux/cfg80211.c
 delete mode 100644 drivers/staging/ath6kl/os/linux/export_hci_transport.c
 delete mode 100644 drivers/staging/ath6kl/os/linux/hci_bridge.c
 delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
 delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
 delete mode 100644 drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h
 delete mode 100644 drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
 delete mode 100644 drivers/staging/ath6kl/os/linux/include/cfg80211.h
 delete mode 100644 drivers/staging/ath6kl/os/linux/include/config_linux.h
 delete mode 100644 drivers/staging/ath6kl/os/linux/include/debug_linux.h
 delete mode 100644 drivers/staging/ath6kl/os/linux/include/export_hci_transport.h
 delete mode 100644 drivers/staging/ath6kl/os/linux/include/ieee80211_ioctl.h
 delete mode 100644 drivers/staging/ath6kl/os/linux/include/osapi_linux.h
 delete mode 100644 drivers/staging/ath6kl/os/linux/include/wlan_config.h
 delete mode 100644 drivers/staging/ath6kl/os/linux/include/wmi_filter_linux.h
 delete mode 100644 drivers/staging/ath6kl/os/linux/netbuf.c
 delete mode 100644 drivers/staging/ath6kl/reorder/aggr_rx_internal.h
 delete mode 100644 drivers/staging/ath6kl/reorder/rcv_aggr.c
 delete mode 100644 drivers/staging/ath6kl/wlan/include/ieee80211.h
 delete mode 100644 drivers/staging/ath6kl/wlan/include/ieee80211_node.h
 delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_node.c
 delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
 delete mode 100644 drivers/staging/ath6kl/wlan/src/wlan_utils.c
 delete mode 100644 drivers/staging/ath6kl/wmi/wmi.c
 delete mode 100644 drivers/staging/ath6kl/wmi/wmi_host.h

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 06c9081..d497a93 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -126,8 +126,6 @@ source "drivers/staging/quickstart/Kconfig"
 
 source "drivers/staging/sbe-2t3e3/Kconfig"
 
-source "drivers/staging/ath6kl/Kconfig"
-
 source "drivers/staging/keucr/Kconfig"
 
 source "drivers/staging/bcm/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index f3c5e33..fe6c611 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -54,7 +54,6 @@ obj-$(CONFIG_SOLO6X10)		+= solo6x10/
 obj-$(CONFIG_TIDSPBRIDGE)	+= tidspbridge/
 obj-$(CONFIG_ACPI_QUICKSTART)	+= quickstart/
 obj-$(CONFIG_SBE_2T3E3)		+= sbe-2t3e3/
-obj-$(CONFIG_ATH6K_LEGACY)	+= ath6kl/
 obj-$(CONFIG_USB_ENESTORAGE)	+= keucr/
 obj-$(CONFIG_BCM_WIMAX)		+= bcm/
 obj-$(CONFIG_FT1000)		+= ft1000/
-- 
1.7.5.4

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

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

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: linux-next: build failure after merge of the final tree (wireless & staging trees related)
  2011-08-11  5:55 linux-next: build failure after merge of the final tree (wireless & staging trees related) Stephen Rothwell
@ 2011-08-11  8:05 ` Kalle Valo
       [not found]   ` <4E438D56.5020801-A+ZNKFmMK5xy9aJCnZT0Uw@public.gmane.org>
  0 siblings, 1 reply; 11+ messages in thread
From: Kalle Valo @ 2011-08-11  8:05 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: John W. Linville, linux-next, linux-kernel,
	Vasanthakumar Thiagarajan, Raja Mani, Greg Kroah-Hartman,
	linux-wireless

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

^ permalink raw reply	[flat|nested] 11+ messages in thread

[parent not found: <4E438D56.5020801-A+ZNKFmMK5xy9aJCnZT0Uw@public.gmane.org>]

* Re: linux-next: build failure after merge of the final tree (wireless & staging trees related)
       [not found]   ` <4E438D56.5020801-A+ZNKFmMK5xy9aJCnZT0Uw@public.gmane.org>
@ 2011-08-11 14:16     ` Greg KH
       [not found]       ` <20110811141604.GA14763-l3A5Bk7waGM@public.gmane.org>
  0 siblings, 1 reply; 11+ messages in thread
From: Greg KH @ 2011-08-11 14:16 UTC (permalink / raw)
  To: Kalle Valo
  Cc: Stephen Rothwell, John W. Linville,
	linux-next-u79uwXL29TY76Z2rM5mHXA,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA, Vasanthakumar Thiagarajan,
	Raja Mani, linux-wireless

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
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 11+ messages in thread

[parent not found: <20110811141604.GA14763-l3A5Bk7waGM@public.gmane.org>]

* Re: linux-next: build failure after merge of the final tree (wireless & staging trees related)
       [not found]       ` <20110811141604.GA14763-l3A5Bk7waGM@public.gmane.org>
@ 2011-08-11 15:50         ` Kalle Valo
  2011-08-12  2:12           ` Stephen Rothwell
  0 siblings, 1 reply; 11+ messages in thread
From: Kalle Valo @ 2011-08-11 15:50 UTC (permalink / raw)
  To: Greg KH
  Cc: Stephen Rothwell, John W. Linville,
	linux-next-u79uwXL29TY76Z2rM5mHXA,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA, Vasanthakumar Thiagarajan,
	Raja Mani, linux-wireless

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
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: linux-next: build failure after merge of the final tree (wireless & staging trees related)
  2011-08-11 15:50         ` Kalle Valo
@ 2011-08-12  2:12           ` Stephen Rothwell
  2011-08-12 13:51             ` John W. Linville
  0 siblings, 1 reply; 11+ messages in thread
From: Stephen Rothwell @ 2011-08-12  2:12 UTC (permalink / raw)
  To: Kalle Valo
  Cc: Greg KH, John W. Linville, linux-next, linux-kernel,
	Vasanthakumar Thiagarajan, Raja Mani, linux-wireless

[-- 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 --]

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: linux-next: build failure after merge of the final tree (wireless & staging trees related)
  2011-08-12  2:12           ` Stephen Rothwell
@ 2011-08-12 13:51             ` John W. Linville
  2011-08-12 14:13               ` Kalle Valo
  0 siblings, 1 reply; 11+ messages in thread
From: John W. Linville @ 2011-08-12 13:51 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Kalle Valo, Greg KH, linux-next, linux-kernel,
	Vasanthakumar Thiagarajan, Raja Mani, linux-wireless

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.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: linux-next: build failure after merge of the final tree (wireless & staging trees related)
  2011-08-12 13:51             ` John W. Linville
@ 2011-08-12 14:13               ` Kalle Valo
  2011-08-12 17:32                 ` Greg KH
  2011-08-23 21:30                 ` Greg KH
  0 siblings, 2 replies; 11+ messages in thread
From: Kalle Valo @ 2011-08-12 14:13 UTC (permalink / raw)
  To: John W. Linville
  Cc: Stephen Rothwell, Greg KH, linux-next, linux-kernel,
	Vasanthakumar Thiagarajan, Raja Mani, linux-wireless

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

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: linux-next: build failure after merge of the final tree (wireless & staging trees related)
  2011-08-12 14:13               ` Kalle Valo
@ 2011-08-12 17:32                 ` Greg KH
       [not found]                   ` <20110812173255.GE14182-l3A5Bk7waGM@public.gmane.org>
  2011-08-23 21:30                 ` Greg KH
  1 sibling, 1 reply; 11+ messages in thread
From: Greg KH @ 2011-08-12 17:32 UTC (permalink / raw)
  To: Kalle Valo
  Cc: John W. Linville, Stephen Rothwell, linux-next, linux-kernel,
	Vasanthakumar Thiagarajan, Raja Mani, linux-wireless

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

^ permalink raw reply	[flat|nested] 11+ messages in thread

[parent not found: <20110812173255.GE14182-l3A5Bk7waGM@public.gmane.org>]

* Re: linux-next: build failure after merge of the final tree (wireless & staging trees related)
       [not found]                   ` <20110812173255.GE14182-l3A5Bk7waGM@public.gmane.org>
@ 2011-08-12 19:24                     ` Kalle Valo
  0 siblings, 0 replies; 11+ messages in thread
From: Kalle Valo @ 2011-08-12 19:24 UTC (permalink / raw)
  To: Greg KH
  Cc: John W. Linville, Stephen Rothwell,
	linux-next-u79uwXL29TY76Z2rM5mHXA,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA, Vasanthakumar Thiagarajan,
	Raja Mani, linux-wireless

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-A+ZNKFmMK5xy9aJCnZT0Uw@public.gmane.org> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: linux-next: build failure after merge of the final tree (wireless & staging trees related)
  2011-08-12 14:13               ` Kalle Valo
  2011-08-12 17:32                 ` Greg KH
@ 2011-08-23 21:30                 ` Greg KH
  2011-08-24  1:06                   ` Stephen Rothwell
  1 sibling, 1 reply; 11+ messages in thread
From: Greg KH @ 2011-08-23 21:30 UTC (permalink / raw)
  To: Kalle Valo
  Cc: John W. Linville, Stephen Rothwell, Greg KH, linux-next,
	linux-kernel, Vasanthakumar Thiagarajan, Raja Mani,
	linux-wireless

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

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: linux-next: build failure after merge of the final tree (wireless & staging trees related)
  2011-08-23 21:30                 ` Greg KH
@ 2011-08-24  1:06                   ` Stephen Rothwell
  0 siblings, 0 replies; 11+ messages in thread
From: Stephen Rothwell @ 2011-08-24  1:06 UTC (permalink / raw)
  To: Greg KH
  Cc: Kalle Valo, John W. Linville, Greg KH, linux-next, linux-kernel,
	Vasanthakumar Thiagarajan, Raja Mani, linux-wireless

[-- 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 --]

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2011-08-24  1:06 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-11  5:55 linux-next: build failure after merge of the final tree (wireless & staging trees related) Stephen Rothwell
2011-08-11  8:05 ` Kalle Valo
     [not found]   ` <4E438D56.5020801-A+ZNKFmMK5xy9aJCnZT0Uw@public.gmane.org>
2011-08-11 14:16     ` Greg KH
     [not found]       ` <20110811141604.GA14763-l3A5Bk7waGM@public.gmane.org>
2011-08-11 15:50         ` Kalle Valo
2011-08-12  2:12           ` Stephen Rothwell
2011-08-12 13:51             ` John W. Linville
2011-08-12 14:13               ` Kalle Valo
2011-08-12 17:32                 ` Greg KH
     [not found]                   ` <20110812173255.GE14182-l3A5Bk7waGM@public.gmane.org>
2011-08-12 19:24                     ` Kalle Valo
2011-08-23 21:30                 ` Greg KH
2011-08-24  1:06                   ` Stephen Rothwell

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).