2012-10-02_12_16_18

From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
 * branch            master     -> FETCH_HEAD
Already up-to-date.

commit 974a847e00cf3ff1695e62b276892137893706ab
Author: Olof Johansson <olof@lixom.net>
Date:   Thu Sep 20 16:14:25 2012 -0700

    drivers: bus: omap_l3: fixup merge conflict resolution
    
    This fixes a local merge conflict resolution done wrong locally in
    arm-soc for-next. soc.h was added on a cleanup branch, but the driver
    was moved and the header no longer needed.
    
    Signed-off-by: Olof Johansson <olof@lixom.net>
    [ .. and I did the same wrong merge, since git automatically does the
      whole rename detection etc, so applying this patch from Olof  - Linus ]
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

spawn ./qemu-run-nonet.sh
FDT: INTEL FLASH: baseaddr: 0xa0000000, size: 0x2000000
FDT: Unsupported peripheral invalidated ethernet@81c00000 compatibilities xlnx,xps-ll-temac-1.01.b
FDT: Unsupported peripheral invalidated i2c@81600000 compatibilities xlnx,xps-iic-2.00.a
FDT: Unsupported peripheral invalidated gpio@81400000 compatibilities xlnx,xps-gpio-1.00.a
FDT: Unsupported peripheral invalidated sysace@83600000 compatibilities xlnx,xps-sysace-1.00.a
FDT: Unsupported peripheral invalidated debug@84400000 compatibilities xlnx,mdm-1.00.d
FDT: Unsupported peripheral invalidated mpmc@90000000 compatibilities xlnx,mpmc-4.02.a
FDT: Creating QDEV model xilinx,intc  (intc)
	setting qdev prop "kind-of-intr" = 0x00000100
	connected irq : (none)
FDT: Creating QDEV model xilinx,timer  
	setting qdev prop "frequency" = 0x03b20b80
	setting qdev prop "nr-timers" = 0x00000002
	connected irq : 3 (interrupt-controller@81800000)
FDT: Creating QDEV model xilinx,uartlite  
	setting qdev prop "chr" = 0x0a7a04e0
	connected irq : 8 (interrupt-controller@81800000)
FDT: Device tree scan complete
Early console on uartlite at 0x84000000
bootconsole [earlyser0] enabled
Ramdisk addr 0x00000000, FDT at 0x90410608
Linux version 3.6.0-03887-g974a847 (monstr@monstr-desktop) (gcc version 4.1.2) #1 Tue Oct 2 12:13:24 CEST 2012
setup_cpuinfo: initialising
setup_cpuinfo: Using full CPU PVR support
cache: wt_msr
setup_memory: Main mem: 0x90000000, size 0x10000000
setup_memory: kernel addr:0x90000000-0x9040d000 size=0x0040d000
setup_memory: max_mapnr: 0x10000
setup_memory: min_low_pfn: 0x90000
setup_memory: max_low_pfn: 0xa0000
setup_memory: max_pfn: 0xa0000
Zone ranges:
  DMA      [mem 0x90000000-0x9fffffff]
  Normal   empty
Movable zone start for each node
Early memory node ranges
  node   0: [mem 0x90000000-0x9fffffff]
On node 0 totalpages: 65536
free_area_init_node: node 0, pgdat 902bf48c, node_mem_map 9040f000
  DMA zone: 512 pages used for memmap
  DMA zone: 0 pages reserved
  DMA zone: 65024 pages, LIFO batch:0
