linux-next: manual merge of the staging-next tree with the rr tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging-next tree got a conflict in
drivers/staging/rtl8187se/r8180_core.c between commit
db8b06bcf94dbd02fba2601bee81ac4d9a626095
("param:remove-useless-writable-charp") from the rr tree and commit
3992db8fcb2ead240f311fc3e212443c5e1c43b9 ("Staging: rtl8187se: fix coding
style issues in r8180_core.c") from the staging-next tree.

I fixed it up (see below) and can carry the fixes as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/staging/rtl8187se/r8180_core.c
index b09ce4b,84a745b..0000000
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@@ -3612,10 -3614,10 +3614,10 @@@ static int __devinit rtl8180_pci_probe(
  	dev->watchdog_timeo = HZ*3;
  
  	if (dev_alloc_name(dev, ifname) < 0){
-                 DMESG("Oops: devname already taken! Trying wlan%%d...\n");
+ 		DMESG("Oops: devname already taken! Trying wlan%%d...\n");
 -		ifname = "wlan%d";
 +		strcpy(ifname, "wlan%d");
  		dev_alloc_name(dev, ifname);
-         }
+ 	}
  
  	if(rtl8180_init(dev)!=0){
  		DMESG("Initialization failed");
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/