2013-03-03_12_18_15

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

commit 9ee80eb74f8bf4520bd2c78d5941f8e539e91165
Merge: 56e3f9b a7c1120
Author: Michal Simek <monstr@monstr.eu>
Date:   Sun Mar 3 12:04:34 2013 +0100

    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

  CLEAN   .
  CLEAN   arch/microblaze/kernel
  CLEAN   kernel
  CLEAN   usr
  CLEAN   .tmp_versions
  CLEAN   scripts/basic
  CLEAN   scripts/dtc
  CLEAN   scripts/kconfig
  CLEAN   scripts/mod
  CLEAN   scripts
  CLEAN   include/config include/generated arch/microblaze/include/generated
  CLEAN   .config .version include/generated/uapi/linux/version.h

  HOSTCC  scripts/basic/fixdep
  HOSTCC  scripts/kconfig/conf.o
  SHIPPED scripts/kconfig/zconf.tab.c
  SHIPPED scripts/kconfig/zconf.lex.c
  SHIPPED scripts/kconfig/zconf.hash.c
  HOSTCC  scripts/kconfig/zconf.tab.o
  HOSTLD  scripts/kconfig/conf
#
# configuration written to .config
#

scripts/kconfig/conf --silentoldconfig Kconfig
  WRAP    arch/microblaze/include/generated/asm/clkdev.h
  WRAP    arch/microblaze/include/generated/asm/exec.h
  WRAP    arch/microblaze/include/generated/asm/trace_clock.h
  WRAP    arch/microblaze/include/generated/asm/syscalls.h
  CHK     include/generated/uapi/linux/version.h
  UPD     include/generated/uapi/linux/version.h
  HOSTCC  scripts/dtc/checks.o
  HOSTCC  scripts/dtc/data.o
  CC      scripts/mod/empty.o
  HOSTCC  scripts/mod/mk_elfconfig
  SHIPPED scripts/dtc/dtc-lexer.lex.c
  SHIPPED scripts/dtc/dtc-parser.tab.h
  SHIPPED scripts/dtc/dtc-parser.tab.c
  HOSTCC  scripts/dtc/dtc.o
  CC      scripts/mod/devicetable-offsets.s
  HOSTCC  scripts/dtc/flattree.o
  MKELF   scripts/mod/elfconfig.h
  GEN     scripts/mod/devicetable-offsets.h
  HOSTCC  scripts/mod/modpost.o
  HOSTCC  scripts/dtc/fstree.o
  HOSTCC  scripts/dtc/livetree.o
  HOSTCC  scripts/mod/sumversion.o
  HOSTCC  scripts/dtc/srcpos.o
  HOSTCC  scripts/dtc/treesource.o
  HOSTCC  scripts/mod/file2alias.o
  HOSTCC  scripts/dtc/util.o
  HOSTCC  scripts/dtc/dtc-lexer.lex.o
  HOSTCC  scripts/dtc/dtc-parser.tab.o
  HOSTLD  scripts/mod/modpost
  HOSTCC  scripts/kallsyms
  HOSTLD  scripts/dtc/dtc
  HOSTCC  scripts/bin2c
  CHK     include/generated/utsrelease.h
  UPD     include/generated/utsrelease.h
  CC      kernel/bounds.s
  GEN     include/generated/bounds.h
  CC      arch/microblaze/kernel/asm-offsets.s
  GEN     include/generated/asm-offsets.h
  CALL    scripts/checksyscalls.sh
  CC      init/main.o
  HOSTCC  usr/gen_init_cpio
  GEN     usr/initramfs_data.cpio.gz
  AS      usr/initramfs_data.o
  LD      usr/built-in.o
  CC      arch/microblaze/kernel/dma.o
  CC      arch/microblaze/kernel/exceptions.o
  CHK     include/generated/compile.h
  UPD     include/generated/compile.h
  CC      init/do_mounts.o
  AS      arch/microblaze/kernel/hw_exception_handler.o
  CC      arch/microblaze/kernel/intc.o
  CC      arch/microblaze/kernel/irq.o
  CC      arch/microblaze/kernel/process.o
  CC      arch/microblaze/kernel/prom.o
  CC      init/do_mounts_rd.o
  CC      arch/microblaze/kernel/prom_parse.o
  CC      arch/microblaze/kernel/ptrace.o
  CC      init/do_mounts_initrd.o
  CC      arch/microblaze/kernel/reset.o
  CC      init/initramfs.o
  CC      arch/microblaze/kernel/setup.o
  CC      arch/microblaze/kernel/signal.o
  CC      init/calibrate.o
  CC      init/init_task.o
  CC      arch/microblaze/kernel/sys_microblaze.o
  CC      init/version.o
  CC      arch/microblaze/kernel/timer.o
  LD      init/mounts.o
  LD      init/built-in.o
  CC      arch/microblaze/kernel/traps.o
  CC      arch/microblaze/mm/consistent.o
  CC      arch/microblaze/kernel/unwind.o
  CC      arch/microblaze/kernel/cpu/cache.o
  CC      arch/microblaze/mm/init.o
  CC      arch/microblaze/kernel/cpu/cpuinfo.o
  CC      arch/microblaze/kernel/cpu/cpuinfo-pvr-full.o
  LD      arch/microblaze/mm/built-in.o
  CC      arch/microblaze/kernel/early_printk.o
  CC      arch/microblaze/kernel/cpu/cpuinfo-static.o
  CC      arch/microblaze/kernel/cpu/mb.o
  CC      arch/microblaze/platform/platform.o
  LD      arch/microblaze/platform/built-in.o
  CC      arch/microblaze/kernel/microblaze_ksyms.o
  CC      arch/microblaze/kernel/cpu/pvr.o
  LD      arch/microblaze/kernel/cpu/built-in.o
  CC      kernel/fork.o
  CC      arch/microblaze/kernel/module.o
  AS      arch/microblaze/kernel/entry-nommu.o
  AS      arch/microblaze/kernel/head.o
  LDS     arch/microblaze/kernel/vmlinux.lds
  LD      arch/microblaze/kernel/built-in.o
  CC      mm/filemap.o
  CC      kernel/exec_domain.o
  CC      kernel/panic.o
  CC      mm/mempool.o
  CC      kernel/printk.o
  CC      mm/oom_kill.o
  CC      mm/fadvise.o
  CC      mm/maccess.o
  CC      kernel/cpu.o
  CC      mm/page_alloc.o
  CC      kernel/exit.o
  CC      kernel/itimer.o
  HZFILE  kernel/hz.bc
  CC      kernel/softirq.o
  CC      mm/page-writeback.o
  CC      kernel/resource.o
  CC      kernel/sysctl.o
  CC      mm/readahead.o
  CC      mm/swap.o
  CC      kernel/sysctl_binary.o
  CC      mm/truncate.o
  CC      kernel/capability.o
  CC      mm/vmscan.o
  CC      kernel/ptrace.o
  CC      kernel/timer.o
  CC      mm/shmem.o