early_printk_console remapping from 0x84000000 to 0x84000000
pcpu-alloc: s0 r0 d32768 u32768 alloc=1*32768
pcpu-alloc: [0] 0 
Built 1 zonelists in Zone order, mobility grouping on.  Total pages: 65024
Kernel command line: console=ttyUL0,115200 highres=on 
PID hash table entries: 1024 (order: 0, 4096 bytes)
Dentry cache hash table entries: 32768 (order: 5, 131072 bytes)
Inode-cache hash table entries: 16384 (order: 4, 65536 bytes)
Memory: 255696k/262144k available (2748k kernel code, 6448k reserved, 68k data, 313k bss, 1010k init)
NR_IRQS:33
interrupt-controller #0 at 0x81800000, num_irq=9, edge=0x100
timer #0 at 0x83c00000, irq=3
microblaze_timer_set_mode: shutdown
microblaze_timer_set_mode: periodic
ODEBUG: 2 of 2 active objects replaced
ODEBUG: selftest passed
Calibrating delay loop... 111.51 BogoMIPS (lpj=557568)
pid_max: default: 4096 minimum: 301
Mount-cache hash table entries: 512
NET: Registered protocol family 16
bio: create slab <bio-0> at 0
Switching to clocksource microblaze_clocksource
NET: Registered protocol family 2
microblaze_timer_set_mode: oneshot
TCP established hash table entries: 8192 (order: 4, 65536 bytes)
TCP bind hash table entries: 8192 (order: 3, 32768 bytes)
TCP: Hash tables configured (established 8192 bind 8192)
TCP: reno registered
UDP hash table entries: 256 (order: 0, 4096 bytes)
UDP-Lite hash table entries: 256 (order: 0, 4096 bytes)
NET: Registered protocol family 1
RPC: Registered named UNIX socket transport module.
RPC: Registered udp transport module.
RPC: Registered tcp transport module.
RPC: Registered tcp NFSv4.1 backchannel transport module.
OF: no ranges; cannot translate
OF: no ranges; cannot translate
ROMFS MTD (C) 2007 Red Hat, Inc.
msgmni has been set to 499
io scheduler noop registered
io scheduler deadline registered
io scheduler cfq registered (default)
84000000.serial: ttyUL0 at MMIO 0x84000000 (irq = 8) is a uartlite
console [ttyUL0] enabled, bootconsole disabled
console [ttyUL0] enabled, bootconsole disabled
brd: module loaded
nbd: registered device at major 43
TCP: cubic registered
NET: Registered protocol family 17
Freeing unused kernel memory: 1010k freed

Bad inittab entry at line 3
Mounting proc: 
Mounting var: 
Populating /var: 
Running local start scripts.
Mounting sysfs:
Setting hostname: 
Setting up interface lo: 
Setting up interface eth0: 
ifconfig: SIOCSIFADDR: No such device
Starting syslogd:
Starting httpd: 
Mounting nfs server


uclinux login: root
Password: pass ok

/root # ifconfig
lo        Link encap:Local Loopback  
          inet addr:127.0.0.1  Mask:255.0.0.0
          UP LOOPBACK RUNNING  MTU:16436  Metric:1
          RX packets:0 errors:0 dropped:0 overruns:0 frame:0
          TX packets:0 errors:0 dropped:0 overruns:0 carrier:0
          collisions:0 txqueuelen:0 
          RX bytes:0 (0.0 B)  TX bytes:0 (0.0 B)

/root # cat /proc/cpuinfo
CPU-Family:	MicroBlaze
FPGA-Arch:	virtex5
CPU-Ver:	7.10.d, big endian
CPU-MHz:	125.00
BogoMips:	111.51
HW:
 Shift:		yes
 MSR:		yes
 PCMP:		yes
 DIV:		yes
 MMU:		3
 MUL:		v2
 FPU:		v2
 Exc:		op0x0 unal ill zero fpu 
Stream-insns:	privileged
Icache:		no
Dcache:		no
HW-Debug:	no
PVR-USR1:	00
PVR-USR2:	00000000
Page size:	4096
/root # strace ls /
strace: applet not found
/root # 
Statistic
3.6.0-03887-g974a847 (monstr@monstr-desktop) (gcc version 4.1.2) #1 Tue Oct 2 12:13:24 CEST 2012
setup_cpuinfo: initialising
setup_cpuinfo: Using full CPU PVR support
cache:

