Table of Contents
2014-01-31_13_06_04
- noMMU
- nommu-cpio_defconfig
- microblaze-unknown-uclinux-uclibc-
linux26
From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 * branch master -> FETCH_HEAD Updating 9b0cd30..e7651b8 Fast-forward Documentation/block/biodoc.txt | 7 +- Documentation/block/biovecs.txt | 111 ++ .../zram => Documentation/blockdev}/zram.txt | 6 - .../devicetree/bindings/arm/bcm/kona-timer.txt | 7 +- .../devicetree/bindings/clock/bcm-kona-clock.txt | 93 ++ .../devicetree/bindings/clock/corenet-clock.txt | 134 +++ .../devicetree/bindings/mmc/kona-sdhci.txt | 4 + Documentation/filesystems/btrfs.txt | 47 +- Documentation/filesystems/nfs/nfs41-server.txt | 42 +- Documentation/filesystems/proc.txt | 4 +- Documentation/filesystems/vfs.txt | 12 +- MAINTAINERS | 18 +- Makefile | 11 +- arch/arc/include/asm/linkage.h | 2 + arch/arm/boot/dts/bcm11351-brt.dts | 6 + arch/arm/boot/dts/bcm11351.dtsi | 170 ++- arch/arm/boot/dts/bcm28155-ap.dts | 28 + arch/arm/boot/dts/moxart-uc7112lx.dts | 8 + arch/arm/boot/dts/moxart.dtsi | 6 - arch/frv/Makefile | 7 - arch/m68k/emu/nfblock.c | 13 +- arch/mips/Kconfig | 221 ++-- arch/mips/Makefile | 2 +- arch/mips/alchemy/common/power.c | 1 - arch/mips/ar7/time.c | 1 - arch/mips/ath79/common.h | 1 - arch/mips/bcm47xx/Kconfig | 4 + arch/mips/bcm47xx/Makefile | 3 +- arch/mips/bcm47xx/bcm47xx_private.h | 12 + arch/mips/bcm47xx/board.c | 34 +- arch/mips/bcm47xx/buttons.c | 531 +++++++++ arch/mips/bcm47xx/irq.c | 25 +- arch/mips/bcm47xx/leds.c | 542 +++++++++ arch/mips/bcm47xx/nvram.c | 3 +- arch/mips/bcm47xx/prom.c | 127 +- arch/mips/bcm47xx/serial.c | 6 +- arch/mips/bcm47xx/setup.c | 35 + arch/mips/bcm47xx/sprom.c | 18 +- arch/mips/bcm47xx/wgt634u.c | 174 --- arch/mips/bcm63xx/Kconfig | 8 + arch/mips/bcm63xx/Makefile | 4 +- arch/mips/bcm63xx/boards/board_bcm963xx.c | 3 + arch/mips/bcm63xx/clk.c | 42 + arch/mips/bcm63xx/cpu.c | 6 +- arch/mips/bcm63xx/dev-hsspi.c | 47 + arch/mips/bcm63xx/early_printk.c | 3 +- arch/mips/bcm63xx/prom.c | 14 +- arch/mips/boot/compressed/Makefile | 4 +- arch/mips/boot/compressed/dbg.c | 1 - arch/mips/boot/compressed/decompress.c | 22 - arch/mips/boot/compressed/string.c | 28 + arch/mips/boot/compressed/uart-16550.c | 5 +- arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c | 1 + .../cavium-octeon/executive/cvmx-helper-board.c | 27 + .../cavium-octeon/executive/cvmx-helper-util.c | 4 + arch/mips/cavium-octeon/executive/cvmx-helper.c | 10 +- arch/mips/cavium-octeon/executive/cvmx-pko.c | 3 +- arch/mips/cavium-octeon/executive/cvmx-spi.c | 1 + arch/mips/cavium-octeon/octeon-platform.c | 38 +- arch/mips/cavium-octeon/octeon_3xxx.dts | 19 + arch/mips/cavium-octeon/smp.c | 1 - arch/mips/configs/ar7_defconfig | 1 - arch/mips/configs/bcm47xx_defconfig | 623 +--------- arch/mips/configs/bcm63xx_defconfig | 1 - arch/mips/configs/cobalt_defconfig | 1 - arch/mips/configs/gpr_defconfig | 1 - arch/mips/configs/jmr3927_defconfig | 1 - arch/mips/configs/lasat_defconfig | 1 - arch/mips/configs/maltasmvp_defconfig | 3 +- arch/mips/configs/markeins_defconfig | 1 - arch/mips/configs/mtx1_defconfig | 1 - arch/mips/configs/pnx8335_stb225_defconfig | 1 - arch/mips/configs/qi_lb60_defconfig | 188 +++ arch/mips/configs/rb532_defconfig | 1 - arch/mips/configs/rbtx49xx_defconfig | 1 - arch/mips/fw/arc/file.c | 1 - arch/mips/include/asm/amon.h | 15 +- arch/mips/include/asm/asmmacro-32.h | 42 - arch/mips/include/asm/asmmacro-64.h | 96 -- arch/mips/include/asm/asmmacro.h | 107 ++ arch/mips/include/asm/bmips.h | 29 +- arch/mips/include/asm/cpu-features.h | 7 + arch/mips/include/asm/cpu-info.h | 3 + arch/mips/include/asm/cpu-type.h | 15 +- arch/mips/include/asm/cpu.h | 12 +- arch/mips/include/asm/dma-coherence.h | 9 + arch/mips/include/asm/elf.h | 31 +- arch/mips/include/asm/fpu.h | 104 +- arch/mips/include/asm/highmem.h | 1 - arch/mips/include/asm/kvm_host.h | 7 - arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 1 - arch/mips/include/asm/mach-bcm47xx/bcm47xx.h | 2 + arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 1 + .../asm/mach-bcm47xx/cpu-feature-overrides.h | 82 ++ arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 18 + .../include/asm/mach-bcm63xx/bcm63xx_dev_hsspi.h | 8 + arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 120 -- arch/mips/include/asm/mach-generic/dma-coherence.h | 4 - arch/mips/include/asm/mach-generic/floppy.h | 1 - arch/mips/include/asm/mach-generic/ide.h | 6 +- arch/mips/include/asm/mach-jazz/floppy.h | 1 - arch/mips/include/asm/mach-jz4740/platform.h | 1 + arch/mips/include/asm/mach-netlogic/irq.h | 3 +- arch/mips/include/asm/mach-netlogic/multi-node.h | 33 +- arch/mips/include/asm/mach-netlogic/topology.h | 20 + arch/mips/include/asm/mips-boards/piix4.h | 7 + arch/mips/include/asm/mipsregs.h | 85 +- arch/mips/include/asm/netlogic/common.h | 24 +- arch/mips/include/asm/netlogic/mips-extns.h | 7 +- arch/mips/include/asm/netlogic/xlp-hal/bridge.h | 69 +- arch/mips/include/asm/netlogic/xlp-hal/iomap.h | 48 +- arch/mips/include/asm/netlogic/xlp-hal/pcibus.h | 41 +- arch/mips/include/asm/netlogic/xlp-hal/pic.h | 77 +- arch/mips/include/asm/netlogic/xlp-hal/sys.h | 18 +- arch/mips/include/asm/netlogic/xlp-hal/uart.h | 3 +- arch/mips/include/asm/netlogic/xlp-hal/xlp.h | 38 +- arch/mips/include/asm/netlogic/xlr/xlr.h | 5 - arch/mips/include/asm/octeon/cvmx-helper-board.h | 9 + arch/mips/include/asm/page.h | 25 + arch/mips/include/asm/rtlx.h | 49 +- arch/mips/include/asm/switch_to.h | 16 +- arch/mips/include/asm/syscall.h | 2 +- arch/mips/include/asm/thread_info.h | 4 +- arch/mips/include/asm/tlb.h | 4 + arch/mips/include/asm/vpe.h | 131 ++- arch/mips/include/uapi/asm/inst.h | 7 +- arch/mips/jz4740/board-qi_lb60.c | 1 + arch/mips/jz4740/platform.c | 41 +- arch/mips/kernel/Makefile | 5 + arch/mips/kernel/binfmt_elfo32.c | 14 + arch/mips/kernel/bmips_vec.S | 56 +- arch/mips/kernel/cpu-probe.c | 103 +- arch/mips/kernel/crash.c | 1 - arch/mips/kernel/genex.S | 1 + arch/mips/kernel/idle.c | 2 + arch/mips/kernel/proc.c | 48 +- arch/mips/kernel/process.c | 6 +- arch/mips/kernel/ptrace.c | 60 +- arch/mips/kernel/ptrace32.c | 53 +- arch/mips/kernel/r4k_fpu.S | 74 +- arch/mips/kernel/r4k_switch.S | 45 +- arch/mips/kernel/rtlx-cmp.c | 116 ++ arch/mips/kernel/rtlx-mt.c | 148 +++ arch/mips/kernel/rtlx.c | 273 +---- arch/mips/kernel/segment.c | 110 ++ arch/mips/kernel/signal.c | 10 +- arch/mips/kernel/signal32.c | 10 +- arch/mips/kernel/smp-bmips.c | 312 +++-- arch/mips/kernel/smp-cmp.c | 3 + arch/mips/kernel/smp-mt.c | 28 + arch/mips/kernel/spram.c | 3 +- arch/mips/kernel/sync-r4k.c | 1 - arch/mips/kernel/traps.c | 71 +- arch/mips/kernel/vpe-cmp.c | 180 +++ arch/mips/kernel/vpe-mt.c | 523 +++++++++ arch/mips/kernel/vpe.c | 882 ++------------ arch/mips/kvm/kvm_mips.c | 1 - arch/mips/kvm/kvm_tlb.c | 135 +-- arch/mips/lantiq/xway/clk.c | 1 - arch/mips/lantiq/xway/dma.c | 4 - arch/mips/lasat/at93c.c | 1 - arch/mips/lasat/picvue.c | 1 - arch/mips/lib/uncached.c | 1 - arch/mips/loongson/lemote-2f/clock.c | 1 - arch/mips/math-emu/cp1emu.c | 42 +- arch/mips/math-emu/kernel_linkage.c | 6 +- arch/mips/mm/c-octeon.c | 1 - arch/mips/mm/c-r3k.c | 1 - arch/mips/mm/c-r4k.c | 26 +- arch/mips/mm/cache.c | 1 - arch/mips/mm/cex-sb1.S | 1 - arch/mips/mm/dma-default.c | 2 + arch/mips/mm/hugetlbpage.c | 1 - arch/mips/mm/init.c | 2 - arch/mips/mm/page.c | 1 - arch/mips/mm/sc-mips.c | 2 + arch/mips/mm/sc-rm7k.c | 1 - arch/mips/mm/tlb-r3k.c | 1 - arch/mips/mm/tlb-r4k.c | 48 +- arch/mips/mm/tlb-r8k.c | 1 - arch/mips/mm/tlbex.c | 2 +- arch/mips/mm/uasm-micromips.c | 1 - arch/mips/mm/uasm-mips.c | 1 - arch/mips/mti-malta/Makefile | 2 - arch/mips/mti-malta/malta-amon.c | 49 +- arch/mips/mti-malta/malta-console.c | 47 - arch/mips/mti-malta/malta-init.c | 58 +- arch/mips/mti-malta/malta-int.c | 127 +- arch/mips/mti-malta/malta-platform.c | 2 + arch/mips/mti-malta/malta-time.c | 16 +- arch/mips/mti-sead3/Makefile | 2 + arch/mips/mti-sead3/sead3-pic32-bus.c | 1 - arch/mips/mti-sead3/sead3-setup.c | 84 +- arch/mips/mti-sead3/sead3-time.c | 4 - arch/mips/mti-sead3/sead3.dts | 4 - arch/mips/netlogic/Kconfig | 9 + arch/mips/netlogic/common/earlycons.c | 2 + arch/mips/netlogic/common/irq.c | 72 +- arch/mips/netlogic/common/reset.S | 63 +- arch/mips/netlogic/common/smp.c | 8 +- arch/mips/netlogic/common/smpboot.S | 4 +- arch/mips/netlogic/dts/Makefile | 1 + arch/mips/netlogic/dts/xlp_gvp.dts | 76 ++ arch/mips/netlogic/xlp/dt.c | 7 +- arch/mips/netlogic/xlp/nlm_hal.c | 71 +- arch/mips/netlogic/xlp/setup.c | 25 +- arch/mips/netlogic/xlp/usb-init-xlp2.c | 88 +- arch/mips/netlogic/xlp/wakeup.c | 92 +- arch/mips/netlogic/xlr/platform.c | 4 +- arch/mips/netlogic/xlr/setup.c | 20 - arch/mips/netlogic/xlr/wakeup.c | 3 +- arch/mips/oprofile/common.c | 2 + arch/mips/oprofile/op_model_mipsxx.c | 8 + arch/mips/pci/Makefile | 1 + arch/mips/pci/fixup-malta.c | 11 + arch/mips/pci/fixup-rc32434.c | 1 - arch/mips/pci/fixup-sb1250.c | 1 - arch/mips/pci/msi-xlp.c | 494 ++++++++ arch/mips/pci/ops-bcm63xx.c | 1 - arch/mips/pci/ops-bonito64.c | 1 - arch/mips/pci/ops-lantiq.c | 1 - arch/mips/pci/ops-loongson2.c | 1 - arch/mips/pci/ops-mace.c | 1 - arch/mips/pci/ops-msc.c | 1 - arch/mips/pci/ops-nile4.c | 1 - arch/mips/pci/ops-rc32434.c | 1 - arch/mips/pci/pci-ip27.c | 1 - arch/mips/pci/pci-malta.c | 6 +- arch/mips/pci/pci-rt3883.c | 3 - arch/mips/pci/pci-xlp.c | 110 +- arch/mips/pmcs-msp71xx/Kconfig | 1 + arch/mips/ralink/Kconfig | 1 + arch/mips/sgi-ip27/ip27-console.c | 1 - arch/mips/sgi-ip27/ip27-irq-pci.c | 1 - arch/mips/sgi-ip27/ip27-klconfig.c | 1 - arch/mips/sgi-ip27/ip27-xtalk.c | 1 - arch/mn10300/Makefile | 8 - arch/openrisc/kernel/entry.S | 59 +- arch/openrisc/kernel/signal.c | 233 ++-- arch/powerpc/Kconfig | 6 +- arch/powerpc/boot/dts/ac14xx.dts | 7 + arch/powerpc/boot/dts/mpc5121.dtsi | 113 +- arch/powerpc/boot/dts/mpc5125twr.dts | 53 +- arch/powerpc/include/asm/clk_interface.h | 20 - arch/powerpc/include/asm/mpc5121.h | 7 +- arch/powerpc/include/asm/pgtable-ppc64.h | 6 +- arch/powerpc/include/asm/processor.h | 7 - arch/powerpc/include/asm/systbl.h | 2 + arch/powerpc/include/asm/unistd.h | 2 +- arch/powerpc/include/uapi/asm/unistd.h | 3 +- arch/powerpc/kernel/Makefile | 1 - arch/powerpc/kernel/cacheinfo.c | 3 + arch/powerpc/kernel/clock.c | 82 -- arch/powerpc/kernel/process.c | 2 +- arch/powerpc/kernel/signal_32.c | 19 +- arch/powerpc/kernel/sysfs.c | 2 - arch/powerpc/mm/hugetlbpage.c | 4 +- arch/powerpc/mm/numa.c | 2 +- arch/powerpc/mm/slice.c | 2 +- arch/powerpc/mm/tlb_low_64e.S | 3 +- arch/powerpc/mm/tlb_nohash.c | 2 + arch/powerpc/platforms/512x/Kconfig | 2 +- arch/powerpc/platforms/512x/Makefile | 3 +- arch/powerpc/platforms/512x/clock-commonclk.c | 1221 ++++++++++++++++++++ arch/powerpc/platforms/512x/clock.c | 754 ------------ arch/powerpc/platforms/512x/mpc512x_shared.c | 169 +-- arch/powerpc/platforms/52xx/Kconfig | 2 +- arch/powerpc/platforms/powernv/setup.c | 13 +- arch/powerpc/platforms/pseries/Kconfig | 9 - arch/powerpc/platforms/pseries/Makefile | 1 - arch/powerpc/sysdev/axonram.c | 21 +- arch/powerpc/sysdev/dart_iommu.c | 1 + arch/x86/Makefile | 22 + arch/x86/boot/Makefile | 15 +- arch/x86/boot/cpuflags.c | 25 +- arch/x86/boot/video.h | 2 +- arch/x86/include/asm/paravirt.h | 2 +- arch/x86/include/asm/paravirt_types.h | 9 +- arch/x86/include/asm/pgtable_types.h | 3 +- arch/x86/include/asm/thread_info.h | 8 +- arch/x86/kernel/kvm.c | 2 +- arch/x86/kernel/vsmp_64.c | 8 +- arch/x86/lguest/boot.c | 12 +- arch/x86/math-emu/errors.c | 5 - arch/x86/realmode/rm/Makefile | 17 +- arch/x86/tools/relocs.c | 30 +- arch/x86/tools/relocs.h | 7 +- arch/x86/tools/relocs_common.c | 16 +- arch/x86/xen/irq.c | 8 +- arch/x86/xen/mmu.c | 16 +- arch/x86/xen/setup.c | 4 +- arch/x86/xen/spinlock.c | 2 +- arch/xtensa/platforms/iss/simdisk.c | 14 +- block/blk-core.c | 61 +- block/blk-exec.c | 4 + block/blk-flush.c | 2 +- block/blk-integrity.c | 40 +- block/blk-lib.c | 12 +- block/blk-map.c | 6 +- block/blk-merge.c | 66 +- block/blk-mq-cpu.c | 37 +- block/blk-mq.c | 123 +- block/blk-mq.h | 3 +- block/blk-settings.c | 4 + block/blk-sysfs.c | 1 + block/blk-throttle.c | 14 +- block/cmdline-parser.c | 18 +- block/elevator.c | 2 +- block/scsi_ioctl.c | 6 +- drivers/bcma/Kconfig | 1 + drivers/bcma/driver_gpio.c | 137 ++- drivers/block/Kconfig | 2 + drivers/block/Makefile | 1 + drivers/block/aoe/aoe.h | 10 +- drivers/block/aoe/aoecmd.c | 153 +-- drivers/block/brd.c | 16 +- drivers/block/cciss.c | 4 +- drivers/block/drbd/drbd_actlog.c | 2 +- drivers/block/drbd/drbd_bitmap.c | 2 +- drivers/block/drbd/drbd_main.c | 27 +- drivers/block/drbd/drbd_receiver.c | 19 +- drivers/block/drbd/drbd_req.c | 6 +- drivers/block/drbd/drbd_req.h | 2 +- drivers/block/drbd/drbd_worker.c | 8 +- drivers/block/floppy.c | 52 +- drivers/block/loop.c | 29 +- drivers/block/mg_disk.c | 2 +- drivers/block/mtip32xx/mtip32xx.c | 270 +++-- drivers/block/mtip32xx/mtip32xx.h | 14 +- drivers/block/nbd.c | 14 +- drivers/block/null_blk.c | 5 + drivers/block/nvme-core.c | 142 +-- drivers/block/paride/pg.c | 2 +- drivers/block/pktcdvd.c | 186 +-- drivers/block/ps3disk.c | 17 +- drivers/block/ps3vram.c | 12 +- drivers/block/rbd.c | 91 +- drivers/block/rsxx/dev.c | 6 +- drivers/block/rsxx/dma.c | 15 +- drivers/block/sx8.c | 16 +- drivers/block/umem.c | 53 +- drivers/block/xen-blkback/blkback.c | 2 +- drivers/block/xen-blkfront.c | 2 +- drivers/{staging => block}/zram/Kconfig | 1 - drivers/{staging => block}/zram/Makefile | 0 drivers/{staging => block}/zram/zram_drv.c | 161 +-- drivers/{staging => block}/zram/zram_drv.h | 32 +- drivers/cdrom/gdrom.c | 4 +- drivers/char/ipmi/ipmi_si_intf.c | 1 + drivers/cpuidle/Kconfig | 5 + drivers/cpuidle/Kconfig.powerpc | 20 + drivers/cpuidle/Makefile | 5 + drivers/cpuidle/cpuidle-powernv.c | 169 +++ .../cpuidle/cpuidle-pseries.c | 79 +- drivers/md/bcache/Makefile | 5 +- drivers/md/bcache/alloc.c | 89 +- drivers/md/bcache/bcache.h | 84 +- drivers/md/bcache/bset.c | 904 ++++++++------- drivers/md/bcache/bset.h | 440 ++++--- drivers/md/bcache/btree.c | 682 ++++------- drivers/md/bcache/btree.h | 62 +- drivers/md/bcache/closure.c | 90 +- drivers/md/bcache/closure.h | 355 ++---- drivers/md/bcache/debug.c | 268 ++--- drivers/md/bcache/debug.h | 27 +- drivers/md/bcache/extents.c | 616 ++++++++++ drivers/md/bcache/extents.h | 13 + drivers/md/bcache/io.c | 196 +--- drivers/md/bcache/journal.c | 87 +- drivers/md/bcache/journal.h | 1 + drivers/md/bcache/movinggc.c | 6 +- drivers/md/bcache/request.c | 197 ++-- drivers/md/bcache/request.h | 21 +- drivers/md/bcache/super.c | 123 +- drivers/md/bcache/sysfs.c | 79 +- drivers/md/bcache/util.c | 4 +- drivers/md/bcache/util.h | 8 + drivers/md/bcache/writeback.c | 6 +- drivers/md/bcache/writeback.h | 2 +- drivers/md/dm-bio-record.h | 37 +- drivers/md/dm-bufio.c | 2 +- drivers/md/dm-cache-policy-mq.c | 4 +- drivers/md/dm-cache-target.c | 28 +- drivers/md/dm-crypt.c | 64 +- drivers/md/dm-delay.c | 7 +- drivers/md/dm-flakey.c | 7 +- drivers/md/dm-io.c | 37 +- drivers/md/dm-linear.c | 3 +- drivers/md/dm-raid1.c | 20 +- drivers/md/dm-region-hash.c | 3 +- drivers/md/dm-snap.c | 19 +- drivers/md/dm-stripe.c | 13 +- drivers/md/dm-switch.c | 4 +- drivers/md/dm-thin.c | 30 +- drivers/md/dm-verity.c | 62 +- drivers/md/dm.c | 189 +-- drivers/md/faulty.c | 19 +- drivers/md/linear.c | 96 +- drivers/md/md.c | 12 +- drivers/md/multipath.c | 13 +- drivers/md/raid0.c | 79 +- drivers/md/raid1.c | 73 +- drivers/md/raid10.c | 194 ++-- drivers/md/raid5.c | 85 +- drivers/media/platform/fsl-viu.c | 2 +- drivers/message/fusion/mptsas.c | 8 +- drivers/mtd/nand/mpc5121_nfc.c | 2 +- drivers/mtd/ubi/attach.c | 4 +- drivers/mtd/ubi/build.c | 4 +- drivers/mtd/ubi/io.c | 54 +- drivers/net/can/mscan/mpc5xxx_can.c | 270 +++-- drivers/net/phy/mdio_bus.c | 1 + drivers/s390/block/dasd_diag.c | 10 +- drivers/s390/block/dasd_eckd.c | 48 +- drivers/s390/block/dasd_fba.c | 26 +- drivers/s390/block/dcssblk.c | 21 +- drivers/s390/block/scm_blk.c | 8 +- drivers/s390/block/scm_blk_cluster.c | 4 +- drivers/s390/block/xpram.c | 19 +- drivers/scsi/libsas/sas_expander.c | 8 +- drivers/scsi/mpt2sas/mpt2sas_transport.c | 41 +- drivers/scsi/mpt3sas/mpt3sas_transport.c | 39 +- drivers/scsi/osd/osd_initiator.c | 2 +- drivers/scsi/sd.c | 2 +- drivers/scsi/sd_dif.c | 30 +- drivers/spi/spi-mpc512x-psc.c | 26 +- drivers/ssb/Kconfig | 1 + drivers/ssb/driver_gpio.c | 306 ++++- drivers/ssb/main.c | 12 +- drivers/staging/Kconfig | 4 - drivers/staging/Makefile | 2 - drivers/staging/lustre/lustre/llite/lloop.c | 26 +- drivers/staging/zsmalloc/Kconfig | 24 - drivers/staging/zsmalloc/Makefile | 3 - drivers/target/target_core_iblock.c | 2 +- drivers/tty/serial/bcm63xx_uart.c | 9 +- drivers/tty/serial/mpc52xx_uart.c | 90 +- drivers/usb/host/fsl-mph-dr-of.c | 13 +- drivers/video/backlight/lcd.c | 2 +- fs/bio-integrity.c | 170 +-- fs/bio.c | 502 ++++---- fs/btrfs/Kconfig | 3 +- fs/btrfs/Makefile | 2 +- fs/btrfs/backref.c | 195 ++-- fs/btrfs/btrfs_inode.h | 4 + fs/btrfs/check-integrity.c | 20 +- fs/btrfs/compression.c | 39 +- fs/btrfs/ctree.c | 552 +++++++-- fs/btrfs/ctree.h | 134 ++- fs/btrfs/delayed-inode.c | 208 ++-- fs/btrfs/delayed-inode.h | 8 +- fs/btrfs/delayed-ref.c | 300 ++--- fs/btrfs/delayed-ref.h | 26 +- fs/btrfs/dev-replace.c | 56 +- fs/btrfs/dir-item.c | 8 +- fs/btrfs/disk-io.c | 266 ++--- fs/btrfs/extent-tree.c | 617 +++++----- fs/btrfs/extent_io.c | 277 +++-- fs/btrfs/extent_io.h | 9 +- fs/btrfs/extent_map.c | 74 +- fs/btrfs/file-item.c | 23 +- fs/btrfs/file.c | 216 +++- fs/btrfs/free-space-cache.c | 23 +- fs/btrfs/hash.c | 50 + fs/btrfs/hash.h | 11 +- fs/btrfs/inode-item.c | 65 -- fs/btrfs/inode.c | 483 +++++--- fs/btrfs/ioctl.c | 348 +++++- fs/btrfs/lzo.c | 6 +- fs/btrfs/ordered-data.c | 15 +- fs/btrfs/orphan.c | 20 - fs/btrfs/print-tree.c | 4 +- fs/btrfs/props.c | 427 +++++++ fs/btrfs/props.h | 42 + fs/btrfs/qgroup.c | 57 +- fs/btrfs/raid56.c | 22 +- fs/btrfs/reada.c | 9 +- fs/btrfs/relocation.c | 105 +- fs/btrfs/root-tree.c | 19 +- fs/btrfs/scrub.c | 146 +-- fs/btrfs/send.c | 961 ++++++++++++--- fs/btrfs/super.c | 241 ++-- fs/btrfs/sysfs.c | 617 ++++++++++ fs/btrfs/sysfs.h | 64 + fs/btrfs/tests/btrfs-tests.h | 2 +- fs/btrfs/transaction.c | 55 +- fs/btrfs/transaction.h | 3 +- fs/btrfs/tree-log.c | 209 +++- fs/btrfs/ulist.c | 117 +- fs/btrfs/ulist.h | 39 +- fs/btrfs/uuid-tree.c | 13 +- fs/btrfs/volumes.c | 108 +- fs/btrfs/xattr.c | 12 +- fs/btrfs/zlib.c | 8 +- fs/buffer.c | 14 +- fs/ceph/acl.c | 56 +- fs/ceph/super.h | 1 - fs/direct-io.c | 4 +- fs/ext4/page-io.c | 8 +- fs/f2fs/data.c | 35 +- fs/gfs2/lops.c | 2 +- fs/gfs2/ops_fstype.c | 2 +- fs/hfsplus/wrapper.c | 2 +- fs/jfs/jfs_logmgr.c | 12 +- fs/jfs/jfs_metapage.c | 9 +- fs/logfs/dev_bdev.c | 38 +- fs/mpage.c | 19 +- fs/nfs/blocklayout/blocklayout.c | 43 +- fs/nfs/nfs3proc.c | 4 +- fs/nfsd/acl.h | 2 +- fs/nfsd/cache.h | 8 - fs/nfsd/idmap.h | 4 +- fs/nfsd/netns.h | 1 + fs/nfsd/nfs3xdr.c | 14 +- fs/nfsd/nfs4acl.c | 20 +- fs/nfsd/nfs4idmap.c | 50 +- fs/nfsd/nfs4proc.c | 57 +- fs/nfsd/nfs4state.c | 40 +- fs/nfsd/nfs4xdr.c | 178 +-- fs/nfsd/nfscache.c | 36 +- fs/nfsd/nfssvc.c | 30 +- fs/nfsd/nfsxdr.c | 2 +- fs/nfsd/vfs.c | 40 +- fs/nfsd/vfs.h | 2 - fs/nfsd/xdr3.h | 3 + fs/nfsd/xdr4.h | 4 +- fs/nilfs2/segbuf.c | 3 +- fs/ocfs2/cluster/heartbeat.c | 2 +- fs/xfs/xfs_aops.c | 2 +- fs/xfs/xfs_buf.c | 4 +- include/dt-bindings/clock/mpc512x-clock.h | 76 ++ include/linux/bcma/bcma_driver_chipcommon.h | 1 + include/linux/bio.h | 283 +++-- include/linux/blk-mq.h | 13 +- include/linux/blk_types.h | 24 +- include/linux/blkdev.h | 15 +- include/linux/bootmem.h | 4 +- include/linux/ceph/messenger.h | 4 +- include/linux/clk-provider.h | 16 + include/linux/cmdline-parser.h | 8 +- include/linux/dm-io.h | 4 +- include/linux/linkage.h | 19 +- include/linux/rwsem.h | 11 + include/linux/serial_bcm63xx.h | 119 ++ include/linux/smp.h | 6 +- include/linux/ssb/ssb.h | 1 + include/linux/sunrpc/svc.h | 6 +- .../staging/zsmalloc => include/linux}/zsmalloc.h | 1 + include/trace/events/bcache.h | 36 +- include/trace/events/block.h | 26 +- include/trace/events/btrfs.h | 23 +- include/trace/events/f2fs.h | 4 +- include/uapi/linux/bcache.h | 3 +- include/uapi/linux/btrfs.h | 13 + include/uapi/linux/fd.h | 3 +- include/uapi/linux/xattr.h | 3 + kernel/power/block_io.c | 2 +- kernel/smp.c | 68 +- kernel/trace/blktrace.c | 15 +- lib/kobject.c | 1 + mm/Kconfig | 25 + mm/Makefile | 1 + mm/bounce.c | 44 +- mm/memcontrol.c | 7 +- mm/mempolicy.c | 2 +- mm/oom_kill.c | 2 +- mm/page_io.c | 10 +- mm/slub.c | 19 +- .../zsmalloc/zsmalloc-main.c => mm/zsmalloc.c | 4 +- net/ceph/messenger.c | 43 +- net/compat.c | 9 +- net/sunrpc/auth_gss/gss_krb5_keys.c | 17 +- net/sunrpc/auth_gss/gss_rpc_upcall.c | 2 - net/sunrpc/auth_gss/svcauth_gss.c | 82 +- net/sunrpc/cache.c | 4 +- net/sunrpc/netns.h | 1 - net/sunrpc/svc.c | 25 +- net/sunrpc/xprtsock.c | 7 +- scripts/setlocalversion | 3 +- 579 files changed, 19718 insertions(+), 12113 deletions(-) create mode 100644 Documentation/block/biovecs.txt rename {drivers/staging/zram => Documentation/blockdev}/zram.txt (90%) create mode 100644 Documentation/devicetree/bindings/clock/bcm-kona-clock.txt create mode 100644 Documentation/devicetree/bindings/clock/corenet-clock.txt create mode 100644 arch/mips/bcm47xx/bcm47xx_private.h create mode 100644 arch/mips/bcm47xx/buttons.c create mode 100644 arch/mips/bcm47xx/leds.c delete mode 100644 arch/mips/bcm47xx/wgt634u.c create mode 100644 arch/mips/bcm63xx/dev-hsspi.c create mode 100644 arch/mips/boot/compressed/string.c create mode 100644 arch/mips/configs/qi_lb60_defconfig create mode 100644 arch/mips/include/asm/mach-bcm47xx/cpu-feature-overrides.h create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_hsspi.h create mode 100644 arch/mips/include/asm/mach-netlogic/topology.h create mode 100644 arch/mips/kernel/rtlx-cmp.c create mode 100644 arch/mips/kernel/rtlx-mt.c create mode 100644 arch/mips/kernel/segment.c create mode 100644 arch/mips/kernel/vpe-cmp.c create mode 100644 arch/mips/kernel/vpe-mt.c delete mode 100644 arch/mips/mti-malta/malta-console.c create mode 100644 arch/mips/netlogic/dts/xlp_gvp.dts create mode 100644 arch/mips/pci/msi-xlp.c delete mode 100644 arch/powerpc/include/asm/clk_interface.h delete mode 100644 arch/powerpc/kernel/clock.c create mode 100644 arch/powerpc/platforms/512x/clock-commonclk.c delete mode 100644 arch/powerpc/platforms/512x/clock.c rename drivers/{staging => block}/zram/Kconfig (93%) rename drivers/{staging => block}/zram/Makefile (100%) rename drivers/{staging => block}/zram/zram_drv.c (87%) rename drivers/{staging => block}/zram/zram_drv.h (74%) create mode 100644 drivers/cpuidle/Kconfig.powerpc create mode 100644 drivers/cpuidle/cpuidle-powernv.c rename arch/powerpc/platforms/pseries/processor_idle.c => drivers/cpuidle/cpuidle-pseries.c (75%) create mode 100644 drivers/md/bcache/extents.c create mode 100644 drivers/md/bcache/extents.h delete mode 100644 drivers/staging/zsmalloc/Kconfig delete mode 100644 drivers/staging/zsmalloc/Makefile create mode 100644 fs/btrfs/hash.c create mode 100644 fs/btrfs/props.c create mode 100644 fs/btrfs/props.h create mode 100644 fs/btrfs/sysfs.h create mode 100644 include/dt-bindings/clock/mpc512x-clock.h create mode 100644 include/linux/serial_bcm63xx.h rename {drivers/staging/zsmalloc => include/linux}/zsmalloc.h (97%) rename drivers/staging/zsmalloc/zsmalloc-main.c => mm/zsmalloc.c (99%) From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 9b0cd30..e7651b8 master -> origin/master
commit e7651b819e90da924991d727d3c007200a18670d Merge: 060e8e3 cf93da7 Author: Linus Torvalds <torvalds@linux-foundation.org> Date: Thu Jan 30 20:08:20 2014 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs Pull btrfs updates from Chris Mason: "This is a pretty big pull, and most of these changes have been floating in btrfs-next for a long time. Filipe's properties work is a cool building block for inheriting attributes like compression down on a per inode basis. Jeff Mahoney kicked in code to export filesystem info into sysfs. Otherwise, lots of performance improvements, cleanups and bug fixes. Looks like there are still a few other small pending incrementals, but I wanted to get the bulk of this in first" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (149 commits) Btrfs: fix spin_unlock in check_ref_cleanup Btrfs: setup inode location during btrfs_init_inode_locked Btrfs: don't use ram_bytes for uncompressed inline items Btrfs: fix btrfs_search_slot_for_read backwards iteration Btrfs: do not export ulist functions Btrfs: rework ulist with list+rb_tree Btrfs: fix memory leaks on walking backrefs failure Btrfs: fix send file hole detection leading to data corruption Btrfs: add a reschedule point in btrfs_find_all_roots() Btrfs: make send's file extent item search more efficient Btrfs: fix to catch all errors when resolving indirect ref Btrfs: fix protection between walking backrefs and root deletion btrfs: fix warning while merging two adjacent extents Btrfs: fix infinite path build loops in incremental send btrfs: undo sysfs when open_ctree() fails Btrfs: fix snprintf usage by send's gen_unique_name btrfs: fix defrag 32-bit integer overflow btrfs: sysfs: list the NO_HOLES feature btrfs: sysfs: don't show reserved incompat feature btrfs: call permission checks earlier in ioctls and return EPERM ...
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 init/initramfs.o CC arch/microblaze/kernel/signal.o CC arch/microblaze/kernel/sys_microblaze.o CC init/calibrate.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/mm/consistent.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/cpu/cpuinfo-static.o CC arch/microblaze/kernel/cpu/mb.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 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/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/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/locking/mutex.o CC kernel/irq/handle.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/rcu/srcu.o CC kernel/sched/core.o CC kernel/rcu/tiny.o LD kernel/rcu/built-in.o CC kernel/time/timekeeping.o CC kernel/sched/proc.o CC kernel/time/ntp.o CC kernel/sched/clock.o CC kernel/time/clocksource.o CC kernel/sched/cputime.o CC kernel/sched/idle_task.o CC kernel/time/jiffies.o CC kernel/sched/fair.o CC kernel/time/timer_list.o CC kernel/time/timeconv.o CC kernel/time/posix-clock.o CC kernel/sched/rt.o CC kernel/time/alarmtimer.o CC kernel/sched/deadline.o CC kernel/sched/stop_task.o CC kernel/sched/wait.o CC kernel/time/tick-common.o CC kernel/sched/completion.o CC kernel/time/sched_clock.o CC kernel/sched/stats.o CC kernel/time/tick-oneshot.o CC kernel/sched/debug.o CC kernel/time/tick-sched.o CC kernel/time/timer_stats.o LD kernel/sched/built-in.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
linux_next
Switched to branch 'master' Deleted branch next (was 9cb3e19). 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 9b0cd30..e7651b8 Fast-forward Documentation/block/biodoc.txt | 7 +- Documentation/block/biovecs.txt | 111 ++ .../zram => Documentation/blockdev}/zram.txt | 6 - .../devicetree/bindings/arm/bcm/kona-timer.txt | 7 +- .../devicetree/bindings/clock/bcm-kona-clock.txt | 93 ++ .../devicetree/bindings/clock/corenet-clock.txt | 134 +++ .../devicetree/bindings/mmc/kona-sdhci.txt | 4 + Documentation/filesystems/btrfs.txt | 47 +- Documentation/filesystems/nfs/nfs41-server.txt | 42 +- Documentation/filesystems/proc.txt | 4 +- Documentation/filesystems/vfs.txt | 12 +- MAINTAINERS | 18 +- Makefile | 11 +- arch/arc/include/asm/linkage.h | 2 + arch/arm/boot/dts/bcm11351-brt.dts | 6 + arch/arm/boot/dts/bcm11351.dtsi | 170 ++- arch/arm/boot/dts/bcm28155-ap.dts | 28 + arch/arm/boot/dts/moxart-uc7112lx.dts | 8 + arch/arm/boot/dts/moxart.dtsi | 6 - arch/frv/Makefile | 7 - arch/m68k/emu/nfblock.c | 13 +- arch/mips/Kconfig | 221 ++-- arch/mips/Makefile | 2 +- arch/mips/alchemy/common/power.c | 1 - arch/mips/ar7/time.c | 1 - arch/mips/ath79/common.h | 1 - arch/mips/bcm47xx/Kconfig | 4 + arch/mips/bcm47xx/Makefile | 3 +- arch/mips/bcm47xx/bcm47xx_private.h | 12 + arch/mips/bcm47xx/board.c | 34 +- arch/mips/bcm47xx/buttons.c | 531 +++++++++ arch/mips/bcm47xx/irq.c | 25 +- arch/mips/bcm47xx/leds.c | 542 +++++++++ arch/mips/bcm47xx/nvram.c | 3 +- arch/mips/bcm47xx/prom.c | 127 +- arch/mips/bcm47xx/serial.c | 6 +- arch/mips/bcm47xx/setup.c | 35 + arch/mips/bcm47xx/sprom.c | 18 +- arch/mips/bcm47xx/wgt634u.c | 174 --- arch/mips/bcm63xx/Kconfig | 8 + arch/mips/bcm63xx/Makefile | 4 +- arch/mips/bcm63xx/boards/board_bcm963xx.c | 3 + arch/mips/bcm63xx/clk.c | 42 + arch/mips/bcm63xx/cpu.c | 6 +- arch/mips/bcm63xx/dev-hsspi.c | 47 + arch/mips/bcm63xx/early_printk.c | 3 +- arch/mips/bcm63xx/prom.c | 14 +- arch/mips/boot/compressed/Makefile | 4 +- arch/mips/boot/compressed/dbg.c | 1 - arch/mips/boot/compressed/decompress.c | 22 - arch/mips/boot/compressed/string.c | 28 + arch/mips/boot/compressed/uart-16550.c | 5 +- arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c | 1 + .../cavium-octeon/executive/cvmx-helper-board.c | 27 + .../cavium-octeon/executive/cvmx-helper-util.c | 4 + arch/mips/cavium-octeon/executive/cvmx-helper.c | 10 +- arch/mips/cavium-octeon/executive/cvmx-pko.c | 3 +- arch/mips/cavium-octeon/executive/cvmx-spi.c | 1 + arch/mips/cavium-octeon/octeon-platform.c | 38 +- arch/mips/cavium-octeon/octeon_3xxx.dts | 19 + arch/mips/cavium-octeon/smp.c | 1 - arch/mips/configs/ar7_defconfig | 1 - arch/mips/configs/bcm47xx_defconfig | 623 +--------- arch/mips/configs/bcm63xx_defconfig | 1 - arch/mips/configs/cobalt_defconfig | 1 - arch/mips/configs/gpr_defconfig | 1 - arch/mips/configs/jmr3927_defconfig | 1 - arch/mips/configs/lasat_defconfig | 1 - arch/mips/configs/maltasmvp_defconfig | 3 +- arch/mips/configs/markeins_defconfig | 1 - arch/mips/configs/mtx1_defconfig | 1 - arch/mips/configs/pnx8335_stb225_defconfig | 1 - arch/mips/configs/qi_lb60_defconfig | 188 +++ arch/mips/configs/rb532_defconfig | 1 - arch/mips/configs/rbtx49xx_defconfig | 1 - arch/mips/fw/arc/file.c | 1 - arch/mips/include/asm/amon.h | 15 +- arch/mips/include/asm/asmmacro-32.h | 42 - arch/mips/include/asm/asmmacro-64.h | 96 -- arch/mips/include/asm/asmmacro.h | 107 ++ arch/mips/include/asm/bmips.h | 29 +- arch/mips/include/asm/cpu-features.h | 7 + arch/mips/include/asm/cpu-info.h | 3 + arch/mips/include/asm/cpu-type.h | 15 +- arch/mips/include/asm/cpu.h | 12 +- arch/mips/include/asm/dma-coherence.h | 9 + arch/mips/include/asm/elf.h | 31 +- arch/mips/include/asm/fpu.h | 104 +- arch/mips/include/asm/highmem.h | 1 - arch/mips/include/asm/kvm_host.h | 7 - arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 1 - arch/mips/include/asm/mach-bcm47xx/bcm47xx.h | 2 + arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 1 + .../asm/mach-bcm47xx/cpu-feature-overrides.h | 82 ++ arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 18 + .../include/asm/mach-bcm63xx/bcm63xx_dev_hsspi.h | 8 + arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 120 -- arch/mips/include/asm/mach-generic/dma-coherence.h | 4 - arch/mips/include/asm/mach-generic/floppy.h | 1 - arch/mips/include/asm/mach-generic/ide.h | 6 +- arch/mips/include/asm/mach-jazz/floppy.h | 1 - arch/mips/include/asm/mach-jz4740/platform.h | 1 + arch/mips/include/asm/mach-netlogic/irq.h | 3 +- arch/mips/include/asm/mach-netlogic/multi-node.h | 33 +- arch/mips/include/asm/mach-netlogic/topology.h | 20 + arch/mips/include/asm/mips-boards/piix4.h | 7 + arch/mips/include/asm/mipsregs.h | 85 +- arch/mips/include/asm/netlogic/common.h | 24 +- arch/mips/include/asm/netlogic/mips-extns.h | 7 +- arch/mips/include/asm/netlogic/xlp-hal/bridge.h | 69 +- arch/mips/include/asm/netlogic/xlp-hal/iomap.h | 48 +- arch/mips/include/asm/netlogic/xlp-hal/pcibus.h | 41 +- arch/mips/include/asm/netlogic/xlp-hal/pic.h | 77 +- arch/mips/include/asm/netlogic/xlp-hal/sys.h | 18 +- arch/mips/include/asm/netlogic/xlp-hal/uart.h | 3 +- arch/mips/include/asm/netlogic/xlp-hal/xlp.h | 38 +- arch/mips/include/asm/netlogic/xlr/xlr.h | 5 - arch/mips/include/asm/octeon/cvmx-helper-board.h | 9 + arch/mips/include/asm/page.h | 25 + arch/mips/include/asm/rtlx.h | 49 +- arch/mips/include/asm/switch_to.h | 16 +- arch/mips/include/asm/syscall.h | 2 +- arch/mips/include/asm/thread_info.h | 4 +- arch/mips/include/asm/tlb.h | 4 + arch/mips/include/asm/vpe.h | 131 ++- arch/mips/include/uapi/asm/inst.h | 7 +- arch/mips/jz4740/board-qi_lb60.c | 1 + arch/mips/jz4740/platform.c | 41 +- arch/mips/kernel/Makefile | 5 + arch/mips/kernel/binfmt_elfo32.c | 14 + arch/mips/kernel/bmips_vec.S | 56 +- arch/mips/kernel/cpu-probe.c | 103 +- arch/mips/kernel/crash.c | 1 - arch/mips/kernel/genex.S | 1 + arch/mips/kernel/idle.c | 2 + arch/mips/kernel/proc.c | 48 +- arch/mips/kernel/process.c | 6 +- arch/mips/kernel/ptrace.c | 60 +- arch/mips/kernel/ptrace32.c | 53 +- arch/mips/kernel/r4k_fpu.S | 74 +- arch/mips/kernel/r4k_switch.S | 45 +- arch/mips/kernel/rtlx-cmp.c | 116 ++ arch/mips/kernel/rtlx-mt.c | 148 +++ arch/mips/kernel/rtlx.c | 273 +---- arch/mips/kernel/segment.c | 110 ++ arch/mips/kernel/signal.c | 10 +- arch/mips/kernel/signal32.c | 10 +- arch/mips/kernel/smp-bmips.c | 312 +++-- arch/mips/kernel/smp-cmp.c | 3 + arch/mips/kernel/smp-mt.c | 28 + arch/mips/kernel/spram.c | 3 +- arch/mips/kernel/sync-r4k.c | 1 - arch/mips/kernel/traps.c | 71 +- arch/mips/kernel/vpe-cmp.c | 180 +++ arch/mips/kernel/vpe-mt.c | 523 +++++++++ arch/mips/kernel/vpe.c | 882 ++------------ arch/mips/kvm/kvm_mips.c | 1 - arch/mips/kvm/kvm_tlb.c | 135 +-- arch/mips/lantiq/xway/clk.c | 1 - arch/mips/lantiq/xway/dma.c | 4 - arch/mips/lasat/at93c.c | 1 - arch/mips/lasat/picvue.c | 1 - arch/mips/lib/uncached.c | 1 - arch/mips/loongson/lemote-2f/clock.c | 1 - arch/mips/math-emu/cp1emu.c | 42 +- arch/mips/math-emu/kernel_linkage.c | 6 +- arch/mips/mm/c-octeon.c | 1 - arch/mips/mm/c-r3k.c | 1 - arch/mips/mm/c-r4k.c | 26 +- arch/mips/mm/cache.c | 1 - arch/mips/mm/cex-sb1.S | 1 - arch/mips/mm/dma-default.c | 2 + arch/mips/mm/hugetlbpage.c | 1 - arch/mips/mm/init.c | 2 - arch/mips/mm/page.c | 1 - arch/mips/mm/sc-mips.c | 2 + arch/mips/mm/sc-rm7k.c | 1 - arch/mips/mm/tlb-r3k.c | 1 - arch/mips/mm/tlb-r4k.c | 48 +- arch/mips/mm/tlb-r8k.c | 1 - arch/mips/mm/tlbex.c | 2 +- arch/mips/mm/uasm-micromips.c | 1 - arch/mips/mm/uasm-mips.c | 1 - arch/mips/mti-malta/Makefile | 2 - arch/mips/mti-malta/malta-amon.c | 49 +- arch/mips/mti-malta/malta-console.c | 47 - arch/mips/mti-malta/malta-init.c | 58 +- arch/mips/mti-malta/malta-int.c | 127 +- arch/mips/mti-malta/malta-platform.c | 2 + arch/mips/mti-malta/malta-time.c | 16 +- arch/mips/mti-sead3/Makefile | 2 + arch/mips/mti-sead3/sead3-pic32-bus.c | 1 - arch/mips/mti-sead3/sead3-setup.c | 84 +- arch/mips/mti-sead3/sead3-time.c | 4 - arch/mips/mti-sead3/sead3.dts | 4 - arch/mips/netlogic/Kconfig | 9 + arch/mips/netlogic/common/earlycons.c | 2 + arch/mips/netlogic/common/irq.c | 72 +- arch/mips/netlogic/common/reset.S | 63 +- arch/mips/netlogic/common/smp.c | 8 +- arch/mips/netlogic/common/smpboot.S | 4 +- arch/mips/netlogic/dts/Makefile | 1 + arch/mips/netlogic/dts/xlp_gvp.dts | 76 ++ arch/mips/netlogic/xlp/dt.c | 7 +- arch/mips/netlogic/xlp/nlm_hal.c | 71 +- arch/mips/netlogic/xlp/setup.c | 25 +- arch/mips/netlogic/xlp/usb-init-xlp2.c | 88 +- arch/mips/netlogic/xlp/wakeup.c | 92 +- arch/mips/netlogic/xlr/platform.c | 4 +- arch/mips/netlogic/xlr/setup.c | 20 - arch/mips/netlogic/xlr/wakeup.c | 3 +- arch/mips/oprofile/common.c | 2 + arch/mips/oprofile/op_model_mipsxx.c | 8 + arch/mips/pci/Makefile | 1 + arch/mips/pci/fixup-malta.c | 11 + arch/mips/pci/fixup-rc32434.c | 1 - arch/mips/pci/fixup-sb1250.c | 1 - arch/mips/pci/msi-xlp.c | 494 ++++++++ arch/mips/pci/ops-bcm63xx.c | 1 - arch/mips/pci/ops-bonito64.c | 1 - arch/mips/pci/ops-lantiq.c | 1 - arch/mips/pci/ops-loongson2.c | 1 - arch/mips/pci/ops-mace.c | 1 - arch/mips/pci/ops-msc.c | 1 - arch/mips/pci/ops-nile4.c | 1 - arch/mips/pci/ops-rc32434.c | 1 - arch/mips/pci/pci-ip27.c | 1 - arch/mips/pci/pci-malta.c | 6 +- arch/mips/pci/pci-rt3883.c | 3 - arch/mips/pci/pci-xlp.c | 110 +- arch/mips/pmcs-msp71xx/Kconfig | 1 + arch/mips/ralink/Kconfig | 1 + arch/mips/sgi-ip27/ip27-console.c | 1 - arch/mips/sgi-ip27/ip27-irq-pci.c | 1 - arch/mips/sgi-ip27/ip27-klconfig.c | 1 - arch/mips/sgi-ip27/ip27-xtalk.c | 1 - arch/mn10300/Makefile | 8 - arch/openrisc/kernel/entry.S | 59 +- arch/openrisc/kernel/signal.c | 233 ++-- arch/powerpc/Kconfig | 6 +- arch/powerpc/boot/dts/ac14xx.dts | 7 + arch/powerpc/boot/dts/mpc5121.dtsi | 113 +- arch/powerpc/boot/dts/mpc5125twr.dts | 53 +- arch/powerpc/include/asm/clk_interface.h | 20 - arch/powerpc/include/asm/mpc5121.h | 7 +- arch/powerpc/include/asm/pgtable-ppc64.h | 6 +- arch/powerpc/include/asm/processor.h | 7 - arch/powerpc/include/asm/systbl.h | 2 + arch/powerpc/include/asm/unistd.h | 2 +- arch/powerpc/include/uapi/asm/unistd.h | 3 +- arch/powerpc/kernel/Makefile | 1 - arch/powerpc/kernel/cacheinfo.c | 3 + arch/powerpc/kernel/clock.c | 82 -- arch/powerpc/kernel/process.c | 2 +- arch/powerpc/kernel/signal_32.c | 19 +- arch/powerpc/kernel/sysfs.c | 2 - arch/powerpc/mm/hugetlbpage.c | 4 +- arch/powerpc/mm/numa.c | 2 +- arch/powerpc/mm/slice.c | 2 +- arch/powerpc/mm/tlb_low_64e.S | 3 +- arch/powerpc/mm/tlb_nohash.c | 2 + arch/powerpc/platforms/512x/Kconfig | 2 +- arch/powerpc/platforms/512x/Makefile | 3 +- arch/powerpc/platforms/512x/clock-commonclk.c | 1221 ++++++++++++++++++++ arch/powerpc/platforms/512x/clock.c | 754 ------------ arch/powerpc/platforms/512x/mpc512x_shared.c | 169 +-- arch/powerpc/platforms/52xx/Kconfig | 2 +- arch/powerpc/platforms/powernv/setup.c | 13 +- arch/powerpc/platforms/pseries/Kconfig | 9 - arch/powerpc/platforms/pseries/Makefile | 1 - arch/powerpc/sysdev/axonram.c | 21 +- arch/powerpc/sysdev/dart_iommu.c | 1 + arch/x86/Makefile | 22 + arch/x86/boot/Makefile | 15 +- arch/x86/boot/cpuflags.c | 25 +- arch/x86/boot/video.h | 2 +- arch/x86/include/asm/paravirt.h | 2 +- arch/x86/include/asm/paravirt_types.h | 9 +- arch/x86/include/asm/pgtable_types.h | 3 +- arch/x86/include/asm/thread_info.h | 8 +- arch/x86/kernel/kvm.c | 2 +- arch/x86/kernel/vsmp_64.c | 8 +- arch/x86/lguest/boot.c | 12 +- arch/x86/math-emu/errors.c | 5 - arch/x86/realmode/rm/Makefile | 17 +- arch/x86/tools/relocs.c | 30 +- arch/x86/tools/relocs.h | 7 +- arch/x86/tools/relocs_common.c | 16 +- arch/x86/xen/irq.c | 8 +- arch/x86/xen/mmu.c | 16 +- arch/x86/xen/setup.c | 4 +- arch/x86/xen/spinlock.c | 2 +- arch/xtensa/platforms/iss/simdisk.c | 14 +- block/blk-core.c | 61 +- block/blk-exec.c | 4 + block/blk-flush.c | 2 +- block/blk-integrity.c | 40 +- block/blk-lib.c | 12 +- block/blk-map.c | 6 +- block/blk-merge.c | 66 +- block/blk-mq-cpu.c | 37 +- block/blk-mq.c | 123 +- block/blk-mq.h | 3 +- block/blk-settings.c | 4 + block/blk-sysfs.c | 1 + block/blk-throttle.c | 14 +- block/cmdline-parser.c | 18 +- block/elevator.c | 2 +- block/scsi_ioctl.c | 6 +- drivers/bcma/Kconfig | 1 + drivers/bcma/driver_gpio.c | 137 ++- drivers/block/Kconfig | 2 + drivers/block/Makefile | 1 + drivers/block/aoe/aoe.h | 10 +- drivers/block/aoe/aoecmd.c | 153 +-- drivers/block/brd.c | 16 +- drivers/block/cciss.c | 4 +- drivers/block/drbd/drbd_actlog.c | 2 +- drivers/block/drbd/drbd_bitmap.c | 2 +- drivers/block/drbd/drbd_main.c | 27 +- drivers/block/drbd/drbd_receiver.c | 19 +- drivers/block/drbd/drbd_req.c | 6 +- drivers/block/drbd/drbd_req.h | 2 +- drivers/block/drbd/drbd_worker.c | 8 +- drivers/block/floppy.c | 52 +- drivers/block/loop.c | 29 +- drivers/block/mg_disk.c | 2 +- drivers/block/mtip32xx/mtip32xx.c | 270 +++-- drivers/block/mtip32xx/mtip32xx.h | 14 +- drivers/block/nbd.c | 14 +- drivers/block/null_blk.c | 5 + drivers/block/nvme-core.c | 142 +-- drivers/block/paride/pg.c | 2 +- drivers/block/pktcdvd.c | 186 +-- drivers/block/ps3disk.c | 17 +- drivers/block/ps3vram.c | 12 +- drivers/block/rbd.c | 91 +- drivers/block/rsxx/dev.c | 6 +- drivers/block/rsxx/dma.c | 15 +- drivers/block/sx8.c | 16 +- drivers/block/umem.c | 53 +- drivers/block/xen-blkback/blkback.c | 2 +- drivers/block/xen-blkfront.c | 2 +- drivers/{staging => block}/zram/Kconfig | 1 - drivers/{staging => block}/zram/Makefile | 0 drivers/{staging => block}/zram/zram_drv.c | 161 +-- drivers/{staging => block}/zram/zram_drv.h | 32 +- drivers/cdrom/gdrom.c | 4 +- drivers/char/ipmi/ipmi_si_intf.c | 1 + drivers/cpuidle/Kconfig | 5 + drivers/cpuidle/Kconfig.powerpc | 20 + drivers/cpuidle/Makefile | 5 + drivers/cpuidle/cpuidle-powernv.c | 169 +++ .../cpuidle/cpuidle-pseries.c | 79 +- drivers/md/bcache/Makefile | 5 +- drivers/md/bcache/alloc.c | 89 +- drivers/md/bcache/bcache.h | 84 +- drivers/md/bcache/bset.c | 904 ++++++++------- drivers/md/bcache/bset.h | 440 ++++--- drivers/md/bcache/btree.c | 682 ++++------- drivers/md/bcache/btree.h | 62 +- drivers/md/bcache/closure.c | 90 +- drivers/md/bcache/closure.h | 355 ++---- drivers/md/bcache/debug.c | 268 ++--- drivers/md/bcache/debug.h | 27 +- drivers/md/bcache/extents.c | 616 ++++++++++ drivers/md/bcache/extents.h | 13 + drivers/md/bcache/io.c | 196 +--- drivers/md/bcache/journal.c | 87 +- drivers/md/bcache/journal.h | 1 + drivers/md/bcache/movinggc.c | 6 +- drivers/md/bcache/request.c | 197 ++-- drivers/md/bcache/request.h | 21 +- drivers/md/bcache/super.c | 123 +- drivers/md/bcache/sysfs.c | 79 +- drivers/md/bcache/util.c | 4 +- drivers/md/bcache/util.h | 8 + drivers/md/bcache/writeback.c | 6 +- drivers/md/bcache/writeback.h | 2 +- drivers/md/dm-bio-record.h | 37 +- drivers/md/dm-bufio.c | 2 +- drivers/md/dm-cache-policy-mq.c | 4 +- drivers/md/dm-cache-target.c | 28 +- drivers/md/dm-crypt.c | 64 +- drivers/md/dm-delay.c | 7 +- drivers/md/dm-flakey.c | 7 +- drivers/md/dm-io.c | 37 +- drivers/md/dm-linear.c | 3 +- drivers/md/dm-raid1.c | 20 +- drivers/md/dm-region-hash.c | 3 +- drivers/md/dm-snap.c | 19 +- drivers/md/dm-stripe.c | 13 +- drivers/md/dm-switch.c | 4 +- drivers/md/dm-thin.c | 30 +- drivers/md/dm-verity.c | 62 +- drivers/md/dm.c | 189 +-- drivers/md/faulty.c | 19 +- drivers/md/linear.c | 96 +- drivers/md/md.c | 12 +- drivers/md/multipath.c | 13 +- drivers/md/raid0.c | 79 +- drivers/md/raid1.c | 73 +- drivers/md/raid10.c | 194 ++-- drivers/md/raid5.c | 85 +- drivers/media/platform/fsl-viu.c | 2 +- drivers/message/fusion/mptsas.c | 8 +- drivers/mtd/nand/mpc5121_nfc.c | 2 +- drivers/mtd/ubi/attach.c | 4 +- drivers/mtd/ubi/build.c | 4 +- drivers/mtd/ubi/io.c | 54 +- drivers/net/can/mscan/mpc5xxx_can.c | 270 +++-- drivers/net/phy/mdio_bus.c | 1 + drivers/s390/block/dasd_diag.c | 10 +- drivers/s390/block/dasd_eckd.c | 48 +- drivers/s390/block/dasd_fba.c | 26 +- drivers/s390/block/dcssblk.c | 21 +- drivers/s390/block/scm_blk.c | 8 +- drivers/s390/block/scm_blk_cluster.c | 4 +- drivers/s390/block/xpram.c | 19 +- drivers/scsi/libsas/sas_expander.c | 8 +- drivers/scsi/mpt2sas/mpt2sas_transport.c | 41 +- drivers/scsi/mpt3sas/mpt3sas_transport.c | 39 +- drivers/scsi/osd/osd_initiator.c | 2 +- drivers/scsi/sd.c | 2 +- drivers/scsi/sd_dif.c | 30 +- drivers/spi/spi-mpc512x-psc.c | 26 +- drivers/ssb/Kconfig | 1 + drivers/ssb/driver_gpio.c | 306 ++++- drivers/ssb/main.c | 12 +- drivers/staging/Kconfig | 4 - drivers/staging/Makefile | 2 - drivers/staging/lustre/lustre/llite/lloop.c | 26 +- drivers/staging/zsmalloc/Kconfig | 24 - drivers/staging/zsmalloc/Makefile | 3 - drivers/target/target_core_iblock.c | 2 +- drivers/tty/serial/bcm63xx_uart.c | 9 +- drivers/tty/serial/mpc52xx_uart.c | 90 +- drivers/usb/host/fsl-mph-dr-of.c | 13 +- drivers/video/backlight/lcd.c | 2 +- fs/bio-integrity.c | 170 +-- fs/bio.c | 502 ++++---- fs/btrfs/Kconfig | 3 +- fs/btrfs/Makefile | 2 +- fs/btrfs/backref.c | 195 ++-- fs/btrfs/btrfs_inode.h | 4 + fs/btrfs/check-integrity.c | 20 +- fs/btrfs/compression.c | 39 +- fs/btrfs/ctree.c | 552 +++++++-- fs/btrfs/ctree.h | 134 ++- fs/btrfs/delayed-inode.c | 208 ++-- fs/btrfs/delayed-inode.h | 8 +- fs/btrfs/delayed-ref.c | 300 ++--- fs/btrfs/delayed-ref.h | 26 +- fs/btrfs/dev-replace.c | 56 +- fs/btrfs/dir-item.c | 8 +- fs/btrfs/disk-io.c | 266 ++--- fs/btrfs/extent-tree.c | 617 +++++----- fs/btrfs/extent_io.c | 277 +++-- fs/btrfs/extent_io.h | 9 +- fs/btrfs/extent_map.c | 74 +- fs/btrfs/file-item.c | 23 +- fs/btrfs/file.c | 216 +++- fs/btrfs/free-space-cache.c | 23 +- fs/btrfs/hash.c | 50 + fs/btrfs/hash.h | 11 +- fs/btrfs/inode-item.c | 65 -- fs/btrfs/inode.c | 483 +++++--- fs/btrfs/ioctl.c | 348 +++++- fs/btrfs/lzo.c | 6 +- fs/btrfs/ordered-data.c | 15 +- fs/btrfs/orphan.c | 20 - fs/btrfs/print-tree.c | 4 +- fs/btrfs/props.c | 427 +++++++ fs/btrfs/props.h | 42 + fs/btrfs/qgroup.c | 57 +- fs/btrfs/raid56.c | 22 +- fs/btrfs/reada.c | 9 +- fs/btrfs/relocation.c | 105 +- fs/btrfs/root-tree.c | 19 +- fs/btrfs/scrub.c | 146 +-- fs/btrfs/send.c | 961 ++++++++++++--- fs/btrfs/super.c | 241 ++-- fs/btrfs/sysfs.c | 617 ++++++++++ fs/btrfs/sysfs.h | 64 + fs/btrfs/tests/btrfs-tests.h | 2 +- fs/btrfs/transaction.c | 55 +- fs/btrfs/transaction.h | 3 +- fs/btrfs/tree-log.c | 209 +++- fs/btrfs/ulist.c | 117 +- fs/btrfs/ulist.h | 39 +- fs/btrfs/uuid-tree.c | 13 +- fs/btrfs/volumes.c | 108 +- fs/btrfs/xattr.c | 12 +- fs/btrfs/zlib.c | 8 +- fs/buffer.c | 14 +- fs/ceph/acl.c | 56 +- fs/ceph/super.h | 1 - fs/direct-io.c | 4 +- fs/ext4/page-io.c | 8 +- fs/f2fs/data.c | 35 +- fs/gfs2/lops.c | 2 +- fs/gfs2/ops_fstype.c | 2 +- fs/hfsplus/wrapper.c | 2 +- fs/jfs/jfs_logmgr.c | 12 +- fs/jfs/jfs_metapage.c | 9 +- fs/logfs/dev_bdev.c | 38 +- fs/mpage.c | 19 +- fs/nfs/blocklayout/blocklayout.c | 43 +- fs/nfs/nfs3proc.c | 4 +- fs/nfsd/acl.h | 2 +- fs/nfsd/cache.h | 8 - fs/nfsd/idmap.h | 4 +- fs/nfsd/netns.h | 1 + fs/nfsd/nfs3xdr.c | 14 +- fs/nfsd/nfs4acl.c | 20 +- fs/nfsd/nfs4idmap.c | 50 +- fs/nfsd/nfs4proc.c | 57 +- fs/nfsd/nfs4state.c | 40 +- fs/nfsd/nfs4xdr.c | 178 +-- fs/nfsd/nfscache.c | 36 +- fs/nfsd/nfssvc.c | 30 +- fs/nfsd/nfsxdr.c | 2 +- fs/nfsd/vfs.c | 40 +- fs/nfsd/vfs.h | 2 - fs/nfsd/xdr3.h | 3 + fs/nfsd/xdr4.h | 4 +- fs/nilfs2/segbuf.c | 3 +- fs/ocfs2/cluster/heartbeat.c | 2 +- fs/xfs/xfs_aops.c | 2 +- fs/xfs/xfs_buf.c | 4 +- include/dt-bindings/clock/mpc512x-clock.h | 76 ++ include/linux/bcma/bcma_driver_chipcommon.h | 1 + include/linux/bio.h | 283 +++-- include/linux/blk-mq.h | 13 +- include/linux/blk_types.h | 24 +- include/linux/blkdev.h | 15 +- include/linux/bootmem.h | 4 +- include/linux/ceph/messenger.h | 4 +- include/linux/clk-provider.h | 16 + include/linux/cmdline-parser.h | 8 +- include/linux/dm-io.h | 4 +- include/linux/linkage.h | 19 +- include/linux/rwsem.h | 11 + include/linux/serial_bcm63xx.h | 119 ++ include/linux/smp.h | 6 +- include/linux/ssb/ssb.h | 1 + include/linux/sunrpc/svc.h | 6 +- .../staging/zsmalloc => include/linux}/zsmalloc.h | 1 + include/trace/events/bcache.h | 36 +- include/trace/events/block.h | 26 +- include/trace/events/btrfs.h | 23 +- include/trace/events/f2fs.h | 4 +- include/uapi/linux/bcache.h | 3 +- include/uapi/linux/btrfs.h | 13 + include/uapi/linux/fd.h | 3 +- include/uapi/linux/xattr.h | 3 + kernel/power/block_io.c | 2 +- kernel/smp.c | 68 +- kernel/trace/blktrace.c | 15 +- lib/kobject.c | 1 + mm/Kconfig | 25 + mm/Makefile | 1 + mm/bounce.c | 44 +- mm/memcontrol.c | 7 +- mm/mempolicy.c | 2 +- mm/oom_kill.c | 2 +- mm/page_io.c | 10 +- mm/slub.c | 19 +- .../zsmalloc/zsmalloc-main.c => mm/zsmalloc.c | 4 +- net/ceph/messenger.c | 43 +- net/compat.c | 9 +- net/sunrpc/auth_gss/gss_krb5_keys.c | 17 +- net/sunrpc/auth_gss/gss_rpc_upcall.c | 2 - net/sunrpc/auth_gss/svcauth_gss.c | 82 +- net/sunrpc/cache.c | 4 +- net/sunrpc/netns.h | 1 - net/sunrpc/svc.c | 25 +- net/sunrpc/xprtsock.c | 7 +- scripts/setlocalversion | 3 +- 579 files changed, 19718 insertions(+), 12113 deletions(-) create mode 100644 Documentation/block/biovecs.txt rename {drivers/staging/zram => Documentation/blockdev}/zram.txt (90%) create mode 100644 Documentation/devicetree/bindings/clock/bcm-kona-clock.txt create mode 100644 Documentation/devicetree/bindings/clock/corenet-clock.txt create mode 100644 arch/mips/bcm47xx/bcm47xx_private.h create mode 100644 arch/mips/bcm47xx/buttons.c create mode 100644 arch/mips/bcm47xx/leds.c delete mode 100644 arch/mips/bcm47xx/wgt634u.c create mode 100644 arch/mips/bcm63xx/dev-hsspi.c create mode 100644 arch/mips/boot/compressed/string.c create mode 100644 arch/mips/configs/qi_lb60_defconfig create mode 100644 arch/mips/include/asm/mach-bcm47xx/cpu-feature-overrides.h create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_hsspi.h create mode 100644 arch/mips/include/asm/mach-netlogic/topology.h create mode 100644 arch/mips/kernel/rtlx-cmp.c create mode 100644 arch/mips/kernel/rtlx-mt.c create mode 100644 arch/mips/kernel/segment.c create mode 100644 arch/mips/kernel/vpe-cmp.c create mode 100644 arch/mips/kernel/vpe-mt.c delete mode 100644 arch/mips/mti-malta/malta-console.c create mode 100644 arch/mips/netlogic/dts/xlp_gvp.dts create mode 100644 arch/mips/pci/msi-xlp.c delete mode 100644 arch/powerpc/include/asm/clk_interface.h delete mode 100644 arch/powerpc/kernel/clock.c create mode 100644 arch/powerpc/platforms/512x/clock-commonclk.c delete mode 100644 arch/powerpc/platforms/512x/clock.c rename drivers/{staging => block}/zram/Kconfig (93%) rename drivers/{staging => block}/zram/Makefile (100%) rename drivers/{staging => block}/zram/zram_drv.c (87%) rename drivers/{staging => block}/zram/zram_drv.h (74%) create mode 100644 drivers/cpuidle/Kconfig.powerpc create mode 100644 drivers/cpuidle/cpuidle-powernv.c rename arch/powerpc/platforms/pseries/processor_idle.c => drivers/cpuidle/cpuidle-pseries.c (75%) create mode 100644 drivers/md/bcache/extents.c create mode 100644 drivers/md/bcache/extents.h delete mode 100644 drivers/staging/zsmalloc/Kconfig delete mode 100644 drivers/staging/zsmalloc/Makefile create mode 100644 fs/btrfs/hash.c create mode 100644 fs/btrfs/props.c create mode 100644 fs/btrfs/props.h create mode 100644 fs/btrfs/sysfs.h create mode 100644 include/dt-bindings/clock/mpc512x-clock.h create mode 100644 include/linux/serial_bcm63xx.h rename {drivers/staging/zsmalloc => include/linux}/zsmalloc.h (97%) rename drivers/staging/zsmalloc/zsmalloc-main.c => mm/zsmalloc.c (99%) From git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next + d276d6e...aa7edc6 akpm -> linux-next/akpm (forced update) + ebb9894...7ac8db3 akpm-base -> linux-next/akpm-base (forced update) + 9cb3e19...7e8bf24 master -> linux-next/master (forced update) 0e47c96..53d8ab2 stable -> linux-next/stable * [new tag] next-20140131 -> next-20140131 Fetching origin From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 9b0cd30..e7651b8 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 7e8bf24ffa6ec03e57398d9fcd0961a2cd9e8d80 Author: Stephen Rothwell <sfr@canb.auug.org.au> Date: Fri Jan 31 13:12:11 2014 +1100 Add linux-next specific files for 20140131 Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
CLEAN . 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
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 CC kernel/bounds.s 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 GEN include/generated/bounds.h CC arch/microblaze/kernel/asm-offsets.s 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 GEN include/generated/asm-offsets.h CALL scripts/checksyscalls.sh HOSTCC scripts/dtc/dtc-parser.tab.o HOSTLD scripts/dtc/dtc <stdin>:1226:2: warning: #warning syscall sched_setattr not implemented <stdin>:1229:2: warning: #warning syscall sched_getattr not implemented HOSTCC scripts/kallsyms 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/bin2c HOSTCC scripts/mod/file2alias.o HOSTCC scripts/sortextable HOSTLD scripts/mod/modpost 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 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 init/calibrate.o CC arch/microblaze/kernel/timer.o CC init/init_task.o CC arch/microblaze/kernel/traps.o CC arch/microblaze/kernel/unwind.o CC init/version.o LD init/mounts.o CC arch/microblaze/kernel/cpu/cache.o LD init/built-in.o CC arch/microblaze/mm/consistent.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/cpu/pvr.o LD arch/microblaze/kernel/cpu/built-in.o CC arch/microblaze/platform/platform.o CC arch/microblaze/kernel/early_printk.o LD arch/microblaze/platform/built-in.o CC arch/microblaze/kernel/microblaze_ksyms.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/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/locking/mutex.o CC kernel/irq/handle.o CC kernel/irq/manage.o CC kernel/locking/semaphore.o CC kernel/locking/rwsem.o CC kernel/locking/lglock.o CC kernel/irq/spurious.o CC kernel/locking/rtmutex.o CC kernel/irq/resend.o CC kernel/irq/chip.o CC kernel/locking/rwsem-spinlock.o LD kernel/locking/built-in.o CC kernel/power/qos.o CC kernel/irq/dummychip.o CC kernel/irq/devres.o LD kernel/power/built-in.o CC kernel/irq/autoprobe.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 CC kernel/rcu/srcu.o LD kernel/printk/built-in.o CC kernel/rcu/tiny.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/time/ntp.o CC kernel/time/clocksource.o CC kernel/sched/idle_task.o CC kernel/time/jiffies.o CC kernel/time/timer_list.o CC kernel/sched/fair.o CC kernel/time/timeconv.o CC kernel/sched/rt.o CC kernel/time/posix-clock.o CC kernel/sched/deadline.o CC kernel/time/alarmtimer.o CC kernel/sched/stop_task.o CC kernel/time/clockevents.o CC kernel/sched/wait.o CC kernel/time/tick-common.o CC kernel/sched/completion.o CC kernel/time/sched_clock.o CC kernel/sched/stats.o CC kernel/time/tick-oneshot.o CC kernel/sched/debug.o CC kernel/time/tick-sched.o CC kernel/time/timer_stats.o LD kernel/sched/built-in.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