mm/shmem.c: In function 'shmem_file_setup':
mm/shmem.c:2935: error: 'error' undeclared (first use in this function)
mm/shmem.c:2935: error: (Each undeclared identifier is reported only once
mm/shmem.c:2935: error: for each function it appears in.)
make[1]: *** [mm/shmem.o] Error 1
make: *** [mm] Error 2
make: *** Waiting for unfinished jobs....
  CC      kernel/user.o
  CC      kernel/signal.o
  CC      kernel/sys.o
  CC      kernel/kmod.o
  CC      kernel/workqueue.o
  CC      kernel/pid.o
  CC      kernel/task_work.o
  CC      kernel/rcupdate.o
  CC      kernel/extable.o
  CC      kernel/params.o
  CC      kernel/posix-timers.o
  CC      kernel/kthread.o
  CC      kernel/wait.o
  CC      kernel/sys_ni.o
  CC      kernel/posix-cpu-timers.o
  CC      kernel/mutex.o
  CC      kernel/hrtimer.o
  CC      kernel/rwsem.o
  CC      kernel/nsproxy.o
  CC      kernel/srcu.o
  CC      kernel/semaphore.o
  CC      kernel/notifier.o
  CC      kernel/ksysfs.o
  CC      kernel/cred.o
  CC      kernel/async.o
  CC      kernel/range.o
  CC      kernel/groups.o
  CC      kernel/lglock.o
  CC      kernel/smpboot.o
  CC      kernel/irq/irqdesc.o
  CC      kernel/irq/handle.o
  CC      kernel/irq/manage.o
  CC      kernel/power/qos.o
  LD      kernel/power/built-in.o
  CC      kernel/sched/core.o
  CC      kernel/irq/spurious.o
  CC      kernel/irq/resend.o
  CC      kernel/irq/chip.o
  CC      kernel/irq/dummychip.o
  CC      kernel/irq/devres.o
  CC      kernel/irq/autoprobe.o
  CC      kernel/sched/clock.o
  CC      kernel/sched/cputime.o
  CC      kernel/irq/irqdomain.o
  CC      kernel/sched/idle_task.o
  CC      kernel/irq/proc.o
  CC      kernel/sched/fair.o
  LD      kernel/irq/built-in.o
  CC      kernel/time/timekeeping.o
  CC      kernel/sched/rt.o
  CC      kernel/sched/stop_task.o
  CC      kernel/time/ntp.o
  CC      kernel/sched/stats.o
  CC      kernel/sched/debug.o
  CC      kernel/time/clocksource.o
  CC      kernel/time/jiffies.o
  LD      kernel/sched/built-in.o
  CC      kernel/time/timer_list.o
  CC      kernel/time/timeconv.o
  CC      kernel/time/posix-clock.o
  CC      kernel/futex.o
  CC      kernel/time/alarmtimer.o
  CC      kernel/time/clockevents.o
  CC      kernel/time/tick-common.o
  CC      kernel/time/tick-oneshot.o
  CC      kernel/time/tick-sched.o
  CC      kernel/rtmutex.o
  CC      kernel/time/timer_stats.o
  CC      kernel/up.o
  CC      kernel/module.o
  LD      kernel/time/built-in.o
  CC      kernel/kallsyms.o
  CC      kernel/acct.o
  GZIP    kernel/config_data.gz
  CC      kernel/hung_task.o
  CC      kernel/seccomp.o
  CC      kernel/rcutiny.o
  CC      kernel/utsname_sysctl.o
  CC      kernel/irq_work.o