Checking out files:  26% (2191/8276)   
Checking out files:  27% (2235/8276)   
Checking out files:  28% (2318/8276)   
Checking out files:  28% (2354/8276)   
Checking out files:  29% (2401/8276)   
Checking out files:  30% (2483/8276)   
Checking out files:  31% (2566/8276)   
Checking out files:  31% (2574/8276)   
Checking out files:  32% (2649/8276)   
Checking out files:  33% (2732/8276)   
Checking out files:  33% (2761/8276)   
Checking out files:  34% (2814/8276)   
Checking out files:  35% (2897/8276)   
Checking out files:  36% (2980/8276)   
Checking out files:  36% (3008/8276)   
Checking out files:  37% (3063/8276)   
Checking out files:  38% (3145/8276)   
Checking out files:  39% (3228/8276)   
Checking out files:  39% (3259/8276)   
Checking out files:  40% (3311/8276)   
Checking out files:  41% (3394/8276)   
Checking out files:  42% (3476/8276)   
Checking out files:  42% (3508/8276)   
Checking out files:  43% (3559/8276)   
Checking out files:  44% (3642/8276)   
Checking out files:  45% (3725/8276)   
Checking out files:  45% (3766/8276)   
Checking out files:  46% (3807/8276)   
Checking out files:  47% (3890/8276)   
Checking out files:  48% (3973/8276)   
Checking out files:  49% (4056/8276)   
Checking out files:  49% (4112/8276)   
Checking out files:  50% (4138/8276)   
Checking out files:  51% (4221/8276)   
Checking out files:  52% (4304/8276)   
Checking out files:  53% (4387/8276)   
Checking out files:  54% (4470/8276)   
Checking out files:  55% (4552/8276)   
Checking out files:  55% (4592/8276)   
Checking out files:  56% (4635/8276)   
Checking out files:  57% (4718/8276)   
Checking out files:  58% (4801/8276)   
Checking out files:  59% (4883/8276)   
Checking out files:  60% (4966/8276)   
Checking out files:  61% (5049/8276)   
Checking out files:  62% (5132/8276)   
Checking out files:  63% (5214/8276)   
Checking out files:  64% (5297/8276)   
Checking out files:  65% (5380/8276)   
Checking out files:  65% (5451/8276)   
Checking out files:  66% (5463/8276)   
Checking out files:  67% (5545/8276)   
Checking out files:  68% (5628/8276)   
Checking out files:  69% (5711/8276)   
Checking out files:  70% (5794/8276)   
Checking out files:  70% (5813/8276)   
Checking out files:  71% (5876/8276)   
Checking out files:  72% (5959/8276)   
Checking out files:  73% (6042/8276)   
Checking out files:  73% (6049/8276)   
Checking out files:  74% (6125/8276)   
Checking out files:  75% (6207/8276)   
Checking out files:  76% (6290/8276)   
Checking out files:  76% (6327/8276)   
Checking out files:  77% (6373/8276)   
Checking out files:  78% (6456/8276)   
Checking out files:  79% (6539/8276)   
Checking out files:  79% (6550/8276)   
Checking out files:  80% (6621/8276)   
Checking out files:  81% (6704/8276)   
Checking out files:  82% (6787/8276)   
Checking out files:  82% (6832/8276)   
Checking out files:  83% (6870/8276)   
Checking out files:  84% (6952/8276)   
Checking out files:  85% (7035/8276)   
Checking out files:  86% (7118/8276)   
Checking out files:  87% (7201/8276)   
Checking out files:  87% (7273/8276)   
Checking out files:  88% (7283/8276)   
Checking out files:  89% (7366/8276)   
Checking out files:  90% (7449/8276)   
Checking out files:  91% (7532/8276)   
Checking out files:  92% (7614/8276)   
Checking out files:  92% (7630/8276)   
Checking out files:  93% (7697/8276)   
Checking out files:  94% (7780/8276)   
Checking out files:  95% (7863/8276)   
Checking out files:  96% (7945/8276)   
Checking out files:  97% (8028/8276)   
Checking out files:  97% (8105/8276)   
Checking out files:  98% (8111/8276)   
Checking out files:  99% (8194/8276)   
Checking out files: 100% (8276/8276)   
Checking out files: 100% (8276/8276), done.
Switched to branch 'master'
Deleted branch next (was 046301d).
From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
 * branch            master     -> FETCH_HEAD
Already up-to-date.
From ../linux-2.6
 * branch            HEAD       -> FETCH_HEAD
Already up-to-date.
Fetching origin
Fetching linux-next
Checking out files:  27% (2246/8276)   
Checking out files:  28% (2318/8276)   
Checking out files:  29% (2401/8276)   
Checking out files:  30% (2483/8276)   
Checking out files:  31% (2566/8276)   
Checking out files:  32% (2649/8276)   
Checking out files:  33% (2732/8276)   
Checking out files:  34% (2814/8276)   
Checking out files:  35% (2897/8276)   
Checking out files:  36% (2980/8276)   
Checking out files:  37% (3063/8276)   
Checking out files:  37% (3117/8276)   
Checking out files:  38% (3145/8276)   
Checking out files:  39% (3228/8276)   
Checking out files:  40% (3311/8276)   
Checking out files:  41% (3394/8276)   
Checking out files:  42% (3476/8276)   
Checking out files:  43% (3559/8276)   
Checking out files:  44% (3642/8276)   
Checking out files:  45% (3725/8276)   
Checking out files:  46% (3807/8276)   
Checking out files:  47% (3890/8276)   
Checking out files:  48% (3973/8276)   
Checking out files:  48% (4008/8276)   
Checking out files:  49% (4056/8276)   
Checking out files:  50% (4138/8276)   
Checking out files:  51% (4221/8276)   
Checking out files:  52% (4304/8276)   
Checking out files:  53% (4387/8276)   
Checking out files:  54% (4470/8276)   
Checking out files:  55% (4552/8276)   
Checking out files:  56% (4635/8276)   
Checking out files:  57% (4718/8276)   
Checking out files:  58% (4801/8276)   
Checking out files:  59% (4883/8276)   
Checking out files:  60% (4966/8276)   
Checking out files:  61% (5049/8276)   
Checking out files:  62% (5132/8276)   
Checking out files:  63% (5214/8276)   
Checking out files:  64% (5297/8276)   
Checking out files:  65% (5380/8276)   
Checking out files:  65% (5389/8276)   
Checking out files:  66% (5463/8276)   
Checking out files:  67% (5545/8276)   
Checking out files:  68% (5628/8276)   
Checking out files:  69% (5711/8276)   
Checking out files:  70% (5794/8276)   
Checking out files:  71% (5876/8276)   
Checking out files:  72% (5959/8276)   
Checking out files:  72% (5980/8276)   
Checking out files:  73% (6042/8276)   
Checking out files:  74% (6125/8276)   
Checking out files:  75% (6207/8276)   
Checking out files:  76% (6290/8276)   
Checking out files:  76% (6371/8276)   
Checking out files:  77% (6373/8276)   
Checking out files:  78% (6456/8276)   
Checking out files:  79% (6539/8276)   
Checking out files:  80% (6621/8276)   
Checking out files:  81% (6704/8276)   
Checking out files:  82% (6787/8276)   
Checking out files:  82% (6813/8276)   
Checking out files:  83% (6870/8276)   
Checking out files:  84% (6952/8276)   
Checking out files:  85% (7035/8276)   
Checking out files:  86% (7118/8276)   
Checking out files:  86% (7195/8276)   
Checking out files:  87% (7201/8276)   
Checking out files:  88% (7283/8276)   
Checking out files:  89% (7366/8276)   
Checking out files:  90% (7449/8276)   
Checking out files:  91% (7532/8276)   
Checking out files:  92% (7614/8276)   
Checking out files:  92% (7637/8276)   
Checking out files:  93% (7697/8276)   
Checking out files:  94% (7780/8276)   
Checking out files:  95% (7863/8276)   
Checking out files:  96% (7945/8276)   
Checking out files:  97% (8028/8276)   
Checking out files:  98% (8111/8276)   
Checking out files:  99% (8194/8276)   
Checking out files: 100% (8276/8276)   
Checking out files: 100% (8276/8276), done.
Switched to a new branch 'next'
Branch next set up to track remote branch master from linux-next.

