linux-next: manual merge of the wireless tree with Linus' tree

linux-next: manual merge of the wireless tree with Linus' tree

[Stephen Rothwell]

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/zd1211rw/zd_rf_rf2959.c between commit 25985edcedea
("Fix common misspellings") from Linus' tree and commit fbd5d17b8e2b
("zd1211rw: rename CR* macros to ZD_CR*") from the wireless tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
index e361174,0325426..0000000
--- a/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
+++ b/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
@@@ -152,44 -152,44 +152,44 @@@ static int rf2959_init_hw(struct zd_rf 
  	struct zd_chip *chip = zd_rf_to_chip(rf);
  
  	static const struct zd_ioreq16 ioreqs[] = {
- 		{ CR2,   0x1E }, { CR9,   0x20 }, { CR10,  0x89 },
- 		{ CR11,  0x00 }, { CR15,  0xD0 }, { CR17,  0x68 },
- 		{ CR19,  0x4a }, { CR20,  0x0c }, { CR21,  0x0E },
- 		{ CR23,  0x48 },
+ 		{ ZD_CR2,   0x1E }, { ZD_CR9,   0x20 }, { ZD_CR10,  0x89 },
+ 		{ ZD_CR11,  0x00 }, { ZD_CR15,  0xD0 }, { ZD_CR17,  0x68 },
+ 		{ ZD_CR19,  0x4a }, { ZD_CR20,  0x0c }, { ZD_CR21,  0x0E },
+ 		{ ZD_CR23,  0x48 },
  		/* normal size for cca threshold */
- 		{ CR24,  0x14 },
- 		/* { CR24,  0x20 }, */
- 		{ CR26,  0x90 }, { CR27,  0x30 }, { CR29,  0x20 },
- 		{ CR31,  0xb2 }, { CR32,  0x43 }, { CR33,  0x28 },
- 		{ CR38,  0x30 }, { CR34,  0x0f }, { CR35,  0xF0 },
- 		{ CR41,  0x2a }, { CR46,  0x7F }, { CR47,  0x1E },
- 		{ CR51,  0xc5 }, { CR52,  0xc5 }, { CR53,  0xc5 },
- 		{ CR79,  0x58 }, { CR80,  0x30 }, { CR81,  0x30 },
- 		{ CR82,  0x00 }, { CR83,  0x24 }, { CR84,  0x04 },
- 		{ CR85,  0x00 }, { CR86,  0x10 }, { CR87,  0x2A },
- 		{ CR88,  0x10 }, { CR89,  0x24 }, { CR90,  0x18 },
- 		/* { CR91,  0x18 }, */
+ 		{ ZD_CR24,  0x14 },
+ 		/* { ZD_CR24,  0x20 }, */
+ 		{ ZD_CR26,  0x90 }, { ZD_CR27,  0x30 }, { ZD_CR29,  0x20 },
+ 		{ ZD_CR31,  0xb2 }, { ZD_CR32,  0x43 }, { ZD_CR33,  0x28 },
+ 		{ ZD_CR38,  0x30 }, { ZD_CR34,  0x0f }, { ZD_CR35,  0xF0 },
+ 		{ ZD_CR41,  0x2a }, { ZD_CR46,  0x7F }, { ZD_CR47,  0x1E },
+ 		{ ZD_CR51,  0xc5 }, { ZD_CR52,  0xc5 }, { ZD_CR53,  0xc5 },
+ 		{ ZD_CR79,  0x58 }, { ZD_CR80,  0x30 }, { ZD_CR81,  0x30 },
+ 		{ ZD_CR82,  0x00 }, { ZD_CR83,  0x24 }, { ZD_CR84,  0x04 },
+ 		{ ZD_CR85,  0x00 }, { ZD_CR86,  0x10 }, { ZD_CR87,  0x2A },
+ 		{ ZD_CR88,  0x10 }, { ZD_CR89,  0x24 }, { ZD_CR90,  0x18 },
+ 		/* { ZD_CR91,  0x18 }, */
 -		/* should solve continous CTS frame problems */
 +		/* should solve continuous CTS frame problems */
- 		{ CR91,  0x00 },
- 		{ CR92,  0x0a }, { CR93,  0x00 }, { CR94,  0x01 },
- 		{ CR95,  0x00 }, { CR96,  0x40 }, { CR97,  0x37 },
- 		{ CR98,  0x05 }, { CR99,  0x28 }, { CR100, 0x00 },
- 		{ CR101, 0x13 }, { CR102, 0x27 }, { CR103, 0x27 },
- 		{ CR104, 0x18 }, { CR105, 0x12 },
+ 		{ ZD_CR91,  0x00 },
+ 		{ ZD_CR92,  0x0a }, { ZD_CR93,  0x00 }, { ZD_CR94,  0x01 },
+ 		{ ZD_CR95,  0x00 }, { ZD_CR96,  0x40 }, { ZD_CR97,  0x37 },
+ 		{ ZD_CR98,  0x05 }, { ZD_CR99,  0x28 }, { ZD_CR100, 0x00 },
+ 		{ ZD_CR101, 0x13 }, { ZD_CR102, 0x27 }, { ZD_CR103, 0x27 },
+ 		{ ZD_CR104, 0x18 }, { ZD_CR105, 0x12 },
  		/* normal size */
- 		{ CR106, 0x1a },
- 		/* { CR106, 0x22 }, */
- 		{ CR107, 0x24 }, { CR108, 0x0a }, { CR109, 0x13 },
- 		{ CR110, 0x2F }, { CR111, 0x27 }, { CR112, 0x27 },
- 		{ CR113, 0x27 }, { CR114, 0x27 }, { CR115, 0x40 },
- 		{ CR116, 0x40 }, { CR117, 0xF0 }, { CR118, 0xF0 },
- 		{ CR119, 0x16 },
+ 		{ ZD_CR106, 0x1a },
+ 		/* { ZD_CR106, 0x22 }, */
+ 		{ ZD_CR107, 0x24 }, { ZD_CR108, 0x0a }, { ZD_CR109, 0x13 },
+ 		{ ZD_CR110, 0x2F }, { ZD_CR111, 0x27 }, { ZD_CR112, 0x27 },
+ 		{ ZD_CR113, 0x27 }, { ZD_CR114, 0x27 }, { ZD_CR115, 0x40 },
+ 		{ ZD_CR116, 0x40 }, { ZD_CR117, 0xF0 }, { ZD_CR118, 0xF0 },
+ 		{ ZD_CR119, 0x16 },
  		/* no TX continuation */
- 		{ CR122, 0x00 },
- 		/* { CR122, 0xff }, */
- 		{ CR127, 0x03 }, { CR131, 0x08 }, { CR138, 0x28 },
- 		{ CR148, 0x44 }, { CR150, 0x10 }, { CR169, 0xBB },
- 		{ CR170, 0xBB },
+ 		{ ZD_CR122, 0x00 },
+ 		/* { ZD_CR122, 0xff }, */
+ 		{ ZD_CR127, 0x03 }, { ZD_CR131, 0x08 }, { ZD_CR138, 0x28 },
+ 		{ ZD_CR148, 0x44 }, { ZD_CR150, 0x10 }, { ZD_CR169, 0xBB },
+ 		{ ZD_CR170, 0xBB },
  	};
  
  	static const u32 rv[] = {

Re: linux-next: manual merge of the wireless tree with Linus' tree

[Jussi Kivilinna]

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

> Hi John,
>
> Today's linux-next merge of the wireless tree got a conflict in
> drivers/net/wireless/zd1211rw/zd_rf_rf2959.c between commit 25985edcedea
> ("Fix common misspellings") from Linus' tree and commit fbd5d17b8e2b
> ("zd1211rw: rename CR* macros to ZD_CR*") from the wireless tree.
>
> I fixed it up (see below) and can carry the fix as necessary.

Fix looks ok to me.

> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
>
> diff --cc drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
> index e361174,0325426..0000000
> --- a/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
> +++ b/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
> @@@ -152,44 -152,44 +152,44 @@@ static int rf2959_init_hw(struct zd_rf
>   	struct zd_chip *chip = zd_rf_to_chip(rf);
>
>   	static const struct zd_ioreq16 ioreqs[] = {
> - 		{ CR2,   0x1E }, { CR9,   0x20 }, { CR10,  0x89 },
> - 		{ CR11,  0x00 }, { CR15,  0xD0 }, { CR17,  0x68 },
> - 		{ CR19,  0x4a }, { CR20,  0x0c }, { CR21,  0x0E },
> - 		{ CR23,  0x48 },
> + 		{ ZD_CR2,   0x1E }, { ZD_CR9,   0x20 }, { ZD_CR10,  0x89 },
> + 		{ ZD_CR11,  0x00 }, { ZD_CR15,  0xD0 }, { ZD_CR17,  0x68 },
> + 		{ ZD_CR19,  0x4a }, { ZD_CR20,  0x0c }, { ZD_CR21,  0x0E },
> + 		{ ZD_CR23,  0x48 },
>   		/* normal size for cca threshold */
> - 		{ CR24,  0x14 },
> - 		/* { CR24,  0x20 }, */
> - 		{ CR26,  0x90 }, { CR27,  0x30 }, { CR29,  0x20 },
> - 		{ CR31,  0xb2 }, { CR32,  0x43 }, { CR33,  0x28 },
> - 		{ CR38,  0x30 }, { CR34,  0x0f }, { CR35,  0xF0 },
> - 		{ CR41,  0x2a }, { CR46,  0x7F }, { CR47,  0x1E },
> - 		{ CR51,  0xc5 }, { CR52,  0xc5 }, { CR53,  0xc5 },
> - 		{ CR79,  0x58 }, { CR80,  0x30 }, { CR81,  0x30 },
> - 		{ CR82,  0x00 }, { CR83,  0x24 }, { CR84,  0x04 },
> - 		{ CR85,  0x00 }, { CR86,  0x10 }, { CR87,  0x2A },
> - 		{ CR88,  0x10 }, { CR89,  0x24 }, { CR90,  0x18 },
> - 		/* { CR91,  0x18 }, */
> + 		{ ZD_CR24,  0x14 },
> + 		/* { ZD_CR24,  0x20 }, */
> + 		{ ZD_CR26,  0x90 }, { ZD_CR27,  0x30 }, { ZD_CR29,  0x20 },
> + 		{ ZD_CR31,  0xb2 }, { ZD_CR32,  0x43 }, { ZD_CR33,  0x28 },
> + 		{ ZD_CR38,  0x30 }, { ZD_CR34,  0x0f }, { ZD_CR35,  0xF0 },
> + 		{ ZD_CR41,  0x2a }, { ZD_CR46,  0x7F }, { ZD_CR47,  0x1E },
> + 		{ ZD_CR51,  0xc5 }, { ZD_CR52,  0xc5 }, { ZD_CR53,  0xc5 },
> + 		{ ZD_CR79,  0x58 }, { ZD_CR80,  0x30 }, { ZD_CR81,  0x30 },
> + 		{ ZD_CR82,  0x00 }, { ZD_CR83,  0x24 }, { ZD_CR84,  0x04 },
> + 		{ ZD_CR85,  0x00 }, { ZD_CR86,  0x10 }, { ZD_CR87,  0x2A },
> + 		{ ZD_CR88,  0x10 }, { ZD_CR89,  0x24 }, { ZD_CR90,  0x18 },
> + 		/* { ZD_CR91,  0x18 }, */
>  -		/* should solve continous CTS frame problems */
>  +		/* should solve continuous CTS frame problems */
> - 		{ CR91,  0x00 },
> - 		{ CR92,  0x0a }, { CR93,  0x00 }, { CR94,  0x01 },
> - 		{ CR95,  0x00 }, { CR96,  0x40 }, { CR97,  0x37 },
> - 		{ CR98,  0x05 }, { CR99,  0x28 }, { CR100, 0x00 },
> - 		{ CR101, 0x13 }, { CR102, 0x27 }, { CR103, 0x27 },
> - 		{ CR104, 0x18 }, { CR105, 0x12 },
> + 		{ ZD_CR91,  0x00 },
> + 		{ ZD_CR92,  0x0a }, { ZD_CR93,  0x00 }, { ZD_CR94,  0x01 },
> + 		{ ZD_CR95,  0x00 }, { ZD_CR96,  0x40 }, { ZD_CR97,  0x37 },
> + 		{ ZD_CR98,  0x05 }, { ZD_CR99,  0x28 }, { ZD_CR100, 0x00 },
> + 		{ ZD_CR101, 0x13 }, { ZD_CR102, 0x27 }, { ZD_CR103, 0x27 },
> + 		{ ZD_CR104, 0x18 }, { ZD_CR105, 0x12 },
>   		/* normal size */
> - 		{ CR106, 0x1a },
> - 		/* { CR106, 0x22 }, */
> - 		{ CR107, 0x24 }, { CR108, 0x0a }, { CR109, 0x13 },
> - 		{ CR110, 0x2F }, { CR111, 0x27 }, { CR112, 0x27 },
> - 		{ CR113, 0x27 }, { CR114, 0x27 }, { CR115, 0x40 },
> - 		{ CR116, 0x40 }, { CR117, 0xF0 }, { CR118, 0xF0 },
> - 		{ CR119, 0x16 },
> + 		{ ZD_CR106, 0x1a },
> + 		/* { ZD_CR106, 0x22 }, */
> + 		{ ZD_CR107, 0x24 }, { ZD_CR108, 0x0a }, { ZD_CR109, 0x13 },
> + 		{ ZD_CR110, 0x2F }, { ZD_CR111, 0x27 }, { ZD_CR112, 0x27 },
> + 		{ ZD_CR113, 0x27 }, { ZD_CR114, 0x27 }, { ZD_CR115, 0x40 },
> + 		{ ZD_CR116, 0x40 }, { ZD_CR117, 0xF0 }, { ZD_CR118, 0xF0 },
> + 		{ ZD_CR119, 0x16 },
>   		/* no TX continuation */
> - 		{ CR122, 0x00 },
> - 		/* { CR122, 0xff }, */
> - 		{ CR127, 0x03 }, { CR131, 0x08 }, { CR138, 0x28 },
> - 		{ CR148, 0x44 }, { CR150, 0x10 }, { CR169, 0xBB },
> - 		{ CR170, 0xBB },
> + 		{ ZD_CR122, 0x00 },
> + 		/* { ZD_CR122, 0xff }, */
> + 		{ ZD_CR127, 0x03 }, { ZD_CR131, 0x08 }, { ZD_CR138, 0x28 },
> + 		{ ZD_CR148, 0x44 }, { ZD_CR150, 0x10 }, { ZD_CR169, 0xBB },
> + 		{ ZD_CR170, 0xBB },
>   	};
>
>   	static const u32 rv[] = {
>
>

linux-next: manual merge of the wireless tree with Linus' tree

[Stephen Rothwell]

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

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/bcma/driver_gpio.c between commit 2997609eb4c9 ("bcma: gpio: add
own IRQ domain") from Linus' tree and commit 6b6ee88774ae ("bcma: gpio:
register all 32 GPIOs") from the wireless tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

[Aside, Ralf: that commit in Linus' tree is committed by you but has no
Signed-off-by from you.  There were a couple of others there as well.]
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/bcma/driver_gpio.c
index 25f9887a35d0,39dadf5342c6..000000000000
--- a/drivers/bcma/driver_gpio.c
+++ b/drivers/bcma/driver_gpio.c
@@@ -215,10 -95,8 +215,10 @@@ int bcma_gpio_init(struct bcma_drv_cc *
  	chip->set		= bcma_gpio_set_value;
  	chip->direction_input	= bcma_gpio_direction_input;
  	chip->direction_output	= bcma_gpio_direction_output;
 +#if IS_BUILTIN(CONFIG_BCMA_HOST_SOC)
  	chip->to_irq		= bcma_gpio_to_irq;
 +#endif
- 	chip->ngpio		= 16;
+ 	chip->ngpio		= 32;
  	/* There is just one SoC in one device and its GPIO addresses should be
  	 * deterministic to address them more easily. The other buses could get
  	 * a random base number. */

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

linux-next: manual merge of the wireless tree with Linus' tree

[Stephen Rothwell]

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

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/rtlwifi/rtl8192cu/sw.c between commit 9d9779e723a5
("drivers/net: Add module.h to drivers who were implicitly using it")
from the  tree and commit e97173c985c0 ("rtl8192cu: Fix WARNING on
suspend/resume") from the wireless tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
index c244f2f,a48bea6..0000000
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
@@@ -42,7 -42,8 +42,9 @@@
  #include "led.h"
  #include "hw.h"
  #include <linux/vmalloc.h>
 +#include <linux/module.h>
+ #include <linux/atomic.h>
+ #include <linux/types.h>
  
  MODULE_AUTHOR("Georgia		<georgia@realtek.com>");
  MODULE_AUTHOR("Ziv Huang	<ziv_huang@realtek.com>");

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

Re: linux-next: manual merge of the wireless tree with Linus' tree

[John W. Linville]

On Tue, Sep 20, 2011 at 01:28:14PM +1000, Stephen Rothwell wrote:
> Hi John,
> 
> Today's linux-next merge of the wireless tree got a conflict in
> drivers/net/wireless/wl12xx/main.c between commit 7a5e4877c14d ("wl12xx:
> add max_sched_scan_ssids value to the hw description") from Linus' tree
> and commit 221737d24f88 ("wl12xx: increase number of allowed SSIDs in
> sched_scan") from the wireless tree.
> 
> I fixed it up (I used the wireless tree version) and can carry the fix as
> necessary.
> 
> John, maybe you could merge the wireless-current tree (or the part of it
> that has already been merged into Linus' tree) into the wireless tree and
> fix these merge issues.

Yes, I will -- I'm trying to get resynced w/ Dave...

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

linux-next: manual merge of the wireless tree with Linus' tree

[Stephen Rothwell]

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

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/wl12xx/main.c between commit 7a5e4877c14d ("wl12xx:
add max_sched_scan_ssids value to the hw description") from Linus' tree
and commit 221737d24f88 ("wl12xx: increase number of allowed SSIDs in
sched_scan") from the wireless tree.

I fixed it up (I used the wireless tree version) and can carry the fix as
necessary.

John, maybe you could merge the wireless-current tree (or the part of it
that has already been merged into Linus' tree) into the wireless tree and
fix these merge issues.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: manual merge of the wireless tree with Linus' tree

[Stephen Rothwell]

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

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-pci.c between commit 16a9d06c753a
("iwlagn: sysfs couldn't find the priv pointer") from Linus' tree and
commit 18d0077f0c4a ("iwlagn: remove drvdata support from bus layer")
from the wireless tree.

I fixed it up (I used the version from the wireless tree) and can carry
the fix as necessary.
-- 
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: manual merge of the wireless tree with Linus' tree

[Luciano Coelho]

Hi Stephen

On Mon, 2011-09-19 at 15:14 +1000, Stephen Rothwell wrote: 
> Today's linux-next merge of the wireless tree got a conflict in
> drivers/net/wireless/wl12xx/main.c between commit 7a5e4877c14d ("wl12xx:
> add max_sched_scan_ssids value to the hw description") from Linus' tree
> and commit f952079a19c6 ("wl12xx: add support for multiple SSIDs in
> sched_scan") from the wireless tree.
> 
> I used the version from the wireless tree.

This is correct, the version from the wireless tree should be use (ie.,
setting the value to 8).  I guess wireless-next doesn't include the
change that went into Linus' tree yet.

-- 
Cheers,
Luca.

linux-next: manual merge of the wireless tree with Linus' tree

[Stephen Rothwell]

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

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/wl12xx/main.c between commit 7a5e4877c14d ("wl12xx:
add max_sched_scan_ssids value to the hw description") from Linus' tree
and commit f952079a19c6 ("wl12xx: add support for multiple SSIDs in
sched_scan") from the wireless tree.

I used the version from the wireless tree.
-- 
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: manual merge of the wireless tree with Linus' tree

[Helmut Schaa]

On Thu, Sep 15, 2011 at 5:14 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the wireless tree got a conflict in
> drivers/net/wireless/rt2x00/rt2800usb.c between commit 674db1344443
> ("rt2x00: fix crash in rt2800usb_get_txwi") from Linus' tree and commit
> 31937c423ed3 ("rt2x00: Minor optimizazion in txdone path") from the
> wireless tree.
>
> I fixed it up (see below) anc can carry the fix as necessary.

Fix looks good to me.

Thanks,
Helmut

> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
>
> diff --cc drivers/net/wireless/rt2x00/rt2800usb.c
> index dbf501c,4b907a5..0000000
> --- a/drivers/net/wireless/rt2x00/rt2800usb.c
> +++ b/drivers/net/wireless/rt2x00/rt2800usb.c
> @@@ -538,11 -529,13 +538,12 @@@ static void rt2800usb_txdone(struct rt2
>                        entry = rt2x00queue_get_entry(queue, Q_INDEX_DONE);
>                        if (rt2800usb_txdone_entry_check(entry, reg))
>                                break;
>  +                      entry = NULL;
>                }
>
>  -              if (!entry || rt2x00queue_empty(queue))
>  -                      break;
>  -
>  -              rt2800_txdone_entry(entry, reg,
>  +              if (entry)
> -                       rt2800_txdone_entry(entry, reg);
> ++                      rt2800_txdone_entry(entry, reg,
> +                                   rt2800usb_get_txwi(entry));
>        }
>  }
>
>

linux-next: manual merge of the wireless tree with Linus' tree

[Stephen Rothwell]

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/rt2x00/rt2800usb.c between commit 674db1344443
("rt2x00: fix crash in rt2800usb_get_txwi") from Linus' tree and commit
31937c423ed3 ("rt2x00: Minor optimizazion in txdone path") from the
wireless tree.

I fixed it up (see below) anc can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/wireless/rt2x00/rt2800usb.c
index dbf501c,4b907a5..0000000
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@@ -538,11 -529,13 +538,12 @@@ static void rt2800usb_txdone(struct rt2
  			entry = rt2x00queue_get_entry(queue, Q_INDEX_DONE);
  			if (rt2800usb_txdone_entry_check(entry, reg))
  				break;
 +			entry = NULL;
  		}
  
 -		if (!entry || rt2x00queue_empty(queue))
 -			break;
 -
 -		rt2800_txdone_entry(entry, reg,
 +		if (entry)
- 			rt2800_txdone_entry(entry, reg);
++			rt2800_txdone_entry(entry, reg,
+ 				    rt2800usb_get_txwi(entry));
  	}
  }
  

linux-next: manual merge of the wireless tree with Linus' tree

[Stephen Rothwell]

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

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-pci.c between commit 16a9d06c753a
("iwlagn: sysfs couldn't find the priv pointer") from Linus' tree and
commit 65e291acd806 ("iwlagn: merge iwl_pci_down and iwl_pci_remove")
from the wireless tree.

I used the latter version as they ended up more or less thae same (with a
coupld of more changes in the latter).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: manual merge of the wireless tree with Linus' tree

[Stephen Rothwell]

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-pci.c between commit 16a9d06c753a
("iwlagn: sysfs couldn't find the priv pointer") from Linus' tree and
commit cac988a682d4 ("iwlagn: introduce struct iwl-shared - known by all
layers") from the wireless tree.

I fixed it up (I think - see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/wireless/iwlwifi/iwl-pci.c
index 2fdbffa,e41f53e..0000000
--- a/drivers/net/wireless/iwlwifi/iwl-pci.c
+++ b/drivers/net/wireless/iwlwifi/iwl-pci.c
@@@ -478,25 -483,30 +483,25 @@@ out_no_pci
  	return err;
  }
  
 -static void iwl_pci_down(struct iwl_bus *bus)
 -{
 -	struct iwl_pci_bus *pci_bus = (struct iwl_pci_bus *) bus->bus_specific;
 -
 -	pci_disable_msi(pci_bus->pci_dev);
 -	pci_iounmap(pci_bus->pci_dev, pci_bus->hw_base);
 -	pci_release_regions(pci_bus->pci_dev);
 -	pci_disable_device(pci_bus->pci_dev);
 -	pci_set_drvdata(pci_bus->pci_dev, NULL);
 -
 -	kfree(bus);
 -}
 -
  static void __devexit iwl_pci_remove(struct pci_dev *pdev)
  {
- 	struct iwl_priv *priv = pci_get_drvdata(pdev);
- 	struct iwl_bus *bus = priv->bus;
+ 	struct iwl_shared *shrd = pci_get_drvdata(pdev);
+ 	struct iwl_bus *bus = shrd->bus;
 +	struct iwl_pci_bus *pci_bus = IWL_BUS_GET_PCI_BUS(bus);
 +	struct pci_dev *pci_dev = IWL_BUS_GET_PCI_DEV(bus);
  
- 	iwl_remove(priv);
+ 	iwl_remove(shrd->priv);
  
 -	iwl_pci_down(bus);
 +	pci_disable_msi(pci_dev);
 +	pci_iounmap(pci_dev, pci_bus->hw_base);
 +	pci_release_regions(pci_dev);
 +	pci_disable_device(pci_dev);
 +	pci_set_drvdata(pci_dev, NULL);
 +
 +	kfree(bus);
  }
  
- #ifdef CONFIG_PM
+ #ifdef CONFIG_PM_SLEEP
  
  static int iwl_pci_suspend(struct device *device)
  {

linux-next: manual merge of the wireless tree with Linus' tree

[Stephen Rothwell]

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

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
net/mac80211/sta_info.h between commit 25985edcedea ("Fix common
misspellings") from Linus' tree and commit 9c3990aaec0a ("nl80211: Let
userspace drive the peer link management states") from the wireless tree.

The latter removed the code updated by the former.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: manual merge of the wireless tree with Linus' tree

[Stephen Rothwell]

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-agn-tx.c between commit bfd36103ec26
("iwlagn: fix "Received BA when not expected"") from Linus' tree and
commit 2c46f72e069e ("iwlagn: check DMA mapping errors") from the
wireless tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/wireless/iwlwifi/iwl-agn-tx.c
index 4afae14,7c1becf..0000000
--- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
@@@ -582,17 -580,12 +580,17 @@@ int iwlagn_tx_skb(struct iwl_priv *priv
  
  	hdr_len = ieee80211_hdrlen(fc);
  
 -	/* Find index into station table for destination station */
 -	sta_id = iwl_sta_id_or_broadcast(priv, ctx, info->control.sta);
 -	if (sta_id == IWL_INVALID_STATION) {
 -		IWL_DEBUG_DROP(priv, "Dropping - INVALID STATION: %pM\n",
 -			       hdr->addr1);
 -		goto drop_unlock_priv;
 +	/* For management frames use broadcast id to do not break aggregation */
 +	if (!ieee80211_is_data(fc))
 +		sta_id = ctx->bcast_sta_id;
 +	else {
 +		/* Find index into station table for destination station */
 +		sta_id = iwl_sta_id_or_broadcast(priv, ctx, info->control.sta);
 +		if (sta_id == IWL_INVALID_STATION) {
 +			IWL_DEBUG_DROP(priv, "Dropping - INVALID STATION: %pM\n",
 +				       hdr->addr1);
- 			goto drop_unlock;
++			goto drop_unlock_priv;
 +		}
  	}
  
  	IWL_DEBUG_TX(priv, "station Id %d\n", sta_id);

linux-next: manual merge of the wireless tree with Linus' tree

[Stephen Rothwell]

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

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/rtlwifi/pci.c between commit 25985edcedea ("Fix
common misspellings") from Linus' tree and commit c7cfe38ee0f9 ("rtlwifi:
Convert pci routines for addition of rtl8192se and rtl8192de") from the
wireless tree.

The latter removes the line corrected by the former.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: manual merge of the wireless tree with Linus' tree

[Stephen Rothwell]

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

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-core.c between commit 25985edcedea ("Fix
common misspellings") from Linus' tree and commit ee3cd7e04ca0 ("iwlagn:
cleanup to remove the reference for 3945") from the wireless tree.

The latter removes the line that the former corrects, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: manual merge of the wireless tree with Linus' tree

[Stephen Rothwell]

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

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/ath/ar9170/main.c and
drivers/net/wireless/ath/ar9170/phy.c between commit 25985edcedea ("Fix
common misspellings") from Linus' tree and commit b0006e696158
("ar9170usb: purge obsolete driver") from the wireless tree.

The latter just removed the files, so I did that.
-- 
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: manual merge of the wireless tree with Linus' tree

[John W. Linville]

On Tue, Sep 21, 2010 at 12:09:19PM +1000, Stephen Rothwell wrote:
> Hi John,
> 
> Today's linux-next merge of the wireless tree got a conflict in
> arch/arm/mach-omap2/board-omap3pandora.c between commit
> 79ccf549b33c613b57eebcb03f8b24644c545a88 ("omap3: pandora: add NAND and
> wifi support") from Linus' tree and commit
> 664279b5121b480f31ffecf202cd2d1591ff356e ("wl12xx: make wl12xx.h common
> to both spi and sdio") from the wireless tree.
> 
> The wireless tree commit copied the include/linux/spi/wl12xx.h to
> include/linux but did not remove the spi/ one.  Later patches modified
> only the new one ... I fixed the above conflict (see below) on the
> assumption that the spi/ version of the header file should have been
> removed.

Hmmmm...not sure how the delete part of the move got lost...  I'll fix
it up.

Thanks for letting me know!

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: manual merge of the wireless tree with Linus' tree

[Ohad Ben-Cohen]

On Tue, Sep 21, 2010 at 8:53 AM, Ohad Ben-Cohen <ohad@wizery.com> wrote:
> On Tue, Sep 21, 2010 at 4:09 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> The wireless tree commit copied the include/linux/spi/wl12xx.h to
>> include/linux but did not remove the spi/ one.
>
> We had that one fixed in
> http://www.mail-archive.com/linux-omap@vger.kernel.org/msg34910.html
> but it seems an older patch accidentally got in.

Ok, figured this out - the correct patch _was_ taken, but commit
79ccf549b33c613b57eebcb03f8b24644c545a88 ("omap3: pandora: add NAND
and
wifi support") only came later, so the "#include <linux/spi/wl12xx.h>"
was only removed in the merge (so it was dropped from the original
patch).

Anyway your fix is good Stephen, Thank you.


>> --
>> Cheers,
>> Stephen Rothwell                    sfr@canb.auug.org.au
>>
>> diff --cc arch/arm/mach-omap2/board-omap3pandora.c
>> index dd3af2b,9b62b62..0000000
>> --- a/arch/arm/mach-omap2/board-omap3pandora.c
>> +++ b/arch/arm/mach-omap2/board-omap3pandora.c
>> @@@ -25,9 -25,7 +25,9 @@@
>>  #include <linux/spi/ads7846.h>
>>  #include <linux/regulator/machine.h>
>>  #include <linux/i2c/twl.h>
>> - #include <linux/spi/wl12xx.h>
>> + #include <linux/wl12xx.h>
>>  +#include <linux/mtd/partitions.h>
>>  +#include <linux/mtd/nand.h>
>>  #include <linux/leds.h>
>>  #include <linux/input.h>
>>  #include <linux/input/matrix_keypad.h>
>>
>

Re: linux-next: manual merge of the wireless tree with Linus' tree

[Ohad Ben-Cohen]

Hi Stephen,

On Tue, Sep 21, 2010 at 4:09 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> The wireless tree commit copied the include/linux/spi/wl12xx.h to
> include/linux but did not remove the spi/ one.

We had that one fixed in
http://www.mail-archive.com/linux-omap@vger.kernel.org/msg34910.html
but it seems an older patch accidentally got in.

> only the new one ... I fixed the above conflict (see below) on the
> assumption that the spi/ version of the header file should have been
> removed.

Yes, thank you. I'll send a patch to fix that in the wireless tree too.

Thanks,
Ohad.

> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
>
> diff --cc arch/arm/mach-omap2/board-omap3pandora.c
> index dd3af2b,9b62b62..0000000
> --- a/arch/arm/mach-omap2/board-omap3pandora.c
> +++ b/arch/arm/mach-omap2/board-omap3pandora.c
> @@@ -25,9 -25,7 +25,9 @@@
>  #include <linux/spi/ads7846.h>
>  #include <linux/regulator/machine.h>
>  #include <linux/i2c/twl.h>
> - #include <linux/spi/wl12xx.h>
> + #include <linux/wl12xx.h>
>  +#include <linux/mtd/partitions.h>
>  +#include <linux/mtd/nand.h>
>  #include <linux/leds.h>
>  #include <linux/input.h>
>  #include <linux/input/matrix_keypad.h>
>

linux-next: manual merge of the wireless tree with Linus' tree

[Stephen Rothwell]

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

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/ath/ath5k/base.c between commit
d8e1ba76d619dbc0be8fbeee4e6c683b5c812d3a ("ath5k: check return value of
ieee80211_get_tx_rate") from Linus' tree and (probably) commit
bb18dec05909c96a13754f4e070e5d604cb2b805 ("ath5k: reorder base.c to
remove fwd decls") from the wireless tree.

I fixed it up (I think - I just applied the patch from Linus' tree to the
new position in the wireless tree file) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: manual merge of the wireless tree with Linus' tree

[Stephen Rothwell]

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
arch/arm/mach-omap2/board-omap3pandora.c between commit
79ccf549b33c613b57eebcb03f8b24644c545a88 ("omap3: pandora: add NAND and
wifi support") from Linus' tree and commit
664279b5121b480f31ffecf202cd2d1591ff356e ("wl12xx: make wl12xx.h common
to both spi and sdio") from the wireless tree.

The wireless tree commit copied the include/linux/spi/wl12xx.h to
include/linux but did not remove the spi/ one.  Later patches modified
only the new one ... I fixed the above conflict (see below) on the
assumption that the spi/ version of the header file should have been
removed.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-omap2/board-omap3pandora.c
index dd3af2b,9b62b62..0000000
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@@ -25,9 -25,7 +25,9 @@@
  #include <linux/spi/ads7846.h>
  #include <linux/regulator/machine.h>
  #include <linux/i2c/twl.h>
- #include <linux/spi/wl12xx.h>
+ #include <linux/wl12xx.h>
 +#include <linux/mtd/partitions.h>
 +#include <linux/mtd/nand.h>
  #include <linux/leds.h>
  #include <linux/input.h>
  #include <linux/input/matrix_keypad.h>

Re: linux-next: manual merge of the wireless tree with Linus' tree

[Stephen Rothwell]

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

Hi Rusty,

On Tue, 17 Aug 2010 12:29:44 +0930 Rusty Russell <rusty@rustcorp.com.au> wrote:
>
> You can drop the commit as you have done.  But it leaves three problematic
> writable charp parameters in the libertas/ directory which now need lifetime
> management.
> 
> ie. kparam_block_sysfs_write()/unblock around them, and probably they need
> to be copied.

I figured that there was something needed, but I could not figure out where.

-- 
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: manual merge of the wireless tree with Linus' tree

[Rusty Russell]

On Tue, 17 Aug 2010 11:22:03 am Stephen Rothwell wrote:
> Hi John,
> 
> Today's linux-next merge of the wireless tree got a conflict in
> drivers/net/wireless/libertas/if_sdio.c between commit
> 886275ce41a9751117367fb387ed171049eb6148 ("param: lock if_sdio's
> lbs_helper_name and lbs_fw_name against sysfs changes") from Linus' tree
> and commit 3d32a58b87cd251b50842f93b87d5458061c0cfc ("libertas: [sdio]
> use common firmware request helper and new firmware locations") from the
> wireless tree.
> 
> OK, I can't quite figure out what is going on here.  The latter commit
> removes that code that was modified by the former, so I effectively
> reverted the former commit (by using this file from the wireless tree)
> since the "helper" and "firmware" fields of struct if_sdio_card don't
> seem to be used anywhere anymore.  Can they be removed as well?

I'm looking at the wireless tree now.

You can drop the commit as you have done.  But it leaves three problematic
writable charp parameters in the libertas/ directory which now need lifetime
management.

ie. kparam_block_sysfs_write()/unblock around them, and probably they need
to be copied.

Cheers,
Rusty.

linux-next: manual merge of the wireless tree with Linus' tree

[Stephen Rothwell]

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

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/libertas/if_sdio.c between commit
886275ce41a9751117367fb387ed171049eb6148 ("param: lock if_sdio's
lbs_helper_name and lbs_fw_name against sysfs changes") from Linus' tree
and commit 3d32a58b87cd251b50842f93b87d5458061c0cfc ("libertas: [sdio]
use common firmware request helper and new firmware locations") from the
wireless tree.

OK, I can't quite figure out what is going on here.  The latter commit
removes that code that was modified by the former, so I effectively
reverted the former commit (by using this file from the wireless tree)
since the "helper" and "firmware" fields of struct if_sdio_card don't
seem to be used anywhere anymore.  Can they be removed as well?
-- 
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: manual merge of the wireless tree with Linus' tree

[John W. Linville]

On Tue, Jun 15, 2010 at 12:00:48PM +1000, Stephen Rothwell wrote:
> Hi John,
> 
> Today's linux-next merge of the wireless tree got a conflict in
> net/mac80211/mlme.c between commit
> b054b747a694927879c94dd11af54d04346aed7d ("mac80211: fix deauth before
> assoc") from Linus' tree and commit
> 36b3a628a4e85d002ee8813ebd2a5caef6d3c1a7 ("mac80211: common work skb
> freeing") from the wireless tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix
> for a while.

Yes, that looks correct.  I will get the merge sorted-out when I send
the next pull request to Dave, probably this week.

Thanks,

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

linux-next: manual merge of the wireless tree with Linus' tree

[Stephen Rothwell]

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
net/mac80211/mlme.c between commit
b054b747a694927879c94dd11af54d04346aed7d ("mac80211: fix deauth before
assoc") from Linus' tree and commit
36b3a628a4e85d002ee8813ebd2a5caef6d3c1a7 ("mac80211: common work skb
freeing") from the wireless tree.

Just context changes.  I fixed it up (see below) and can carry the fix
for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc net/mac80211/mlme.c
index 8fb85c3,74479c2..0000000
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@@ -1760,47 -1708,8 +1708,45 @@@ void ieee80211_sta_rx_queued_mgmt(struc
  	mutex_unlock(&ifmgd->mtx);
  
  	if (skb->len >= 24 + 2 /* mgmt + deauth reason */ &&
 -	    (fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_DEAUTH)
 +	    (fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_DEAUTH) {
 +		struct ieee80211_local *local = sdata->local;
 +		struct ieee80211_work *wk;
 +
 +		mutex_lock(&local->work_mtx);
 +		list_for_each_entry(wk, &local->work_list, list) {
 +			if (wk->sdata != sdata)
 +				continue;
 +
 +			if (wk->type != IEEE80211_WORK_ASSOC)
 +				continue;
 +
 +			if (memcmp(mgmt->bssid, wk->filter_ta, ETH_ALEN))
 +				continue;
 +			if (memcmp(mgmt->sa, wk->filter_ta, ETH_ALEN))
 +				continue;
 +
 +			/*
 +			 * Printing the message only here means we can't
 +			 * spuriously print it, but it also means that it
 +			 * won't be printed when the frame comes in before
 +			 * we even tried to associate or in similar cases.
 +			 *
 +			 * Ultimately, I suspect cfg80211 should print the
 +			 * messages instead.
 +			 */
 +			printk(KERN_DEBUG
 +			       "%s: deauthenticated from %pM (Reason: %u)\n",
 +			       sdata->name, mgmt->bssid,
 +			       le16_to_cpu(mgmt->u.deauth.reason_code));
 +
 +			list_del_rcu(&wk->list);
 +			free_work(wk);
 +			break;
 +		}
 +		mutex_unlock(&local->work_mtx);
 +
  		cfg80211_send_deauth(sdata->dev, (u8 *)mgmt, skb->len);
 +	}
-  out:
- 	kfree_skb(skb);
  }
  
  static void ieee80211_sta_timer(unsigned long data)

linux-next: manual merge of the wireless tree with Linus' tree

[Stephen Rothwell]

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

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/ath/ar9170/main.c between commit
984b3f5746ed2cde3d184651dabf26980f2b66e5 ("bitops: rename for_each_bit()
to for_each_set_bit()") from Linus' tree and commit
f3926b49b7122f66f8f2a1da4ae3275b112ab3e7 ("ar9170usb: remove deprecated
aggregation code") from the wireless tree.

The latter just remove the code modified by the former.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: manual merge of the wireless tree with Linus' tree

[Stephen Rothwell]

Hi John,

Today's linux-next merge of the wireless tree got a conflicts in
drivers/net/wireless/libertas_tf/cmd.c and
drivers/net/wireless/libertas_tf/main.c between commit
5a0e3ad6af8660be21ca98a971cd00f331318c05 ("include cleanup: Update gfp.h
and slab.h includes to prepare for breaking implicit slab.h inclusion
from percpu.h") from Linus' tree and commit
e9bd5bcde7af27ebb92bb866afde5ef5e4f3dc6c ("libertastf: add configurable
debug messages") from the wireless tree.

Just overlapping additions.  I fixed it up (see below) and can carry the
fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/wireless/libertas_tf/cmd.c
index b620daf,22645e4..0000000
--- a/drivers/net/wireless/libertas_tf/cmd.c
+++ b/drivers/net/wireless/libertas_tf/cmd.c
@@@ -7,8 -7,7 +7,9 @@@
   *  the Free Software Foundation; either version 2 of the License, or (at
   *  your option) any later version.
   */
 +#include <linux/slab.h>
 +
+ #include "deb_defs.h"
  #include "libertas_tf.h"
  
  static const struct channel_range channel_ranges[] = {
diff --cc drivers/net/wireless/libertas_tf/main.c
index 7533a23,3b1db84..0000000
--- a/drivers/net/wireless/libertas_tf/main.c
+++ b/drivers/net/wireless/libertas_tf/main.c
@@@ -7,8 -7,7 +7,9 @@@
   *  the Free Software Foundation; either version 2 of the License, or (at
   *  your option) any later version.
   */
 +#include <linux/slab.h>
 +
+ #include "deb_defs.h"
  #include "libertas_tf.h"
  #include "linux/etherdevice.h"
  

linux-next: manual merge of the wireless tree with Linus' tree

[Stephen Rothwell]

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

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-core.h between commit
46e75f66677f5094bb51e91f9473128c4e907c7d ("net: fix for utsrelease.h
moving to generated") from Linus' tree and commit
61b91c1ea31d0d3ae5f848f7f7eab53dd691f8d0 ("iwlwifi: remove
linux/utsrelease.h dependency") from the wireless tree.

The latter clearly removes the need for the former, so I used that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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