In file included from include/linux/irq_work.h:4,
                 from kernel/irq_work.c:11:
include/linux/llist.h: In function 'llist_add':
include/linux/llist.h:160: error: implicit declaration of function 'cmpxchg_local'
include/linux/llist.h:160: warning: assignment makes pointer from integer without a cast
make[1]: *** [kernel/irq_work.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [kernel] Error 2

Already on 'master'
error: branch 'next' not found.
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.
error: Ref refs/remotes/linux-next/master is at 106edea2fe051df65a1a6231e9ffa2876cc391cc but expected be03210f1bbdde34b397e86c115511667210fe98
From git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next
 ! be03210...106edea master     -> linux-next/master  (unable to update local ref)
error: Ref refs/remotes/linux-next/stable is at de1a2262b006220dae2561a299a6ea128c46f4fe but expected 323a72d83c9b2963bd1e46c8e6963e468d4658d7
 ! 323a72d..de1a226  stable     -> linux-next/stable  (unable to update local ref)
 * [new tag]         next-20130301 -> next-20130301
 * [new tag]         v3.8       -> v3.8
Fetching origin
Fetching linux-next
fatal: git checkout: branch next already exists

scripts/kconfig/conf --silentoldconfig Kconfig
  WRAP    arch/microblaze/include/generated/asm/clkdev.h
  WRAP    arch/microblaze/include/generated/asm/exec.h
  WRAP    arch/microblaze/include/generated/asm/trace_clock.h
  WRAP    arch/microblaze/include/generated/asm/syscalls.h
  CHK     include/generated/uapi/linux/version.h
  UPD     include/generated/uapi/linux/version.h
  CHK     include/generated/utsrelease.h
  UPD     include/generated/utsrelease.h
  HOSTCC  scripts/dtc/checks.o
  CC      scripts/mod/empty.o
  HOSTCC  scripts/mod/mk_elfconfig
  CC      scripts/mod/devicetable-offsets.s
  MKELF   scripts/mod/elfconfig.h
  GEN     scripts/mod/devicetable-offsets.h
  HOSTCC  scripts/dtc/data.o
  HOSTCC  scripts/mod/modpost.o
  SHIPPED scripts/dtc/dtc-lexer.lex.c
  SHIPPED scripts/dtc/dtc-parser.tab.h
  SHIPPED scripts/dtc/dtc-parser.tab.c
  HOSTCC  scripts/dtc/dtc.o
  HOSTCC  scripts/dtc/flattree.o
  HOSTCC  scripts/mod/sumversion.o
  HOSTCC  scripts/dtc/fstree.o
  HOSTCC  scripts/dtc/livetree.o
  HOSTCC  scripts/mod/file2alias.o
  HOSTCC  scripts/dtc/srcpos.o
  HOSTCC  scripts/dtc/treesource.o
  HOSTCC  scripts/dtc/util.o
  HOSTCC  scripts/dtc/dtc-lexer.lex.o
  HOSTLD  scripts/mod/modpost
  HOSTCC  scripts/dtc/dtc-parser.tab.o
  HOSTCC  scripts/kallsyms
  HOSTLD  scripts/dtc/dtc
  HOSTCC  scripts/bin2c
  CC      kernel/bounds.s
  GEN     include/generated/bounds.h
  CC      arch/microblaze/kernel/asm-offsets.s
  GEN     include/generated/asm-offsets.h
  CALL    scripts/checksyscalls.sh
  CC      init/main.o
  HOSTCC  usr/gen_init_cpio
  GEN     usr/initramfs_data.cpio.gz
  AS      usr/initramfs_data.o
  LD      usr/built-in.o
  CHK     include/generated/compile.h
  UPD     include/generated/compile.h
  CC      arch/microblaze/kernel/dma.o
  CC      arch/microblaze/kernel/exceptions.o
  CC      init/do_mounts.o
  AS      arch/microblaze/kernel/hw_exception_handler.o
  CC      arch/microblaze/kernel/intc.o
  CC      arch/microblaze/kernel/irq.o
  CC      arch/microblaze/kernel/process.o
  CC      arch/microblaze/kernel/prom.o
  CC      arch/microblaze/kernel/prom_parse.o
  CC      init/do_mounts_rd.o
  CC      arch/microblaze/kernel/ptrace.o
  CC      init/do_mounts_initrd.o
  CC      arch/microblaze/kernel/reset.o
  CC      arch/microblaze/kernel/setup.o
  CC      init/initramfs.o
  CC      arch/microblaze/kernel/signal.o
  CC      init/calibrate.o
  CC      arch/microblaze/kernel/sys_microblaze.o
  CC      init/init_task.o
  CC      arch/microblaze/kernel/timer.o
  CC      init/version.o
  CC      arch/microblaze/kernel/traps.o
  LD      init/mounts.o
  LD      init/built-in.o
  CC      arch/microblaze/kernel/unwind.o
  CC      arch/microblaze/kernel/cpu/cache.o
  CC      arch/microblaze/kernel/early_printk.o
  CC      arch/microblaze/kernel/cpu/cpuinfo.o
  CC      arch/microblaze/kernel/microblaze_ksyms.o
  CC      arch/microblaze/kernel/cpu/cpuinfo-pvr-full.o
  CC      arch/microblaze/kernel/cpu/cpuinfo-static.o
  CC      arch/microblaze/kernel/module.o
  CC      arch/microblaze/kernel/cpu/mb.o
  AS      arch/microblaze/kernel/entry-nommu.o
  AS      arch/microblaze/kernel/head.o
  LDS     arch/microblaze/kernel/vmlinux.lds
  CC      arch/microblaze/mm/consistent.o
  CC      arch/microblaze/kernel/cpu/pvr.o
  LD      arch/microblaze/kernel/cpu/built-in.o
  LD      arch/microblaze/kernel/built-in.o
  CC      arch/microblaze/platform/platform.o
  LD      arch/microblaze/platform/built-in.o
  CC      kernel/fork.o
  CC      arch/microblaze/mm/init.o
  LD      arch/microblaze/mm/built-in.o
  CC      kernel/exec_domain.o
  CC      mm/filemap.o
  CC      kernel/panic.o
  CC      kernel/printk.o
  CC      mm/mempool.o
  CC      mm/oom_kill.o
  CC      kernel/cpu.o
  CC      mm/fadvise.o
  CC      kernel/exit.o
  CC      mm/maccess.o
  CC      mm/page_alloc.o
  CC      kernel/itimer.o
  HZFILE  kernel/hz.bc
  CC      kernel/softirq.o
  CC      kernel/resource.o
  CC      mm/page-writeback.o
  CC      kernel/sysctl.o
  CC      mm/readahead.o
  CC      kernel/sysctl_binary.o
  CC      mm/swap.o
  CC      kernel/capability.o
  CC      mm/truncate.o
  CC      kernel/ptrace.o
  CC      mm/vmscan.o
  CC      kernel/timer.o
  CC      kernel/user.o
  CC      mm/shmem.o
  CC      kernel/signal.o
mm/shmem.c: In function 'shmem_file_setup':
mm/shmem.c:2936: error: 'error' undeclared (first use in this function)
mm/shmem.c:2936: error: (Each undeclared identifier is reported only once
mm/shmem.c:2936: error: for each function it appears in.)
make[1]: *** [mm/shmem.o] Error 1
make: *** [mm] Error 2
make: *** Waiting for unfinished jobs....
  CC      kernel/sys.o
  CC      kernel/kmod.o
  CC      kernel/workqueue.o
  CC      kernel/pid.o
  CC      kernel/task_work.o
  CC      kernel/rcupdate.o
  CC      kernel/extable.o
  CC      kernel/params.o
  CC      kernel/posix-timers.o
  CC      kernel/kthread.o
  CC      kernel/wait.o
  CC      kernel/sys_ni.o
  CC      kernel/posix-cpu-timers.o
  CC      kernel/mutex.o
  CC      kernel/hrtimer.o
  CC      kernel/rwsem.o
  CC      kernel/nsproxy.o
  CC      kernel/srcu.o
  CC      kernel/semaphore.o
  CC      kernel/notifier.o
  CC      kernel/ksysfs.o
  CC      kernel/cred.o
  CC      kernel/async.o
  CC      kernel/range.o
  CC      kernel/groups.o
  CC      kernel/lglock.o
  CC      kernel/smpboot.o
  CC      kernel/irq/irqdesc.o
  CC      kernel/power/qos.o
  CC      kernel/irq/handle.o
  CC      kernel/irq/manage.o
  CC      kernel/irq/spurious.o
  CC      kernel/irq/resend.o
  CC      kernel/sched/core.o
  CC      kernel/irq/chip.o
  CC      kernel/irq/dummychip.o
  CC      kernel/irq/devres.o
  CC      kernel/irq/autoprobe.o
  CC      kernel/irq/irqdomain.o
  CC      kernel/sched/clock.o
  CC      kernel/sched/cputime.o
  CC      kernel/irq/proc.o
  CC      kernel/sched/idle_task.o
  LD      kernel/irq/built-in.o
  CC      kernel/time/timekeeping.o
  CC      kernel/sched/fair.o
  CC      kernel/sched/rt.o
  CC      kernel/time/ntp.o
  CC      kernel/sched/stop_task.o
  CC      kernel/time/clocksource.o
  CC      kernel/sched/stats.o
  CC      kernel/sched/debug.o
  CC      kernel/time/jiffies.o
  CC      kernel/time/timer_list.o
  LD      kernel/sched/built-in.o
  CC      kernel/futex.o
  CC      kernel/time/timeconv.o
  CC      kernel/time/posix-clock.o
  CC      kernel/time/alarmtimer.o
  CC      kernel/rtmutex.o
  CC      kernel/time/clockevents.o
  CC      kernel/up.o
  CC      kernel/time/tick-common.o
  CC      kernel/module.o
  CC      kernel/time/tick-oneshot.o
  CC      kernel/time/tick-sched.o
  CC      kernel/time/timer_stats.o
  LD      kernel/time/built-in.o
  CC      kernel/kallsyms.o
  CC      kernel/acct.o
  GZIP    kernel/config_data.gz
  CC      kernel/hung_task.o
  CC      kernel/seccomp.o
  CC      kernel/rcutiny.o
  CC      kernel/utsname_sysctl.o
  CC      kernel/irq_work.o
In file included from include/linux/irq_work.h:4,
                 from kernel/irq_work.c:11:
include/linux/llist.h: In function 'llist_add':
include/linux/llist.h:160: error: implicit declaration of function 'cmpxchg_local'
include/linux/llist.h:160: warning: assignment makes pointer from integer without a cast
make[1]: *** [kernel/irq_work.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [kernel] Error 2