commit 046301d46bd85bd2c02106613d7b1e29ab62a069
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date:   Tue Oct 2 16:21:46 2012 +1000

    Add linux-next specific files for 20121002
    
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

spawn ./qemu-run-nonet.sh
FDT: INTEL FLASH: baseaddr: 0xa0000000, size: 0x2000000
FDT: Unsupported peripheral invalidated ethernet@81c00000 compatibilities xlnx,xps-ll-temac-1.01.b
FDT: Unsupported peripheral invalidated i2c@81600000 compatibilities xlnx,xps-iic-2.00.a
FDT: Unsupported peripheral invalidated gpio@81400000 compatibilities xlnx,xps-gpio-1.00.a
FDT: Unsupported peripheral invalidated sysace@83600000 compatibilities xlnx,xps-sysace-1.00.a
FDT: Unsupported peripheral invalidated debug@84400000 compatibilities xlnx,mdm-1.00.d
FDT: Unsupported peripheral invalidated mpmc@90000000 compatibilities xlnx,mpmc-4.02.a
FDT: Creating QDEV model xilinx,intc  (intc)
	setting qdev prop "kind-of-intr" = 0x00000100
	connected irq : (none)
FDT: Creating QDEV model xilinx,timer  
	setting qdev prop "frequency" = 0x03b20b80
	setting qdev prop "nr-timers" = 0x00000002
	connected irq : 3 (interrupt-controller@81800000)
FDT: Creating QDEV model xilinx,uartlite  
	setting qdev prop "chr" = 0x08ac54e0
	connected irq : 8 (interrupt-controller@81800000)
FDT: Device tree scan complete
Early console on uartlite at 0x84000000
bootconsole [earlyser0] enabled
Ramdisk addr 0x00000000, FDT at 0x90420628
Linux version 3.6.0-next-20121002 (monstr@monstr-desktop) (gcc version 4.1.2) #1 Tue Oct 2 12:15:03 CEST 2012
setup_cpuinfo: initialising
setup_cpuinfo: Using full CPU PVR support
cache: wt_msr
setup_memory: Main mem: 0x90000000, size 0x10000000
setup_memory: kernel addr:0x90000000-0x9041d000 size=0x0041d000
setup_memory: max_mapnr: 0x10000
setup_memory: min_low_pfn: 0x90000
setup_memory: max_low_pfn: 0xa0000
setup_memory: max_pfn: 0xa0000
Zone ranges:
  DMA      [mem 0x90000000-0x9fffffff]
  Normal   empty
Movable zone start for each node
Early memory node ranges
  node   0: [mem 0x90000000-0x9fffffff]
On node 0 totalpages: 65536
free_area_init_node: node 0, pgdat 902cf5ec, node_mem_map 9041f000
  DMA zone: 512 pages used for memmap
  DMA zone: 0 pages reserved
  DMA zone: 65024 pages, LIFO batch:0
