From: Jiri Kosina <jkosina@suse.cz>
Date: Mon, 8 Mar 2010 15:55:37 +0000 (+0100)
Subject: Merge branch 'for-next' into for-linus
X-Git-Tag: v2.6.34-rc2~65^2
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=318ae2edc3b29216abd8a2510f3f80b764f06858;p=sfrench%2Fcifs-2.6.git

Merge branch 'for-next' into for-linus

Conflicts:
	Documentation/filesystems/proc.txt
	arch/arm/mach-u300/include/mach/debug-macro.S
	drivers/net/qlge/qlge_ethtool.c
	drivers/net/qlge/qlge_main.c
	drivers/net/typhoon.c
---

318ae2edc3b29216abd8a2510f3f80b764f06858
diff --cc Documentation/filesystems/proc.txt
index 96a44dd95e03,bb314f60a76a..a4f30faa4f1f
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@@ -189,13 -188,7 +189,13 @@@ memory usage. Its seven fields are expl
  contains details information about the process itself.  Its fields are
  explained in Table 1-4.
  
 +(for SMP CONFIG users)
 +For making accounting scalable, RSS related information are handled in
 +asynchronous manner and the vaule may not be very precise. To see a precise
 +snapshot of a moment, you can see /proc/<pid>/smaps file and scan page table.
 +It's slow but very precise.
 +
- Table 1-2: Contents of the statm files (as of 2.6.30-rc7)
+ Table 1-2: Contents of the status files (as of 2.6.30-rc7)
  ..............................................................................
   Field                       Content
   Name                        filename of the executable
diff --cc arch/arm/mach-omap2/board-3630sdp.c
index 4386d2b4a785,739059632811..4386d2b4a785
mode 100755,100644..100644
--- a/arch/arm/mach-omap2/board-3630sdp.c
+++ b/arch/arm/mach-omap2/board-3630sdp.c
diff --cc arch/arm/mach-omap2/board-zoom-peripherals.c
index ca95d8d64136,1e3dfb652acc..ca95d8d64136
mode 100755,100644..100644
--- a/arch/arm/mach-omap2/board-zoom-peripherals.c
+++ b/arch/arm/mach-omap2/board-zoom-peripherals.c
diff --cc arch/arm/mach-u300/include/mach/debug-macro.S
index ca4a028c2661,d591fe13ed13..92c12420256f
--- a/arch/arm/mach-u300/include/mach/debug-macro.S
+++ b/arch/arm/mach-u300/include/mach/debug-macro.S
@@@ -10,8 -10,8 +10,8 @@@
   */
  #include <mach/hardware.h>
  
 -	.macro	addruart,rx
 +	.macro	addruart, rx, tmp
- 	/* If we move the adress using MMU, use this. */
+ 	/* If we move the address using MMU, use this. */
  	mrc	p15, 0, \rx, c1, c0
  	tst	\rx, #1			@ MMU enabled?
  	ldreq	\rx,	  = U300_SLOW_PER_PHYS_BASE @ MMU off, physical address
diff --cc drivers/net/qlge/qlge_ethtool.c
index 05b8bde9980d,b8d21ab212c6..7dbff87480dc
--- a/drivers/net/qlge/qlge_ethtool.c
+++ b/drivers/net/qlge/qlge_ethtool.c
@@@ -404,9 -401,9 +404,9 @@@ static int ql_set_wol(struct net_devic
  	if (!qdev->wol) {
  		u32 wol = 0;
  		status = ql_mb_wol_mode(qdev, wol);
 -		QPRINTK(qdev, DRV, ERR, "WOL %s (wol code 0x%x) on %s\n",
 -			(status == 0) ? "cleared successfully" : "clear failed",
 -			wol, qdev->ndev->name);
 +		netif_err(qdev, drv, qdev->ndev, "WOL %s (wol code 0x%x)\n",
- 			  status == 0 ? "cleared sucessfully" : "clear failed",
++			  status == 0 ? "cleared successfully" : "clear failed",
 +			  wol);
  	}
  
  	return 0;
diff --cc drivers/net/qlge/qlge_main.c
index c26ec5d740f6,a35845b48ea4..fd34f266c0a8
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@@ -3853,10 -3516,9 +3853,10 @@@ int ql_wol(struct ql_adapter *qdev
  	if (qdev->wol) {
  		wol |= MB_WOL_MODE_ON;
  		status = ql_mb_wol_mode(qdev, wol);
 -		QPRINTK(qdev, DRV, ERR, "WOL %s (wol code 0x%x) on %s\n",
 -			(status == 0) ? "Successfully set" : "Failed", wol,
 -			qdev->ndev->name);
 +		netif_err(qdev, drv, qdev->ndev,
 +			  "WOL %s (wol code 0x%x) on %s\n",
- 			  (status == 0) ? "Sucessfully set" : "Failed",
++			  (status == 0) ? "Successfully set" : "Failed",
 +			  wol, qdev->ndev->name);
  	}
  
  	return status;
diff --cc drivers/net/typhoon.c
index e3ddcb8f29df,d1a80685e3a7..2fbf15235c05
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@@ -2095,8 -2111,9 +2095,8 @@@ typhoon_tx_timeout(struct net_device *d
  	struct typhoon *tp = netdev_priv(dev);
  
  	if(typhoon_reset(tp->ioaddr, WaitNoSleep) < 0) {
 -		printk(KERN_WARNING "%s: could not reset in tx timeout\n",
 -					dev->name);
 +		netdev_warn(dev, "could not reset in tx timeout\n");
- 		goto truely_dead;
+ 		goto truly_dead;
  	}
  
  	/* If we ever start using the Hi ring, it will need cleaning too */
@@@ -2104,8 -2121,9 +2104,8 @@@
  	typhoon_free_rx_rings(tp);
  
  	if(typhoon_start_runtime(tp) < 0) {
 -		printk(KERN_ERR "%s: could not start runtime in tx timeout\n",
 -					dev->name);
 +		netdev_err(dev, "could not start runtime in tx timeout\n");
- 		goto truely_dead;
+ 		goto truly_dead;
          }
  
  	netif_wake_queue(dev);