From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 * branch master -> FETCH_HEAD Updating ef42c58..9343224 Fast-forward Documentation/kernel-parameters.txt | 8 +- arch/x86/mm/numa.c | 21 +- drivers/gpu/drm/ast/ast_fb.c | 2 +- drivers/gpu/drm/cirrus/cirrus_fbdev.c | 2 +- drivers/gpu/drm/mgag200/mgag200_fb.c | 2 +- drivers/gpu/drm/mgag200/mgag200_mode.c | 4 +- drivers/gpu/drm/radeon/r600_cs.c | 18 +- drivers/gpu/drm/radeon/radeon_drv.c | 3 +- drivers/gpu/drm/radeon/reg_srcs/r600 | 1 + drivers/gpu/drm/ttm/ttm_object.c | 2 +- drivers/gpu/drm/ttm/ttm_tt.c | 3 + drivers/gpu/drm/vmwgfx/svga3d_reg.h | 24 ++ drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 144 ++++++++-- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 7 + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 35 ++- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 330 +++++++++++++++++++--- drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 93 ++++-- drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 1 + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 11 +- drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 467 +++++++++++++++++++++++++++---- drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 6 +- fs/buffer.c | 6 +- fs/ocfs2/alloc.c | 38 ++- fs/ocfs2/localalloc.c | 42 +++ fs/ocfs2/localalloc.h | 6 + include/linux/page-flags.h | 4 +- mm/page-writeback.c | 5 +- mm/swap_state.c | 63 ++++- mm/swapfile.c | 11 +- sound/pci/hda/patch_analog.c | 27 ++ sound/pci/hda/patch_realtek.c | 12 +- sound/usb/Kconfig | 1 + 32 files changed, 1233 insertions(+), 166 deletions(-) From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ef42c58..9343224 master -> origin/master
commit 9343224bfd4be6a02e6ae0c0d66426c955c7d76e
Merge: f2de3a15 227d53b3
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu Feb 6 13:49:03 2014 -0800
Merge branch 'akpm' (patches from Andrew Morton)
Merge a bunch of fixes from Andrew Morton:
"Commit 579f82901f6f ("swap: add a simple detector for inappropriate
swapin readahead") is a feature. No probs if you decide to defer it
until the next merge window.
It has been sitting in my tree for over a year because of my dislike
of all the magic numbers, but recent discussion with Hugh has made me
give up"
* emailed patches fron Andrew Morton <akpm@linux-foundation.org>:
mm: __set_page_dirty uses spin_lock_irqsave instead of spin_lock_irq
arch/x86/mm/numa.c: fix array index overflow when synchronizing nid to memblock.reserved.
arch/x86/mm/numa.c: initialize numa_kernel_nodes in numa_clear_kernel_node_hotplug()
mm: __set_page_dirty_nobuffers() uses spin_lock_irqsave() instead of spin_lock_irq()
mm/swap: fix race on swap_info reuse between swapoff and swapon
swap: add a simple detector for inappropriate swapin readahead
ocfs2: free allocated clusters if error occurs after ocfs2_claim_clusters
Documentation/kernel-parameters.txt: fix memmap= language
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 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 arch/microblaze/kernel/reset.o CC init/do_mounts_initrd.o CC arch/microblaze/kernel/setup.o CC arch/microblaze/kernel/signal.o CC init/initramfs.o CC arch/microblaze/kernel/sys_microblaze.o CC init/calibrate.o CC init/init_task.o CC arch/microblaze/kernel/timer.o CC arch/microblaze/kernel/traps.o CC init/version.o CC arch/microblaze/kernel/unwind.o LD init/mounts.o LD init/built-in.o CC arch/microblaze/kernel/cpu/cache.o CC arch/microblaze/kernel/cpu/cpuinfo.o CC arch/microblaze/mm/consistent.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 CC arch/microblaze/mm/init.o CC arch/microblaze/kernel/cpu/pvr.o LD arch/microblaze/kernel/cpu/built-in.o CC arch/microblaze/kernel/early_printk.o LD arch/microblaze/mm/built-in.o CC arch/microblaze/kernel/microblaze_ksyms.o CC arch/microblaze/kernel/module.o CC arch/microblaze/platform/platform.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.... LD arch/microblaze/platform/built-in.o
Switched to branch 'master' Deleted branch next (was 0cc2aa5). 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 Updating ef42c58..9343224 Fast-forward Documentation/kernel-parameters.txt | 8 +- arch/x86/mm/numa.c | 21 +- drivers/gpu/drm/ast/ast_fb.c | 2 +- drivers/gpu/drm/cirrus/cirrus_fbdev.c | 2 +- drivers/gpu/drm/mgag200/mgag200_fb.c | 2 +- drivers/gpu/drm/mgag200/mgag200_mode.c | 4 +- drivers/gpu/drm/radeon/r600_cs.c | 18 +- drivers/gpu/drm/radeon/radeon_drv.c | 3 +- drivers/gpu/drm/radeon/reg_srcs/r600 | 1 + drivers/gpu/drm/ttm/ttm_object.c | 2 +- drivers/gpu/drm/ttm/ttm_tt.c | 3 + drivers/gpu/drm/vmwgfx/svga3d_reg.h | 24 ++ drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 144 ++++++++-- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 7 + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 35 ++- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 330 +++++++++++++++++++--- drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 93 ++++-- drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 1 + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 11 +- drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 467 +++++++++++++++++++++++++++---- drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 6 +- fs/buffer.c | 6 +- fs/ocfs2/alloc.c | 38 ++- fs/ocfs2/localalloc.c | 42 +++ fs/ocfs2/localalloc.h | 6 + include/linux/page-flags.h | 4 +- mm/page-writeback.c | 5 +- mm/swap_state.c | 63 ++++- mm/swapfile.c | 11 +- sound/pci/hda/patch_analog.c | 27 ++ sound/pci/hda/patch_realtek.c | 12 +- sound/usb/Kconfig | 1 + 32 files changed, 1233 insertions(+), 166 deletions(-) From git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next + 38c2f4f...04bf9c8 akpm -> linux-next/akpm (forced update) + cd0f80e...7f7b2d8 akpm-base -> linux-next/akpm-base (forced update) + 0cc2aa5...72569d9 master -> linux-next/master (forced update) f8f2023..9343224 stable -> linux-next/stable * [new tag] next-20140207 -> next-20140207 Fetching origin From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ef42c58..9343224 master -> origin/master Fetching linux-next Switched to a new branch 'next' Branch next set up to track remote branch master from linux-next.
commit 72569d9aa91b091268775ab1cd1b99cc3906f204
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri Feb 7 13:35:08 2014 +1100
Add linux-next specific files for 20140207
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
linux_next configure log - PASS
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 #
linux_next compile log - FAILED
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 UPD include/config/kernel.release CHK include/generated/utsrelease.h UPD include/generated/utsrelease.h HOSTCC scripts/dtc/checks.o HOSTCC scripts/dtc/data.o SHIPPED scripts/dtc/dtc-lexer.lex.c CC scripts/mod/empty.o SHIPPED scripts/dtc/dtc-parser.tab.h SHIPPED scripts/dtc/dtc-parser.tab.c HOSTCC scripts/dtc/dtc.o HOSTCC scripts/mod/mk_elfconfig HOSTCC scripts/dtc/flattree.o CC scripts/mod/devicetable-offsets.s 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/dtc/srcpos.o HOSTCC scripts/dtc/treesource.o HOSTCC scripts/mod/sumversion.o HOSTCC scripts/dtc/util.o HOSTCC scripts/dtc/dtc-lexer.lex.o HOSTCC scripts/mod/file2alias.o HOSTCC scripts/dtc/dtc-parser.tab.o HOSTLD scripts/dtc/dtc HOSTCC scripts/kallsyms HOSTLD scripts/mod/modpost CC kernel/bounds.s HOSTCC scripts/bin2c HOSTCC scripts/sortextable 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 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 init/do_mounts.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 init/init_task.o CC arch/microblaze/kernel/sys_microblaze.o CC arch/microblaze/kernel/timer.o CC init/version.o LD init/mounts.o LD init/built-in.o CC arch/microblaze/kernel/traps.o CC arch/microblaze/kernel/unwind.o CC arch/microblaze/mm/consistent.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/mm/init.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/early_printk.o CC arch/microblaze/kernel/cpu/pvr.o LD arch/microblaze/kernel/cpu/built-in.o CC arch/microblaze/platform/platform.o CC arch/microblaze/kernel/microblaze_ksyms.o LD arch/microblaze/platform/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 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/irq/manage.o CC kernel/irq/spurious.o CC kernel/irq/resend.o CC kernel/locking/mutex.o CC kernel/irq/chip.o CC kernel/locking/semaphore.o CC kernel/irq/dummychip.o CC kernel/irq/devres.o CC kernel/locking/rwsem.o CC kernel/irq/autoprobe.o CC kernel/locking/lglock.o CC kernel/locking/rtmutex.o CC kernel/irq/irqdomain.o CC kernel/irq/proc.o CC kernel/locking/rwsem-spinlock.o LD kernel/locking/built-in.o CC kernel/power/qos.o LD kernel/irq/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/printk/built-in.o CC kernel/sched/core.o LD kernel/rcu/built-in.o CC kernel/sched/proc.o CC kernel/sched/clock.o CC kernel/sched/cputime.o CC kernel/sched/idle_task.o CC kernel/sched/fair.o CC kernel/sched/rt.o CC kernel/time/timekeeping.o CC kernel/sched/deadline.o CC kernel/sched/stop_task.o CC kernel/sched/wait.o CC kernel/time/ntp.o CC kernel/sched/completion.o CC kernel/sched/stats.o CC kernel/time/clocksource.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/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/sched_clock.o CC kernel/time/tick-oneshot.o CC kernel/up.o CC kernel/time/tick-sched.o CC kernel/module.o CC kernel/time/timer_stats.o CC kernel/time/timekeeping_debug.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/time.o CC kernel/configs.o LD kernel/built-in.o