2014-01-30_13_43_05

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

commit 9b0cd304f26b9fca140de15deeac2bf357d1f388
Merge: ca2a650 ef64cf9
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Jan 29 20:49:12 2014 -0800

    Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
    
    Pull drm updates from Dave Airlie:
     "Been a bit busy, first week of kids school, and waiting on other trees
      to go in before I could send this, so its a bit later than I'd
      normally like.
    
      Highlights:
       - core:
          timestamp fixes, lots of misc cleanups
       - new drivers:
          bochs virtual vga
       - vmwgfx:
          major overhaul for their nextgen virt gpu.
       - i915:
          runtime D3 on HSW, watermark fixes, power well work, fbc fixes,
          bdw is no longer prelim.
       - nouveau:
          gk110/208 acceleration, more pm groundwork, old overlay support
       - radeon:
          dpm rework and clockgating for CIK, pci config reset, big endian
          fixes
       - tegra:
          panel support and DSI support, build as module, prime.
       - armada, omap, gma500, rcar, exynos, mgag200, cirrus, ast:
          fixes
       - msm:
          hdmi support for mdp5"
    
    * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (595 commits)
      drm/nouveau: resume display if any later suspend bits fail
      drm/nouveau: fix lock unbalance in nouveau_crtc_page_flip
      drm/nouveau: implement hooks for needed for drm vblank timestamping support
      drm/nouveau/disp: add a method to fetch info needed by drm vblank timestamping
      drm/nv50: fill in crtc mode struct members from crtc_mode_fixup
      drm/radeon/dce8: workaround for atom BlankCrtc table
      drm/radeon/DCE4+: clear bios scratch dpms bit (v2)
      drm/radeon: set si_notify_smc_display_change properly
      drm/radeon: fix DAC interrupt handling on DCE5+
      drm/radeon: clean up active vram sizing
      drm/radeon: skip async dma init on r6xx
      drm/radeon/runpm: don't runtime suspend non-PX cards
      drm/radeon: add ring to fence trace functions
      drm/radeon: add missing trace point
      drm/radeon: fix VMID use tracking
      drm: ast,cirrus,mgag200: use drm_can_sleep
      drm/gma500: Lock struct_mutex around cursor updates
      drm/i915: Fix the offset issue for the stolen GEM objects
      DRM: armada: fix missing DRM_KMS_FB_HELPER select
      drm/i915: Decouple GPU error reporting from ring initialisation
      ...

  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
kernel/time/Kconfig:162:warning: range is invalid
#
# configuration written to .config
#

scripts/kconfig/conf --silentoldconfig Kconfig
kernel/time/Kconfig:162:warning: range is invalid
  CHK     include/config/kernel.release
  WRAP    arch/microblaze/include/generated/asm/barrier.h
  WRAP    arch/microblaze/include/generated/asm/clkdev.h
  WRAP    arch/microblaze/include/generated/asm/exec.h
  WRAP    arch/microblaze/include/generated/asm/hash.h
  WRAP    arch/microblaze/include/generated/asm/trace_clock.h
  WRAP    arch/microblaze/include/generated/asm/syscalls.h
  WRAP    arch/microblaze/include/generated/asm/preempt.h
  WRAP    arch/microblaze/include/generated/uapi/asm/types.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
  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/dtc/fstree.o
  HOSTCC  scripts/dtc/livetree.o
  HOSTCC  scripts/dtc/srcpos.o
  HOSTCC  scripts/dtc/treesource.o
  HOSTCC  scripts/dtc/util.o
  HOSTCC  scripts/dtc/dtc-lexer.lex.o
  HOSTCC  scripts/dtc/dtc-parser.tab.o
  HOSTLD  scripts/dtc/dtc
  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/mod/modpost.o
  HOSTCC  scripts/mod/sumversion.o
  HOSTCC  scripts/mod/file2alias.o
  HOSTLD  scripts/mod/modpost
  HOSTCC  scripts/kallsyms
  HOSTCC  scripts/bin2c
  HOSTCC  scripts/sortextable
  UPD     include/config/kernel.release
  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
<stdin>:1226:2: warning: #warning syscall sched_setattr not implemented
<stdin>:1229:2: warning: #warning syscall sched_getattr not implemented
  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      init/do_mounts.o
  CC      arch/microblaze/kernel/dma.o
  CC      arch/microblaze/kernel/exceptions.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      init/do_mounts_rd.o
  CC      arch/microblaze/kernel/prom.o
  CC      arch/microblaze/kernel/prom_parse.o
  CC      init/do_mounts_initrd.o
  CC      arch/microblaze/kernel/ptrace.o
  CC      init/initramfs.o
  CC      arch/microblaze/kernel/reset.o
  CC      init/calibrate.o
  CC      init/init_task.o
  CC      arch/microblaze/kernel/setup.o
  CC      arch/microblaze/kernel/signal.o
  CC      init/version.o
  CC      arch/microblaze/kernel/sys_microblaze.o
  LD      init/mounts.o
  LD      init/built-in.o
  CC      arch/microblaze/kernel/timer.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/kernel/cpu/cpuinfo.o
  CC      arch/microblaze/mm/init.o
  CC      arch/microblaze/kernel/cpu/cpuinfo-pvr-full.o
  CC      arch/microblaze/kernel/cpu/cpuinfo-static.o
  CC      arch/microblaze/kernel/cpu/mb.o
  LD      arch/microblaze/mm/built-in.o
  CC      arch/microblaze/kernel/cpu/pvr.o
  CC      arch/microblaze/platform/platform.o
  LD      arch/microblaze/kernel/cpu/built-in.o
  CC      arch/microblaze/kernel/early_printk.o
  LD      arch/microblaze/platform/built-in.o
  CC      arch/microblaze/kernel/microblaze_ksyms.o
  CC      kernel/fork.o
  CC      arch/microblaze/kernel/module.o
  AS      arch/microblaze/kernel/entry-nommu.o
  AS      arch/microblaze/kernel/head.o
arch/microblaze/kernel/head.S: Assembler messages:
arch/microblaze/kernel/head.S:68: Error: register expected, but saw 'rslr,r'
arch/microblaze/kernel/head.S:68: Error: register expected, but saw 'slr,r0'
arch/microblaze/kernel/head.S:68: Fatal error: invalid value for special purpose register
make[1]: *** [arch/microblaze/kernel/head.o] Error 1
make: *** [arch/microblaze/kernel] Error 2
make: *** Waiting for unfinished jobs....
  CC      kernel/exec_domain.o
  CC      kernel/panic.o
  CC      kernel/cpu.o
  CC      kernel/exit.o
  CC      kernel/itimer.o
  HZFILE  kernel/hz.bc
  CC      kernel/softirq.o
  CC      kernel/resource.o
  CC      kernel/sysctl.o
  CC      kernel/sysctl_binary.o
  CC      kernel/capability.o
  CC      kernel/ptrace.o
  CC      kernel/timer.o
  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/extable.o
  CC      kernel/params.o
  CC      kernel/posix-timers.o
  CC      kernel/kthread.o
  CC      kernel/sys_ni.o
  CC      kernel/posix-cpu-timers.o
  CC      kernel/hrtimer.o
  CC      kernel/nsproxy.o
  CC      kernel/notifier.o
  CC      kernel/ksysfs.o
  CC      kernel/cred.o
  CC      kernel/reboot.o
  CC      kernel/async.o
  CC      kernel/range.o
  CC      kernel/groups.o
  CC      kernel/smpboot.o
  CC      kernel/cpu/idle.o
  CC      kernel/irq/irqdesc.o
  LD      kernel/cpu/built-in.o
  CC      kernel/irq/handle.o
  CC      kernel/locking/mutex.o
  CC      kernel/locking/semaphore.o
  CC      kernel/irq/spurious.o
  CC      kernel/irq/resend.o
  CC      kernel/locking/rwsem.o
  CC      kernel/irq/chip.o
  CC      kernel/locking/lglock.o
  CC      kernel/locking/rtmutex.o
  CC      kernel/irq/dummychip.o
  CC      kernel/irq/devres.o
  CC      kernel/locking/rwsem-spinlock.o
  LD      kernel/locking/built-in.o
  CC      kernel/irq/irqdomain.o
  CC      kernel/irq/proc.o
  CC      kernel/power/qos.o
  LD      kernel/irq/built-in.o
  LD      kernel/power/built-in.o
  CC      kernel/printk/printk.o
  CC      kernel/rcu/update.o
  CC      kernel/rcu/srcu.o
  CC      kernel/rcu/tiny.o
  LD      kernel/printk/built-in.o
  CC      kernel/sched/core.o
  LD      kernel/rcu/built-in.o
  CC      kernel/sched/proc.o
  CC      kernel/time/timekeeping.o
  CC      kernel/sched/clock.o
  CC      kernel/sched/cputime.o
  CC      kernel/time/ntp.o
  CC      kernel/sched/idle_task.o
  CC      kernel/sched/fair.o
  CC      kernel/time/clocksource.o
  CC      kernel/sched/rt.o
  CC      kernel/sched/deadline.o
  CC      kernel/time/jiffies.o
  CC      kernel/sched/stop_task.o
  CC      kernel/time/timer_list.o
  CC      kernel/sched/wait.o
  CC      kernel/time/timeconv.o
  CC      kernel/sched/completion.o
  CC      kernel/time/posix-clock.o
  CC      kernel/sched/stats.o
  CC      kernel/sched/debug.o
  CC      kernel/time/alarmtimer.o
  LD      kernel/sched/built-in.o
  CC      kernel/time/clockevents.o
  CC      kernel/futex.o
  CC      kernel/time/tick-common.o
  CC      kernel/time/sched_clock.o
  CC      kernel/time/tick-oneshot.o
  CC      kernel/time/tick-sched.o
  CC      kernel/up.o
  CC      kernel/time/timer_stats.o
  CC      kernel/time/timekeeping_debug.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/utsname_sysctl.o
  CC      kernel/irq_work.o
  BC      kernel/timeconst.h
  CHK     kernel/config_data.h
  UPD     kernel/config_data.h
  CC      kernel/configs.o
  CC      kernel/time.o
  LD      kernel/built-in.o

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
Auto packing the repository for optimum performance. You may also
run "git gc" manually. See "git help gc" for more information.

commit 9cb3e193366fd66a41463d8043296a7173db3814
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date:   Thu Jan 30 15:04:51 2014 +1100

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

  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
kernel/time/Kconfig:162:warning: range is invalid
#
# configuration written to .config
#

scripts/kconfig/conf --silentoldconfig Kconfig
kernel/time/Kconfig:162:warning: range is invalid
  CHK     include/config/kernel.release
  WRAP    arch/microblaze/include/generated/asm/barrier.h
  WRAP    arch/microblaze/include/generated/asm/clkdev.h
  WRAP    arch/microblaze/include/generated/asm/exec.h
  WRAP    arch/microblaze/include/generated/asm/hash.h
  WRAP    arch/microblaze/include/generated/asm/trace_clock.h
  WRAP    arch/microblaze/include/generated/asm/syscalls.h
  WRAP    arch/microblaze/include/generated/asm/preempt.h
  WRAP    arch/microblaze/include/generated/uapi/asm/types.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
  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/dtc/fstree.o
  HOSTCC  scripts/dtc/livetree.o
  HOSTCC  scripts/dtc/srcpos.o
  HOSTCC  scripts/dtc/treesource.o
  HOSTCC  scripts/dtc/util.o
  HOSTCC  scripts/dtc/dtc-lexer.lex.o
  HOSTCC  scripts/dtc/dtc-parser.tab.o
  HOSTLD  scripts/dtc/dtc
  CC      scripts/mod/empty.o
  HOSTCC  scripts/mod/mk_elfconfig
  CC      scripts/mod/devicetable-offsets.s
  HOSTCC  scripts/kallsyms
  MKELF   scripts/mod/elfconfig.h
  GEN     scripts/mod/devicetable-offsets.h
  HOSTCC  scripts/mod/modpost.o
  HOSTCC  scripts/mod/sumversion.o
  CHK     include/generated/utsrelease.h
  UPD     include/generated/utsrelease.h
  HOSTCC  scripts/mod/file2alias.o
  HOSTCC  scripts/bin2c
  HOSTLD  scripts/mod/modpost
  HOSTCC  scripts/sortextable
  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
<stdin>:1226:2: warning: #warning syscall sched_setattr not implemented
<stdin>:1229:2: warning: #warning syscall sched_getattr not implemented
  CC      init/main.o
  HOSTCC  usr/gen_init_cpio
  GEN     usr/initramfs_data.cpio.gz
  AS      usr/initramfs_data.o
  CHK     include/generated/compile.h
  LD      usr/built-in.o
  CC      init/do_mounts.o
  UPD     include/generated/compile.h
  CC      arch/microblaze/kernel/dma.o
  CC      arch/microblaze/kernel/exceptions.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      init/initramfs.o
  CC      arch/microblaze/kernel/setup.o
  CC      init/calibrate.o
  CC      init/init_task.o
  CC      arch/microblaze/kernel/signal.o
  CC      init/version.o
  LD      init/mounts.o
  LD      init/built-in.o
  CC      arch/microblaze/kernel/sys_microblaze.o
  CC      arch/microblaze/mm/consistent.o
  CC      arch/microblaze/kernel/timer.o
  CC      arch/microblaze/mm/init.o
  CC      arch/microblaze/kernel/traps.o
  CC      arch/microblaze/kernel/unwind.o
  LD      arch/microblaze/mm/built-in.o
  CC      arch/microblaze/kernel/cpu/cache.o
  CC      arch/microblaze/kernel/cpu/cpuinfo.o
  CC      arch/microblaze/kernel/cpu/cpuinfo-pvr-full.o
  CC      arch/microblaze/platform/platform.o
  CC      arch/microblaze/kernel/cpu/cpuinfo-static.o
  LD      arch/microblaze/platform/built-in.o
  CC      arch/microblaze/kernel/cpu/mb.o
  CC      arch/microblaze/kernel/early_printk.o
  CC      arch/microblaze/kernel/cpu/pvr.o
  LD      arch/microblaze/kernel/cpu/built-in.o
  CC      kernel/fork.o
  CC      arch/microblaze/kernel/microblaze_ksyms.o
  CC      arch/microblaze/kernel/module.o
  AS      arch/microblaze/kernel/entry-nommu.o
  AS      arch/microblaze/kernel/head.o
arch/microblaze/kernel/head.S: Assembler messages:
arch/microblaze/kernel/head.S:68: Error: register expected, but saw 'rslr,r'
arch/microblaze/kernel/head.S:68: Error: register expected, but saw 'slr,r0'
arch/microblaze/kernel/head.S:68: Fatal error: invalid value for special purpose register
make[1]: *** [arch/microblaze/kernel/head.o] Error 1
make: *** [arch/microblaze/kernel] Error 2
make: *** Waiting for unfinished jobs....
  CC      kernel/exec_domain.o
  CC      kernel/panic.o
  CC      kernel/cpu.o
  CC      kernel/exit.o
  CC      kernel/itimer.o
  HZFILE  kernel/hz.bc
  CC      kernel/softirq.o
  CC      kernel/resource.o
  CC      kernel/sysctl.o
  CC      kernel/sysctl_binary.o
  CC      kernel/capability.o
  CC      kernel/ptrace.o
  CC      kernel/timer.o
  CC      kernel/user.o
  CC      kernel/sys.o
  CC      kernel/kmod.o
  CC      kernel/workqueue.o
  CC      kernel/pid.o
  CC      kernel/task_work.o
  CC      kernel/extable.o
  CC      kernel/params.o
  CC      kernel/posix-timers.o
  CC      kernel/kthread.o
  CC      kernel/sys_ni.o
  CC      kernel/posix-cpu-timers.o
  CC      kernel/hrtimer.o
  CC      kernel/nsproxy.o
  CC      kernel/notifier.o
  CC      kernel/ksysfs.o
  CC      kernel/cred.o
  CC      kernel/reboot.o
  CC      kernel/async.o
  CC      kernel/range.o
  CC      kernel/groups.o
  CC      kernel/smpboot.o
  CC      kernel/cpu/idle.o
  CC      kernel/irq/irqdesc.o
  CC      kernel/irq/handle.o
  LD      kernel/cpu/built-in.o
  CC      kernel/irq/manage.o
  CC      kernel/irq/spurious.o
  CC      kernel/irq/resend.o
  CC      kernel/irq/chip.o
  CC      kernel/locking/mutex.o
  CC      kernel/irq/dummychip.o
  CC      kernel/irq/devres.o
  CC      kernel/locking/semaphore.o
  CC      kernel/locking/rwsem.o
  CC      kernel/locking/lglock.o
  CC      kernel/irq/irqdomain.o
  CC      kernel/locking/rtmutex.o
  CC      kernel/irq/proc.o
  CC      kernel/locking/rwsem-spinlock.o
  LD      kernel/irq/built-in.o
  CC      kernel/power/qos.o
  LD      kernel/locking/built-in.o
  CC      kernel/printk/printk.o
  LD      kernel/power/built-in.o
  CC      kernel/rcu/update.o
  CC      kernel/rcu/srcu.o
  CC      kernel/rcu/tiny.o
  LD      kernel/rcu/built-in.o
  CC      kernel/sched/core.o
  LD      kernel/printk/built-in.o
  CC      kernel/sched/proc.o
  CC      kernel/time/timekeeping.o
  CC      kernel/sched/clock.o
  CC      kernel/sched/cputime.o
  CC      kernel/time/ntp.o
  CC      kernel/sched/idle_task.o
  CC      kernel/sched/fair.o
  CC      kernel/time/clocksource.o
  CC      kernel/time/jiffies.o
  CC      kernel/sched/rt.o
  CC      kernel/time/timer_list.o
  CC      kernel/sched/deadline.o
  CC      kernel/time/timeconv.o
  CC      kernel/time/posix-clock.o
  CC      kernel/sched/stop_task.o
  CC      kernel/sched/wait.o
  CC      kernel/time/alarmtimer.o
  CC      kernel/sched/completion.o
  CC      kernel/time/clockevents.o
  CC      kernel/sched/stats.o
  CC      kernel/time/tick-common.o
  CC      kernel/sched/debug.o
  CC      kernel/time/sched_clock.o
  CC      kernel/time/tick-oneshot.o
  CC      kernel/futex.o
  CC      kernel/time/tick-sched.o
  CC      kernel/time/timer_stats.o
  CC      kernel/time/timekeeping_debug.o
  LD      kernel/time/built-in.o
  CC      kernel/up.o
  CC      kernel/module.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/utsname_sysctl.o
  CC      kernel/irq_work.o
  BC      kernel/timeconst.h
  CHK     kernel/config_data.h
  UPD     kernel/config_data.h
  CC      kernel/time.o
  CC      kernel/configs.o
  LD      kernel/built-in.o