Merge branch 'for-next' into for-linus
Jiri Kosina [Mon, 8 Mar 2010 15:55:37 +0000 (16:55 +0100)]
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

101 files changed:
1  2 
Documentation/filesystems/proc.txt
Documentation/power/runtime_pm.txt
arch/arm/common/clkdev.c
arch/arm/mach-davinci/include/mach/i2c.h
arch/arm/mach-omap2/board-3630sdp.c
arch/arm/mach-omap2/board-zoom-peripherals.c
arch/arm/mach-u300/core.c
arch/arm/mach-u300/include/mach/debug-macro.S
arch/ia64/sn/kernel/setup.c
arch/s390/kernel/sclp.S
arch/sparc/kernel/perf_event.c
arch/x86/kernel/pci-dma.c
arch/x86/kernel/ptrace.c
arch/x86/kernel/tsc.c
arch/x86/kernel/vmiclock_32.c
crypto/Kconfig
drivers/acpi/dock.c
drivers/ata/libata-core.c
drivers/ata/libata-sff.c
drivers/ata/pata_acpi.c
drivers/ata/pata_pcmcia.c
drivers/char/agp/intel-agp.c
drivers/char/hvc_iseries.c
drivers/char/serial167.c
drivers/char/tty_io.c
drivers/gpu/drm/nouveau/nouveau_bios.c
drivers/gpu/drm/nouveau/nouveau_drv.h
drivers/gpu/drm/radeon/radeon_state.c
drivers/input/serio/i8042.c
drivers/media/video/gspca/ov519.c
drivers/mfd/sm501.c
drivers/mmc/card/sdio_uart.c
drivers/net/chelsio/sge.c
drivers/net/cs89x0.c
drivers/net/cxgb3/sge.c
drivers/net/davinci_emac.c
drivers/net/e1000e/82571.c
drivers/net/e1000e/lib.c
drivers/net/igb/igb_main.c
drivers/net/ks8851.c
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/smsc9420.c
drivers/net/spider_net.c
drivers/net/sungem.c
drivers/net/tehuti.c
drivers/net/tokenring/tms380tr.c
drivers/net/tun.c
drivers/net/typhoon.c
drivers/net/ucc_geth.c
drivers/net/wimax/i2400m/fw.c
drivers/net/wireless/ath/ar9170/main.c
drivers/net/wireless/rt2x00/rt2500usb.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/rt2x00/rt2x00debug.c
drivers/net/wireless/rt2x00/rt2x00dev.c
drivers/net/wireless/rt2x00/rt2x00queue.c
drivers/net/wireless/rt2x00/rt61pci.c
drivers/net/wireless/rt2x00/rt73usb.c
drivers/net/wireless/zd1211rw/zd_mac.c
drivers/platform/x86/thinkpad_acpi.c
drivers/scsi/libfc/fc_fcp.c
drivers/scsi/lpfc/lpfc_els.c
drivers/scsi/lpfc/lpfc_scsi.c
drivers/scsi/sd.c
drivers/usb/musb/musb_regs.h
drivers/usb/serial/cypress_m8.c
drivers/usb/serial/opticon.c
drivers/usb/serial/symbolserial.c
fs/binfmt_elf_fdpic.c
fs/bio.c
fs/cifs/cifssmb.c
fs/ext3/super.c
fs/ext4/mballoc.c
fs/ext4/super.c
fs/gfs2/ops_fstype.c
fs/jbd/transaction.c
fs/locks.c
fs/namei.c
fs/nfsd/nfs4xdr.c
fs/ocfs2/dlmglue.c
fs/ocfs2/extent_map.c
fs/reiserfs/bitmap.c
fs/udf/inode.c
include/linux/mmzone.h
include/linux/sched.h
kernel/irq/chip.c
kernel/ksysfs.c
kernel/params.c
kernel/sched_cpupri.c
kernel/trace/ring_buffer.c
kernel/trace/trace.h
mm/slub.c
net/ipv4/tcp_timer.c
net/mac80211/mesh_plink.c
net/netfilter/nf_conntrack_sip.c
net/netfilter/xt_hashlimit.c
security/selinux/avc.c
sound/pci/rme9652/hdspm.c
sound/soc/codecs/wm8990.c
tools/perf/perf.c

@@@ -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
Simple merge
Simple merge
Simple merge
@@@ -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
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc crypto/Kconfig
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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;
@@@ -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;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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 */
        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);
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/bio.c
Simple merge
Simple merge
diff --cc fs/ext3/super.c
Simple merge
Simple merge
diff --cc fs/ext4/super.c
Simple merge
Simple merge
Simple merge
diff --cc fs/locks.c
Simple merge
diff --cc fs/namei.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/udf/inode.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/ksysfs.c
Simple merge
diff --cc kernel/params.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/slub.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge