From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 * branch master -> FETCH_HEAD Updating 878a876..ef42c58 Fast-forward .../interrupt-controller/lsi,zevio-intc.txt | 18 + arch/ia64/include/asm/unistd.h | 2 +- arch/ia64/include/uapi/asm/unistd.h | 2 + arch/ia64/kernel/entry.S | 2 + arch/parisc/hpux/fs.c | 15 +- arch/s390/crypto/aes_s390.c | 65 ++- arch/s390/crypto/des_s390.c | 95 ++-- arch/x86/Kconfig.debug | 1 + arch/x86/include/asm/xen/page.h | 5 +- arch/x86/xen/enlighten.c | 12 + arch/x86/xen/p2m.c | 17 +- drivers/block/nvme-core.c | 610 +++++++++++++++++---- drivers/block/nvme-scsi.c | 147 +++++ drivers/block/xen-blkback/blkback.c | 15 +- drivers/irqchip/Makefile | 1 + drivers/irqchip/irq-armada-370-xp.c | 4 +- drivers/irqchip/irq-zevio.c | 127 +++++ drivers/regulator/ab3100.c | 4 +- drivers/regulator/core.c | 9 +- drivers/regulator/s2mps11.c | 1 + drivers/xen/gntdev.c | 13 +- drivers/xen/grant-table.c | 89 +-- fs/exec.c | 45 +- fs/namei.c | 30 + include/linux/binfmts.h | 1 - include/linux/fs.h | 1 + include/linux/nvme.h | 6 +- include/linux/sched.h | 3 +- include/uapi/linux/nvme.h | 11 + include/xen/grant_table.h | 8 +- init/main.c | 2 +- kernel/auditsc.c | 2 +- kernel/kmod.c | 2 +- 33 files changed, 1057 insertions(+), 308 deletions(-) create mode 100644 Documentation/devicetree/bindings/interrupt-controller/lsi,zevio-intc.txt create mode 100644 drivers/irqchip/irq-zevio.c From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 878a876..ef42c58 master -> origin/master
commit ef42c58a5b4b8060a3931aab36bf2b4f81b44afc
Merge: 1cd731d b662821
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed Feb 5 16:02:53 2014 -0800
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq updates from Thomas Gleixner:
"This lot provides:
* Bugfixes for armada irq controller
* Updates to renesas irq chip
* Support for the TI-NSPIRE irq controller
Not strictly a bug fix only pull request, but important updates for
some of the arm Socs which I completely forgot to send last week.
Seems like my obliviousness is getting worse, I just can't remember
when it started"
* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip: Add support for TI-NSPIRE irqchip
irqchip: renesas-irqc: Enable mask on suspend
irqchip: renesas-irqc: Use lazy disable
irqchip: armada-370-xp: fix MSI race condition
irqchip: armada-370-xp: fix IPI race condition
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 AS arch/microblaze/kernel/hw_exception_handler.o CC init/do_mounts.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 arch/microblaze/kernel/ptrace.o CC init/do_mounts_rd.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 arch/microblaze/kernel/timer.o CC init/calibrate.o CC init/init_task.o CC arch/microblaze/kernel/traps.o CC arch/microblaze/kernel/unwind.o CC init/version.o CC arch/microblaze/kernel/cpu/cache.o LD init/mounts.o LD init/built-in.o CC arch/microblaze/kernel/cpu/cpuinfo.o CC arch/microblaze/kernel/early_printk.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/kernel/cpu/pvr.o CC arch/microblaze/kernel/microblaze_ksyms.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 arch/microblaze/mm/init.o LD arch/microblaze/mm/built-in.o
Switched to branch 'master' Deleted branch next (was 71ce88b). 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 878a876..ef42c58 Fast-forward .../interrupt-controller/lsi,zevio-intc.txt | 18 + arch/ia64/include/asm/unistd.h | 2 +- arch/ia64/include/uapi/asm/unistd.h | 2 + arch/ia64/kernel/entry.S | 2 + arch/parisc/hpux/fs.c | 15 +- arch/s390/crypto/aes_s390.c | 65 ++- arch/s390/crypto/des_s390.c | 95 ++-- arch/x86/Kconfig.debug | 1 + arch/x86/include/asm/xen/page.h | 5 +- arch/x86/xen/enlighten.c | 12 + arch/x86/xen/p2m.c | 17 +- drivers/block/nvme-core.c | 610 +++++++++++++++++---- drivers/block/nvme-scsi.c | 147 +++++ drivers/block/xen-blkback/blkback.c | 15 +- drivers/irqchip/Makefile | 1 + drivers/irqchip/irq-armada-370-xp.c | 4 +- drivers/irqchip/irq-zevio.c | 127 +++++ drivers/regulator/ab3100.c | 4 +- drivers/regulator/core.c | 9 +- drivers/regulator/s2mps11.c | 1 + drivers/xen/gntdev.c | 13 +- drivers/xen/grant-table.c | 89 +-- fs/exec.c | 45 +- fs/namei.c | 30 + include/linux/binfmts.h | 1 - include/linux/fs.h | 1 + include/linux/nvme.h | 6 +- include/linux/sched.h | 3 +- include/uapi/linux/nvme.h | 11 + include/xen/grant_table.h | 8 +- init/main.c | 2 +- kernel/auditsc.c | 2 +- kernel/kmod.c | 2 +- 33 files changed, 1057 insertions(+), 308 deletions(-) create mode 100644 Documentation/devicetree/bindings/interrupt-controller/lsi,zevio-intc.txt create mode 100644 drivers/irqchip/irq-zevio.c From git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next + 3bb8eba...38c2f4f akpm -> linux-next/akpm (forced update) + 8f713e9...cd0f80e akpm-base -> linux-next/akpm-base (forced update) + 71ce88b...0cc2aa5 master -> linux-next/master (forced update) 878a876..f8f2023 stable -> linux-next/stable * [new tag] next-20140206 -> next-20140206 Fetching origin From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 878a876..ef42c58 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 0cc2aa51be9d2f2b001c0e070b2e5cdde89b39f4
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu Feb 6 14:31:16 2014 +1100
Add linux-next specific files for 20140206
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 SHIPPED scripts/dtc/dtc-parser.tab.h SHIPPED scripts/dtc/dtc-parser.tab.c HOSTCC scripts/dtc/dtc.o CC scripts/mod/empty.o HOSTCC scripts/mod/mk_elfconfig HOSTCC scripts/dtc/flattree.o CC scripts/mod/devicetable-offsets.s HOSTCC scripts/dtc/fstree.o MKELF scripts/mod/elfconfig.h GEN scripts/mod/devicetable-offsets.h HOSTCC scripts/mod/modpost.o HOSTCC scripts/dtc/livetree.o HOSTCC scripts/dtc/srcpos.o HOSTCC scripts/dtc/treesource.o HOSTCC scripts/dtc/util.o HOSTCC scripts/mod/sumversion.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 HOSTCC scripts/bin2c CC kernel/bounds.s 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 init/do_mounts.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 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/early_printk.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 LD arch/microblaze/kernel/cpu/built-in.o CC arch/microblaze/kernel/module.o CC arch/microblaze/mm/consistent.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 arch/microblaze/mm/init.o LD arch/microblaze/mm/built-in.o