public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	"Prashant P. Shah" <pshah.mumbai@gmail•com>,
	Rusty Russell <rusty@rustcorp•com.au>
Subject: linux-next: manual merge of the staging-next tree with the rr tree
Date: Mon, 17 May 2010 15:44:52 +1000	[thread overview]
Message-ID: <20100517154452.93fbac66.sfr@canb.auug.org.au> (raw)

Hi Greg,

Today's linux-next merge of the staging-next tree got a conflict in
drivers/staging/rtl8187se/r8180_core.c between commit
9080984577cb3e04226d94c8f733534b60541f01
("param:remove-useless-writable-charp") from the rr tree and commit
bbfb56520c8da666383c08220985495ff918d4ad ("") from the staging-next 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/staging/rtl8187se/r8180_core.c
index b09ce4b,dacefea..0000000
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@@ -74,15 -74,15 +74,15 @@@ MODULE_AUTHOR("Andrea Merello <andreamr
  MODULE_DESCRIPTION("Linux driver for Realtek RTL8180 / RTL8185 WiFi cards");
  
  
 -module_param(ifname, charp, S_IRUGO|S_IWUSR);
 +module_param_string(ifname, ifname, sizeof(ifname), S_IRUGO|S_IWUSR);
- module_param(hwseqnum,int, S_IRUGO|S_IWUSR);
- module_param(hwwep,int, S_IRUGO|S_IWUSR);
- module_param(channels,int, S_IRUGO|S_IWUSR);
+ module_param(hwseqnum, int, S_IRUGO|S_IWUSR);
+ module_param(hwwep, int, S_IRUGO|S_IWUSR);
+ module_param(channels, int, S_IRUGO|S_IWUSR);
  
- MODULE_PARM_DESC(devname," Net interface name, wlan%d=default");
- MODULE_PARM_DESC(hwseqnum," Try to use hardware 802.11 header sequence numbers. Zero=default");
- MODULE_PARM_DESC(hwwep," Try to use hardware WEP support. Still broken and not available on all cards");
- MODULE_PARM_DESC(channels," Channel bitmask for specific locales. NYI");
+ MODULE_PARM_DESC(devname, " Net interface name, wlan%d=default");
+ MODULE_PARM_DESC(hwseqnum, " Try to use hardware 802.11 header sequence numbers. Zero=default");
+ MODULE_PARM_DESC(hwwep, " Try to use hardware WEP support. Still broken and not available on all cards");
+ MODULE_PARM_DESC(channels, " Channel bitmask for specific locales. NYI");
  
  
  static int __devinit rtl8180_pci_probe(struct pci_dev *pdev,
@@@ -3608,16 -3606,16 +3606,16 @@@ static int __devinit rtl8180_pci_probe(
  	dev->netdev_ops = &rtl8180_netdev_ops;
  	dev->wireless_handlers = &r8180_wx_handlers_def;
  
- 	dev->type=ARPHRD_ETHER;
+ 	dev->type = ARPHRD_ETHER;
  	dev->watchdog_timeo = HZ*3;
  
- 	if (dev_alloc_name(dev, ifname) < 0){
-                 DMESG("Oops: devname already taken! Trying wlan%%d...\n");
+ 	if (dev_alloc_name(dev, ifname) < 0) {
+ 		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){
+ 	if (rtl8180_init(dev) != 0) {
  		DMESG("Initialization failed");
  		goto fail1;
  	}

next             reply	other threads:[~2010-05-17  5:44 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-17  5:44 Stephen Rothwell [this message]
2010-05-17 18:01 ` linux-next: manual merge of the staging-next tree with the rr tree Greg KH
  -- strict thread matches above, loose matches on Subject: below --
2010-05-10  5:15 Stephen Rothwell
2010-05-10 16:41 ` Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100517154452.93fbac66.sfr@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=greg@kroah$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=pshah.mumbai@gmail$(echo .)com \
    --cc=rusty@rustcorp$(echo .)com.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox