From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 * branch master -> FETCH_HEAD Updating 38dbfb5..878a876 Fast-forward fs/btrfs/check-integrity.c | 4 ++-- fs/btrfs/disk-io.c | 4 ++-- fs/btrfs/inode.c | 2 +- fs/btrfs/send.c | 4 ++-- fs/btrfs/super.c | 2 +- fs/nfs/nfs3acl.c | 34 ++++++++++++---------------------- fs/nfs/nfs4client.c | 2 +- fs/nfs/nfs4proc.c | 8 ++++---- fs/nfs/nfs4session.c | 25 ++++++++++++++++++++----- fs/nfs/nfs4session.h | 2 +- fs/posix_acl.c | 18 ++++++++++++------ include/linux/nfs_xdr.h | 2 ++ lib/Kconfig.debug | 2 +- 13 files changed, 61 insertions(+), 48 deletions(-) From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 38dbfb5..878a876 master -> origin/master
commit 878a876b2e10888afe53766dcca33f723ae20edc Merge: d7512f7 60efa5e Author: Linus Torvalds <torvalds@linux-foundation.org> Date: Tue Feb 4 12:26:56 2014 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs Pull btrfs fixes from Chris Mason: "Filipe is fixing compile and boot problems with our crc32c rework, and Josef has disabled snapshot aware defrag for now. As the number of snapshots increases, we're hitting OOM. For the short term we're disabling things until a bigger fix is ready" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: use late_initcall instead of module_init Btrfs: use btrfs_crc32c everywhere instead of libcrc32c Btrfs: disable snapshot aware defrag for now
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 init/do_mounts_rd.o CC arch/microblaze/kernel/process.o CC arch/microblaze/kernel/prom.o CC init/do_mounts_initrd.o CC arch/microblaze/kernel/prom_parse.o CC init/initramfs.o CC arch/microblaze/kernel/ptrace.o CC init/calibrate.o CC arch/microblaze/kernel/reset.o CC init/init_task.o CC arch/microblaze/kernel/setup.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/platform/platform.o CC arch/microblaze/kernel/cpu/cache.o LD arch/microblaze/platform/built-in.o CC arch/microblaze/kernel/cpu/cpuinfo.o CC arch/microblaze/kernel/cpu/cpuinfo-pvr-full.o CC arch/microblaze/kernel/cpu/cpuinfo-static.o CC arch/microblaze/kernel/microblaze_ksyms.o CC arch/microblaze/kernel/cpu/mb.o CC arch/microblaze/kernel/cpu/pvr.o CC kernel/fork.o LD arch/microblaze/kernel/cpu/built-in.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 CC kernel/irq/handle.o LD kernel/cpu/built-in.o CC kernel/locking/mutex.o CC kernel/irq/manage.o CC kernel/locking/semaphore.o CC kernel/locking/rwsem.o CC kernel/irq/spurious.o CC kernel/locking/lglock.o CC kernel/locking/rtmutex.o CC kernel/irq/resend.o CC kernel/irq/chip.o CC kernel/locking/rwsem-spinlock.o CC kernel/irq/dummychip.o LD kernel/locking/built-in.o CC kernel/power/qos.o CC kernel/irq/devres.o CC kernel/irq/autoprobe.o LD kernel/power/built-in.o CC kernel/printk/printk.o CC kernel/irq/irqdomain.o CC kernel/irq/proc.o LD kernel/irq/built-in.o CC kernel/rcu/update.o LD kernel/printk/built-in.o CC kernel/sched/core.o CC kernel/rcu/srcu.o CC kernel/rcu/tiny.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/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/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 LD kernel/sched/built-in.o CC kernel/time/tick-sched.o CC kernel/futex.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
Switched to branch 'master' Deleted branch next (was cdd263f). 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 38dbfb5..878a876 Fast-forward fs/btrfs/check-integrity.c | 4 ++-- fs/btrfs/disk-io.c | 4 ++-- fs/btrfs/inode.c | 2 +- fs/btrfs/send.c | 4 ++-- fs/btrfs/super.c | 2 +- fs/nfs/nfs3acl.c | 34 ++++++++++++---------------------- fs/nfs/nfs4client.c | 2 +- fs/nfs/nfs4proc.c | 8 ++++---- fs/nfs/nfs4session.c | 25 ++++++++++++++++++++----- fs/nfs/nfs4session.h | 2 +- fs/posix_acl.c | 18 ++++++++++++------ include/linux/nfs_xdr.h | 2 ++ lib/Kconfig.debug | 2 +- 13 files changed, 61 insertions(+), 48 deletions(-) From git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next + 3e25474...3bb8eba akpm -> linux-next/akpm (forced update) + f6ccf66...8f713e9 akpm-base -> linux-next/akpm-base (forced update) + cdd263f...71ce88b master -> linux-next/master (forced update) 38dbfb5..878a876 stable -> linux-next/stable * [new tag] next-20140205 -> next-20140205 Fetching origin From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 38dbfb5..878a876 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 71ce88b59f52acaca05a8c4a1f6a5d3f74a731db Author: Stephen Rothwell <sfr@canb.auug.org.au> Date: Wed Feb 5 13:35:49 2014 +1100 Add linux-next specific files for 20140205 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 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 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 arch/microblaze/kernel/reset.o CC arch/microblaze/kernel/setup.o CC init/do_mounts_initrd.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/platform/platform.o LD arch/microblaze/platform/built-in.o CC arch/microblaze/kernel/module.o CC kernel/fork.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/itimer.o CC kernel/exit.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/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 LD kernel/locking/built-in.o CC kernel/power/qos.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/time/timekeeping.o CC kernel/sched/cputime.o CC kernel/time/ntp.o CC kernel/sched/idle_task.o CC kernel/time/clocksource.o CC kernel/sched/fair.o CC kernel/time/jiffies.o CC kernel/time/timer_list.o CC kernel/sched/rt.o CC kernel/time/timeconv.o CC kernel/sched/deadline.o CC kernel/time/posix-clock.o CC kernel/sched/stop_task.o CC kernel/time/alarmtimer.o CC kernel/sched/wait.o CC kernel/time/clockevents.o CC kernel/sched/completion.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/time/tick-sched.o LD kernel/sched/built-in.o CC kernel/time/timer_stats.o CC kernel/time/timekeeping_debug.o CC kernel/futex.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