early_printk_console remapping from 0x84000000 to 0x84000000
pcpu-alloc: s0 r0 d32768 u32768 alloc=1*32768
pcpu-alloc: [0] 0 
Built 1 zonelists in Zone order, mobility grouping on.  Total pages: 65024
Kernel command line: console=ttyUL0,115200 highres=on 
PID hash table entries: 1024 (order: 0, 4096 bytes)
Dentry cache hash table entries: 32768 (order: 5, 131072 bytes)
Inode-cache hash table entries: 16384 (order: 4, 65536 bytes)
Memory: 255632k/262144k available (2816k kernel code, 6512k reserved, 64k data, 313k bss, 1011k init)
NR_IRQS:33
interrupt-controller #0 at 0x81800000, num_irq=9, edge=0x100
timer #0 at 0x83c00000, irq=3
microblaze_timer_set_mode: shutdown
microblaze_timer_set_mode: periodic
ODEBUG: 2 of 2 active objects replaced
ODEBUG: selftest passed
Calibrating delay loop... 118.68 BogoMIPS (lpj=593408)
pid_max: default: 4096 minimum: 301
Mount-cache hash table entries: 512
NET: Registered protocol family 16
bio: create slab <bio-0> at 0
Switching to clocksource microblaze_clocksource
NET: Registered protocol family 2
microblaze_timer_set_mode: oneshot
TCP established hash table entries: 8192 (order: 4, 65536 bytes)
TCP bind hash table entries: 8192 (order: 3, 32768 bytes)
TCP: Hash tables configured (established 8192 bind 8192)
TCP: reno registered
UDP hash table entries: 256 (order: 0, 4096 bytes)
UDP-Lite hash table entries: 256 (order: 0, 4096 bytes)
NET: Registered protocol family 1
RPC: Registered named UNIX socket transport module.
RPC: Registered udp transport module.
RPC: Registered tcp transport module.
RPC: Registered tcp NFSv4.1 backchannel transport module.
OF: no ranges; cannot translate
OF: no ranges; cannot translate
ROMFS MTD (C) 2007 Red Hat, Inc.
msgmni has been set to 499
io scheduler noop registered
io scheduler deadline registered
io scheduler cfq registered (default)
84000000.serial: ttyUL0 at MMIO 0x84000000 (irq = 8) is a uartlite
console [ttyUL0] enabled, bootconsole disabled
console [ttyUL0] enabled, bootconsole disabled
brd: module loaded
nbd: registered device at major 43
TCP: cubic registered
NET: Registered protocol family 17
Freeing unused kernel memory: 1011k freed

Bad inittab entry at line 3
Mounting proc: 
Mounting var: 
Populating /var: 
Running local start scripts.
Mounting sysfs:
Setting hostname: 
Setting up interface lo: 
Setting up interface eth0: 
ifconfig: SIOCSIFADDR: No such device
Starting syslogd:
Starting httpd: 
Mounting nfs server


uclinux login: root
Password: pass ok

/root # ifconfig
lo        Link encap:Local Loopback  
          inet addr:127.0.0.1  Mask:255.0.0.0
          UP LOOPBACK RUNNING  MTU:65536  Metric:1
          RX packets:0 errors:0 dropped:0 overruns:0 frame:0
          TX packets:0 errors:0 dropped:0 overruns:0 carrier:0
          collisions:0 txqueuelen:0 
          RX bytes:0 (0.0 B)  TX bytes:0 (0.0 B)

/root # cat /proc/cpuinfo
CPU-Family:	MicroBlaze
FPGA-Arch:	virtex5
CPU-Ver:	7.10.d, big endian
CPU-MHz:	125.00
BogoMips:	118.68
HW:
 Shift:		yes
 MSR:		yes
 PCMP:		yes
 DIV:		yes
 MMU:		3
 MUL:		v2
 FPU:		v2
 Exc:		op0x0 unal ill zero fpu 
Stream-insns:	privileged
Icache:		no
Dcache:		no
HW-Debug:	no
PVR-USR1:	00
PVR-USR2:	00000000
Page size:	4096
/root # strace ls /
strace: applet not found
/root # 
Statistic
3.6.0-next-20121002 (monstr@monstr-desktop) (gcc version 4.1.2) #1 Tue Oct 2 12:15:03 CEST 2012
setup_cpuinfo: initialising
setup_cpuinfo: Using full CPU PVR support
cache: wt_msr
setup_memory: Main mem: 0x90000000, size 0x10000000
setup_memory: kernel addr:0x90000000-0x9041d000