--- /dev/null
+$ date
+Wednesday 10 October 10:02:45 EST 2012
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at f5a246e Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
+Merging origin/master (547b1e8 Fix staging driver use of VM_RESERVED)
+$ git merge origin/master
+Updating f5a246e..547b1e8
+Fast-forward
+ Documentation/00-INDEX | 2 -
+ Documentation/ABI/obsolete/proc-pid-oom_adj | 22 -
+ Documentation/cgroups/memory.txt | 90 +-
+ .../bindings/pinctrl/lantiq,falcon-pinumx.txt | 83 +
+ .../bindings/pinctrl/lantiq,xway-pinumx.txt | 97 +
+ .../devicetree/bindings/spi/spi-octeon.txt | 33 +
+ Documentation/filesystems/proc.txt | 22 +-
+ Documentation/memory.txt | 33 -
+ Documentation/prio_tree.txt | 107 -
+ Documentation/rbtree.txt | 209 +-
+ Documentation/vm/unevictable-lru.txt | 14 +-
+ MAINTAINERS | 10 +
+ arch/Kconfig | 3 +
+ arch/alpha/include/asm/Kbuild | 2 +
+ arch/alpha/kernel/pci-sysfs.c | 2 +-
+ arch/arm/Kconfig | 2 +
+ arch/arm/mm/fault-armv.c | 3 +-
+ arch/arm/mm/fault.c | 1 +
+ arch/arm/mm/flush.c | 3 +-
+ arch/arm64/Kconfig | 4 +
+ arch/avr32/include/asm/Kbuild | 2 +
+ arch/avr32/mm/fault.c | 1 +
+ arch/blackfin/Kconfig | 3 +-
+ arch/blackfin/configs/BF533-EZKIT_defconfig | 7 +-
+ arch/blackfin/configs/BF609-EZKIT_defconfig | 16 +-
+ arch/blackfin/kernel/bfin_gpio.c | 4 +-
+ arch/blackfin/kernel/reboot.c | 1 -
+ arch/blackfin/mach-bf537/boards/cm_bf537e.c | 130 +-
+ arch/blackfin/mach-bf537/boards/stamp.c | 2 +-
+ arch/blackfin/mach-bf609/include/mach/defBF609.h | 271 +
+ arch/blackfin/mach-common/cpufreq.c | 9 +-
+ arch/blackfin/mach-common/ints-priority.c | 1 -
+ arch/blackfin/mach-common/smp.c | 4 +-
+ arch/cris/Kconfig | 1 +
+ arch/cris/include/asm/Kbuild | 2 +
+ arch/cris/mm/fault.c | 1 +
+ arch/frv/Kconfig | 2 +
+ arch/frv/include/asm/Kbuild | 1 +
+ arch/h8300/Kconfig | 1 +
+ arch/h8300/include/asm/Kbuild | 2 +
+ arch/hexagon/include/asm/Kbuild | 1 +
+ arch/hexagon/mm/vm_fault.c | 1 +
+ arch/ia64/include/asm/Kbuild | 1 +
+ arch/ia64/include/asm/hugetlb.h | 4 +
+ arch/ia64/kernel/perfmon.c | 2 +-
+ arch/ia64/mm/fault.c | 1 +
+ arch/ia64/mm/init.c | 4 +-
+ arch/m32r/Kconfig | 1 +
+ arch/m32r/include/asm/Kbuild | 2 +
+ arch/m68k/Kconfig | 2 +
+ arch/m68k/include/asm/Kbuild | 1 +
+ arch/m68k/mm/fault.c | 1 +
+ arch/microblaze/Kconfig | 1 +
+ arch/microblaze/include/asm/Kbuild | 1 +
+ arch/microblaze/include/asm/atomic.h | 1 +
+ arch/microblaze/mm/fault.c | 1 +
+ arch/mips/Kbuild.platforms | 2 +-
+ arch/mips/Kconfig | 47 +-
+ arch/mips/ath79/clock.c | 109 +-
+ arch/mips/ath79/dev-usb.c | 92 +-
+ arch/mips/ath79/mach-db120.c | 2 +
+ arch/mips/bcm63xx/Makefile | 2 +-
+ arch/mips/bcm63xx/boards/board_bcm963xx.c | 26 +-
+ arch/mips/bcm63xx/clk.c | 21 +-
+ arch/mips/bcm63xx/dev-usb-usbd.c | 65 +
+ arch/mips/bcm63xx/irq.c | 22 +-
+ arch/mips/bcm63xx/setup.c | 6 +
+ arch/mips/cavium-octeon/csrc-octeon.c | 93 +-
+ .../cavium-octeon/executive/cvmx-interrupt-rsl.c | 2 +-
+ arch/mips/cavium-octeon/octeon-irq.c | 842 +-
+ arch/mips/cavium-octeon/setup.c | 3 +-
+ ...um-octeon_defconfig => cavium_octeon_defconfig} | 0
+ arch/mips/configs/mipssim_defconfig | 64 -
+ arch/mips/configs/nlm_xlp_defconfig | 133 +-
+ ...5-stb225_defconfig => pnx8335_stb225_defconfig} | 0
+ ...pnx8550-jbs_defconfig => pnx8550_jbs_defconfig} | 0
+ ...0-stb810_defconfig => pnx8550_stb810_defconfig} | 0
+ ...1250-swarm_defconfig => sb1250_swarm_defconfig} | 0
+ arch/mips/configs/sead3_defconfig | 124 +
+ arch/mips/include/asm/cpu-features.h | 4 +-
+ arch/mips/include/asm/cpu.h | 2 +
+ arch/mips/include/asm/gic.h | 49 +-
+ arch/mips/include/asm/hugetlb.h | 4 +
+ arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 30 +
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 93 +-
+ .../asm/mach-bcm63xx/bcm63xx_dev_usb_usbd.h | 17 +
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_iudma.h | 38 +
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 168 +-
+ .../mips/include/asm/mach-bcm63xx/board_bcm963xx.h | 5 +
+ .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 2 +-
+ arch/mips/include/asm/mach-cavium-octeon/irq.h | 7 +-
+ .../include/asm/mach-lantiq/falcon/falcon_irq.h | 2 +
+ .../include/asm/mach-lantiq/falcon/lantiq_soc.h | 4 +
+ arch/mips/include/asm/mach-lantiq/gpio.h | 5 +-
+ .../mips/include/asm/mach-lantiq/xway/lantiq_irq.h | 2 +
+ .../cpu-feature-overrides.h | 15 +-
+ arch/mips/include/asm/mach-sead3/irq.h | 9 +
+ .../include/asm/mach-sead3/kernel-entry-init.h | 52 +
+ .../include/asm/{mach-mipssim => mach-sead3}/war.h | 12 +-
+ arch/mips/include/asm/mips-boards/maltaint.h | 55 +-
+ arch/mips/include/asm/mips-boards/sead3int.h | 19 +
+ arch/mips/include/asm/mips-boards/simint.h | 31 -
+ arch/mips/include/asm/mipsregs.h | 3 +
+ arch/mips/include/asm/octeon/cvmx-agl-defs.h | 1014 +-
+ arch/mips/include/asm/octeon/cvmx-asxx-defs.h | 300 +-
+ arch/mips/include/asm/octeon/cvmx-ciu-defs.h |11333 ++++++++++++++++----
+ arch/mips/include/asm/octeon/cvmx-ciu2-defs.h | 7108 ++++++++++++
+ arch/mips/include/asm/octeon/cvmx-dbg-defs.h | 39 +-
+ arch/mips/include/asm/octeon/cvmx-dpi-defs.h | 411 +-
+ arch/mips/include/asm/octeon/cvmx-fpa-defs.h | 1321 ++-
+ arch/mips/include/asm/octeon/cvmx-gmxx-defs.h | 4966 ++++++++-
+ arch/mips/include/asm/octeon/cvmx-gpio-defs.h | 282 +-
+ arch/mips/include/asm/octeon/cvmx-iob-defs.h | 722 +-
+ arch/mips/include/asm/octeon/cvmx-ipd-defs.h | 1111 +-
+ arch/mips/include/asm/octeon/cvmx-l2c-defs.h | 1726 ++-
+ arch/mips/include/asm/octeon/cvmx-l2d-defs.h | 171 +-
+ arch/mips/include/asm/octeon/cvmx-l2t-defs.h | 105 +-
+ arch/mips/include/asm/octeon/cvmx-led-defs.h | 67 +-
+ arch/mips/include/asm/octeon/cvmx-mio-defs.h | 1909 +++-
+ arch/mips/include/asm/octeon/cvmx-mixx-defs.h | 234 +-
+ arch/mips/include/asm/octeon/cvmx-mpi-defs.h | 328 +
+ arch/mips/include/asm/octeon/cvmx-npei-defs.h | 1743 ++-
+ arch/mips/include/asm/octeon/cvmx-npi-defs.h | 1260 ++-
+ arch/mips/include/asm/octeon/cvmx-pci-defs.h | 909 +-
+ arch/mips/include/asm/octeon/cvmx-pciercx-defs.h | 1292 ++-
+ arch/mips/include/asm/octeon/cvmx-pcsx-defs.h | 729 +-
+ arch/mips/include/asm/octeon/cvmx-pcsxx-defs.h | 574 +-
+ arch/mips/include/asm/octeon/cvmx-pemx-defs.h | 288 +-
+ arch/mips/include/asm/octeon/cvmx-pescx-defs.h | 246 +-
+ arch/mips/include/asm/octeon/cvmx-pexp-defs.h | 2 +-
+ arch/mips/include/asm/octeon/cvmx-pip-defs.h | 2431 ++++-
+ arch/mips/include/asm/octeon/cvmx-pko-defs.h | 1993 +++-
+ arch/mips/include/asm/octeon/cvmx-pow-defs.h | 530 +-
+ arch/mips/include/asm/octeon/cvmx-rnm-defs.h | 107 +-
+ arch/mips/include/asm/octeon/cvmx-sli-defs.h | 1351 ++-
+ arch/mips/include/asm/octeon/cvmx-smix-defs.h | 202 +-
+ arch/mips/include/asm/octeon/cvmx-spxx-defs.h | 225 +-
+ arch/mips/include/asm/octeon/cvmx-sriox-defs.h | 703 +-
+ arch/mips/include/asm/octeon/cvmx-srxx-defs.h | 62 +-
+ arch/mips/include/asm/octeon/cvmx-stxx-defs.h | 166 +-
+ arch/mips/include/asm/octeon/cvmx-uctlx-defs.h | 268 +-
+ arch/mips/include/asm/octeon/octeon-model.h | 18 +
+ arch/mips/include/asm/octeon/octeon.h | 4 +
+ arch/mips/include/asm/pgtable-bits.h | 18 +-
+ arch/mips/include/asm/pgtable.h | 12 +-
+ arch/mips/include/asm/thread_info.h | 6 +-
+ arch/mips/include/asm/uasm.h | 2 +
+ arch/mips/include/asm/unistd.h | 15 +-
+ arch/mips/kernel/Makefile | 19 +-
+ arch/mips/kernel/cevt-r4k.c | 5 +
+ arch/mips/kernel/cpu-probe.c | 10 +-
+ arch/mips/kernel/entry.S | 15 +-
+ arch/mips/kernel/irq-gic.c | 162 +-
+ arch/mips/kernel/scall32-o32.S | 14 +-
+ arch/mips/kernel/scall64-64.S | 14 +-
+ arch/mips/kernel/scall64-n32.S | 14 +-
+ arch/mips/kernel/scall64-o32.S | 14 +-
+ arch/mips/kernel/signal.c | 8 -
+ arch/mips/kernel/smp-mt.c | 2 +
+ arch/mips/lantiq/Kconfig | 2 +
+ arch/mips/lantiq/falcon/prom.c | 5 +
+ arch/mips/lantiq/falcon/sysctrl.c | 1 +
+ arch/mips/lantiq/irq.c | 82 +-
+ arch/mips/lantiq/xway/Makefile | 2 +-
+ arch/mips/lantiq/xway/gpio.c | 183 -
+ arch/mips/lantiq/xway/gptu.c | 214 +
+ arch/mips/lantiq/xway/sysctrl.c | 5 +-
+ arch/mips/lib/Makefile | 21 +-
+ arch/mips/mipssim/Makefile | 23 -
+ arch/mips/mipssim/Platform | 6 -
+ arch/mips/mipssim/sim_console.c | 40 -
+ arch/mips/mipssim/sim_int.c | 87 -
+ arch/mips/mipssim/sim_mem.c | 115 -
+ arch/mips/mipssim/sim_platform.c | 35 -
+ arch/mips/mipssim/sim_setup.c | 99 -
+ arch/mips/mipssim/sim_smtc.c | 116 -
+ arch/mips/mipssim/sim_time.c | 117 -
+ arch/mips/mm/Makefile | 17 +-
+ arch/mips/mm/c-r4k.c | 21 +
+ arch/mips/mm/cache.c | 2 +-
+ arch/mips/mm/fault.c | 3 +-
+ arch/mips/mm/tlb-r4k.c | 2 +-
+ arch/mips/mm/tlbex.c | 44 +-
+ arch/mips/mm/uasm.c | 23 +-
+ arch/mips/mti-malta/malta-int.c | 34 +
+ arch/mips/mti-sead3/Makefile | 19 +
+ arch/mips/mti-sead3/Platform | 7 +
+ arch/mips/mti-sead3/leds-sead3.c | 128 +
+ arch/mips/mti-sead3/sead3-cmdline.c | 46 +
+ arch/mips/mti-sead3/sead3-console.c | 46 +
+ arch/mips/mti-sead3/sead3-display.c | 78 +
+ arch/mips/mti-sead3/sead3-ehci.c | 47 +
+ arch/mips/mti-sead3/sead3-i2c-dev.c | 33 +
+ arch/mips/mti-sead3/sead3-i2c-drv.c | 405 +
+ arch/mips/mti-sead3/sead3-i2c.c | 37 +
+ arch/mips/mti-sead3/sead3-init.c | 91 +
+ arch/mips/mti-sead3/sead3-int.c | 158 +
+ arch/mips/mti-sead3/sead3-lcd.c | 43 +
+ arch/mips/mti-sead3/sead3-leds.c | 83 +
+ arch/mips/mti-sead3/sead3-memory.c | 138 +
+ arch/mips/mti-sead3/sead3-mtd.c | 54 +
+ arch/mips/mti-sead3/sead3-net.c | 51 +
+ arch/mips/mti-sead3/sead3-pic32-bus.c | 103 +
+ arch/mips/mti-sead3/sead3-pic32-i2c-drv.c | 435 +
+ arch/mips/mti-sead3/sead3-platform.c | 45 +
+ arch/mips/mti-sead3/sead3-reset.c | 39 +
+ arch/mips/mti-sead3/sead3-serial.c | 45 +
+ arch/mips/mti-sead3/sead3-setup.c | 20 +
+ arch/mips/mti-sead3/sead3-time.c | 117 +
+ arch/mips/netlogic/Kconfig | 15 +
+ arch/mips/netlogic/Makefile | 1 +
+ arch/mips/netlogic/dts/Makefile | 4 +
+ arch/mips/netlogic/dts/xlp_evp.dts | 124 +
+ arch/mips/netlogic/xlp/Makefile | 3 +-
+ arch/mips/netlogic/xlp/of.c | 34 -
+ arch/mips/netlogic/xlp/platform.c | 108 -
+ arch/mips/netlogic/xlp/setup.c | 32 +-
+ arch/mn10300/include/asm/Kbuild | 2 +
+ arch/openrisc/include/asm/Kbuild | 1 +
+ arch/openrisc/mm/fault.c | 1 +
+ arch/parisc/include/asm/Kbuild | 1 +
+ arch/parisc/kernel/cache.c | 3 +-
+ arch/powerpc/Kconfig | 2 +
+ arch/powerpc/include/asm/Kbuild | 1 +
+ arch/powerpc/include/asm/atomic.h | 1 +
+ arch/powerpc/include/asm/hugetlb.h | 4 +
+ arch/powerpc/kvm/book3s_hv.c | 2 +-
+ arch/powerpc/mm/fault.c | 1 +
+ arch/powerpc/oprofile/cell/spu_task_sync.c | 15 +-
+ arch/powerpc/platforms/pseries/hotplug-memory.c | 13 +-
+ arch/s390/Kconfig | 3 +
+ arch/s390/include/asm/Kbuild | 2 +
+ arch/s390/include/asm/hugetlb.h | 19 +-
+ arch/s390/include/asm/pgtable.h | 210 +
+ arch/s390/include/asm/setup.h | 5 +-
+ arch/s390/include/asm/tlb.h | 1 +
+ arch/s390/kernel/early.c | 2 +
+ arch/s390/mm/fault.c | 1 +
+ arch/s390/mm/gup.c | 11 +-
+ arch/s390/mm/pgtable.c | 108 +
+ arch/score/include/asm/Kbuild | 2 +
+ arch/sh/Kconfig | 3 +
+ arch/sh/include/asm/hugetlb.h | 6 +
+ arch/sh/mm/fault.c | 1 +
+ arch/sparc/Kconfig | 41 +-
+ arch/sparc/include/asm/Kbuild | 1 +
+ arch/sparc/include/asm/hugetlb.h | 9 +-
+ arch/sparc/include/asm/mmu_64.h | 19 +-
+ arch/sparc/include/asm/mmu_context_64.h | 2 +-
+ arch/sparc/include/asm/page_64.h | 21 +-
+ arch/sparc/include/asm/pgalloc_64.h | 56 +-
+ arch/sparc/include/asm/pgtable_64.h | 253 +-
+ arch/sparc/include/asm/tsb.h | 106 +-
+ arch/sparc/kernel/pci.c | 2 +-
+ arch/sparc/kernel/sun4v_tlb_miss.S | 2 +-
+ arch/sparc/kernel/tsb.S | 9 +-
+ arch/sparc/mm/fault_32.c | 1 +
+ arch/sparc/mm/fault_64.c | 5 +-
+ arch/sparc/mm/hugetlbpage.c | 50 -
+ arch/sparc/mm/init_64.c | 314 +-
+ arch/sparc/mm/tlb.c | 118 +-
+ arch/sparc/mm/tsb.c | 40 +-
+ arch/tile/Kconfig | 3 +
+ arch/tile/include/asm/Kbuild | 1 +
+ arch/tile/include/asm/hugetlb.h | 4 +
+ arch/tile/mm/elf.c | 19 +-
+ arch/tile/mm/fault.c | 1 +
+ arch/um/Kconfig.common | 1 +
+ arch/um/include/asm/Kbuild | 2 +-
+ arch/um/kernel/trap.c | 1 +
+ arch/unicore32/include/asm/Kbuild | 1 +
+ arch/unicore32/kernel/process.c | 2 +-
+ arch/x86/Kconfig | 5 +
+ arch/x86/include/asm/Kbuild | 6 +
+ arch/x86/include/asm/atomic.h | 24 -
+ arch/x86/include/asm/hugetlb.h | 4 +
+ arch/x86/include/asm/pgtable.h | 11 +-
+ arch/x86/include/asm/pgtable_32.h | 1 +
+ arch/x86/include/asm/pgtable_64.h | 1 +
+ arch/x86/mm/fault.c | 1 +
+ arch/x86/mm/hugetlbpage.c | 3 +-
+ arch/x86/mm/pat.c | 87 +-
+ arch/x86/mm/pat_rbtree.c | 34 +-
+ arch/x86/xen/mmu.c | 3 +-
+ arch/xtensa/Kconfig | 23 +-
+ arch/xtensa/Makefile | 34 +-
+ arch/xtensa/boot/Makefile | 2 +-
+ arch/xtensa/boot/boot-elf/Makefile | 24 +-
+ arch/xtensa/boot/boot-elf/boot.lds.S | 7 -
+ arch/xtensa/boot/boot-redboot/Makefile | 12 +-
+ arch/xtensa/boot/boot-redboot/boot.ld | 7 -
+ arch/xtensa/boot/boot-redboot/bootstrap.S | 10 -
+ arch/xtensa/boot/ramdisk/Makefile | 23 -
+ arch/xtensa/configs/s6105_defconfig | 5 -
+ arch/xtensa/include/asm/Kbuild | 2 +
+ arch/xtensa/include/asm/io.h | 172 +-
+ arch/xtensa/include/asm/ioctls.h | 4 +-
+ arch/xtensa/include/asm/regs.h | 2 +-
+ arch/xtensa/kernel/Makefile | 3 +-
+ arch/xtensa/kernel/io.c | 75 -
+ arch/xtensa/kernel/irq.c | 4 +-
+ arch/xtensa/kernel/pci-dma.c | 4 +
+ arch/xtensa/kernel/pci.c | 2 +-
+ arch/xtensa/kernel/platform.c | 4 +-
+ arch/xtensa/kernel/setup.c | 12 -
+ arch/xtensa/kernel/vmlinux.lds.S | 5 -
+ arch/xtensa/kernel/xtensa_ksyms.c | 25 +
+ arch/xtensa/mm/fault.c | 1 +
+ arch/xtensa/platforms/iss/Makefile | 4 +-
+ arch/xtensa/platforms/iss/console.c | 15 +-
+ .../platforms/iss/include/platform/simcall.h | 53 +
+ arch/xtensa/platforms/iss/io.c | 32 -
+ arch/xtensa/platforms/iss/network.c | 49 -
+ arch/xtensa/platforms/iss/setup.c | 14 +-
+ drivers/base/memory.c | 40 +-
+ drivers/char/mbcs.c | 2 +-
+ drivers/char/mem.c | 2 +-
+ drivers/char/mspec.c | 2 +-
+ drivers/gpio/gpio-stp-xway.c | 2 +-
+ drivers/gpu/drm/drm_gem.c | 2 +-
+ drivers/gpu/drm/drm_vm.c | 10 +-
+ drivers/gpu/drm/exynos/exynos_drm_gem.c | 2 +-
+ drivers/gpu/drm/gma500/framebuffer.c | 3 +-
+ drivers/gpu/drm/ttm/ttm_bo_vm.c | 4 +-
+ drivers/gpu/drm/udl/udl_fb.c | 2 +-
+ drivers/infiniband/hw/ehca/ehca_uverbs.c | 4 +-
+ drivers/infiniband/hw/ipath/ipath_file_ops.c | 2 +-
+ drivers/infiniband/hw/qib/qib_file_ops.c | 2 +-
+ drivers/isdn/hisax/Kconfig | 10 +-
+ drivers/media/pci/meye/meye.c | 2 +-
+ drivers/media/platform/omap/omap_vout.c | 2 +-
+ drivers/media/platform/vino.c | 2 +-
+ drivers/media/usb/sn9c102/sn9c102_core.c | 3 +-
+ drivers/media/usb/usbvision/usbvision-video.c | 3 +-
+ drivers/media/v4l2-core/videobuf-dma-sg.c | 2 +-
+ drivers/media/v4l2-core/videobuf-vmalloc.c | 2 +-
+ drivers/media/v4l2-core/videobuf2-memops.c | 2 +-
+ drivers/misc/carma/carma-fpga.c | 2 -
+ drivers/misc/sgi-gru/grufile.c | 5 +-
+ drivers/mtd/mtdchar.c | 2 +-
+ drivers/mtd/mtdcore.c | 6 +-
+ drivers/net/ethernet/broadcom/bcm63xx_enet.h | 30 +-
+ drivers/net/ethernet/octeon/octeon_mgmt.c | 550 +-
+ drivers/oprofile/buffer_sync.c | 17 +-
+ drivers/parport/Kconfig | 2 +-
+ drivers/pinctrl/Kconfig | 16 +
+ drivers/pinctrl/Makefile | 3 +
+ drivers/pinctrl/pinctrl-falcon.c | 468 +
+ drivers/pinctrl/pinctrl-lantiq.c | 342 +
+ drivers/pinctrl/pinctrl-lantiq.h | 194 +
+ drivers/pinctrl/pinctrl-xway.c | 781 ++
+ drivers/scsi/sg.c | 2 +-
+ drivers/spi/Kconfig | 7 +
+ drivers/spi/Makefile | 1 +
+ drivers/spi/spi-octeon.c | 362 +
+ drivers/staging/android/ashmem.c | 1 -
+ drivers/staging/omapdrm/omap_gem_dmabuf.c | 2 +-
+ drivers/staging/tidspbridge/rmgr/drv_interface.c | 2 +-
+ drivers/uio/uio.c | 4 +-
+ drivers/usb/mon/mon_bin.c | 2 +-
+ drivers/usb/musb/musb_io.h | 3 +-
+ drivers/vfio/pci/vfio_pci.c | 2 +-
+ drivers/video/68328fb.c | 2 +-
+ drivers/video/aty/atyfb_base.c | 3 +-
+ drivers/video/fb-puv3.c | 3 +-
+ drivers/video/fb_defio.c | 2 +-
+ drivers/video/fbmem.c | 3 +-
+ drivers/video/gbefb.c | 2 +-
+ drivers/video/omap2/omapfb/omapfb-main.c | 2 +-
+ drivers/video/sbuslib.c | 5 +-
+ drivers/video/smscufx.c | 1 -
+ drivers/video/udlfb.c | 1 -
+ drivers/video/vermilion/vermilion.c | 1 -
+ drivers/video/vfb.c | 1 -
+ drivers/xen/gntalloc.c | 2 +-
+ drivers/xen/gntdev.c | 2 +-
+ drivers/xen/privcmd.c | 3 +-
+ fs/9p/vfs_file.c | 1 +
+ fs/binfmt_elf.c | 4 +-
+ fs/binfmt_elf_fdpic.c | 2 +-
+ fs/btrfs/file.c | 2 +-
+ fs/ceph/addr.c | 2 +-
+ fs/cifs/file.c | 1 +
+ fs/exec.c | 2 +-
+ fs/exofs/ore_raid.c | 2 +-
+ fs/exofs/sys.c | 7 +-
+ fs/ext4/file.c | 2 +-
+ fs/fcntl.c | 2 +-
+ fs/fs-writeback.c | 7 +-
+ fs/fuse/file.c | 1 +
+ fs/gfs2/file.c | 2 +-
+ fs/hugetlbfs/inode.c | 11 +-
+ fs/inode.c | 2 +-
+ fs/jffs2/readinode.c | 13 +-
+ fs/nfs/file.c | 1 +
+ fs/nilfs2/file.c | 2 +-
+ fs/ocfs2/mmap.c | 2 +-
+ fs/proc/base.c | 117 +-
+ fs/proc/page.c | 8 +-
+ fs/proc/proc_sysctl.c | 5 +-
+ fs/proc/task_mmu.c | 2 +-
+ fs/ubifs/file.c | 1 +
+ fs/xfs/xfs_file.c | 2 +-
+ include/asm-generic/Kbuild | 35 -
+ include/asm-generic/bitsperlong.h | 13 +-
+ include/asm-generic/clkdev.h | 28 +
+ include/asm-generic/int-l64.h | 26 +-
+ include/asm-generic/int-ll64.h | 31 +-
+ include/asm-generic/ioctl.h | 95 +-
+ include/asm-generic/kvm_para.h | 5 +-
+ include/asm-generic/param.h | 17 +-
+ include/asm-generic/pgtable.h | 72 +-
+ include/asm-generic/resource.h | 66 +-
+ include/asm-generic/siginfo.h | 297 +-
+ include/asm-generic/signal.h | 117 +-
+ include/asm-generic/statfs.h | 81 +-
+ include/asm-generic/termios.h | 49 +-
+ include/asm-generic/unistd.h | 907 +-
+ include/asm-generic/xor.h | 4 +-
+ include/linux/atomic.h | 25 +
+ include/linux/compaction.h | 19 +-
+ include/linux/fs.h | 8 +-
+ include/linux/gfp.h | 9 +-
+ include/linux/huge_mm.h | 3 +-
+ include/linux/interval_tree.h | 27 +
+ include/linux/interval_tree_generic.h | 191 +
+ include/linux/memblock.h | 3 +-
+ include/linux/memcontrol.h | 14 +-
+ include/linux/memory_hotplug.h | 3 +
+ include/linux/mempolicy.h | 4 +-
+ include/linux/mm.h | 140 +-
+ include/linux/mm_types.h | 16 +-
+ include/linux/mman.h | 1 -
+ include/linux/mmu_notifier.h | 60 +-
+ include/linux/mmzone.h | 10 +-
+ include/linux/oom.h | 11 -
+ include/linux/page-isolation.h | 7 +-
+ include/linux/pageblock-flags.h | 19 +-
+ include/linux/pnfs_osd_xdr.h | 1 -
+ include/linux/prio_tree.h | 120 -
+ include/linux/rbtree.h | 119 +-
+ include/linux/rbtree_augmented.h | 223 +
+ include/linux/rmap.h | 36 +-
+ include/linux/sched.h | 1 -
+ include/linux/swap.h | 2 +-
+ include/linux/timerqueue.h | 2 +-
+ include/linux/vm_event_item.h | 1 -
+ include/linux/vmstat.h | 12 +
+ include/trace/events/gfpflags.h | 1 -
+ include/uapi/asm-generic/Kbuild | 35 +
+ include/{ => uapi}/asm-generic/auxvec.h | 0
+ include/uapi/asm-generic/bitsperlong.h | 15 +
+ include/{ => uapi}/asm-generic/errno-base.h | 0
+ include/{ => uapi}/asm-generic/errno.h | 0
+ include/{ => uapi}/asm-generic/fcntl.h | 0
+ include/uapi/asm-generic/int-l64.h | 34 +
+ include/uapi/asm-generic/int-ll64.h | 39 +
+ include/uapi/asm-generic/ioctl.h | 98 +
+ include/{ => uapi}/asm-generic/ioctls.h | 0
+ include/{ => uapi}/asm-generic/ipcbuf.h | 0
+ include/{ => uapi}/asm-generic/mman-common.h | 0
+ include/{ => uapi}/asm-generic/mman.h | 0
+ include/{ => uapi}/asm-generic/msgbuf.h | 0
+ include/uapi/asm-generic/param.h | 19 +
+ include/{ => uapi}/asm-generic/poll.h | 0
+ include/{ => uapi}/asm-generic/posix_types.h | 0
+ include/uapi/asm-generic/resource.h | 68 +
+ include/{ => uapi}/asm-generic/sembuf.h | 0
+ include/{ => uapi}/asm-generic/setup.h | 0
+ include/{ => uapi}/asm-generic/shmbuf.h | 0
+ include/{ => uapi}/asm-generic/shmparam.h | 0
+ include/uapi/asm-generic/siginfo.h | 298 +
+ include/{ => uapi}/asm-generic/signal-defs.h | 0
+ include/uapi/asm-generic/signal.h | 123 +
+ include/{ => uapi}/asm-generic/socket.h | 0
+ include/{ => uapi}/asm-generic/sockios.h | 0
+ include/{ => uapi}/asm-generic/stat.h | 0
+ include/uapi/asm-generic/statfs.h | 83 +
+ include/{ => uapi}/asm-generic/swab.h | 0
+ include/{ => uapi}/asm-generic/termbits.h | 0
+ include/uapi/asm-generic/termios.h | 50 +
+ include/{ => uapi}/asm-generic/types.h | 0
+ include/{ => uapi}/asm-generic/ucontext.h | 0
+ include/uapi/asm-generic/unistd.h | 902 ++
+ init/Kconfig | 11 +-
+ init/main.c | 2 -
+ ipc/mqueue.c | 3 -
+ kernel/auditsc.c | 13 +-
+ kernel/cpu.c | 4 +
+ kernel/events/core.c | 2 +-
+ kernel/events/uprobes.c | 8 +-
+ kernel/fork.c | 32 +-
+ kernel/sysctl.c | 3 +-
+ lib/Kconfig.debug | 38 +-
+ lib/Makefile | 7 +-
+ lib/interval_tree.c | 10 +
+ lib/interval_tree_test_main.c | 105 +
+ lib/prio_tree.c | 466 -
+ lib/rbtree.c | 656 +-
+ lib/rbtree_test.c | 234 +
+ mm/Kconfig | 3 +-
+ mm/Makefile | 4 +-
+ mm/bootmem.c | 10 +-
+ mm/compaction.c | 562 +-
+ mm/filemap.c | 6 +-
+ mm/filemap_xip.c | 10 +-
+ mm/fremap.c | 16 +-
+ mm/huge_memory.c | 440 +-
+ mm/hugetlb.c | 34 +-
+ mm/internal.h | 52 +-
+ mm/interval_tree.c | 112 +
+ mm/kmemleak.c | 100 +-
+ mm/ksm.c | 40 +-
+ mm/madvise.c | 8 +-
+ mm/memblock.c | 5 +-
+ mm/memcontrol.c | 22 +-
+ mm/memory-failure.c | 8 +-
+ mm/memory.c | 115 +-
+ mm/memory_hotplug.c | 77 +-
+ mm/mempolicy.c | 148 +-
+ mm/mlock.c | 27 +-
+ mm/mmap.c | 207 +-
+ mm/mmu_notifier.c | 103 +-
+ mm/mremap.c | 73 +-
+ mm/nobootmem.c | 5 +-
+ mm/nommu.c | 33 +-
+ mm/oom_kill.c | 4 +-
+ mm/page_alloc.c | 317 +-
+ mm/page_isolation.c | 43 +-
+ mm/pgtable-generic.c | 50 +
+ mm/prio_tree.c | 208 -
+ mm/rmap.c | 159 +-
+ mm/shmem.c | 3 +-
+ mm/swap.c | 13 +-
+ mm/truncate.c | 3 -
+ mm/vmalloc.c | 5 +-
+ mm/vmscan.c | 111 +-
+ mm/vmstat.c | 14 +-
+ net/ceph/osd_client.c | 1 -
+ scripts/mod/modpost.c | 2 +
+ security/apparmor/Makefile | 2 +-
+ security/selinux/selinuxfs.c | 2 +-
+ security/tomoyo/util.c | 9 +-
+ sound/core/pcm_native.c | 6 +-
+ sound/usb/usx2y/us122l.c | 2 +-
+ sound/usb/usx2y/usX2Yhwdep.c | 2 +-
+ sound/usb/usx2y/usx2yhwdeppcm.c | 2 +-
+ tools/perf/util/include/linux/rbtree.h | 1 +
+ 548 files changed, 60236 insertions(+), 10674 deletions(-)
+ delete mode 100644 Documentation/ABI/obsolete/proc-pid-oom_adj
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/lantiq,falcon-pinumx.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/lantiq,xway-pinumx.txt
+ create mode 100644 Documentation/devicetree/bindings/spi/spi-octeon.txt
+ delete mode 100644 Documentation/memory.txt
+ delete mode 100644 Documentation/prio_tree.txt
+ create mode 100644 arch/mips/bcm63xx/dev-usb-usbd.c
+ rename arch/mips/configs/{cavium-octeon_defconfig => cavium_octeon_defconfig} (100%)
+ delete mode 100644 arch/mips/configs/mipssim_defconfig
+ rename arch/mips/configs/{pnx8335-stb225_defconfig => pnx8335_stb225_defconfig} (100%)
+ rename arch/mips/configs/{pnx8550-jbs_defconfig => pnx8550_jbs_defconfig} (100%)
+ rename arch/mips/configs/{pnx8550-stb810_defconfig => pnx8550_stb810_defconfig} (100%)
+ rename arch/mips/configs/{sb1250-swarm_defconfig => sb1250_swarm_defconfig} (100%)
+ create mode 100644 arch/mips/configs/sead3_defconfig
+ create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_usbd.h
+ create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_iudma.h
+ rename arch/mips/include/asm/{mach-mipssim => mach-sead3}/cpu-feature-overrides.h (83%)
+ create mode 100644 arch/mips/include/asm/mach-sead3/irq.h
+ create mode 100644 arch/mips/include/asm/mach-sead3/kernel-entry-init.h
+ rename arch/mips/include/asm/{mach-mipssim => mach-sead3}/war.h (72%)
+ create mode 100644 arch/mips/include/asm/mips-boards/sead3int.h
+ delete mode 100644 arch/mips/include/asm/mips-boards/simint.h
+ create mode 100644 arch/mips/include/asm/octeon/cvmx-ciu2-defs.h
+ create mode 100644 arch/mips/include/asm/octeon/cvmx-mpi-defs.h
+ delete mode 100644 arch/mips/lantiq/xway/gpio.c
+ create mode 100644 arch/mips/lantiq/xway/gptu.c
+ delete mode 100644 arch/mips/mipssim/Makefile
+ delete mode 100644 arch/mips/mipssim/Platform
+ delete mode 100644 arch/mips/mipssim/sim_console.c
+ delete mode 100644 arch/mips/mipssim/sim_int.c
+ delete mode 100644 arch/mips/mipssim/sim_mem.c
+ delete mode 100644 arch/mips/mipssim/sim_platform.c
+ delete mode 100644 arch/mips/mipssim/sim_setup.c
+ delete mode 100644 arch/mips/mipssim/sim_smtc.c
+ delete mode 100644 arch/mips/mipssim/sim_time.c
+ create mode 100644 arch/mips/mti-sead3/Makefile
+ create mode 100644 arch/mips/mti-sead3/Platform
+ create mode 100644 arch/mips/mti-sead3/leds-sead3.c
+ create mode 100644 arch/mips/mti-sead3/sead3-cmdline.c
+ create mode 100644 arch/mips/mti-sead3/sead3-console.c
+ create mode 100644 arch/mips/mti-sead3/sead3-display.c
+ create mode 100644 arch/mips/mti-sead3/sead3-ehci.c
+ create mode 100644 arch/mips/mti-sead3/sead3-i2c-dev.c
+ create mode 100644 arch/mips/mti-sead3/sead3-i2c-drv.c
+ create mode 100644 arch/mips/mti-sead3/sead3-i2c.c
+ create mode 100644 arch/mips/mti-sead3/sead3-init.c
+ create mode 100644 arch/mips/mti-sead3/sead3-int.c
+ create mode 100644 arch/mips/mti-sead3/sead3-lcd.c
+ create mode 100644 arch/mips/mti-sead3/sead3-leds.c
+ create mode 100644 arch/mips/mti-sead3/sead3-memory.c
+ create mode 100644 arch/mips/mti-sead3/sead3-mtd.c
+ create mode 100644 arch/mips/mti-sead3/sead3-net.c
+ create mode 100644 arch/mips/mti-sead3/sead3-pic32-bus.c
+ create mode 100644 arch/mips/mti-sead3/sead3-pic32-i2c-drv.c
+ create mode 100644 arch/mips/mti-sead3/sead3-platform.c
+ create mode 100644 arch/mips/mti-sead3/sead3-reset.c
+ create mode 100644 arch/mips/mti-sead3/sead3-serial.c
+ create mode 100644 arch/mips/mti-sead3/sead3-setup.c
+ create mode 100644 arch/mips/mti-sead3/sead3-time.c
+ create mode 100644 arch/mips/netlogic/dts/Makefile
+ create mode 100644 arch/mips/netlogic/dts/xlp_evp.dts
+ delete mode 100644 arch/mips/netlogic/xlp/of.c
+ delete mode 100644 arch/mips/netlogic/xlp/platform.c
+ delete mode 100644 arch/xtensa/boot/ramdisk/Makefile
+ delete mode 100644 arch/xtensa/kernel/io.c
+ create mode 100644 arch/xtensa/platforms/iss/include/platform/serial.h
+ delete mode 100644 arch/xtensa/platforms/iss/io.c
+ create mode 100644 drivers/pinctrl/pinctrl-falcon.c
+ create mode 100644 drivers/pinctrl/pinctrl-lantiq.c
+ create mode 100644 drivers/pinctrl/pinctrl-lantiq.h
+ create mode 100644 drivers/pinctrl/pinctrl-xway.c
+ create mode 100644 drivers/spi/spi-octeon.c
+ create mode 100644 include/asm-generic/clkdev.h
+ create mode 100644 include/linux/interval_tree.h
+ create mode 100644 include/linux/interval_tree_generic.h
+ delete mode 100644 include/linux/prio_tree.h
+ create mode 100644 include/linux/rbtree_augmented.h
+ rename include/{ => uapi}/asm-generic/auxvec.h (100%)
+ create mode 100644 include/uapi/asm-generic/bitsperlong.h
+ rename include/{ => uapi}/asm-generic/errno-base.h (100%)
+ rename include/{ => uapi}/asm-generic/errno.h (100%)
+ rename include/{ => uapi}/asm-generic/fcntl.h (100%)
+ create mode 100644 include/uapi/asm-generic/int-l64.h
+ create mode 100644 include/uapi/asm-generic/int-ll64.h
+ create mode 100644 include/uapi/asm-generic/ioctl.h
+ rename include/{ => uapi}/asm-generic/ioctls.h (100%)
+ rename include/{ => uapi}/asm-generic/ipcbuf.h (100%)
+ create mode 100644 include/uapi/asm-generic/kvm_para.h
+ rename include/{ => uapi}/asm-generic/mman-common.h (100%)
+ rename include/{ => uapi}/asm-generic/mman.h (100%)
+ rename include/{ => uapi}/asm-generic/msgbuf.h (100%)
+ create mode 100644 include/uapi/asm-generic/param.h
+ rename include/{ => uapi}/asm-generic/poll.h (100%)
+ rename include/{ => uapi}/asm-generic/posix_types.h (100%)
+ create mode 100644 include/uapi/asm-generic/resource.h
+ rename include/{ => uapi}/asm-generic/sembuf.h (100%)
+ rename include/{ => uapi}/asm-generic/setup.h (100%)
+ rename include/{ => uapi}/asm-generic/shmbuf.h (100%)
+ rename include/{ => uapi}/asm-generic/shmparam.h (100%)
+ create mode 100644 include/uapi/asm-generic/siginfo.h
+ rename include/{ => uapi}/asm-generic/signal-defs.h (100%)
+ create mode 100644 include/uapi/asm-generic/signal.h
+ rename include/{ => uapi}/asm-generic/socket.h (100%)
+ rename include/{ => uapi}/asm-generic/sockios.h (100%)
+ rename include/{ => uapi}/asm-generic/stat.h (100%)
+ create mode 100644 include/uapi/asm-generic/statfs.h
+ rename include/{ => uapi}/asm-generic/swab.h (100%)
+ rename include/{ => uapi}/asm-generic/termbits.h (100%)
+ create mode 100644 include/uapi/asm-generic/termios.h
+ rename include/{ => uapi}/asm-generic/types.h (100%)
+ rename include/{ => uapi}/asm-generic/ucontext.h (100%)
+ create mode 100644 include/uapi/asm-generic/unistd.h
+ create mode 100644 lib/interval_tree.c
+ create mode 100644 lib/interval_tree_test_main.c
+ delete mode 100644 lib/prio_tree.c
+ create mode 100644 lib/rbtree_test.c
+ create mode 100644 mm/interval_tree.c
+ delete mode 100644 mm/prio_tree.c
+Merging fixes/master (9023a40 Merge tag 'mmc-fixes-for-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc)
+$ git merge fixes/master
+Already up-to-date.
+$ git revert d760afd4d257
+[master 92fbc9f] Revert "memory-hotplug: suppress "Trying to free nonexistent resource <XXXXXXXXXXXXXXXX-YYYYYYYYYYYYYYYY>" warning"
+ 2 files changed, 6 insertions(+), 11 deletions(-)
+Merging kbuild-current/rc-fixes (b1e0d8b kbuild: Fix gcc -x syntax)
+$ git merge kbuild-current/rc-fixes
+Already up-to-date.
+Merging arm-current/fixes (846a136 ARM: vfp: fix saving d16-d31 vfp registers on v6+ kernels)
+$ git merge arm-current/fixes
+Merge made by the 'recursive' strategy.
+ arch/arm/include/asm/vfpmacros.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging m68k-current/for-linus (f82735d m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR)
+$ git merge m68k-current/for-linus
+Already up-to-date.
+Merging powerpc-merge/merge (636802e powerpc: Don't use __put_user() in patch_instruction)
+$ git merge powerpc-merge/merge
+Already up-to-date.
+Merging sparc/master (9836d34 Merge tag 'disintegrate-sparc-20121009' of git://git.infradead.org/users/dhowells/linux-headers)
+$ git merge sparc/master
+Merge made by the 'recursive' strategy.
+ arch/sparc/include/asm/Kbuild | 16 -
+ arch/sparc/include/asm/fbio.h | 260 +-------------
+ arch/sparc/include/asm/ioctls.h | 129 +------
+ arch/sparc/include/asm/mman.h | 25 +-
+ arch/sparc/include/asm/psr.h | 36 +-
+ arch/sparc/include/asm/ptrace.h | 347 +------------------
+ arch/sparc/include/asm/setup.h | 10 +-
+ arch/sparc/include/asm/sigcontext.h | 4 +-
+ arch/sparc/include/asm/siginfo.h | 23 +-
+ arch/sparc/include/asm/signal.h | 185 +---------
+ arch/sparc/include/asm/termbits.h | 260 +-------------
+ arch/sparc/include/asm/termios.h | 41 +--
+ arch/sparc/include/asm/traps.h | 111 +-----
+ arch/sparc/include/asm/unistd.h | 412 +---------------------
+ arch/sparc/include/uapi/asm/Kbuild | 46 +++
+ arch/sparc/include/{ => uapi}/asm/apc.h | 0
+ arch/sparc/include/{ => uapi}/asm/asi.h | 0
+ arch/sparc/include/{ => uapi}/asm/auxvec.h | 0
+ arch/sparc/include/{ => uapi}/asm/bitsperlong.h | 0
+ arch/sparc/include/{ => uapi}/asm/byteorder.h | 0
+ arch/sparc/include/{ => uapi}/asm/display7seg.h | 0
+ arch/sparc/include/{ => uapi}/asm/envctrl.h | 0
+ arch/sparc/include/{ => uapi}/asm/errno.h | 0
+ arch/sparc/include/uapi/asm/fbio.h | 259 ++++++++++++++
+ arch/sparc/include/{ => uapi}/asm/fcntl.h | 0
+ arch/sparc/include/{ => uapi}/asm/ioctl.h | 0
+ arch/sparc/include/uapi/asm/ioctls.h | 131 +++++++
+ arch/sparc/include/{ => uapi}/asm/ipcbuf.h | 0
+ arch/sparc/include/{ => uapi}/asm/jsflash.h | 0
+ arch/sparc/include/{ => uapi}/asm/kvm_para.h | 0
+ arch/sparc/include/uapi/asm/mman.h | 27 ++
+ arch/sparc/include/{ => uapi}/asm/msgbuf.h | 0
+ arch/sparc/include/{ => uapi}/asm/openpromio.h | 0
+ arch/sparc/include/{ => uapi}/asm/param.h | 0
+ arch/sparc/include/{ => uapi}/asm/perfctr.h | 0
+ arch/sparc/include/{ => uapi}/asm/poll.h | 0
+ arch/sparc/include/{ => uapi}/asm/posix_types.h | 0
+ arch/sparc/include/uapi/asm/psr.h | 47 +++
+ arch/sparc/include/{ => uapi}/asm/psrcompat.h | 0
+ arch/sparc/include/{ => uapi}/asm/pstate.h | 0
+ arch/sparc/include/uapi/asm/ptrace.h | 352 +++++++++++++++++++
+ arch/sparc/include/{ => uapi}/asm/resource.h | 0
+ arch/sparc/include/{ => uapi}/asm/sembuf.h | 0
+ arch/sparc/include/uapi/asm/setup.h | 15 +
+ arch/sparc/include/{ => uapi}/asm/shmbuf.h | 0
+ arch/sparc/include/uapi/asm/siginfo.h | 25 ++
+ arch/sparc/include/uapi/asm/signal.h | 185 ++++++++++
+ arch/sparc/include/{ => uapi}/asm/socket.h | 0
+ arch/sparc/include/{ => uapi}/asm/sockios.h | 0
+ arch/sparc/include/{ => uapi}/asm/stat.h | 0
+ arch/sparc/include/{ => uapi}/asm/statfs.h | 0
+ arch/sparc/include/{ => uapi}/asm/swab.h | 0
+ arch/sparc/include/uapi/asm/termbits.h | 263 ++++++++++++++
+ arch/sparc/include/uapi/asm/termios.h | 43 +++
+ arch/sparc/include/uapi/asm/traps.h | 120 +++++++
+ arch/sparc/include/{ => uapi}/asm/types.h | 0
+ arch/sparc/include/{ => uapi}/asm/uctx.h | 0
+ arch/sparc/include/uapi/asm/unistd.h | 422 +++++++++++++++++++++++
+ arch/sparc/include/{ => uapi}/asm/utrap.h | 0
+ arch/sparc/include/{ => uapi}/asm/watchdog.h | 0
+ 60 files changed, 1951 insertions(+), 1843 deletions(-)
+ rename arch/sparc/include/{ => uapi}/asm/apc.h (100%)
+ rename arch/sparc/include/{ => uapi}/asm/asi.h (100%)
+ rename arch/sparc/include/{ => uapi}/asm/auxvec.h (100%)
+ rename arch/sparc/include/{ => uapi}/asm/bitsperlong.h (100%)
+ rename arch/sparc/include/{ => uapi}/asm/byteorder.h (100%)
+ rename arch/sparc/include/{ => uapi}/asm/display7seg.h (100%)
+ rename arch/sparc/include/{ => uapi}/asm/envctrl.h (100%)
+ rename arch/sparc/include/{ => uapi}/asm/errno.h (100%)
+ create mode 100644 arch/sparc/include/uapi/asm/fbio.h
+ rename arch/sparc/include/{ => uapi}/asm/fcntl.h (100%)
+ rename arch/sparc/include/{ => uapi}/asm/ioctl.h (100%)
+ create mode 100644 arch/sparc/include/uapi/asm/ioctls.h
+ rename arch/sparc/include/{ => uapi}/asm/ipcbuf.h (100%)
+ rename arch/sparc/include/{ => uapi}/asm/jsflash.h (100%)
+ rename arch/sparc/include/{ => uapi}/asm/kvm_para.h (100%)
+ create mode 100644 arch/sparc/include/uapi/asm/mman.h
+ rename arch/sparc/include/{ => uapi}/asm/msgbuf.h (100%)
+ rename arch/sparc/include/{ => uapi}/asm/openpromio.h (100%)
+ rename arch/sparc/include/{ => uapi}/asm/param.h (100%)
+ rename arch/sparc/include/{ => uapi}/asm/perfctr.h (100%)
+ rename arch/sparc/include/{ => uapi}/asm/poll.h (100%)
+ rename arch/sparc/include/{ => uapi}/asm/posix_types.h (100%)
+ create mode 100644 arch/sparc/include/uapi/asm/psr.h
+ rename arch/sparc/include/{ => uapi}/asm/psrcompat.h (100%)
+ rename arch/sparc/include/{ => uapi}/asm/pstate.h (100%)
+ create mode 100644 arch/sparc/include/uapi/asm/ptrace.h
+ rename arch/sparc/include/{ => uapi}/asm/resource.h (100%)
+ rename arch/sparc/include/{ => uapi}/asm/sembuf.h (100%)
+ create mode 100644 arch/sparc/include/uapi/asm/setup.h
+ rename arch/sparc/include/{ => uapi}/asm/shmbuf.h (100%)
+ create mode 100644 arch/sparc/include/uapi/asm/sigcontext.h
+ create mode 100644 arch/sparc/include/uapi/asm/siginfo.h
+ create mode 100644 arch/sparc/include/uapi/asm/signal.h
+ rename arch/sparc/include/{ => uapi}/asm/socket.h (100%)
+ rename arch/sparc/include/{ => uapi}/asm/sockios.h (100%)
+ rename arch/sparc/include/{ => uapi}/asm/stat.h (100%)
+ rename arch/sparc/include/{ => uapi}/asm/statfs.h (100%)
+ rename arch/sparc/include/{ => uapi}/asm/swab.h (100%)
+ create mode 100644 arch/sparc/include/uapi/asm/termbits.h
+ create mode 100644 arch/sparc/include/uapi/asm/termios.h
+ create mode 100644 arch/sparc/include/uapi/asm/traps.h
+ rename arch/sparc/include/{ => uapi}/asm/types.h (100%)
+ rename arch/sparc/include/{ => uapi}/asm/uctx.h (100%)
+ create mode 100644 arch/sparc/include/uapi/asm/unistd.h
+ rename arch/sparc/include/{ => uapi}/asm/utrap.h (100%)
+ rename arch/sparc/include/{ => uapi}/asm/watchdog.h (100%)
+Merging net/master (5175a5e RDS: fix rds-ping spinlock recursion)
+$ git merge net/master
+Merge made by the 'recursive' strategy.
+ drivers/infiniband/core/cma.c | 3 +-
+ drivers/infiniband/core/netlink.c | 1 +
+ drivers/net/ethernet/amd/amd8111e.c | 2 +
+ drivers/net/ethernet/amd/au1000_eth.c | 10 +-
+ drivers/net/ethernet/calxeda/xgmac.c | 19 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 1 +
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 54 ++--
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 15 +-
+ drivers/net/ethernet/dec/tulip/dmfe.c | 12 +-
+ drivers/net/ethernet/emulex/benet/be_main.c | 7 +-
+ drivers/net/ethernet/freescale/gianfar.c | 27 +-
+ drivers/net/ethernet/freescale/gianfar.h | 2 -
+ drivers/net/ethernet/freescale/ucc_geth.c | 29 +--
+ drivers/net/ethernet/freescale/ucc_geth.h | 2 -
+ drivers/net/ethernet/intel/e1000e/hw.h | 2 +
+ drivers/net/ethernet/intel/e1000e/netdev.c | 2 +
+ drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 2 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 7 +
+ drivers/net/ethernet/marvell/mv643xx_eth.c | 18 +-
+ drivers/net/ethernet/marvell/skge.c | 13 +-
+ drivers/net/ethernet/marvell/sky2.c | 5 +-
+ drivers/net/ethernet/natsemi/natsemi.c | 4 +-
+ drivers/net/ethernet/natsemi/xtsonic.c | 1 +
+ drivers/net/ethernet/oki-semi/pch_gbe/Kconfig | 3 +
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 3 +-
+ drivers/net/ethernet/realtek/8139cp.c | 2 +-
+ drivers/net/ethernet/renesas/sh_eth.c | 1 +
+ drivers/net/ethernet/sfc/ptp.c | 9 +-
+ drivers/net/ethernet/sis/sis900.c | 4 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 -
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 20 +-
+ drivers/net/ethernet/sun/niu.c | 1 +
+ drivers/net/ethernet/sun/sungem.c | 3 +-
+ drivers/net/irda/irtty-sir.c | 4 +-
+ drivers/net/irda/mcs7780.c | 4 +-
+ drivers/net/irda/pxaficp_ir.c | 4 +-
+ drivers/net/irda/sa1100_ir.c | 4 +-
+ drivers/net/irda/sh_irda.c | 4 +-
+ drivers/net/irda/sh_sir.c | 5 +-
+ drivers/net/phy/mdio_bus.c | 1 +
+ drivers/net/vxlan.c | 5 +-
+ drivers/net/wan/farsync.c | 2 +-
+ include/linux/caif/Kbuild | 2 -
+ include/linux/if_vlan.h | 8 +-
+ include/linux/isdn/Kbuild | 1 -
+ include/linux/netdevice.h | 19 +-
+ include/linux/netfilter/Kbuild | 77 ------
+ include/linux/netfilter/ipset/Kbuild | 4 -
+ include/linux/netfilter/ipset/ip_set.h | 225 +---------------
+ include/linux/netfilter/ipset/ip_set_bitmap.h | 11 +-
+ include/linux/netfilter/ipset/ip_set_hash.h | 19 +-
+ include/linux/netfilter/ipset/ip_set_list.h | 19 +-
+ include/linux/netfilter/nf_conntrack_common.h | 115 +--------
+ include/linux/netfilter/nf_conntrack_ftp.h | 16 +-
+ include/linux/netfilter/nf_conntrack_tcp.h | 49 +---
+ include/linux/netfilter/nfnetlink.h | 55 +---
+ include/linux/netfilter/nfnetlink_acct.h | 25 +-
+ include/linux/netfilter/x_tables.h | 186 +-------------
+ include/linux/netfilter/xt_hashlimit.h | 71 +-----
+ include/linux/netfilter/xt_physdev.h | 21 +-
+ include/linux/netfilter_arp/Kbuild | 2 -
+ include/linux/netfilter_arp/arp_tables.h | 200 +--------------
+ include/linux/netfilter_bridge/Kbuild | 18 --
+ include/linux/netfilter_bridge/ebt_802_3.h | 61 +----
+ include/linux/netfilter_bridge/ebtables.h | 255 +------------------
+ include/linux/netfilter_ipv4/Kbuild | 10 -
+ include/linux/netfilter_ipv4/ip_tables.h | 218 +---------------
+ include/linux/netfilter_ipv6/Kbuild | 12 -
+ include/linux/netfilter_ipv6/ip6_tables.h | 256 +------------------
+ include/linux/netlink.h | 20 +-
+ include/linux/skbuff.h | 24 --
+ include/linux/tc_act/Kbuild | 7 -
+ include/linux/tc_ematch/Kbuild | 4 -
+ include/net/flow.h | 1 +
+ include/net/route.h | 3 +-
+ include/rdma/rdma_netlink.h | 1 +
+ include/uapi/linux/caif/Kbuild | 2 +
+ include/{ => uapi}/linux/caif/caif_socket.h | 0
+ include/{ => uapi}/linux/caif/if_caif.h | 0
+ include/uapi/linux/isdn/Kbuild | 1 +
+ include/{ => uapi}/linux/isdn/capicmd.h | 0
+ include/uapi/linux/netfilter/Kbuild | 76 ++++++
+ include/uapi/linux/netfilter/ipset/Kbuild | 4 +
+ include/uapi/linux/netfilter/ipset/ip_set.h | 231 +++++++++++++++++
+ include/uapi/linux/netfilter/ipset/ip_set_bitmap.h | 13 +
+ include/uapi/linux/netfilter/ipset/ip_set_hash.h | 21 ++
+ include/uapi/linux/netfilter/ipset/ip_set_list.h | 21 ++
+ include/uapi/linux/netfilter/nf_conntrack_common.h | 117 +++++++++
+ include/uapi/linux/netfilter/nf_conntrack_ftp.h | 18 ++
+ .../{ => uapi}/linux/netfilter/nf_conntrack_sctp.h | 0
+ include/uapi/linux/netfilter/nf_conntrack_tcp.h | 51 ++++
+ .../linux/netfilter/nf_conntrack_tuple_common.h | 0
+ include/{ => uapi}/linux/netfilter/nf_nat.h | 0
+ include/uapi/linux/netfilter/nfnetlink.h | 56 ++++
+ include/uapi/linux/netfilter/nfnetlink_acct.h | 27 ++
+ .../{ => uapi}/linux/netfilter/nfnetlink_compat.h | 0
+ .../linux/netfilter/nfnetlink_conntrack.h | 0
+ .../linux/netfilter/nfnetlink_cthelper.h | 0
+ .../linux/netfilter/nfnetlink_cttimeout.h | 0
+ include/{ => uapi}/linux/netfilter/nfnetlink_log.h | 0
+ .../{ => uapi}/linux/netfilter/nfnetlink_queue.h | 0
+ include/uapi/linux/netfilter/x_tables.h | 187 ++++++++++++++
+ include/{ => uapi}/linux/netfilter/xt_AUDIT.h | 0
+ include/{ => uapi}/linux/netfilter/xt_CHECKSUM.h | 0
+ include/{ => uapi}/linux/netfilter/xt_CLASSIFY.h | 0
+ include/{ => uapi}/linux/netfilter/xt_CONNMARK.h | 0
+ .../{ => uapi}/linux/netfilter/xt_CONNSECMARK.h | 0
+ include/{ => uapi}/linux/netfilter/xt_CT.h | 0
+ include/{ => uapi}/linux/netfilter/xt_DSCP.h | 0
+ include/{ => uapi}/linux/netfilter/xt_IDLETIMER.h | 0
+ include/{ => uapi}/linux/netfilter/xt_LED.h | 0
+ include/{ => uapi}/linux/netfilter/xt_LOG.h | 0
+ include/{ => uapi}/linux/netfilter/xt_MARK.h | 0
+ include/{ => uapi}/linux/netfilter/xt_NFLOG.h | 0
+ include/{ => uapi}/linux/netfilter/xt_NFQUEUE.h | 0
+ include/{ => uapi}/linux/netfilter/xt_RATEEST.h | 0
+ include/{ => uapi}/linux/netfilter/xt_SECMARK.h | 0
+ include/{ => uapi}/linux/netfilter/xt_TCPMSS.h | 0
+ .../{ => uapi}/linux/netfilter/xt_TCPOPTSTRIP.h | 0
+ include/{ => uapi}/linux/netfilter/xt_TEE.h | 0
+ include/{ => uapi}/linux/netfilter/xt_TPROXY.h | 0
+ include/{ => uapi}/linux/netfilter/xt_addrtype.h | 0
+ include/{ => uapi}/linux/netfilter/xt_cluster.h | 0
+ include/{ => uapi}/linux/netfilter/xt_comment.h | 0
+ include/{ => uapi}/linux/netfilter/xt_connbytes.h | 0
+ include/{ => uapi}/linux/netfilter/xt_connlimit.h | 0
+ include/{ => uapi}/linux/netfilter/xt_connmark.h | 0
+ include/{ => uapi}/linux/netfilter/xt_conntrack.h | 0
+ include/{ => uapi}/linux/netfilter/xt_cpu.h | 0
+ include/{ => uapi}/linux/netfilter/xt_dccp.h | 0
+ include/{ => uapi}/linux/netfilter/xt_devgroup.h | 0
+ include/{ => uapi}/linux/netfilter/xt_dscp.h | 0
+ include/{ => uapi}/linux/netfilter/xt_ecn.h | 0
+ include/{ => uapi}/linux/netfilter/xt_esp.h | 0
+ include/uapi/linux/netfilter/xt_hashlimit.h | 73 ++++++
+ include/{ => uapi}/linux/netfilter/xt_helper.h | 0
+ include/{ => uapi}/linux/netfilter/xt_iprange.h | 0
+ include/{ => uapi}/linux/netfilter/xt_ipvs.h | 0
+ include/{ => uapi}/linux/netfilter/xt_length.h | 0
+ include/{ => uapi}/linux/netfilter/xt_limit.h | 0
+ include/{ => uapi}/linux/netfilter/xt_mac.h | 0
+ include/{ => uapi}/linux/netfilter/xt_mark.h | 0
+ include/{ => uapi}/linux/netfilter/xt_multiport.h | 0
+ include/{ => uapi}/linux/netfilter/xt_nfacct.h | 0
+ include/{ => uapi}/linux/netfilter/xt_osf.h | 0
+ include/{ => uapi}/linux/netfilter/xt_owner.h | 0
+ include/uapi/linux/netfilter/xt_physdev.h | 23 ++
+ include/{ => uapi}/linux/netfilter/xt_pkttype.h | 0
+ include/{ => uapi}/linux/netfilter/xt_policy.h | 0
+ include/{ => uapi}/linux/netfilter/xt_quota.h | 0
+ include/{ => uapi}/linux/netfilter/xt_rateest.h | 0
+ include/{ => uapi}/linux/netfilter/xt_realm.h | 0
+ include/{ => uapi}/linux/netfilter/xt_recent.h | 0
+ include/{ => uapi}/linux/netfilter/xt_sctp.h | 0
+ include/{ => uapi}/linux/netfilter/xt_set.h | 0
+ include/{ => uapi}/linux/netfilter/xt_socket.h | 0
+ include/{ => uapi}/linux/netfilter/xt_state.h | 0
+ include/{ => uapi}/linux/netfilter/xt_statistic.h | 0
+ include/{ => uapi}/linux/netfilter/xt_string.h | 0
+ include/{ => uapi}/linux/netfilter/xt_tcpmss.h | 0
+ include/{ => uapi}/linux/netfilter/xt_tcpudp.h | 0
+ include/{ => uapi}/linux/netfilter/xt_time.h | 0
+ include/{ => uapi}/linux/netfilter/xt_u32.h | 0
+ include/uapi/linux/netfilter_arp/Kbuild | 2 +
+ include/uapi/linux/netfilter_arp/arp_tables.h | 206 +++++++++++++++
+ .../{ => uapi}/linux/netfilter_arp/arpt_mangle.h | 0
+ include/uapi/linux/netfilter_bridge/Kbuild | 18 ++
+ include/uapi/linux/netfilter_bridge/ebt_802_3.h | 62 +++++
+ .../{ => uapi}/linux/netfilter_bridge/ebt_among.h | 0
+ .../{ => uapi}/linux/netfilter_bridge/ebt_arp.h | 0
+ .../linux/netfilter_bridge/ebt_arpreply.h | 0
+ include/{ => uapi}/linux/netfilter_bridge/ebt_ip.h | 0
+ .../{ => uapi}/linux/netfilter_bridge/ebt_ip6.h | 0
+ .../{ => uapi}/linux/netfilter_bridge/ebt_limit.h | 0
+ .../{ => uapi}/linux/netfilter_bridge/ebt_log.h | 0
+ .../{ => uapi}/linux/netfilter_bridge/ebt_mark_m.h | 0
+ .../{ => uapi}/linux/netfilter_bridge/ebt_mark_t.h | 0
+ .../{ => uapi}/linux/netfilter_bridge/ebt_nat.h | 0
+ .../{ => uapi}/linux/netfilter_bridge/ebt_nflog.h | 0
+ .../linux/netfilter_bridge/ebt_pkttype.h | 0
+ .../linux/netfilter_bridge/ebt_redirect.h | 0
+ .../{ => uapi}/linux/netfilter_bridge/ebt_stp.h | 0
+ .../{ => uapi}/linux/netfilter_bridge/ebt_ulog.h | 0
+ .../{ => uapi}/linux/netfilter_bridge/ebt_vlan.h | 0
+ include/uapi/linux/netfilter_bridge/ebtables.h | 268 ++++++++++++++++++++
+ include/uapi/linux/netfilter_ipv4/Kbuild | 10 +
+ include/uapi/linux/netfilter_ipv4/ip_tables.h | 229 +++++++++++++++++
+ .../linux/netfilter_ipv4/ipt_CLUSTERIP.h | 0
+ include/{ => uapi}/linux/netfilter_ipv4/ipt_ECN.h | 0
+ include/{ => uapi}/linux/netfilter_ipv4/ipt_LOG.h | 0
+ .../{ => uapi}/linux/netfilter_ipv4/ipt_REJECT.h | 0
+ include/{ => uapi}/linux/netfilter_ipv4/ipt_TTL.h | 0
+ include/{ => uapi}/linux/netfilter_ipv4/ipt_ULOG.h | 0
+ include/{ => uapi}/linux/netfilter_ipv4/ipt_ah.h | 0
+ include/{ => uapi}/linux/netfilter_ipv4/ipt_ecn.h | 0
+ include/{ => uapi}/linux/netfilter_ipv4/ipt_ttl.h | 0
+ include/uapi/linux/netfilter_ipv6/Kbuild | 12 +
+ include/uapi/linux/netfilter_ipv6/ip6_tables.h | 267 +++++++++++++++++++
+ include/{ => uapi}/linux/netfilter_ipv6/ip6t_HL.h | 0
+ include/{ => uapi}/linux/netfilter_ipv6/ip6t_LOG.h | 0
+ include/{ => uapi}/linux/netfilter_ipv6/ip6t_NPT.h | 0
+ .../{ => uapi}/linux/netfilter_ipv6/ip6t_REJECT.h | 0
+ include/{ => uapi}/linux/netfilter_ipv6/ip6t_ah.h | 0
+ .../{ => uapi}/linux/netfilter_ipv6/ip6t_frag.h | 0
+ include/{ => uapi}/linux/netfilter_ipv6/ip6t_hl.h | 0
+ .../linux/netfilter_ipv6/ip6t_ipv6header.h | 0
+ include/{ => uapi}/linux/netfilter_ipv6/ip6t_mh.h | 0
+ .../{ => uapi}/linux/netfilter_ipv6/ip6t_opts.h | 0
+ include/{ => uapi}/linux/netfilter_ipv6/ip6t_rt.h | 0
+ include/uapi/linux/tc_act/Kbuild | 7 +
+ include/{ => uapi}/linux/tc_act/tc_csum.h | 0
+ include/{ => uapi}/linux/tc_act/tc_gact.h | 0
+ include/{ => uapi}/linux/tc_act/tc_ipt.h | 0
+ include/{ => uapi}/linux/tc_act/tc_mirred.h | 0
+ include/{ => uapi}/linux/tc_act/tc_nat.h | 0
+ include/{ => uapi}/linux/tc_act/tc_pedit.h | 0
+ include/{ => uapi}/linux/tc_act/tc_skbedit.h | 0
+ include/uapi/linux/tc_ematch/Kbuild | 4 +
+ include/{ => uapi}/linux/tc_ematch/tc_em_cmp.h | 0
+ include/{ => uapi}/linux/tc_ematch/tc_em_meta.h | 0
+ include/{ => uapi}/linux/tc_ematch/tc_em_nbyte.h | 0
+ include/{ => uapi}/linux/tc_ematch/tc_em_text.h | 0
+ net/8021q/vlan_core.c | 10 +-
+ net/core/dev.c | 59 +++--
+ net/core/neighbour.c | 6 +-
+ net/core/skbuff.c | 47 ----
+ net/ipv4/fib_frontend.c | 3 +-
+ net/ipv4/fib_semantics.c | 2 +
+ net/ipv4/inet_connection_sock.c | 4 +-
+ net/ipv4/ip_forward.c | 2 +-
+ net/ipv4/ip_output.c | 4 +-
+ net/ipv4/route.c | 146 ++++++-----
+ net/ipv4/xfrm4_policy.c | 1 +
+ net/ipv6/af_inet6.c | 22 +-
+ net/netfilter/ipvs/ip_vs_xmit.c | 6 +-
+ net/netlink/af_netlink.c | 29 ++-
+ net/rds/send.c | 2 +-
+ 238 files changed, 2392 insertions(+), 2292 deletions(-)
+ rename include/{ => uapi}/linux/caif/caif_socket.h (100%)
+ rename include/{ => uapi}/linux/caif/if_caif.h (100%)
+ rename include/{ => uapi}/linux/isdn/capicmd.h (100%)
+ create mode 100644 include/uapi/linux/netfilter/ipset/ip_set.h
+ create mode 100644 include/uapi/linux/netfilter/ipset/ip_set_bitmap.h
+ create mode 100644 include/uapi/linux/netfilter/ipset/ip_set_hash.h
+ create mode 100644 include/uapi/linux/netfilter/ipset/ip_set_list.h
+ create mode 100644 include/uapi/linux/netfilter/nf_conntrack_common.h
+ create mode 100644 include/uapi/linux/netfilter/nf_conntrack_ftp.h
+ rename include/{ => uapi}/linux/netfilter/nf_conntrack_sctp.h (100%)
+ create mode 100644 include/uapi/linux/netfilter/nf_conntrack_tcp.h
+ rename include/{ => uapi}/linux/netfilter/nf_conntrack_tuple_common.h (100%)
+ rename include/{ => uapi}/linux/netfilter/nf_nat.h (100%)
+ create mode 100644 include/uapi/linux/netfilter/nfnetlink.h
+ create mode 100644 include/uapi/linux/netfilter/nfnetlink_acct.h
+ rename include/{ => uapi}/linux/netfilter/nfnetlink_compat.h (100%)
+ rename include/{ => uapi}/linux/netfilter/nfnetlink_conntrack.h (100%)
+ rename include/{ => uapi}/linux/netfilter/nfnetlink_cthelper.h (100%)
+ rename include/{ => uapi}/linux/netfilter/nfnetlink_cttimeout.h (100%)
+ rename include/{ => uapi}/linux/netfilter/nfnetlink_log.h (100%)
+ rename include/{ => uapi}/linux/netfilter/nfnetlink_queue.h (100%)
+ create mode 100644 include/uapi/linux/netfilter/x_tables.h
+ rename include/{ => uapi}/linux/netfilter/xt_AUDIT.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_CHECKSUM.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_CLASSIFY.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_CONNMARK.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_CONNSECMARK.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_CT.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_DSCP.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_IDLETIMER.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_LED.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_LOG.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_MARK.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_NFLOG.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_NFQUEUE.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_RATEEST.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_SECMARK.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_TCPMSS.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_TCPOPTSTRIP.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_TEE.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_TPROXY.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_addrtype.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_cluster.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_comment.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_connbytes.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_connlimit.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_connmark.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_conntrack.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_cpu.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_dccp.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_devgroup.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_dscp.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_ecn.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_esp.h (100%)
+ create mode 100644 include/uapi/linux/netfilter/xt_hashlimit.h
+ rename include/{ => uapi}/linux/netfilter/xt_helper.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_iprange.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_ipvs.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_length.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_limit.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_mac.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_mark.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_multiport.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_nfacct.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_osf.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_owner.h (100%)
+ create mode 100644 include/uapi/linux/netfilter/xt_physdev.h
+ rename include/{ => uapi}/linux/netfilter/xt_pkttype.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_policy.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_quota.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_rateest.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_realm.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_recent.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_sctp.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_set.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_socket.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_state.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_statistic.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_string.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_tcpmss.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_tcpudp.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_time.h (100%)
+ rename include/{ => uapi}/linux/netfilter/xt_u32.h (100%)
+ create mode 100644 include/uapi/linux/netfilter_arp/arp_tables.h
+ rename include/{ => uapi}/linux/netfilter_arp/arpt_mangle.h (100%)
+ create mode 100644 include/uapi/linux/netfilter_bridge/ebt_802_3.h
+ rename include/{ => uapi}/linux/netfilter_bridge/ebt_among.h (100%)
+ rename include/{ => uapi}/linux/netfilter_bridge/ebt_arp.h (100%)
+ rename include/{ => uapi}/linux/netfilter_bridge/ebt_arpreply.h (100%)
+ rename include/{ => uapi}/linux/netfilter_bridge/ebt_ip.h (100%)
+ rename include/{ => uapi}/linux/netfilter_bridge/ebt_ip6.h (100%)
+ rename include/{ => uapi}/linux/netfilter_bridge/ebt_limit.h (100%)
+ rename include/{ => uapi}/linux/netfilter_bridge/ebt_log.h (100%)
+ rename include/{ => uapi}/linux/netfilter_bridge/ebt_mark_m.h (100%)
+ rename include/{ => uapi}/linux/netfilter_bridge/ebt_mark_t.h (100%)
+ rename include/{ => uapi}/linux/netfilter_bridge/ebt_nat.h (100%)
+ rename include/{ => uapi}/linux/netfilter_bridge/ebt_nflog.h (100%)
+ rename include/{ => uapi}/linux/netfilter_bridge/ebt_pkttype.h (100%)
+ rename include/{ => uapi}/linux/netfilter_bridge/ebt_redirect.h (100%)
+ rename include/{ => uapi}/linux/netfilter_bridge/ebt_stp.h (100%)
+ rename include/{ => uapi}/linux/netfilter_bridge/ebt_ulog.h (100%)
+ rename include/{ => uapi}/linux/netfilter_bridge/ebt_vlan.h (100%)
+ create mode 100644 include/uapi/linux/netfilter_bridge/ebtables.h
+ create mode 100644 include/uapi/linux/netfilter_ipv4/ip_tables.h
+ rename include/{ => uapi}/linux/netfilter_ipv4/ipt_CLUSTERIP.h (100%)
+ rename include/{ => uapi}/linux/netfilter_ipv4/ipt_ECN.h (100%)
+ rename include/{ => uapi}/linux/netfilter_ipv4/ipt_LOG.h (100%)
+ rename include/{ => uapi}/linux/netfilter_ipv4/ipt_REJECT.h (100%)
+ rename include/{ => uapi}/linux/netfilter_ipv4/ipt_TTL.h (100%)
+ rename include/{ => uapi}/linux/netfilter_ipv4/ipt_ULOG.h (100%)
+ rename include/{ => uapi}/linux/netfilter_ipv4/ipt_ah.h (100%)
+ rename include/{ => uapi}/linux/netfilter_ipv4/ipt_ecn.h (100%)
+ rename include/{ => uapi}/linux/netfilter_ipv4/ipt_ttl.h (100%)
+ create mode 100644 include/uapi/linux/netfilter_ipv6/ip6_tables.h
+ rename include/{ => uapi}/linux/netfilter_ipv6/ip6t_HL.h (100%)
+ rename include/{ => uapi}/linux/netfilter_ipv6/ip6t_LOG.h (100%)
+ rename include/{ => uapi}/linux/netfilter_ipv6/ip6t_NPT.h (100%)
+ rename include/{ => uapi}/linux/netfilter_ipv6/ip6t_REJECT.h (100%)
+ rename include/{ => uapi}/linux/netfilter_ipv6/ip6t_ah.h (100%)
+ rename include/{ => uapi}/linux/netfilter_ipv6/ip6t_frag.h (100%)
+ rename include/{ => uapi}/linux/netfilter_ipv6/ip6t_hl.h (100%)
+ rename include/{ => uapi}/linux/netfilter_ipv6/ip6t_ipv6header.h (100%)
+ rename include/{ => uapi}/linux/netfilter_ipv6/ip6t_mh.h (100%)
+ rename include/{ => uapi}/linux/netfilter_ipv6/ip6t_opts.h (100%)
+ rename include/{ => uapi}/linux/netfilter_ipv6/ip6t_rt.h (100%)
+ rename include/{ => uapi}/linux/tc_act/tc_csum.h (100%)
+ rename include/{ => uapi}/linux/tc_act/tc_gact.h (100%)
+ rename include/{ => uapi}/linux/tc_act/tc_ipt.h (100%)
+ rename include/{ => uapi}/linux/tc_act/tc_mirred.h (100%)
+ rename include/{ => uapi}/linux/tc_act/tc_nat.h (100%)
+ rename include/{ => uapi}/linux/tc_act/tc_pedit.h (100%)
+ rename include/{ => uapi}/linux/tc_act/tc_skbedit.h (100%)
+ rename include/{ => uapi}/linux/tc_ematch/tc_em_cmp.h (100%)
+ rename include/{ => uapi}/linux/tc_ematch/tc_em_meta.h (100%)
+ rename include/{ => uapi}/linux/tc_ematch/tc_em_nbyte.h (100%)
+ rename include/{ => uapi}/linux/tc_ematch/tc_em_text.h (100%)
+Merging sound-current/for-linus (5d037f9 Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
+$ git merge sound-current/for-linus
+Already up-to-date.
+Merging pci-current/for-linus (0ff9514 PCI: Don't print anything while decoding is disabled)
+$ git merge pci-current/for-linus
+Already up-to-date.
+Merging wireless/master (c3e7724 mac80211: use ieee80211_free_txskb to fix possible skb leaks)
+$ git merge wireless/master
+Merge made by the 'recursive' strategy.
+ drivers/net/wireless/ath/ath5k/base.c | 3 +-
+ drivers/net/wireless/ath/ath9k/beacon.c | 2 +-
+ drivers/net/wireless/ath/ath9k/hw.c | 5 +++
+ drivers/net/wireless/ath/ath9k/hw.h | 1 +
+ drivers/net/wireless/ath/ath9k/main.c | 15 +++-----
+ drivers/net/wireless/ath/ath9k/pci.c | 7 ++++
+ drivers/net/wireless/ath/ath9k/xmit.c | 53 ++++++++++++++------------
+ drivers/net/wireless/ath/carl9170/carl9170.h | 1 +
+ drivers/net/wireless/ath/carl9170/main.c | 29 +++++++-------
+ drivers/net/wireless/mwifiex/cfg80211.c | 27 ++++++++++---
+ drivers/net/wireless/mwifiex/join.c | 6 ++-
+ drivers/net/wireless/mwifiex/main.h | 2 +-
+ drivers/net/wireless/mwifiex/scan.c | 38 +++++++++---------
+ drivers/net/wireless/mwifiex/sta_cmdresp.c | 4 +-
+ drivers/net/wireless/mwifiex/sta_event.c | 31 +++++++++------
+ drivers/net/wireless/rt2x00/rt2800lib.c | 4 +-
+ net/mac80211/mesh_sync.c | 3 +-
+ net/mac80211/status.c | 4 +-
+ net/mac80211/tx.c | 22 ++++++-----
+ 19 files changed, 151 insertions(+), 106 deletions(-)
+Merging driver-core.current/driver-core-linus (5698bd7 Linux 3.6-rc6)
+$ git merge driver-core.current/driver-core-linus
+Already up-to-date.
+Merging tty.current/tty-linus (b70936d tty: serial: sccnxp: Fix bug with unterminated platform_id list)
+$ git merge tty.current/tty-linus
+Merge made by the 'recursive' strategy.
+ drivers/staging/dgrp/dgrp_mon_ops.c | 1 +
+ drivers/staging/dgrp/dgrp_specproc.c | 1 +
+ drivers/staging/dgrp/dgrp_tty.c | 1 +
+ drivers/tty/serial/Kconfig | 4 ++--
+ drivers/tty/serial/sccnxp.c | 1 +
+ include/linux/ratelimit.h | 27 +++++++++------------------
+ net/irda/ircomm/ircomm_tty.c | 2 ++
+ 7 files changed, 17 insertions(+), 20 deletions(-)
+Merging usb.current/usb-linus (ecefbd9 Merge tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
+$ git merge usb.current/usb-linus
+Already up-to-date.
+Merging staging.current/staging-linus (5698bd7 Linux 3.6-rc6)
+$ git merge staging.current/staging-linus
+Already up-to-date.
+Merging char-misc.current/char-misc-linus (fea7a08 Linux 3.6-rc3)
+$ git merge char-misc.current/char-misc-linus
+Already up-to-date.
+Merging input-current/for-linus (dde3ada Merge branch 'next' into for-linus)
+$ git merge input-current/for-linus
+Already up-to-date.
+Merging md-current/for-linus (80b4812 md/raid10: fix "enough" function for detecting if array is failed.)
+$ git merge md-current/for-linus
+Already up-to-date.
+Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
+$ git merge audit-current/for-linus
+Already up-to-date.
+Merging crypto-current/master (c9f97a2 crypto: x86/glue_helper - fix storing of new IV in CBC encryption)
+$ git merge crypto-current/master
+Already up-to-date.
+Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops)
+$ git merge ide/master
+Already up-to-date.
+Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
+$ git merge dwmw2/master
+Already up-to-date.
+Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions)
+$ git merge sh-current/sh-fixes-for-linus
+Already up-to-date.
+Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting)
+$ git merge irqdomain-current/irqdomain/merge
+Already up-to-date.
+Merging devicetree-current/devicetree/merge (4e8383b of: release node fix for of_parse_phandle_with_args)
+$ git merge devicetree-current/devicetree/merge
+Auto-merging drivers/of/base.c
+Merge made by the 'recursive' strategy.
+ drivers/of/base.c | 2 ++
+ 1 file changed, 2 insertions(+)
+Merging spi-current/spi/merge (d1c185b of/spi: Fix SPI module loading by using proper "spi:" modalias prefixes.)
+$ git merge spi-current/spi/merge
+Auto-merging drivers/spi/spi.c
+Auto-merging drivers/spi/spi-s3c64xx.c
+Auto-merging drivers/spi/spi-bcm63xx.c
+Merge made by the 'recursive' strategy.
+ drivers/spi/spi-bcm63xx.c | 16 ++++++----------
+ drivers/spi/spi-s3c64xx.c | 10 ++++------
+ drivers/spi/spi.c | 5 ++++-
+ 3 files changed, 14 insertions(+), 17 deletions(-)
+Merging gpio-current/gpio/merge (96b7064 gpio/tca6424: merge I2C transactions, remove cast)
+$ git merge gpio-current/gpio/merge
+Already up-to-date.
+Merging asm-generic/master (c37d615 Merge branch 'disintegrate-asm-generic' of git://git.infradead.org/users/dhowells/linux-headers into asm-generic)
+$ git merge asm-generic/master
+Already up-to-date.
+Merging arm/for-next (4231a1e Merge branch 'devel-stable' into for-next)
+$ git merge arm/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/arm/Booting | 22 +++-
+ arch/arm/boot/compressed/.gitignore | 1 +
+ arch/arm/boot/compressed/Makefile | 9 +-
+ arch/arm/boot/compressed/head.S | 71 +++++++++--
+ arch/arm/include/asm/assembler.h | 29 +++++
+ arch/arm/include/asm/cacheflush.h | 15 +++
+ arch/arm/include/asm/glue-cache.h | 1 +
+ arch/arm/include/asm/opcodes-virt.h | 10 ++
+ arch/arm/include/asm/ptrace.h | 1 +
+ arch/arm/include/asm/virt.h | 69 +++++++++++
+ arch/arm/kernel/Makefile | 2 +
+ arch/arm/kernel/head.S | 14 ++-
+ arch/arm/kernel/hyp-stub.S | 223 +++++++++++++++++++++++++++++++++++
+ arch/arm/kernel/setup.c | 20 ++++
+ arch/arm/kernel/smp.c | 8 +-
+ arch/arm/kernel/suspend.c | 17 ++-
+ arch/arm/mm/Kconfig | 17 +++
+ arch/arm/mm/cache-fa.S | 3 +
+ arch/arm/mm/cache-v3.S | 3 +
+ arch/arm/mm/cache-v4.S | 3 +
+ arch/arm/mm/cache-v4wb.S | 3 +
+ arch/arm/mm/cache-v4wt.S | 3 +
+ arch/arm/mm/cache-v6.S | 3 +
+ arch/arm/mm/cache-v7.S | 48 +++++++-
+ arch/arm/mm/proc-arm1020.S | 3 +
+ arch/arm/mm/proc-arm1020e.S | 3 +
+ arch/arm/mm/proc-arm1022.S | 3 +
+ arch/arm/mm/proc-arm1026.S | 3 +
+ arch/arm/mm/proc-arm920.S | 3 +
+ arch/arm/mm/proc-arm922.S | 3 +
+ arch/arm/mm/proc-arm925.S | 3 +
+ arch/arm/mm/proc-arm926.S | 3 +
+ arch/arm/mm/proc-arm940.S | 3 +
+ arch/arm/mm/proc-arm946.S | 3 +
+ arch/arm/mm/proc-feroceon.S | 4 +
+ arch/arm/mm/proc-macros.S | 1 +
+ arch/arm/mm/proc-mohawk.S | 3 +
+ arch/arm/mm/proc-v7.S | 2 +-
+ arch/arm/mm/proc-xsc3.S | 3 +
+ arch/arm/mm/proc-xscale.S | 4 +
+ 40 files changed, 621 insertions(+), 21 deletions(-)
+ create mode 100644 arch/arm/include/asm/virt.h
+ create mode 100644 arch/arm/kernel/hyp-stub.S
+Merging arm-perf/for-next/perf (b90c4b9 Merge branch 'hw-breakpoint' into for-next/perf)
+$ git merge arm-perf/for-next/perf
+Resolved 'arch/arm/kernel/hw_breakpoint.c' using previous resolution.
+Resolved 'arch/arm/mach-omap2/devices.c' using previous resolution.
+Resolved 'arch/arm/mach-ux500/cpu-db8500.c' using previous resolution.
+Auto-merging arch/arm/mach-ux500/cpu-db8500.c
+CONFLICT (content): Merge conflict in arch/arm/mach-ux500/cpu-db8500.c
+CONFLICT (modify/delete): arch/arm/mach-tegra/devices.c deleted in HEAD and modified in arm-perf/for-next/perf. Version arm-perf/for-next/perf of arch/arm/mach-tegra/devices.c left in tree.
+Auto-merging arch/arm/mach-omap2/devices.c
+CONFLICT (content): Merge conflict in arch/arm/mach-omap2/devices.c
+CONFLICT (modify/delete): arch/arm/mach-bcmring/arch.c deleted in HEAD and modified in arm-perf/for-next/perf. Version arm-perf/for-next/perf of arch/arm/mach-bcmring/arch.c left in tree.
+Auto-merging arch/arm/kernel/hw_breakpoint.c
+CONFLICT (content): Merge conflict in arch/arm/kernel/hw_breakpoint.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f arch/arm/mach-tegra/devices.c arch/arm/mach-bcmring/arch.c
+arch/arm/mach-bcmring/arch.c: needs merge
+arch/arm/mach-tegra/devices.c: needs merge
+rm 'arch/arm/mach-bcmring/arch.c'
+rm 'arch/arm/mach-tegra/devices.c'
+$ git commit -v -a
+[master 756337c] Merge remote-tracking branch 'arm-perf/for-next/perf'
+$ git diff -M --stat --summary HEAD^..
+Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
+$ git merge davinci/davinci-next
+Already up-to-date.
+Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
+$ git merge xilinx/arm-next
+Already up-to-date.
+Merging arm64/upstream (6916fd0 arm64: Enable interrupts before calling do_notify_resume())
+$ git merge arm64/upstream
+Already up-to-date.
+Merging blackfin/for-linus (9f57151 Merge tag 'disintegrate-blackfin-20121009' into for-linus)
+$ git merge blackfin/for-linus
+Merge made by the 'recursive' strategy.
+ arch/blackfin/include/asm/Kbuild | 5 -
+ arch/blackfin/include/asm/bfin_sport.h | 128 +-----
+ arch/blackfin/include/asm/fixed_code.h | 30 +-
+ arch/blackfin/include/asm/ptrace.h | 161 +-------
+ arch/blackfin/include/asm/unistd.h | 430 +------------------
+ arch/blackfin/include/uapi/asm/Kbuild | 16 +
+ arch/blackfin/include/uapi/asm/bfin_sport.h | 136 ++++++
+ arch/blackfin/include/{ => uapi}/asm/byteorder.h | 0
+ arch/blackfin/include/{ => uapi}/asm/cachectl.h | 0
+ arch/blackfin/include/{ => uapi}/asm/fcntl.h | 0
+ arch/blackfin/include/uapi/asm/fixed_code.h | 38 ++
+ arch/blackfin/include/{ => uapi}/asm/ioctls.h | 0
+ arch/blackfin/include/{ => uapi}/asm/kvm_para.h | 0
+ arch/blackfin/include/{ => uapi}/asm/poll.h | 0
+ arch/blackfin/include/{ => uapi}/asm/posix_types.h | 0
+ arch/blackfin/include/uapi/asm/ptrace.h | 170 ++++++++
+ arch/blackfin/include/{ => uapi}/asm/sigcontext.h | 0
+ arch/blackfin/include/{ => uapi}/asm/siginfo.h | 0
+ arch/blackfin/include/{ => uapi}/asm/signal.h | 0
+ arch/blackfin/include/{ => uapi}/asm/stat.h | 0
+ arch/blackfin/include/{ => uapi}/asm/swab.h | 0
+ arch/blackfin/include/uapi/asm/unistd.h | 437 ++++++++++++++++++++
+ 22 files changed, 802 insertions(+), 749 deletions(-)
+ create mode 100644 arch/blackfin/include/uapi/asm/bfin_sport.h
+ rename arch/blackfin/include/{ => uapi}/asm/byteorder.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/cachectl.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/fcntl.h (100%)
+ create mode 100644 arch/blackfin/include/uapi/asm/fixed_code.h
+ rename arch/blackfin/include/{ => uapi}/asm/ioctls.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/kvm_para.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/poll.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/posix_types.h (100%)
+ create mode 100644 arch/blackfin/include/uapi/asm/ptrace.h
+ rename arch/blackfin/include/{ => uapi}/asm/sigcontext.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/siginfo.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/signal.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/stat.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/swab.h (100%)
+ create mode 100644 arch/blackfin/include/uapi/asm/unistd.h
+Merging c6x/for-linux-next (fbdd63d UAPI: (Scripted) Disintegrate arch/c6x/include/asm)
+$ git merge c6x/for-linux-next
+Merge made by the 'recursive' strategy.
+ arch/c6x/include/asm/Kbuild | 1 -
+ arch/c6x/include/asm/ptrace.h | 146 +----------------------
+ arch/c6x/include/uapi/asm/Kbuild | 7 ++
+ arch/c6x/include/{ => uapi}/asm/byteorder.h | 0
+ arch/c6x/include/{ => uapi}/asm/kvm_para.h | 0
+ arch/c6x/include/uapi/asm/ptrace.h | 163 ++++++++++++++++++++++++++
+ arch/c6x/include/{ => uapi}/asm/setup.h | 0
+ arch/c6x/include/{ => uapi}/asm/sigcontext.h | 0
+ arch/c6x/include/{ => uapi}/asm/swab.h | 0
+ arch/c6x/include/{ => uapi}/asm/unistd.h | 0
+ 10 files changed, 171 insertions(+), 146 deletions(-)
+ rename arch/c6x/include/{ => uapi}/asm/byteorder.h (100%)
+ rename arch/c6x/include/{ => uapi}/asm/kvm_para.h (100%)
+ create mode 100644 arch/c6x/include/uapi/asm/ptrace.h
+ rename arch/c6x/include/{ => uapi}/asm/setup.h (100%)
+ rename arch/c6x/include/{ => uapi}/asm/sigcontext.h (100%)
+ rename arch/c6x/include/{ => uapi}/asm/swab.h (100%)
+ rename arch/c6x/include/{ => uapi}/asm/unistd.h (100%)
+Merging cris/for-next (d75d806 CRIS: Remove VCS simulator specific code)
+$ git merge cris/for-next
+Already up-to-date.
+Merging hexagon/linux-next (5042ab9 various Kconfig cleanup and old platform build code removal)
+$ git merge hexagon/linux-next
+Already up-to-date.
+Merging ia64/next (f68301f UAPI: (Scripted) Disintegrate arch/ia64/include/asm)
+$ git merge ia64/next
+Resolved 'arch/ia64/include/asm/Kbuild' using previous resolution.
+Auto-merging arch/ia64/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/ia64/include/asm/Kbuild
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master e54f659] Merge remote-tracking branch 'ia64/next'
+$ git diff -M --stat --summary HEAD^..
+ arch/ia64/include/asm/Kbuild | 15 -
+ arch/ia64/include/asm/gcc_intrin.h | 615 +------------------
+ arch/ia64/include/asm/intrinsics.h | 120 +---
+ arch/ia64/include/asm/kvm_para.h | 10 +-
+ arch/ia64/include/asm/mman.h | 12 +-
+ arch/ia64/include/asm/param.h | 22 +-
+ arch/ia64/include/asm/perfmon.h | 171 +-----
+ arch/ia64/include/asm/ptrace.h | 236 +-------
+ arch/ia64/include/asm/siginfo.h | 118 +---
+ arch/ia64/include/asm/signal.h | 122 +---
+ arch/ia64/include/asm/termios.h | 46 +-
+ arch/ia64/include/asm/types.h | 19 +-
+ arch/ia64/include/asm/unistd.h | 324 +---------
+ arch/ia64/include/asm/ustack.h | 11 +-
+ arch/ia64/include/uapi/asm/Kbuild | 45 ++
+ arch/ia64/include/{ => uapi}/asm/auxvec.h | 0
+ arch/ia64/include/{ => uapi}/asm/bitsperlong.h | 0
+ arch/ia64/include/{ => uapi}/asm/break.h | 0
+ arch/ia64/include/{ => uapi}/asm/byteorder.h | 0
+ arch/ia64/include/{ => uapi}/asm/cmpxchg.h | 0
+ arch/ia64/include/{ => uapi}/asm/errno.h | 0
+ arch/ia64/include/{ => uapi}/asm/fcntl.h | 0
+ arch/ia64/include/{ => uapi}/asm/fpu.h | 0
+ arch/ia64/include/uapi/asm/gcc_intrin.h | 618 ++++++++++++++++++++
+ arch/ia64/include/{ => uapi}/asm/ia64regs.h | 0
+ arch/ia64/include/{ => uapi}/asm/intel_intrin.h | 0
+ arch/ia64/include/uapi/asm/intrinsics.h | 124 ++++
+ arch/ia64/include/{ => uapi}/asm/ioctl.h | 0
+ arch/ia64/include/{ => uapi}/asm/ioctls.h | 0
+ arch/ia64/include/{ => uapi}/asm/ipcbuf.h | 0
+ arch/ia64/include/{ => uapi}/asm/kvm.h | 0
+ arch/ia64/include/uapi/asm/mman.h | 16 +
+ arch/ia64/include/{ => uapi}/asm/msgbuf.h | 0
+ arch/ia64/include/uapi/asm/param.h | 29 +
+ arch/ia64/include/uapi/asm/perfmon.h | 177 ++++++
+ .../include/{ => uapi}/asm/perfmon_default_smpl.h | 0
+ arch/ia64/include/{ => uapi}/asm/poll.h | 0
+ arch/ia64/include/{ => uapi}/asm/posix_types.h | 0
+ arch/ia64/include/uapi/asm/ptrace.h | 247 ++++++++
+ arch/ia64/include/{ => uapi}/asm/ptrace_offsets.h | 0
+ arch/ia64/include/{ => uapi}/asm/resource.h | 0
+ arch/ia64/include/{ => uapi}/asm/rse.h | 0
+ arch/ia64/include/{ => uapi}/asm/sembuf.h | 0
+ arch/ia64/include/{ => uapi}/asm/setup.h | 0
+ arch/ia64/include/{ => uapi}/asm/shmbuf.h | 0
+ arch/ia64/include/{ => uapi}/asm/sigcontext.h | 0
+ arch/ia64/include/uapi/asm/siginfo.h | 121 ++++
+ arch/ia64/include/uapi/asm/signal.h | 127 ++++
+ arch/ia64/include/{ => uapi}/asm/socket.h | 0
+ arch/ia64/include/{ => uapi}/asm/sockios.h | 0
+ arch/ia64/include/{ => uapi}/asm/stat.h | 0
+ arch/ia64/include/{ => uapi}/asm/statfs.h | 0
+ arch/ia64/include/{ => uapi}/asm/swab.h | 0
+ arch/ia64/include/{ => uapi}/asm/termbits.h | 0
+ arch/ia64/include/uapi/asm/termios.h | 50 ++
+ arch/ia64/include/uapi/asm/types.h | 31 +
+ arch/ia64/include/{ => uapi}/asm/ucontext.h | 0
+ arch/ia64/include/uapi/asm/unistd.h | 328 +++++++++++
+ arch/ia64/include/uapi/asm/ustack.h | 12 +
+ 59 files changed, 1961 insertions(+), 1805 deletions(-)
+ rename arch/ia64/include/{ => uapi}/asm/auxvec.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/bitsperlong.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/break.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/byteorder.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/cmpxchg.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/errno.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/fcntl.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/fpu.h (100%)
+ create mode 100644 arch/ia64/include/uapi/asm/gcc_intrin.h
+ rename arch/ia64/include/{ => uapi}/asm/ia64regs.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/intel_intrin.h (100%)
+ create mode 100644 arch/ia64/include/uapi/asm/intrinsics.h
+ rename arch/ia64/include/{ => uapi}/asm/ioctl.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/ioctls.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/ipcbuf.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/kvm.h (100%)
+ create mode 100644 arch/ia64/include/uapi/asm/kvm_para.h
+ create mode 100644 arch/ia64/include/uapi/asm/mman.h
+ rename arch/ia64/include/{ => uapi}/asm/msgbuf.h (100%)
+ create mode 100644 arch/ia64/include/uapi/asm/param.h
+ create mode 100644 arch/ia64/include/uapi/asm/perfmon.h
+ rename arch/ia64/include/{ => uapi}/asm/perfmon_default_smpl.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/poll.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/posix_types.h (100%)
+ create mode 100644 arch/ia64/include/uapi/asm/ptrace.h
+ rename arch/ia64/include/{ => uapi}/asm/ptrace_offsets.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/resource.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/rse.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/sembuf.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/setup.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/shmbuf.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/sigcontext.h (100%)
+ create mode 100644 arch/ia64/include/uapi/asm/siginfo.h
+ create mode 100644 arch/ia64/include/uapi/asm/signal.h
+ rename arch/ia64/include/{ => uapi}/asm/socket.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/sockios.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/stat.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/statfs.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/swab.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/termbits.h (100%)
+ create mode 100644 arch/ia64/include/uapi/asm/termios.h
+ create mode 100644 arch/ia64/include/uapi/asm/types.h
+ rename arch/ia64/include/{ => uapi}/asm/ucontext.h (100%)
+ create mode 100644 arch/ia64/include/uapi/asm/unistd.h
+ create mode 100644 arch/ia64/include/uapi/asm/ustack.h
+Merging m68k/for-next (f82735d m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR)
+$ git merge m68k/for-next
+Already up-to-date.
+Merging m68knommu/for-next (a255172 m68knommu: fix inconsistent formating in ColdFire 5407 definitions)
+$ git merge m68knommu/for-next
+Already up-to-date.
+Merging microblaze/next (1883baa UAPI: (Scripted) Disintegrate arch/microblaze/include/asm)
+$ git merge microblaze/next
+Merge made by the 'recursive' strategy.
+ arch/microblaze/include/asm/Kbuild | 2 -
+ arch/microblaze/include/asm/elf.h | 97 +----
+ arch/microblaze/include/asm/ptrace.h | 62 +--
+ arch/microblaze/include/asm/setup.h | 6 +-
+ arch/microblaze/include/asm/unistd.h | 390 +------------------
+ arch/microblaze/include/uapi/asm/Kbuild | 32 ++
+ arch/microblaze/include/{ => uapi}/asm/auxvec.h | 0
+ .../include/{ => uapi}/asm/bitsperlong.h | 0
+ arch/microblaze/include/{ => uapi}/asm/byteorder.h | 0
+ arch/microblaze/include/uapi/asm/elf.h | 121 ++++++
+ arch/microblaze/include/{ => uapi}/asm/errno.h | 0
+ arch/microblaze/include/{ => uapi}/asm/fcntl.h | 0
+ arch/microblaze/include/{ => uapi}/asm/ioctl.h | 0
+ arch/microblaze/include/{ => uapi}/asm/ioctls.h | 0
+ arch/microblaze/include/{ => uapi}/asm/ipcbuf.h | 0
+ arch/microblaze/include/{ => uapi}/asm/kvm_para.h | 0
+ arch/microblaze/include/{ => uapi}/asm/mman.h | 0
+ arch/microblaze/include/{ => uapi}/asm/msgbuf.h | 0
+ arch/microblaze/include/{ => uapi}/asm/param.h | 0
+ arch/microblaze/include/{ => uapi}/asm/poll.h | 0
+ .../include/{ => uapi}/asm/posix_types.h | 0
+ arch/microblaze/include/uapi/asm/ptrace.h | 72 ++++
+ arch/microblaze/include/{ => uapi}/asm/resource.h | 0
+ arch/microblaze/include/{ => uapi}/asm/sembuf.h | 0
+ arch/microblaze/include/uapi/asm/setup.h | 19 +
+ arch/microblaze/include/{ => uapi}/asm/shmbuf.h | 0
+ .../microblaze/include/{ => uapi}/asm/sigcontext.h | 0
+ arch/microblaze/include/{ => uapi}/asm/siginfo.h | 0
+ arch/microblaze/include/{ => uapi}/asm/signal.h | 0
+ arch/microblaze/include/{ => uapi}/asm/socket.h | 0
+ arch/microblaze/include/{ => uapi}/asm/sockios.h | 0
+ arch/microblaze/include/{ => uapi}/asm/stat.h | 0
+ arch/microblaze/include/{ => uapi}/asm/statfs.h | 0
+ arch/microblaze/include/{ => uapi}/asm/swab.h | 0
+ arch/microblaze/include/{ => uapi}/asm/termbits.h | 0
+ arch/microblaze/include/{ => uapi}/asm/termios.h | 0
+ arch/microblaze/include/{ => uapi}/asm/types.h | 0
+ arch/microblaze/include/uapi/asm/unistd.h | 400 ++++++++++++++++++++
+ 38 files changed, 649 insertions(+), 552 deletions(-)
+ rename arch/microblaze/include/{ => uapi}/asm/auxvec.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/bitsperlong.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/byteorder.h (100%)
+ create mode 100644 arch/microblaze/include/uapi/asm/elf.h
+ rename arch/microblaze/include/{ => uapi}/asm/errno.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/fcntl.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/ioctl.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/ioctls.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/ipcbuf.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/kvm_para.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/mman.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/msgbuf.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/param.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/poll.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/posix_types.h (100%)
+ create mode 100644 arch/microblaze/include/uapi/asm/ptrace.h
+ rename arch/microblaze/include/{ => uapi}/asm/resource.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/sembuf.h (100%)
+ create mode 100644 arch/microblaze/include/uapi/asm/setup.h
+ rename arch/microblaze/include/{ => uapi}/asm/shmbuf.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/sigcontext.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/siginfo.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/signal.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/socket.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/sockios.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/stat.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/statfs.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/swab.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/termbits.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/termios.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/types.h (100%)
+ create mode 100644 arch/microblaze/include/uapi/asm/unistd.h
+Merging mips/mips-for-linux-next (0f96572 Merge tag 'disintegrate-mips-20121009' of git://git.infradead.org/users/dhowells/linux-headers into mips-for-linux-next)
+$ git merge mips/mips-for-linux-next
+Removing arch/mips/configs/pb1550_defconfig
+Removing arch/mips/configs/pb1500_defconfig
+Removing arch/mips/configs/pb1100_defconfig
+Removing arch/mips/configs/db1550_defconfig
+Removing arch/mips/configs/db1300_defconfig
+Removing arch/mips/configs/db1200_defconfig
+Removing arch/mips/alchemy/devboards/pb1550.c
+Removing arch/mips/alchemy/devboards/pb1500.c
+Removing arch/mips/alchemy/devboards/pb1100.c
+Merge made by the 'recursive' strategy.
+ arch/mips/Kconfig | 4 +
+ arch/mips/alchemy/Kconfig | 50 +-
+ arch/mips/alchemy/Platform | 22 +-
+ arch/mips/alchemy/devboards/Makefile | 7 +-
+ arch/mips/alchemy/devboards/db1000.c | 120 ++-
+ arch/mips/alchemy/devboards/db1200.c | 37 +-
+ arch/mips/alchemy/devboards/db1235.c | 94 ++
+ arch/mips/alchemy/devboards/db1300.c | 12 +-
+ arch/mips/alchemy/devboards/db1550.c | 192 +++-
+ arch/mips/alchemy/devboards/pb1100.c | 167 ----
+ arch/mips/alchemy/devboards/pb1500.c | 198 ----
+ arch/mips/alchemy/devboards/pb1550.c | 244 -----
+ arch/mips/alchemy/devboards/platform.c | 9 +-
+ arch/mips/boot/compressed/uart-alchemy.c | 4 -
+ arch/mips/configs/db1200_defconfig | 170 ----
+ arch/mips/configs/db1235_defconfig | 434 ++++++++
+ arch/mips/configs/db1300_defconfig | 391 --------
+ arch/mips/configs/db1550_defconfig | 285 ------
+ arch/mips/configs/pb1100_defconfig | 124 ---
+ arch/mips/configs/pb1500_defconfig | 141 ---
+ arch/mips/configs/pb1550_defconfig | 145 ---
+ arch/mips/include/asm/Kbuild | 5 -
+ arch/mips/include/asm/atomic.h | 64 +-
+ arch/mips/include/asm/cpu-features.h | 8 +
+ arch/mips/include/asm/cpu.h | 4 +-
+ arch/mips/include/asm/errno.h | 120 +--
+ .../include/asm/mach-ath79/cpu-feature-overrides.h | 2 +
+ .../asm/mach-au1x00/cpu-feature-overrides.h | 1 +
+ .../asm/mach-bcm63xx/cpu-feature-overrides.h | 1 +
+ .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 1 +
+ .../asm/mach-cobalt/cpu-feature-overrides.h | 1 +
+ arch/mips/include/asm/mach-db1x00/bcsr.h | 2 +
+ .../include/asm/mach-ip22/cpu-feature-overrides.h | 1 +
+ .../include/asm/mach-ip27/cpu-feature-overrides.h | 1 +
+ .../include/asm/mach-ip28/cpu-feature-overrides.h | 1 +
+ .../include/asm/mach-ip32/cpu-feature-overrides.h | 1 +
+ .../asm/mach-jz4740/cpu-feature-overrides.h | 1 +
+ .../asm/mach-loongson/cpu-feature-overrides.h | 1 +
+ .../asm/mach-netlogic/cpu-feature-overrides.h | 1 +
+ .../asm/mach-powertv/cpu-feature-overrides.h | 1 +
+ .../asm/mach-rc32434/cpu-feature-overrides.h | 1 +
+ .../include/asm/mach-rm/cpu-feature-overrides.h | 1 +
+ .../asm/mach-sibyte/cpu-feature-overrides.h | 1 +
+ .../asm/mach-tx49xx/cpu-feature-overrides.h | 1 +
+ .../asm/mach-yosemite/cpu-feature-overrides.h | 1 +
+ arch/mips/include/asm/mipsregs.h | 3 +
+ .../asm/pmc-sierra/msp71xx/cpu-feature-overrides.h | 1 +
+ arch/mips/include/asm/ptrace.h | 107 +-
+ arch/mips/include/asm/setup.h | 5 +-
+ arch/mips/include/asm/sigcontext.h | 66 +-
+ arch/mips/include/asm/siginfo.h | 104 +-
+ arch/mips/include/asm/signal.h | 115 +--
+ arch/mips/include/asm/socket.h | 83 +-
+ arch/mips/include/asm/termios.h | 73 +-
+ arch/mips/include/asm/types.h | 16 +-
+ arch/mips/include/asm/unistd.h | 1022 +------------------
+ arch/mips/include/uapi/asm/Kbuild | 34 +
+ arch/mips/include/{ => uapi}/asm/auxvec.h | 0
+ arch/mips/include/{ => uapi}/asm/bitsperlong.h | 0
+ arch/mips/include/{ => uapi}/asm/byteorder.h | 0
+ arch/mips/include/{ => uapi}/asm/cachectl.h | 0
+ arch/mips/include/uapi/asm/errno.h | 129 +++
+ arch/mips/include/{ => uapi}/asm/fcntl.h | 0
+ arch/mips/include/{ => uapi}/asm/ioctl.h | 0
+ arch/mips/include/{ => uapi}/asm/ioctls.h | 0
+ arch/mips/include/{ => uapi}/asm/ipcbuf.h | 0
+ arch/mips/include/{ => uapi}/asm/kvm_para.h | 0
+ arch/mips/include/{ => uapi}/asm/mman.h | 0
+ arch/mips/include/{ => uapi}/asm/msgbuf.h | 0
+ arch/mips/include/{ => uapi}/asm/param.h | 0
+ arch/mips/include/{ => uapi}/asm/poll.h | 0
+ arch/mips/include/{ => uapi}/asm/posix_types.h | 0
+ arch/mips/include/uapi/asm/ptrace.h | 116 +++
+ arch/mips/include/{ => uapi}/asm/resource.h | 0
+ arch/mips/include/{ => uapi}/asm/sembuf.h | 0
+ arch/mips/include/uapi/asm/setup.h | 7 +
+ arch/mips/include/{ => uapi}/asm/sgidefs.h | 0
+ arch/mips/include/{ => uapi}/asm/shmbuf.h | 0
+ arch/mips/include/uapi/asm/sigcontext.h | 78 ++
+ arch/mips/include/uapi/asm/siginfo.h | 114 +++
+ arch/mips/include/uapi/asm/signal.h | 123 +++
+ arch/mips/include/uapi/asm/socket.h | 93 ++
+ arch/mips/include/{ => uapi}/asm/sockios.h | 0
+ arch/mips/include/{ => uapi}/asm/stat.h | 0
+ arch/mips/include/{ => uapi}/asm/statfs.h | 0
+ arch/mips/include/{ => uapi}/asm/swab.h | 0
+ arch/mips/include/{ => uapi}/asm/sysmips.h | 0
+ arch/mips/include/{ => uapi}/asm/termbits.h | 0
+ arch/mips/include/uapi/asm/termios.h | 80 ++
+ arch/mips/include/uapi/asm/types.h | 27 +
+ arch/mips/include/uapi/asm/unistd.h | 1035 ++++++++++++++++++++
+ arch/mips/kernel/asm-offsets.c | 10 -
+ arch/mips/kernel/cpu-probe.c | 11 +-
+ arch/mips/kernel/perf_event_mipsxx.c | 262 ++---
+ arch/mips/kernel/proc.c | 19 +-
+ arch/mips/kernel/vmlinux.lds.S | 21 +-
+ arch/mips/mm/init.c | 17 +-
+ arch/mips/mm/pgtable-64.c | 20 +-
+ arch/mips/mm/tlbex.c | 23 +-
+ arch/mips/pci/fixup-malta.c | 3 +-
+ include/asm-generic/vmlinux.lds.h | 9 +
+ 101 files changed, 2892 insertions(+), 4006 deletions(-)
+ create mode 100644 arch/mips/alchemy/devboards/db1235.c
+ delete mode 100644 arch/mips/alchemy/devboards/pb1100.c
+ delete mode 100644 arch/mips/alchemy/devboards/pb1500.c
+ delete mode 100644 arch/mips/alchemy/devboards/pb1550.c
+ delete mode 100644 arch/mips/configs/db1200_defconfig
+ create mode 100644 arch/mips/configs/db1235_defconfig
+ delete mode 100644 arch/mips/configs/db1300_defconfig
+ delete mode 100644 arch/mips/configs/db1550_defconfig
+ delete mode 100644 arch/mips/configs/pb1100_defconfig
+ delete mode 100644 arch/mips/configs/pb1500_defconfig
+ delete mode 100644 arch/mips/configs/pb1550_defconfig
+ rename arch/mips/include/{ => uapi}/asm/auxvec.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/bitsperlong.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/byteorder.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/cachectl.h (100%)
+ create mode 100644 arch/mips/include/uapi/asm/errno.h
+ rename arch/mips/include/{ => uapi}/asm/fcntl.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/ioctl.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/ioctls.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/ipcbuf.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/kvm_para.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/mman.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/msgbuf.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/param.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/poll.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/posix_types.h (100%)
+ create mode 100644 arch/mips/include/uapi/asm/ptrace.h
+ rename arch/mips/include/{ => uapi}/asm/resource.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/sembuf.h (100%)
+ create mode 100644 arch/mips/include/uapi/asm/setup.h
+ rename arch/mips/include/{ => uapi}/asm/sgidefs.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/shmbuf.h (100%)
+ create mode 100644 arch/mips/include/uapi/asm/sigcontext.h
+ create mode 100644 arch/mips/include/uapi/asm/siginfo.h
+ create mode 100644 arch/mips/include/uapi/asm/signal.h
+ create mode 100644 arch/mips/include/uapi/asm/socket.h
+ rename arch/mips/include/{ => uapi}/asm/sockios.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/stat.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/statfs.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/swab.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/sysmips.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/termbits.h (100%)
+ create mode 100644 arch/mips/include/uapi/asm/termios.h
+ create mode 100644 arch/mips/include/uapi/asm/types.h
+ create mode 100644 arch/mips/include/uapi/asm/unistd.h
+Merging openrisc/for-upstream (4c8faa4 openrisc: mask interrupts in irq_mask_ack function)
+$ git merge openrisc/for-upstream
+Auto-merging include/linux/audit.h
+Merge made by the 'recursive' strategy.
+ arch/openrisc/include/asm/processor.h | 2 +-
+ arch/openrisc/kernel/irq.c | 20 +++++++++++---------
+ arch/openrisc/kernel/ptrace.c | 2 +-
+ arch/openrisc/lib/delay.c | 6 +++---
+ include/linux/audit.h | 1 +
+ 5 files changed, 17 insertions(+), 14 deletions(-)
+Merging parisc/for-next (5b24c42 [PARISC] fix personality flag check in copy_thread())
+$ git merge parisc/for-next
+Already up-to-date.
+Merging s390/features (ab08ff3 Merge tag 'disintegrate-s390-20121009' of git://git.infradead.org/users/dhowells/linux-headers)
+$ git merge s390/features
+Auto-merging arch/s390/include/uapi/asm/chsc.h
+Merge made by the 'recursive' strategy.
+ arch/s390/Kconfig.debug | 12 +
+ arch/s390/include/asm/Kbuild | 14 -
+ arch/s390/include/asm/chpid.h | 19 +-
+ arch/s390/include/asm/cmb.h | 51 +--
+ arch/s390/include/asm/css_chars.h | 3 -
+ arch/s390/include/asm/debug.h | 28 +-
+ arch/s390/include/asm/kvm_para.h | 14 +-
+ arch/s390/include/asm/mman.h | 6 +-
+ arch/s390/include/asm/page.h | 14 +-
+ arch/s390/include/asm/pgtable.h | 30 +-
+ arch/s390/include/asm/ptrace.h | 462 +----------------------
+ arch/s390/include/asm/schid.h | 15 +-
+ arch/s390/include/asm/setup.h | 21 +-
+ arch/s390/include/asm/signal.h | 128 +------
+ arch/s390/include/asm/termios.h | 42 +--
+ arch/s390/include/asm/types.h | 15 +-
+ arch/s390/include/asm/unistd.h | 367 +-----------------
+ arch/s390/include/uapi/asm/Kbuild | 45 +++
+ arch/s390/include/{ => uapi}/asm/auxvec.h | 0
+ arch/s390/include/{ => uapi}/asm/bitsperlong.h | 0
+ arch/s390/include/{ => uapi}/asm/byteorder.h | 0
+ arch/s390/include/uapi/asm/chpid.h | 22 ++
+ arch/s390/include/{ => uapi}/asm/chsc.h | 10 +-
+ arch/s390/include/uapi/asm/cmb.h | 53 +++
+ arch/s390/include/{ => uapi}/asm/dasd.h | 0
+ arch/s390/include/uapi/asm/debug.h | 34 ++
+ arch/s390/include/{ => uapi}/asm/errno.h | 0
+ arch/s390/include/{ => uapi}/asm/fcntl.h | 0
+ arch/s390/include/{ => uapi}/asm/ioctl.h | 0
+ arch/s390/include/{ => uapi}/asm/ioctls.h | 0
+ arch/s390/include/{ => uapi}/asm/ipcbuf.h | 0
+ arch/s390/include/{ => uapi}/asm/kvm.h | 0
+ arch/s390/include/{ => uapi}/asm/kvm_virtio.h | 0
+ arch/s390/include/uapi/asm/mman.h | 6 +
+ arch/s390/include/{ => uapi}/asm/monwriter.h | 0
+ arch/s390/include/{ => uapi}/asm/msgbuf.h | 0
+ arch/s390/include/{ => uapi}/asm/param.h | 0
+ arch/s390/include/{ => uapi}/asm/poll.h | 0
+ arch/s390/include/{ => uapi}/asm/posix_types.h | 0
+ arch/s390/include/uapi/asm/ptrace.h | 472 ++++++++++++++++++++++++
+ arch/s390/include/{ => uapi}/asm/qeth.h | 0
+ arch/s390/include/{ => uapi}/asm/resource.h | 0
+ arch/s390/include/uapi/asm/schid.h | 16 +
+ arch/s390/include/{ => uapi}/asm/sembuf.h | 0
+ arch/s390/include/uapi/asm/setup.h | 13 +
+ arch/s390/include/{ => uapi}/asm/shmbuf.h | 0
+ arch/s390/include/{ => uapi}/asm/sigcontext.h | 0
+ arch/s390/include/{ => uapi}/asm/siginfo.h | 0
+ arch/s390/include/uapi/asm/signal.h | 135 +++++++
+ arch/s390/include/{ => uapi}/asm/socket.h | 0
+ arch/s390/include/{ => uapi}/asm/sockios.h | 0
+ arch/s390/include/{ => uapi}/asm/stat.h | 0
+ arch/s390/include/{ => uapi}/asm/statfs.h | 0
+ arch/s390/include/{ => uapi}/asm/swab.h | 0
+ arch/s390/include/{ => uapi}/asm/tape390.h | 0
+ arch/s390/include/{ => uapi}/asm/termbits.h | 0
+ arch/s390/include/uapi/asm/termios.h | 49 +++
+ arch/s390/include/uapi/asm/types.h | 22 ++
+ arch/s390/include/{ => uapi}/asm/ucontext.h | 0
+ arch/s390/include/uapi/asm/unistd.h | 374 +++++++++++++++++++
+ arch/s390/include/{ => uapi}/asm/vtoc.h | 0
+ arch/s390/include/{ => uapi}/asm/zcrypt.h | 0
+ arch/s390/kernel/early.c | 17 +-
+ arch/s390/kernel/entry64.S | 2 +-
+ arch/s390/kernel/head.S | 101 +++--
+ arch/s390/kernel/head31.S | 3 -
+ arch/s390/kernel/head64.S | 3 -
+ arch/s390/kernel/module.c | 11 +
+ arch/s390/kernel/setup.c | 51 ++-
+ arch/s390/mm/Makefile | 1 +
+ arch/s390/mm/dump_pagetables.c | 226 ++++++++++++
+ arch/s390/mm/pageattr.c | 40 +-
+ arch/s390/mm/vmem.c | 45 ++-
+ drivers/s390/block/dcssblk.c | 52 ++-
+ drivers/s390/crypto/zcrypt_pcixcc.c | 1 -
+ 75 files changed, 1755 insertions(+), 1290 deletions(-)
+ rename arch/s390/include/{ => uapi}/asm/auxvec.h (100%)
+ rename arch/s390/include/{ => uapi}/asm/bitsperlong.h (100%)
+ rename arch/s390/include/{ => uapi}/asm/byteorder.h (100%)
+ create mode 100644 arch/s390/include/uapi/asm/chpid.h
+ rename arch/s390/include/{ => uapi}/asm/chsc.h (92%)
+ create mode 100644 arch/s390/include/uapi/asm/cmb.h
+ rename arch/s390/include/{ => uapi}/asm/dasd.h (100%)
+ create mode 100644 arch/s390/include/uapi/asm/debug.h
+ rename arch/s390/include/{ => uapi}/asm/errno.h (100%)
+ rename arch/s390/include/{ => uapi}/asm/fcntl.h (100%)
+ rename arch/s390/include/{ => uapi}/asm/ioctl.h (100%)
+ rename arch/s390/include/{ => uapi}/asm/ioctls.h (100%)
+ rename arch/s390/include/{ => uapi}/asm/ipcbuf.h (100%)
+ rename arch/s390/include/{ => uapi}/asm/kvm.h (100%)
+ create mode 100644 arch/s390/include/uapi/asm/kvm_para.h
+ rename arch/s390/include/{ => uapi}/asm/kvm_virtio.h (100%)
+ create mode 100644 arch/s390/include/uapi/asm/mman.h
+ rename arch/s390/include/{ => uapi}/asm/monwriter.h (100%)
+ rename arch/s390/include/{ => uapi}/asm/msgbuf.h (100%)
+ rename arch/s390/include/{ => uapi}/asm/param.h (100%)
+ rename arch/s390/include/{ => uapi}/asm/poll.h (100%)
+ rename arch/s390/include/{ => uapi}/asm/posix_types.h (100%)
+ create mode 100644 arch/s390/include/uapi/asm/ptrace.h
+ rename arch/s390/include/{ => uapi}/asm/qeth.h (100%)
+ rename arch/s390/include/{ => uapi}/asm/resource.h (100%)
+ create mode 100644 arch/s390/include/uapi/asm/schid.h
+ rename arch/s390/include/{ => uapi}/asm/sembuf.h (100%)
+ create mode 100644 arch/s390/include/uapi/asm/setup.h
+ rename arch/s390/include/{ => uapi}/asm/shmbuf.h (100%)
+ rename arch/s390/include/{ => uapi}/asm/sigcontext.h (100%)
+ rename arch/s390/include/{ => uapi}/asm/siginfo.h (100%)
+ create mode 100644 arch/s390/include/uapi/asm/signal.h
+ rename arch/s390/include/{ => uapi}/asm/socket.h (100%)
+ rename arch/s390/include/{ => uapi}/asm/sockios.h (100%)
+ rename arch/s390/include/{ => uapi}/asm/stat.h (100%)
+ rename arch/s390/include/{ => uapi}/asm/statfs.h (100%)
+ rename arch/s390/include/{ => uapi}/asm/swab.h (100%)
+ rename arch/s390/include/{ => uapi}/asm/tape390.h (100%)
+ rename arch/s390/include/{ => uapi}/asm/termbits.h (100%)
+ create mode 100644 arch/s390/include/uapi/asm/termios.h
+ create mode 100644 arch/s390/include/uapi/asm/types.h
+ rename arch/s390/include/{ => uapi}/asm/ucontext.h (100%)
+ create mode 100644 arch/s390/include/uapi/asm/unistd.h
+ rename arch/s390/include/{ => uapi}/asm/vtoc.h (100%)
+ rename arch/s390/include/{ => uapi}/asm/zcrypt.h (100%)
+ create mode 100644 arch/s390/mm/dump_pagetables.c
+Merging sh/sh-latest (16d74eb sh: pfc: Fix up GPIO mux type reconfig case.)
+$ git merge sh/sh-latest
+Already up-to-date.
+Merging sparc-next/master (7fe0b14 Merge tag 'spi-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc)
+$ git merge sparc-next/master
+Already up-to-date.
+Merging tile/master (e70cf54 tile: gxio iorpc numbering change for TRIO interface)
+$ git merge tile/master
+Already up-to-date.
+Merging unicore32/unicore32 (e4baa56 UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference between native and cross compiler)
+$ git merge unicore32/unicore32
+Auto-merging arch/unicore32/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/unicore32/Kconfig | 3 +++
+ arch/unicore32/include/asm/bug.h | 5 -----
+ arch/unicore32/include/asm/cmpxchg.h | 2 +-
+ arch/unicore32/kernel/setup.h | 6 ++++++
+ arch/unicore32/mm/fault.c | 37 +++++++++++++++++++++++++---------
+ 5 files changed, 37 insertions(+), 16 deletions(-)
+Merging xtensa/for_next (ded389d xtensa: Add missing RCU idle APIs on idle loop)
+$ git merge xtensa/for_next
+Recorded preimage for 'arch/xtensa/boot/boot-elf/Makefile'
+Recorded preimage for 'scripts/mod/modpost.c'
+Auto-merging scripts/mod/modpost.c
+CONFLICT (content): Merge conflict in scripts/mod/modpost.c
+Auto-merging arch/xtensa/boot/boot-elf/Makefile
+CONFLICT (content): Merge conflict in arch/xtensa/boot/boot-elf/Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'arch/xtensa/boot/boot-elf/Makefile'.
+Recorded resolution for 'scripts/mod/modpost.c'.
+[master 8ad6f16] Merge remote-tracking branch 'xtensa/for_next'
+$ git diff -M --stat --summary HEAD^..
+Merging btrfs/next (f46dbe3 btrfs: init ref_index to zero in add_inode_ref)
+$ git merge btrfs/next
+Auto-merging fs/btrfs/ioctl.c
+Auto-merging fs/btrfs/inode.c
+Auto-merging fs/btrfs/file.c
+Auto-merging fs/btrfs/extent_io.c
+Auto-merging fs/btrfs/delayed-inode.c
+Auto-merging fs/btrfs/ctree.h
+Merge made by the 'recursive' strategy.
+ fs/btrfs/backref.c | 299 +++++++++++---
+ fs/btrfs/backref.h | 10 +-
+ fs/btrfs/btrfs_inode.h | 15 +-
+ fs/btrfs/check-integrity.c | 16 +-
+ fs/btrfs/compression.c | 13 +-
+ fs/btrfs/ctree.c | 148 +------
+ fs/btrfs/ctree.h | 109 ++++-
+ fs/btrfs/delayed-inode.c | 6 +-
+ fs/btrfs/disk-io.c | 230 ++++++-----
+ fs/btrfs/disk-io.h | 2 +
+ fs/btrfs/extent-tree.c | 376 +++++++++--------
+ fs/btrfs/extent_io.c | 128 ++++--
+ fs/btrfs/extent_io.h | 23 +-
+ fs/btrfs/extent_map.c | 55 ++-
+ fs/btrfs/extent_map.h | 8 +-
+ fs/btrfs/file-item.c | 5 +-
+ fs/btrfs/file.c | 447 +++++++++++++++++++--
+ fs/btrfs/free-space-cache.c | 10 +-
+ fs/btrfs/hash.h | 10 +
+ fs/btrfs/inode-item.c | 285 ++++++++++++-
+ fs/btrfs/inode.c | 386 ++++++++++++------
+ fs/btrfs/ioctl.c | 100 +++--
+ fs/btrfs/ordered-data.c | 97 ++---
+ fs/btrfs/ordered-data.h | 12 +-
+ fs/btrfs/qgroup.c | 40 +-
+ fs/btrfs/relocation.c | 11 +-
+ fs/btrfs/root-tree.c | 29 +-
+ fs/btrfs/scrub.c | 30 +-
+ fs/btrfs/send.c | 915 +++++++++++++++++++++++-------------------
+ fs/btrfs/send.h | 1 +
+ fs/btrfs/super.c | 74 ++--
+ fs/btrfs/transaction.c | 283 +++++++++----
+ fs/btrfs/transaction.h | 20 +-
+ fs/btrfs/tree-log.c | 889 ++++++++++++++++++++++++++++++++--------
+ fs/btrfs/ulist.c | 7 +-
+ fs/btrfs/ulist.h | 9 +-
+ fs/btrfs/volumes.c | 73 +++-
+ fs/btrfs/zlib.c | 8 +-
+ include/trace/events/btrfs.h | 14 +-
+ 39 files changed, 3574 insertions(+), 1619 deletions(-)
+Merging ceph/master (6285bc2 ceph: avoid 32-bit page index overflow)
+$ git merge ceph/master
+Already up-to-date.
+Merging cifs/for-next (72bd481 cifs: reinstate the forcegid option)
+$ git merge cifs/for-next
+Merge made by the 'recursive' strategy.
+ fs/cifs/cifs_unicode.c | 22 ++++++++++++++++++++++
+ fs/cifs/connect.c | 9 +++++++++
+ fs/cifs/transport.c | 6 ++++++
+ 3 files changed, 37 insertions(+)
+Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
+$ git merge configfs/linux-next
+Already up-to-date.
+Merging ecryptfs/next (0d7614f Linux 3.6-rc1)
+$ git merge ecryptfs/next
+Already up-to-date.
+Merging ext3/for_next (6c29c50 quota: Silence warning about PRJQUOTA not being handled in need_print_warning())
+$ git merge ext3/for_next
+Merge made by the 'recursive' strategy.
+ fs/ext2/super.c | 4 ++--
+ fs/ext3/namei.c | 40 +++++++++++++++++++++-------------------
+ fs/ext3/namei.h | 19 +++++++++++++++++++
+ fs/ext3/super.c | 4 ++--
+ fs/quota/dquot.c | 2 ++
+ 5 files changed, 46 insertions(+), 23 deletions(-)
+Merging ext4/dev (c278531 ext4: fix ext4_flush_completed_IO wait semantics)
+$ git merge ext4/dev
+Already up-to-date.
+Merging fuse/for-next (c7a3f5e fuse: Move CUSE Kconfig entry from fs/Kconfig into fs/fuse/Kconfig)
+$ git merge fuse/for-next
+Auto-merging fs/fuse/inode.c
+Auto-merging fs/fuse/dev.c
+Merge made by the 'recursive' strategy.
+ fs/Kconfig | 10 ----
+ fs/fuse/Kconfig | 16 ++++-
+ fs/fuse/dev.c | 19 ++++++
+ fs/fuse/dir.c | 160 ++++++++++++++++++++++++++++++++++++++++++++++++--
+ fs/fuse/fuse_i.h | 6 ++
+ fs/fuse/inode.c | 5 +-
+ include/linux/fuse.h | 12 ++++
+ 7 files changed, 211 insertions(+), 17 deletions(-)
+Merging gfs2/master (ecefbd9 Merge tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
+$ git merge gfs2/master
+Already up-to-date.
+Merging jfs/jfs-next (84f4141 jfs: Fix do_div precision in commit b40c2e66)
+$ git merge jfs/jfs-next
+Already up-to-date.
+Merging logfs/master (ab2ec19 logfs: fix possible memory leak in logfs_mtd_can_write_buf())
+$ git merge logfs/master
+Merge made by the 'recursive' strategy.
+ fs/logfs/dev_mtd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging nfs/linux-next (af28388 pnfsblock: cleanup nfs4_blkdev_get)
+$ git merge nfs/linux-next
+Auto-merging fs/nfs/super.c
+Auto-merging fs/nfs/inode.c
+Auto-merging fs/nfs/file.c
+Auto-merging Documentation/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/nfs/nfs.txt | 44 +++-
+ Documentation/kernel-parameters.txt | 5 +
+ fs/lockd/mon.c | 86 +++++--
+ fs/lockd/netns.h | 4 +
+ fs/lockd/svc.c | 1 +
+ fs/nfs/Kconfig | 4 +-
+ fs/nfs/blocklayout/blocklayout.c | 306 +++++++++++++++++++++---
+ fs/nfs/blocklayout/blocklayout.h | 2 +-
+ fs/nfs/blocklayout/blocklayoutdev.c | 25 +-
+ fs/nfs/blocklayout/extents.c | 3 +-
+ fs/nfs/callback.c | 321 ++++++++++++++++---------
+ fs/nfs/callback.h | 3 +-
+ fs/nfs/callback_proc.c | 31 ++-
+ fs/nfs/client.c | 23 +-
+ fs/nfs/dir.c | 16 +-
+ fs/nfs/direct.c | 32 ++-
+ fs/nfs/file.c | 41 +++-
+ fs/nfs/getroot.c | 2 +
+ fs/nfs/idmap.c | 114 +++++----
+ fs/nfs/inode.c | 10 +-
+ fs/nfs/internal.h | 15 +-
+ fs/nfs/netns.h | 4 +
+ fs/nfs/nfs4_fs.h | 19 +-
+ fs/nfs/nfs4client.c | 256 +++++++++++++++++++-
+ fs/nfs/nfs4file.c | 29 ++-
+ fs/nfs/nfs4filelayout.c | 41 ++--
+ fs/nfs/nfs4filelayout.h | 16 +-
+ fs/nfs/nfs4filelayoutdev.c | 17 +-
+ fs/nfs/nfs4namespace.c | 16 +-
+ fs/nfs/nfs4proc.c | 342 ++++++++++++++++++++-------
+ fs/nfs/nfs4state.c | 228 ++++++++++++++++--
+ fs/nfs/nfs4sysctl.c | 1 +
+ fs/nfs/nfs4xdr.c | 31 ++-
+ fs/nfs/objlayout/objio_osd.c | 9 +-
+ fs/nfs/pagelist.c | 12 +-
+ fs/nfs/pnfs.c | 417 +++++++++++++++++++--------------
+ fs/nfs/pnfs.h | 57 ++---
+ fs/nfs/pnfs_dev.c | 27 +++
+ fs/nfs/super.c | 31 ++-
+ fs/nfs/write.c | 11 +-
+ include/linux/nfs_fs.h | 11 +-
+ include/linux/nfs_fs_sb.h | 3 +
+ include/linux/nfs_xdr.h | 5 +-
+ include/linux/sunrpc/clnt.h | 2 +
+ include/linux/sunrpc/xprt.h | 3 +-
+ net/sunrpc/auth_gss/auth_gss.c | 58 ++---
+ net/sunrpc/clnt.c | 105 +++++----
+ net/sunrpc/rpc_pipe.c | 8 +-
+ net/sunrpc/sched.c | 2 +-
+ net/sunrpc/xdr.c | 21 +-
+ net/sunrpc/xprt.c | 8 +-
+ net/sunrpc/xprtrdma/transport.c | 22 +-
+ net/sunrpc/xprtsock.c | 40 ++--
+ 53 files changed, 2126 insertions(+), 814 deletions(-)
+Merging nfsd/nfsd-next (0d22f68 nfsd4: don't allow reclaims of expired clients)
+$ git merge nfsd/nfsd-next
+Auto-merging fs/nfsd/vfs.c
+Auto-merging fs/nfsd/nfs4state.c
+Auto-merging fs/nfs/callback.c
+Auto-merging fs/locks.c
+Auto-merging fs/lockd/svc.c
+Merge made by the 'recursive' strategy.
+ .../filesystems/nfs/nfsd-admin-interfaces.txt | 41 +++
+ fs/lockd/svc.c | 17 +-
+ fs/locks.c | 6 +-
+ fs/nfs/callback.c | 16 +-
+ fs/nfsd/nfs2acl.c | 3 +-
+ fs/nfsd/nfs3proc.c | 2 +-
+ fs/nfsd/nfs4callback.c | 1 -
+ fs/nfsd/nfs4idmap.c | 4 +-
+ fs/nfsd/nfs4proc.c | 6 +-
+ fs/nfsd/nfs4state.c | 351 +++++++++++---------
+ fs/nfsd/nfs4xdr.c | 2 +-
+ fs/nfsd/nfsctl.c | 84 +----
+ fs/nfsd/nfsd.h | 4 +-
+ fs/nfsd/nfssvc.c | 26 +-
+ fs/nfsd/state.h | 8 +-
+ fs/nfsd/vfs.c | 2 +-
+ include/linux/sunrpc/svc_xprt.h | 5 +-
+ include/linux/sunrpc/svcsock.h | 3 -
+ net/sunrpc/svc_xprt.c | 233 +++++++------
+ net/sunrpc/svcsock.c | 157 +++------
+ net/sunrpc/xprtrdma/svc_rdma_transport.c | 4 -
+ 21 files changed, 460 insertions(+), 515 deletions(-)
+ create mode 100644 Documentation/filesystems/nfs/nfsd-admin-interfaces.txt
+Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
+$ git merge ocfs2/linux-next
+Auto-merging fs/ocfs2/cluster/heartbeat.c
+Merge made by the 'recursive' strategy.
+ fs/ocfs2/cluster/heartbeat.c | 40 +++++++++-------------------------------
+ fs/ocfs2/cluster/masklog.h | 3 ++-
+ fs/ocfs2/dlm/dlmmaster.c | 10 ++++++++--
+ fs/ocfs2/dlm/dlmrecovery.c | 7 +++++++
+ fs/ocfs2/symlink.c | 2 +-
+ 5 files changed, 27 insertions(+), 35 deletions(-)
+Merging omfs/for-next (976d167 Linux 3.1-rc9)
+$ git merge omfs/for-next
+Already up-to-date.
+Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
+$ git merge squashfs/master
+Already up-to-date.
+Merging v9fs/for-next (552aad0 9P: Fix race between p9_write_work() and p9_fd_request())
+$ git merge v9fs/for-next
+Auto-merging net/9p/trans_fd.c
+Auto-merging fs/9p/v9fs.c
+Merge made by the 'recursive' strategy.
+ fs/9p/v9fs.c | 30 +++++++++++++++++++-----------
+ fs/9p/vfs_inode.c | 8 ++++----
+ net/9p/client.c | 18 ++++++++++++++++--
+ net/9p/trans_fd.c | 38 ++++++++++++++++++++------------------
+ 4 files changed, 59 insertions(+), 35 deletions(-)
+Merging ubifs/linux-next (3668b70 UBIFS: print less)
+$ git merge ubifs/linux-next
+Already up-to-date.
+Merging xfs/for-next (2ea0392 xfs: Make inode32 a remountable option)
+$ git merge xfs/for-next
+Already up-to-date.
+Merging vfs/for-next (2bd2c19 MAX_LFS_FILESIZE should be a loff_t)
+$ git merge vfs/for-next
+Already up-to-date.
+Merging pci/next (78c8f84 Merge branch 'pci/yinghai-misc' into next)
+$ git merge pci/next
+Already up-to-date.
+Merging powerpc/next (d900bd7 powerpc/iommu: Fix multiple issues with IOMMU pools code)
+$ git merge powerpc/next
+Already up-to-date.
+Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
+$ git merge 4xx/next
+Already up-to-date.
+Merging mpc5xxx/next (f3ac712 powerpc/pcm030: add pcm030-audio-fabric to dts)
+$ git merge mpc5xxx/next
+Merge made by the 'recursive' strategy.
+ arch/powerpc/boot/dts/pcm030.dts | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+Merging galak/next (10bfa76 driver/mtd:IFC NAND:Initialise internal SRAM before any write)
+$ git merge galak/next
+Already up-to-date.
+Merging hid/for-next (0b82411 Merge branch 'hidraw' into for-next)
+$ git merge hid/for-next
+Resolved 'drivers/hid/hid-multitouch.c' using previous resolution.
+Auto-merging drivers/hid/hid-multitouch.c
+CONFLICT (content): Merge conflict in drivers/hid/hid-multitouch.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 64a2c19] Merge remote-tracking branch 'hid/for-next'
+$ git diff -M --stat --summary HEAD^..
+Merging quilt/i2c (d43b716 Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild)
+$ git merge quilt/i2c
+Already up-to-date.
+Merging i2c-embedded/i2c-embedded/for-next (62885f5 MXS: Implement DMA support into mxs-i2c)
+$ git merge i2c-embedded/i2c-embedded/for-next
+Resolved 'drivers/i2c/busses/i2c-omap.c' using previous resolution.
+Auto-merging drivers/i2c/busses/i2c-s3c2410.c
+Auto-merging drivers/i2c/busses/i2c-omap.c
+CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c
+Auto-merging drivers/i2c/busses/i2c-mpc.c
+Auto-merging drivers/i2c/busses/i2c-imx.c
+Auto-merging drivers/i2c/busses/i2c-davinci.c
+Auto-merging drivers/i2c/busses/Kconfig
+Auto-merging arch/arm/plat-omap/i2c.c
+Removing arch/arm/mach-at91/include/mach/at91_twi.h
+Auto-merging arch/arm/mach-at91/at91sam9rl_devices.c
+Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c
+Auto-merging arch/arm/mach-at91/at91sam9263_devices.c
+Auto-merging arch/arm/mach-at91/at91sam9263.c
+Auto-merging arch/arm/mach-at91/at91sam9261_devices.c
+Auto-merging arch/arm/mach-at91/at91sam9260_devices.c
+Auto-merging arch/arm/mach-at91/at91rm9200_devices.c
+Auto-merging arch/arm/boot/dts/imx28.dtsi
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master b7bf318] Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/i2c/atmel-i2c.txt | 30 +
+ Documentation/devicetree/bindings/i2c/davinci.txt | 28 +
+ Documentation/devicetree/bindings/i2c/i2c-mxs.txt | 2 +
+ Documentation/devicetree/bindings/i2c/nomadik.txt | 23 +
+ arch/arm/boot/dts/at91sam9260.dtsi | 10 +
+ arch/arm/boot/dts/at91sam9263.dtsi | 10 +
+ arch/arm/boot/dts/at91sam9g20.dtsi | 4 +
+ arch/arm/boot/dts/at91sam9g25ek.dts | 12 +
+ arch/arm/boot/dts/at91sam9g45.dtsi | 20 +
+ arch/arm/boot/dts/at91sam9m10g45ek.dts | 8 +
+ arch/arm/boot/dts/at91sam9n12.dtsi | 20 +
+ arch/arm/boot/dts/at91sam9n12ek.dts | 8 +
+ arch/arm/boot/dts/at91sam9x5.dtsi | 30 +
+ arch/arm/boot/dts/imx28.dtsi | 2 +
+ arch/arm/mach-at91/at91rm9200.c | 1 +
+ arch/arm/mach-at91/at91rm9200_devices.c | 2 +-
+ arch/arm/mach-at91/at91sam9260.c | 3 +
+ arch/arm/mach-at91/at91sam9260_devices.c | 8 +-
+ arch/arm/mach-at91/at91sam9261.c | 2 +
+ arch/arm/mach-at91/at91sam9261_devices.c | 14 +-
+ arch/arm/mach-at91/at91sam9263.c | 2 +
+ arch/arm/mach-at91/at91sam9263_devices.c | 2 +-
+ arch/arm/mach-at91/at91sam9g45.c | 4 +
+ arch/arm/mach-at91/at91sam9g45_devices.c | 10 +-
+ arch/arm/mach-at91/at91sam9n12.c | 2 +
+ arch/arm/mach-at91/at91sam9rl.c | 2 +
+ arch/arm/mach-at91/at91sam9rl_devices.c | 2 +-
+ arch/arm/mach-at91/at91sam9x5.c | 3 +
+ arch/arm/mach-at91/include/mach/at91_twi.h | 68 --
+ arch/arm/plat-omap/i2c.c | 21 -
+ drivers/i2c/algos/i2c-algo-pca.c | 27 +-
+ drivers/i2c/busses/Kconfig | 27 +-
+ drivers/i2c/busses/Makefile | 1 +
+ drivers/i2c/busses/i2c-at91.c | 667 ++++++++++++------
+ drivers/i2c/busses/i2c-davinci.c | 58 +-
+ drivers/i2c/busses/i2c-imx.c | 6 +-
+ drivers/i2c/busses/i2c-mpc.c | 18 +-
+ drivers/i2c/busses/i2c-mxs.c | 269 +++++++-
+ drivers/i2c/busses/i2c-nomadik.c | 52 +-
+ drivers/i2c/busses/i2c-omap.c | 474 ++++++++-----
+ drivers/i2c/busses/i2c-rcar.c | 709 ++++++++++++++++++++
+ drivers/i2c/busses/i2c-s3c2410.c | 18 +-
+ include/linux/i2c-algo-pca.h | 1 +
+ include/linux/i2c-omap.h | 1 -
+ include/linux/i2c/i2c-rcar.h | 10 +
+ include/linux/platform_data/i2c-nomadik.h | 2 +-
+ 46 files changed, 2096 insertions(+), 597 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/i2c/atmel-i2c.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/davinci.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/nomadik.txt
+ delete mode 100644 arch/arm/mach-at91/include/mach/at91_twi.h
+ create mode 100644 drivers/i2c/busses/i2c-rcar.c
+ create mode 100644 include/linux/i2c/i2c-rcar.h
+Merging quilt/jdelvare-hwmon (e086be6 hwmon: Drop needless includes of <linux/delay.h>)
+$ git merge quilt/jdelvare-hwmon
+Merge made by the 'recursive' strategy.
+ Documentation/hwmon/da9052 | 2 +-
+ Documentation/hwmon/max1619 | 2 +-
+ Documentation/hwmon/twl4030-madc-hwmon | 2 +-
+ drivers/hwmon/adm9240.c | 1 +
+ drivers/hwmon/adt7411.c | 1 -
+ drivers/hwmon/adt7462.c | 1 -
+ drivers/hwmon/adt7475.c | 1 +
+ drivers/hwmon/asus_atk0110.c | 1 +
+ drivers/hwmon/da9052-hwmon.c | 1 -
+ drivers/hwmon/emc1403.c | 1 +
+ drivers/hwmon/emc6w201.c | 1 -
+ drivers/hwmon/hih6130.c | 1 +
+ drivers/hwmon/i5k_amb.c | 2 --
+ drivers/hwmon/ina2xx.c | 1 +
+ drivers/hwmon/k8temp.c | 1 -
+ drivers/hwmon/lineage-pem.c | 1 +
+ drivers/hwmon/lm92.c | 1 +
+ drivers/hwmon/lm93.c | 1 +
+ drivers/hwmon/ltc4151.c | 1 +
+ drivers/hwmon/ltc4215.c | 1 +
+ drivers/hwmon/ltc4245.c | 1 +
+ drivers/hwmon/ltc4261.c | 1 +
+ drivers/hwmon/max16065.c | 1 -
+ drivers/hwmon/max1619.c | 4 ++--
+ drivers/hwmon/max6642.c | 2 +-
+ drivers/hwmon/pmbus/pmbus_core.c | 2 +-
+ drivers/hwmon/s3c-hwmon.c | 1 -
+ drivers/hwmon/sht21.c | 1 +
+ drivers/hwmon/smm665.c | 1 +
+ drivers/hwmon/thmc50.c | 1 +
+ drivers/hwmon/tmp102.c | 1 +
+ drivers/hwmon/w83791d.c | 1 +
+ drivers/hwmon/w83792d.c | 1 +
+ drivers/hwmon/w83793.c | 1 +
+ drivers/hwmon/w83795.c | 2 +-
+ drivers/hwmon/w83l786ng.c | 1 +
+ 36 files changed, 29 insertions(+), 17 deletions(-)
+Merging hwmon-staging/hwmon-next (967d7fe hwmon: (ads7828) driver cleanup)
+$ git merge hwmon-staging/hwmon-next
+Merge made by the 'recursive' strategy.
+ drivers/hwmon/ads7828.c | 91 ++++++++++++++++++++++-------------------------
+ 1 file changed, 43 insertions(+), 48 deletions(-)
+Merging v4l-dvb/master (7da79d8 Merge /home/v4l/v4l/patchwork)
+$ git merge v4l-dvb/master
+Resolved 'arch/arm/mach-davinci/include/mach/da8xx.h' using previous resolution.
+Removing drivers/media/platform/s5p-mfc/s5p_mfc_shm.c
+Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.h
+Auto-merging drivers/media/platform/s5p-fimc/fimc-capture.c
+Auto-merging arch/arm/mach-exynos/mach-universal_c210.c
+Auto-merging arch/arm/mach-exynos/mach-origen.c
+Auto-merging arch/arm/mach-exynos/mach-nuri.c
+Auto-merging arch/arm/mach-davinci/include/mach/da8xx.h
+CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/da8xx.h
+Auto-merging arch/arm/mach-davinci/dm644x.c
+Auto-merging arch/arm/mach-davinci/da850.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 9121304] Merge remote-tracking branch 'v4l-dvb/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/media/v4l/compat.xml | 4 +
+ Documentation/DocBook/media/v4l/controls.xml | 278 ++-
+ Documentation/DocBook/media/v4l/io.xml | 6 +-
+ Documentation/DocBook/media/v4l/pixfmt-nv12m.xml | 17 +-
+ Documentation/DocBook/media/v4l/pixfmt.xml | 38 +
+ Documentation/DocBook/media/v4l/subdev-formats.xml | 44 +
+ Documentation/DocBook/media/v4l/vidioc-qbuf.xml | 3 +-
+ .../DocBook/media/v4l/vidioc-querybuf.xml | 11 +-
+ Documentation/video4linux/v4l2-controls.txt | 24 +
+ arch/arm/mach-davinci/Kconfig | 7 +
+ arch/arm/mach-davinci/board-da850-evm.c | 179 ++
+ arch/arm/mach-davinci/board-dm644x-evm.c | 15 +-
+ arch/arm/mach-davinci/board-dm646x-evm.c | 80 +-
+ arch/arm/mach-davinci/da850.c | 152 ++
+ arch/arm/mach-davinci/dm644x.c | 17 +-
+ arch/arm/mach-davinci/include/mach/da8xx.h | 11 +
+ arch/arm/mach-davinci/include/mach/mux.h | 42 +
+ arch/arm/mach-davinci/include/mach/psc.h | 1 +
+ arch/arm/mach-exynos/mach-nuri.c | 7 +-
+ arch/arm/mach-exynos/mach-origen.c | 4 +-
+ arch/arm/mach-exynos/mach-universal_c210.c | 7 +-
+ arch/arm/plat-samsung/setup-mipiphy.c | 20 +-
+ drivers/media/dvb-frontends/af9033.c | 16 +-
+ drivers/media/dvb-frontends/cxd2820r_core.c | 3 +-
+ drivers/media/i2c/m5mols/m5mols.h | 9 +
+ drivers/media/i2c/m5mols/m5mols_capture.c | 3 +
+ drivers/media/i2c/m5mols/m5mols_core.c | 47 +
+ drivers/media/i2c/m5mols/m5mols_reg.h | 1 +
+ drivers/media/i2c/mt9p031.c | 19 +-
+ drivers/media/i2c/mt9t001.c | 22 +-
+ drivers/media/i2c/mt9v032.c | 54 +-
+ drivers/media/i2c/ths7303.c | 106 +-
+ drivers/media/i2c/tvp514x.c | 77 +-
+ drivers/media/platform/Kconfig | 4 +-
+ drivers/media/platform/davinci/vpbe.c | 110 +-
+ drivers/media/platform/davinci/vpbe_display.c | 80 +-
+ drivers/media/platform/davinci/vpbe_venc.c | 25 +-
+ drivers/media/platform/davinci/vpfe_capture.c | 17 +-
+ drivers/media/platform/davinci/vpif_capture.c | 370 ++--
+ drivers/media/platform/davinci/vpif_capture.h | 16 +-
+ drivers/media/platform/davinci/vpif_display.c | 275 ++-
+ drivers/media/platform/davinci/vpif_display.h | 18 +-
+ drivers/media/platform/fsl-viu.c | 2 +-
+ drivers/media/platform/s5p-fimc/fimc-capture.c | 135 +-
+ drivers/media/platform/s5p-fimc/fimc-core.c | 19 +-
+ drivers/media/platform/s5p-fimc/fimc-core.h | 28 +-
+ drivers/media/platform/s5p-fimc/fimc-m2m.c | 25 +-
+ drivers/media/platform/s5p-fimc/fimc-reg.c | 23 +-
+ drivers/media/platform/s5p-fimc/fimc-reg.h | 3 +-
+ drivers/media/platform/s5p-fimc/mipi-csis.c | 75 +-
+ drivers/media/platform/s5p-g2d/g2d.c | 2 +-
+ drivers/media/platform/s5p-jpeg/jpeg-core.c | 6 +-
+ drivers/media/platform/s5p-mfc/Makefile | 7 +-
+ drivers/media/platform/s5p-mfc/regs-mfc-v6.h | 408 ++++
+ drivers/media/platform/s5p-mfc/regs-mfc.h | 41 +
+ drivers/media/platform/s5p-mfc/s5p_mfc.c | 294 ++-
+ drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c | 111 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h | 17 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c | 166 ++
+ drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h | 20 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c | 156 ++
+ drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h | 20 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 191 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 202 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h | 1 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 258 ++-
+ drivers/media/platform/s5p-mfc/s5p_mfc_dec.h | 1 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 236 ++-
+ drivers/media/platform/s5p-mfc/s5p_mfc_enc.h | 1 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_intr.c | 11 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr.c | 1418 +-------------
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr.h | 137 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 1794 ++++++++++++++++++
+ .../s5p-mfc/{s5p_mfc_shm.h => s5p_mfc_opr_v5.h} | 41 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 1956 ++++++++++++++++++++
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h | 50 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_pm.c | 3 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_shm.c | 47 -
+ drivers/media/usb/dvb-usb/technisat-usb2.c | 1 +
+ drivers/media/v4l2-core/v4l2-ctrls.c | 74 +
+ drivers/media/v4l2-core/v4l2-ioctl.c | 1 +
+ drivers/media/v4l2-core/videobuf2-core.c | 79 +-
+ include/linux/platform_data/mipi-csis.h | 30 +-
+ include/linux/v4l2-controls.h | 42 +
+ include/linux/v4l2-mediabus.h | 5 +
+ include/linux/videodev2.h | 5 +
+ include/media/davinci/vpbe.h | 14 +-
+ include/media/davinci/vpbe_types.h | 8 +-
+ include/media/davinci/vpbe_venc.h | 2 +-
+ include/media/davinci/vpif_types.h | 26 +-
+ include/media/s5p_fimc.h | 2 -
+ include/media/v4l2-ctrls.h | 23 +
+ include/media/v4l2-subdev.h | 48 +
+ 93 files changed, 7653 insertions(+), 2851 deletions(-)
+ create mode 100644 drivers/media/platform/s5p-mfc/regs-mfc-v6.h
+ create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c
+ create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h
+ create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c
+ create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h
+ create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
+ rename drivers/media/platform/s5p-mfc/{s5p_mfc_shm.h => s5p_mfc_opr_v5.h} (76%)
+ create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
+ create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
+ delete mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_shm.c
+Merging kbuild/for-next (f1748a9 Merge branch 'kbuild/rc-fixes' into kbuild/for-next)
+$ git merge kbuild/for-next
+Auto-merging tools/testing/ktest/ktest.pl
+Auto-merging scripts/kernel-doc
+Auto-merging Makefile
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 5 -
+ Makefile | 19 +--
+ scripts/Makefile.modinst | 2 +-
+ scripts/Makefile.modpost | 2 +-
+ scripts/coccinelle/api/ptr_ret.cocci | 26 ++++
+ scripts/kconfig/Makefile | 12 +-
+ scripts/kconfig/conf.c | 25 ++--
+ scripts/kconfig/expr.h | 11 ++
+ scripts/kconfig/lkc_proto.h | 6 +-
+ scripts/kconfig/lxdialog/dialog.h | 9 +-
+ scripts/kconfig/lxdialog/textbox.c | 171 +++++++++++----------
+ scripts/kconfig/lxdialog/util.c | 7 +
+ scripts/kconfig/mconf.c | 123 +++++++++++----
+ scripts/kconfig/menu.c | 53 +++++--
+ scripts/kconfig/nconf.c | 2 +-
+ scripts/kernel-doc | 273 +++++++++++++++++++++++++++++++++-
+ scripts/package/buildtar | 6 +-
+ scripts/tags.sh | 8 +-
+ tools/testing/ktest/ktest.pl | 15 +-
+ 19 files changed, 602 insertions(+), 173 deletions(-)
+Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
+$ git merge kconfig/for-next
+Already up-to-date.
+Merging libata/NEXT (13b7408 sata_mv: Fix warnings when no PCI)
+$ git merge libata/NEXT
+Already up-to-date.
+Merging infiniband/for-next (56040f0 Merge branches 'cma', 'ipoib', 'iser', 'mlx4' and 'nes' into for-next)
+$ git merge infiniband/for-next
+Already up-to-date.
+Merging pstore/master (80c9d03 pstore: Avoid recursive spinlocks in the oops_in_progress case)
+$ git merge pstore/master
+Already up-to-date.
+Merging acpi/next (d1d4a81 Merge branches 'fixes-for-37', 'ec' and 'thermal' into release)
+$ git merge acpi/next
+Auto-merging include/linux/platform_data/exynos_thermal.h
+Removing drivers/hwmon/exynos4_tmu.c
+Auto-merging Documentation/thermal/exynos_thermal
+Merge made by the 'recursive' strategy.
+ Documentation/thermal/cpu-cooling-api.txt | 32 +
+ .../{hwmon/exynos4_tmu => thermal/exynos_thermal} | 35 +-
+ Documentation/thermal/sysfs-api.txt | 9 +-
+ drivers/acpi/ec.c | 30 +-
+ drivers/acpi/processor_idle.c | 3 +-
+ drivers/acpi/thermal.c | 93 +-
+ drivers/cpuidle/cpuidle.c | 2 +-
+ drivers/hwmon/Kconfig | 10 -
+ drivers/hwmon/Makefile | 1 -
+ drivers/hwmon/exynos4_tmu.c | 518 ----------
+ drivers/platform/x86/acerhdf.c | 5 +-
+ drivers/platform/x86/intel_mid_thermal.c | 2 +-
+ drivers/power/power_supply_core.c | 2 +-
+ drivers/staging/omap-thermal/omap-thermal-common.c | 5 +-
+ drivers/thermal/Kconfig | 26 +
+ drivers/thermal/Makefile | 5 +-
+ drivers/thermal/cpu_cooling.c | 449 +++++++++
+ drivers/thermal/exynos_thermal.c | 997 ++++++++++++++++++++
+ drivers/thermal/rcar_thermal.c | 260 +++++
+ drivers/thermal/spear_thermal.c | 2 +-
+ drivers/thermal/thermal_sys.c | 321 ++++---
+ include/linux/cpu_cooling.h | 58 ++
+ .../{exynos4_tmu.h => exynos_thermal.h} | 47 +-
+ include/linux/thermal.h | 28 +-
+ tools/power/acpi/acpidump.c | 1 -
+ 25 files changed, 2205 insertions(+), 736 deletions(-)
+ create mode 100644 Documentation/thermal/cpu-cooling-api.txt
+ rename Documentation/{hwmon/exynos4_tmu => thermal/exynos_thermal} (71%)
+ delete mode 100644 drivers/hwmon/exynos4_tmu.c
+ create mode 100644 drivers/thermal/cpu_cooling.c
+ create mode 100644 drivers/thermal/exynos_thermal.c
+ create mode 100644 drivers/thermal/rcar_thermal.c
+ create mode 100644 include/linux/cpu_cooling.h
+ rename include/linux/platform_data/{exynos4_tmu.h => exynos_thermal.h} (64%)
+Merging cpuidle/cpuidle-next (3cf7997 acpi: intel_idle : break dependency between modules)
+$ git merge cpuidle/cpuidle-next
+Resolved 'drivers/cpuidle/coupled.c' using previous resolution.
+Resolved 'include/linux/cpuidle.h' using previous resolution.
+Auto-merging include/linux/cpuidle.h
+CONFLICT (content): Merge conflict in include/linux/cpuidle.h
+Auto-merging drivers/cpuidle/coupled.c
+CONFLICT (add/add): Merge conflict in drivers/cpuidle/coupled.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master c7f6d08] Merge remote-tracking branch 'cpuidle/cpuidle-next'
+$ git diff -M --stat --summary HEAD^..
+Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
+$ git merge cpupowerutils/master
+Already up-to-date.
+Merging thermal/next (f5a246e Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound)
+$ git merge thermal/next
+Already up-to-date.
+$ git am -3 ../patches/0001-termal-for-for-MAX_ID_MASK-to-MAX_IDR_MASK-rename.patch
+Applying: thermal: fix for for MAX_ID_MASK to MAX_IDR_MASK rename
+Using index info to reconstruct a base tree...
+M drivers/thermal/cpu_cooling.c
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Merging ieee1394/for-next (790198f firewire: cdev: fix user memory corruption (i386 userland on amd64 kernel))
+$ git merge ieee1394/for-next
+Merge made by the 'recursive' strategy.
+ drivers/firewire/core-cdev.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging ubi/linux-next (76ac66e UBI: Wire-up fastmap)
+$ git merge ubi/linux-next
+Already up-to-date.
+Merging dlm/next (2b75bc9 dlm: check the maximum size of a request from user)
+$ git merge dlm/next
+Already up-to-date.
+Merging scsi/for-next (5c1b10a [SCSI] storvsc: Account for in-transit packets in the RESET path)
+$ git merge scsi/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-bus-fcoe | 12 +-
+ Documentation/scsi/ChangeLog.megaraid_sas | 13 +
+ drivers/scsi/bfa/bfa_core.c | 85 ++-
+ drivers/scsi/bfa/bfa_defs.h | 61 +-
+ drivers/scsi/bfa/bfa_defs_svc.h | 119 ++-
+ drivers/scsi/bfa/bfa_fc.h | 5 +
+ drivers/scsi/bfa/bfa_fcbuild.c | 4 +
+ drivers/scsi/bfa/bfa_fcpim.c | 123 ++-
+ drivers/scsi/bfa/bfa_fcpim.h | 13 +-
+ drivers/scsi/bfa/bfa_fcs.c | 64 +-
+ drivers/scsi/bfa/bfa_fcs.h | 23 +-
+ drivers/scsi/bfa/bfa_fcs_lport.c | 155 +++-
+ drivers/scsi/bfa/bfa_fcs_rport.c | 288 ++++++-
+ drivers/scsi/bfa/bfa_ioc.c | 494 +++++++++++-
+ drivers/scsi/bfa/bfa_ioc.h | 63 +-
+ drivers/scsi/bfa/bfa_ioc_ct.c | 236 +++---
+ drivers/scsi/bfa/bfa_modules.h | 1 +
+ drivers/scsi/bfa/bfa_port.c | 32 +
+ drivers/scsi/bfa/bfa_port.h | 3 +
+ drivers/scsi/bfa/bfa_svc.c | 732 +++++++++++++++++-
+ drivers/scsi/bfa/bfa_svc.h | 30 +-
+ drivers/scsi/bfa/bfad.c | 6 +-
+ drivers/scsi/bfa/bfad_bsg.c | 375 +++++++--
+ drivers/scsi/bfa/bfad_bsg.h | 63 +-
+ drivers/scsi/bfa/bfad_drv.h | 2 +-
+ drivers/scsi/bfa/bfi.h | 72 +-
+ drivers/scsi/bfa/bfi_ms.h | 14 +
+ drivers/scsi/bfa/bfi_reg.h | 3 +
+ drivers/scsi/fcoe/fcoe.c | 14 +-
+ drivers/scsi/fcoe/fcoe.h | 2 +
+ drivers/scsi/libfc/fc_fcp.c | 3 +-
+ drivers/scsi/lpfc/lpfc.h | 2 +
+ drivers/scsi/lpfc/lpfc_attr.c | 8 +-
+ drivers/scsi/lpfc/lpfc_crtn.h | 1 +
+ drivers/scsi/lpfc/lpfc_els.c | 7 +-
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 11 +-
+ drivers/scsi/lpfc/lpfc_hw4.h | 20 +-
+ drivers/scsi/lpfc/lpfc_init.c | 256 +++++--
+ drivers/scsi/lpfc/lpfc_scsi.c | 39 +-
+ drivers/scsi/lpfc/lpfc_sli.c | 96 ++-
+ drivers/scsi/lpfc/lpfc_sli4.h | 8 +-
+ drivers/scsi/lpfc/lpfc_version.h | 2 +-
+ drivers/scsi/megaraid/megaraid_sas.h | 8 +-
+ drivers/scsi/megaraid/megaraid_sas_base.c | 13 +-
+ drivers/scsi/megaraid/megaraid_sas_fp.c | 2 +-
+ drivers/scsi/megaraid/megaraid_sas_fusion.c | 27 +-
+ drivers/scsi/megaraid/megaraid_sas_fusion.h | 2 +-
+ drivers/scsi/mvumi.c | 1093 ++++++++++++++++++++++-----
+ drivers/scsi/mvumi.h | 235 ++++--
+ drivers/scsi/qla2xxx/qla_init.c | 5 +-
+ drivers/scsi/scsi_debug.c | 2 +-
+ drivers/scsi/scsi_error.c | 8 +-
+ drivers/scsi/storvsc_drv.c | 5 +
+ drivers/scsi/virtio_scsi.c | 39 +-
+ include/linux/virtio_scsi.h | 2 +
+ include/scsi/fc/fc_fcp.h | 6 +
+ include/scsi/libfcoe.h | 2 -
+ include/scsi/scsi_cmnd.h | 12 +-
+ 58 files changed, 4274 insertions(+), 747 deletions(-)
+Merging target-updates/for-next (cf0eb28 iscsi-target: Bump defaults for nopin_timeout + nopin_response_timeout values)
+$ git merge target-updates/for-next
+Auto-merging drivers/usb/gadget/tcm_usb_gadget.c
+Auto-merging drivers/target/iscsi/iscsi_target_parameters.c
+Auto-merging drivers/scsi/qla2xxx/qla_target.c
+Merge made by the 'recursive' strategy.
+ Documentation/target/tcm_mod_builder.py | 16 --
+ drivers/infiniband/ulp/srpt/ib_srpt.c | 12 -
+ drivers/scsi/qla2xxx/qla_target.c | 2 +-
+ drivers/scsi/qla2xxx/tcm_qla2xxx.c | 15 --
+ drivers/target/iscsi/iscsi_target.c | 196 ++++++++--------
+ drivers/target/iscsi/iscsi_target.h | 5 +
+ drivers/target/iscsi/iscsi_target_configfs.c | 42 +---
+ drivers/target/iscsi/iscsi_target_core.h | 15 +-
+ drivers/target/iscsi/iscsi_target_erl0.c | 94 ++++----
+ drivers/target/iscsi/iscsi_target_erl1.c | 4 +-
+ drivers/target/iscsi/iscsi_target_erl1.h | 4 +-
+ drivers/target/iscsi/iscsi_target_erl2.c | 9 +-
+ drivers/target/iscsi/iscsi_target_erl2.h | 2 +-
+ drivers/target/iscsi/iscsi_target_login.c | 20 +-
+ drivers/target/iscsi/iscsi_target_nego.c | 31 +--
+ drivers/target/iscsi/iscsi_target_parameters.c | 71 +++++-
+ drivers/target/iscsi/iscsi_target_parameters.h | 7 +-
+ drivers/target/iscsi/iscsi_target_seq_pdu_list.c | 61 ++---
+ drivers/target/iscsi/iscsi_target_tmr.c | 31 +--
+ drivers/target/iscsi/iscsi_target_tpg.c | 12 +
+ drivers/target/iscsi/iscsi_target_tq.c | 6 +-
+ drivers/target/iscsi/iscsi_target_tq.h | 1 -
+ drivers/target/iscsi/iscsi_target_util.c | 16 +-
+ drivers/target/iscsi/iscsi_target_util.h | 8 +-
+ drivers/target/loopback/tcm_loop.c | 74 +-----
+ drivers/target/sbp/sbp_target.c | 27 +--
+ drivers/target/target_core_alua.c | 2 +-
+ drivers/target/target_core_configfs.c | 18 +-
+ drivers/target/target_core_device.c | 16 +-
+ drivers/target/target_core_fabric_configfs.c | 1 -
+ drivers/target/target_core_fabric_lib.c | 8 +-
+ drivers/target/target_core_file.c | 43 +++-
+ drivers/target/target_core_file.h | 1 +
+ drivers/target/target_core_iblock.c | 17 +-
+ drivers/target/target_core_pr.c | 14 +-
+ drivers/target/target_core_pscsi.c | 2 +-
+ drivers/target/target_core_sbc.c | 23 +-
+ drivers/target/target_core_spc.c | 48 ++--
+ drivers/target/target_core_stat.c | 1 -
+ drivers/target/target_core_tpg.c | 2 +-
+ drivers/target/target_core_transport.c | 268 ++++++++++++----------
+ drivers/target/tcm_fc/tfc_cmd.c | 1 -
+ drivers/target/tcm_fc/tfc_conf.c | 12 -
+ drivers/target/tcm_fc/tfc_io.c | 4 +-
+ drivers/target/tcm_fc/tfc_sess.c | 1 -
+ drivers/usb/gadget/tcm_usb_gadget.c | 15 +-
+ drivers/vhost/tcm_vhost.c | 81 ++-----
+ drivers/vhost/tcm_vhost.h | 8 +
+ include/target/target_core_backend.h | 3 -
+ include/target/target_core_fabric.h | 5 +-
+ 50 files changed, 640 insertions(+), 735 deletions(-)
+Merging target-merge/for-next-merge (d987569 Linux 3.6-rc2)
+$ git merge target-merge/for-next-merge
+Already up-to-date.
+Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
+$ git merge ibft/linux-next
+Already up-to-date.
+Merging isci/all (6734092 isci: add a couple __iomem annotations)
+$ git merge isci/all
+Already up-to-date.
+Merging slave-dma/next (d0fc905 dma: tegra: fix interrupt name issue with apb dma.)
+$ git merge slave-dma/next
+Resolved 'drivers/dma/mmp_tdma.c' using previous resolution.
+Resolved 'drivers/mmc/host/davinci_mmc.c' using previous resolution.
+Resolved 'drivers/spi/spi-davinci.c' using previous resolution.
+Auto-merging drivers/spi/spi-davinci.c
+CONFLICT (content): Merge conflict in drivers/spi/spi-davinci.c
+Auto-merging drivers/spi/Kconfig
+Auto-merging drivers/mmc/host/davinci_mmc.c
+CONFLICT (content): Merge conflict in drivers/mmc/host/davinci_mmc.c
+Auto-merging drivers/dma/tegra20-apb-dma.c
+Auto-merging drivers/dma/ste_dma40.c
+Auto-merging drivers/dma/sirf-dma.c
+Auto-merging drivers/dma/pl330.c
+Auto-merging drivers/dma/mxs-dma.c
+Auto-merging drivers/dma/mmp_tdma.c
+CONFLICT (content): Merge conflict in drivers/dma/mmp_tdma.c
+Auto-merging arch/arm/mach-spear13xx/spear13xx.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 0608da4] Merge remote-tracking branch 'slave-dma/next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/mach-exynos/dma.c | 2 +
+ arch/arm/mach-spear13xx/spear13xx.c | 3 +
+ arch/avr32/mach-at32ap/at32ap700x.c | 3 +
+ drivers/dma/Kconfig | 17 +
+ drivers/dma/Makefile | 2 +
+ drivers/dma/amba-pl08x.c | 2 +
+ drivers/dma/dw_dmac.c | 258 +++++++---
+ drivers/dma/dw_dmac_regs.h | 48 +-
+ drivers/dma/edma.c | 671 +++++++++++++++++++++++++
+ drivers/dma/ioat/dma_v2.c | 3 +-
+ drivers/dma/ioat/pci.c | 22 +
+ drivers/dma/mmp_pdma.c | 875 +++++++++++++++++++++++++++++++++
+ drivers/dma/mmp_tdma.c | 51 +-
+ drivers/dma/mxs-dma.c | 14 +-
+ drivers/dma/pl330.c | 76 +--
+ drivers/dma/sirf-dma.c | 23 +-
+ drivers/dma/ste_dma40.c | 14 +-
+ drivers/dma/tegra20-apb-dma.c | 12 +-
+ drivers/mmc/host/davinci_mmc.c | 271 +++-------
+ drivers/spi/Kconfig | 1 +
+ drivers/spi/spi-davinci.c | 292 +++++------
+ include/linux/dw_dmac.h | 7 +
+ include/linux/edma.h | 29 ++
+ include/linux/platform_data/mmp_dma.h | 19 +
+ 24 files changed, 2166 insertions(+), 549 deletions(-)
+ create mode 100644 drivers/dma/edma.c
+ create mode 100644 drivers/dma/mmp_pdma.c
+ create mode 100644 include/linux/edma.h
+ create mode 100644 include/linux/platform_data/mmp_dma.h
+$ git am -3 ../patches/DMA__PL330__Fix_build_error_on_linux-next-20120924.patch
+Applying: DMA: PL330: Fix build error (on linux-next-20120924)
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/dma/pl330.c
+$ git add .
+$ git commit -v -a --amend
+[master b3fb3ac] Merge remote-tracking branch 'slave-dma/next'
+Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
+$ git merge dmaengine/next
+Already up-to-date.
+Merging net-next/master (7fe0b14 Merge tag 'spi-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc)
+$ git merge net-next/master
+Already up-to-date.
+Merging wireless-next/master (5160b46 ath9k: Fix BTCOEX weight initialization)
+$ git merge wireless-next/master
+Already up-to-date.
+Merging bluetooth/master (23d3a86 Bluetooth: don't attempt to free a channel that wasn't created)
+$ git merge bluetooth/master
+Auto-merging net/bluetooth/rfcomm/tty.c
+Auto-merging net/bluetooth/rfcomm/sock.c
+Auto-merging net/bluetooth/mgmt.c
+Auto-merging net/bluetooth/l2cap_sock.c
+Auto-merging net/bluetooth/l2cap_core.c
+Auto-merging net/bluetooth/hci_core.c
+Merge made by the 'recursive' strategy.
+ drivers/bluetooth/btmrvl_sdio.c | 24 +-
+ include/net/bluetooth/a2mp.h | 22 ++
+ include/net/bluetooth/amp.h | 50 ++++
+ include/net/bluetooth/bluetooth.h | 1 -
+ include/net/bluetooth/hci.h | 39 +++-
+ include/net/bluetooth/hci_core.h | 13 +-
+ include/net/bluetooth/l2cap.h | 9 +-
+ net/bluetooth/Kconfig | 1 +
+ net/bluetooth/Makefile | 2 +-
+ net/bluetooth/a2mp.c | 454 ++++++++++++++++++++++++++++++++++---
+ net/bluetooth/af_bluetooth.c | 10 +-
+ net/bluetooth/amp.c | 374 ++++++++++++++++++++++++++++++
+ net/bluetooth/bnep/core.c | 3 +-
+ net/bluetooth/cmtp/core.c | 2 +-
+ net/bluetooth/hci_conn.c | 6 +-
+ net/bluetooth/hci_core.c | 30 +--
+ net/bluetooth/hci_event.c | 141 +++++++++++-
+ net/bluetooth/hci_sysfs.c | 10 +-
+ net/bluetooth/hidp/core.c | 8 +-
+ net/bluetooth/l2cap_core.c | 108 ++++++---
+ net/bluetooth/l2cap_sock.c | 14 +-
+ net/bluetooth/lib.c | 14 --
+ net/bluetooth/mgmt.c | 5 +-
+ net/bluetooth/rfcomm/core.c | 15 +-
+ net/bluetooth/rfcomm/sock.c | 9 +-
+ net/bluetooth/rfcomm/tty.c | 6 +-
+ net/bluetooth/sco.c | 12 +-
+ 27 files changed, 1217 insertions(+), 165 deletions(-)
+ create mode 100644 include/net/bluetooth/amp.h
+ create mode 100644 net/bluetooth/amp.c
+Merging mtd/master (f5cf8f0 mtd: Disable mtdchar mmap on MMU systems)
+$ git merge mtd/master
+Removing drivers/mtd/nand/nand_bcm_umi.h
+Removing drivers/mtd/nand/nand_bcm_umi.c
+Removing drivers/mtd/nand/bcm_umi_nand.c
+Removing drivers/mtd/nand/bcm_umi_bch.c
+Removing drivers/mtd/maps/wr_sbc82xx_flash.c
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/mtdnand.tmpl | 2 -
+ .../devicetree/bindings/arm/davinci/nand.txt | 51 +
+ .../devicetree/bindings/mtd/atmel-nand.txt | 40 +-
+ .../devicetree/bindings/mtd/gpmi-nand.txt | 4 +
+ .../devicetree/bindings/mtd/lpc32xx-mlc.txt | 50 +
+ .../devicetree/bindings/mtd/lpc32xx-slc.txt | 52 +
+ .../devicetree/bindings/mtd/mtd-physmap.txt | 7 +
+ arch/arm/boot/dts/imx51.dtsi | 7 +
+ arch/arm/boot/dts/imx53.dtsi | 7 +
+ arch/arm/configs/cam60_defconfig | 1 -
+ arch/arm/configs/corgi_defconfig | 1 -
+ arch/arm/configs/ep93xx_defconfig | 1 -
+ arch/arm/configs/mini2440_defconfig | 1 -
+ arch/arm/configs/mv78xx0_defconfig | 1 -
+ arch/arm/configs/nhk8815_defconfig | 1 -
+ arch/arm/configs/orion5x_defconfig | 1 -
+ arch/arm/configs/pxa3xx_defconfig | 1 -
+ arch/arm/configs/spitz_defconfig | 1 -
+ arch/arm/mach-clps711x/autcpu12.c | 19 +
+ arch/arm/mach-imx/clk-imx51-imx53.c | 2 +
+ arch/arm/plat-mxc/devices/platform-mxc_nand.c | 11 +-
+ arch/blackfin/configs/BF561-ACVILON_defconfig | 1 -
+ arch/mips/configs/rb532_defconfig | 1 -
+ arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | 1 -
+ arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | 1 -
+ arch/powerpc/configs/mpc83xx_defconfig | 1 -
+ drivers/mtd/Kconfig | 7 +
+ drivers/mtd/Makefile | 1 +
+ drivers/mtd/bcm47xxpart.c | 202 ++++
+ drivers/mtd/chips/Kconfig | 11 +-
+ drivers/mtd/chips/cfi_cmdset_0001.c | 14 +-
+ drivers/mtd/chips/cfi_cmdset_0002.c | 67 ++
+ drivers/mtd/cmdlinepart.c | 183 ++--
+ drivers/mtd/devices/Kconfig | 10 +-
+ drivers/mtd/devices/Makefile | 1 +
+ drivers/mtd/devices/bcm47xxsflash.c | 105 ++
+ drivers/mtd/devices/doc2001plus.c | 14 +-
+ drivers/mtd/devices/docg3.c | 12 +-
+ drivers/mtd/devices/m25p80.c | 24 +-
+ drivers/mtd/devices/spear_smi.c | 141 +--
+ drivers/mtd/maps/Kconfig | 16 +-
+ drivers/mtd/maps/Makefile | 1 -
+ drivers/mtd/maps/autcpu12-nvram.c | 153 +--
+ drivers/mtd/maps/pci.c | 23 -
+ drivers/mtd/maps/physmap_of.c | 14 +
+ drivers/mtd/maps/rbtx4939-flash.c | 2 -
+ drivers/mtd/maps/uclinux.c | 15 +-
+ drivers/mtd/maps/wr_sbc82xx_flash.c | 174 ----
+ drivers/mtd/mtdchar.c | 6 +-
+ drivers/mtd/mtdcore.c | 21 +
+ drivers/mtd/mtdoops.c | 14 +-
+ drivers/mtd/mtdpart.c | 5 +-
+ drivers/mtd/nand/Kconfig | 63 +-
+ drivers/mtd/nand/Makefile | 4 +-
+ drivers/mtd/nand/ams-delta.c | 13 -
+ drivers/mtd/nand/atmel_nand.c | 987 +++++++++++++++++--
+ drivers/mtd/nand/atmel_nand_ecc.h | 114 ++-
+ drivers/mtd/nand/au1550nd.c | 46 -
+ drivers/mtd/nand/bcm_umi_bch.c | 217 ----
+ drivers/mtd/nand/bcm_umi_nand.c | 555 -----------
+ drivers/mtd/nand/bf5xx_nand.c | 6 +-
+ drivers/mtd/nand/cafe_nand.c | 20 +-
+ drivers/mtd/nand/cmx270_nand.c | 13 -
+ drivers/mtd/nand/davinci_nand.c | 78 +-
+ drivers/mtd/nand/denali.c | 12 +-
+ drivers/mtd/nand/diskonchip.c | 63 --
+ drivers/mtd/nand/docg4.c | 43 +-
+ drivers/mtd/nand/fsl_elbc_nand.c | 51 +-
+ drivers/mtd/nand/fsl_ifc_nand.c | 52 +-
+ drivers/mtd/nand/gpio.c | 54 +-
+ drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 322 +++++-
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 152 ++-
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 26 +-
+ drivers/mtd/nand/gpmi-nand/gpmi-regs.h | 12 +
+ drivers/mtd/nand/lpc32xx_mlc.c | 924 +++++++++++++++++
+ drivers/mtd/nand/lpc32xx_slc.c | 1039 ++++++++++++++++++++
+ drivers/mtd/nand/mpc5121_nfc.c | 22 -
+ drivers/mtd/nand/mxc_nand.c | 168 ++--
+ drivers/mtd/nand/nand_base.c | 529 ++++++----
+ drivers/mtd/nand/nand_bbt.c | 148 +--
+ drivers/mtd/nand/nand_bcm_umi.c | 149 ---
+ drivers/mtd/nand/nand_bcm_umi.h | 336 -------
+ drivers/mtd/nand/nand_ids.c | 7 +-
+ drivers/mtd/nand/nandsim.c | 17 +-
+ drivers/mtd/nand/ndfc.c | 13 -
+ drivers/mtd/nand/nuc900_nand.c | 17 -
+ drivers/mtd/nand/omap2.c | 36 +-
+ drivers/mtd/nand/orion_nand.c | 1 -
+ drivers/mtd/nand/plat_nand.c | 5 +
+ drivers/mtd/nand/pxa3xx_nand.c | 12 +-
+ drivers/mtd/nand/r852.c | 22 -
+ drivers/mtd/nand/s3c2410.c | 191 ++--
+ drivers/mtd/nand/sh_flctl.c | 327 +++---
+ drivers/mtd/nand/socrates_nand.c | 19 -
+ drivers/mtd/nand/tmio_nand.c | 13 -
+ drivers/mtd/nand/txx9ndfmc.c | 13 -
+ drivers/mtd/nand/xway_nand.c | 201 ++++
+ drivers/mtd/sm_ftl.c | 1 -
+ drivers/mtd/tests/Makefile | 1 +
+ drivers/mtd/tests/mtd_nandbiterrs.c | 460 +++++++++
+ drivers/mtd/tests/mtd_nandecctest.c | 294 +++++-
+ drivers/mtd/tests/mtd_speedtest.c | 16 +-
+ drivers/mtd/tests/mtd_stresstest.c | 39 +-
+ fs/jffs2/super.c | 4 +
+ fs/jffs2/wbuf.c | 8 +-
+ include/linux/bcma/bcma_driver_chipcommon.h | 2 +
+ include/linux/mtd/bbm.h | 7 +-
+ include/linux/mtd/lpc32xx_mlc.h | 20 +
+ include/linux/mtd/lpc32xx_slc.h | 20 +
+ include/linux/mtd/mtd.h | 9 +-
+ include/linux/mtd/nand.h | 72 +-
+ include/linux/mtd/sh_flctl.h | 23 +-
+ include/mtd/Kbuild | 5 -
+ include/uapi/mtd/Kbuild | 5 +
+ include/{ => uapi}/mtd/inftl-user.h | 0
+ include/{ => uapi}/mtd/mtd-abi.h | 0
+ include/{ => uapi}/mtd/mtd-user.h | 0
+ include/{ => uapi}/mtd/nftl-user.h | 0
+ include/{ => uapi}/mtd/ubi-user.h | 0
+ 119 files changed, 6361 insertions(+), 3239 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/davinci/nand.txt
+ create mode 100644 Documentation/devicetree/bindings/mtd/lpc32xx-mlc.txt
+ create mode 100644 Documentation/devicetree/bindings/mtd/lpc32xx-slc.txt
+ create mode 100644 drivers/mtd/bcm47xxpart.c
+ create mode 100644 drivers/mtd/devices/bcm47xxsflash.c
+ delete mode 100644 drivers/mtd/maps/wr_sbc82xx_flash.c
+ delete mode 100644 drivers/mtd/nand/bcm_umi_bch.c
+ delete mode 100644 drivers/mtd/nand/bcm_umi_nand.c
+ create mode 100644 drivers/mtd/nand/lpc32xx_mlc.c
+ create mode 100644 drivers/mtd/nand/lpc32xx_slc.c
+ delete mode 100644 drivers/mtd/nand/nand_bcm_umi.c
+ delete mode 100644 drivers/mtd/nand/nand_bcm_umi.h
+ create mode 100644 drivers/mtd/nand/xway_nand.c
+ create mode 100644 drivers/mtd/tests/mtd_nandbiterrs.c
+ create mode 100644 include/linux/mtd/lpc32xx_mlc.h
+ create mode 100644 include/linux/mtd/lpc32xx_slc.h
+ rename include/{ => uapi}/mtd/inftl-user.h (100%)
+ rename include/{ => uapi}/mtd/mtd-abi.h (100%)
+ rename include/{ => uapi}/mtd/mtd-user.h (100%)
+ rename include/{ => uapi}/mtd/nftl-user.h (100%)
+ rename include/{ => uapi}/mtd/ubi-user.h (100%)
+Merging l2-mtd/master (35c241d mtd: onenand: Make flexonenand_set_boundary static)
+$ git merge l2-mtd/master
+Merge made by the 'recursive' strategy.
+ drivers/mtd/devices/slram.c | 2 +-
+ drivers/mtd/onenand/onenand_base.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Merging crypto/master (c9f97a2 crypto: x86/glue_helper - fix storing of new IV in CBC encryption)
+$ git merge crypto/master
+Already up-to-date.
+Merging drm/drm-next (1f31c69 Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next)
+$ git merge drm/drm-next
+Already up-to-date.
+Merging sound/for-next (8d032a8 ALSA: hda - remove "Mic Jack Mode" for headset jacks (Latitude Exx30))
+$ git merge sound/for-next
+Merge made by the 'recursive' strategy.
+ sound/pci/hda/patch_cirrus.c | 48 +++++---------------
+ sound/pci/hda/patch_sigmatel.c | 27 ++++++++++++
+ sound/pci/hda/patch_via.c | 94 ++++++++++------------------------------
+ sound/usb/quirks-table.h | 46 ++++++++++++++++++++
+ 4 files changed, 106 insertions(+), 109 deletions(-)
+Merging sound-asoc/for-next (961a7ae ASoC: dmaengine: Correct Makefile when sound is built as module)
+$ git merge sound-asoc/for-next
+Auto-merging sound/soc/omap/omap-mcpdm.c
+Auto-merging sound/soc/omap/omap-abe-twl6040.c
+Auto-merging sound/soc/omap/ams-delta.c
+Auto-merging arch/arm/mach-omap1/board-ams-delta.c
+Merge made by the 'recursive' strategy.
+ arch/arm/mach-omap1/board-ams-delta.c | 12 +++++++
+ sound/soc/Makefile | 5 +--
+ sound/soc/codecs/twl6040.c | 8 ++---
+ sound/soc/codecs/wm2200.c | 3 +-
+ sound/soc/omap/ams-delta.c | 63 ++++++++++++++++-----------------
+ sound/soc/omap/omap-abe-twl6040.c | 2 +-
+ sound/soc/omap/omap-mcpdm.c | 9 ++---
+ sound/soc/pxa/mmp-pcm.c | 2 +-
+ sound/soc/samsung/bells.c | 2 +-
+ sound/soc/sh/fsi.c | 15 ++++----
+ sound/soc/soc-jack.c | 7 ++--
+ 11 files changed, 68 insertions(+), 60 deletions(-)
+Merging modules/modules-next (3a7989c X.509: Fix indefinite length element skip error handling)
+$ git merge modules/modules-next
+Recorded preimage for 'arch/Kconfig'
+Recorded preimage for 'lib/Makefile'
+Resolved 'Makefile' using previous resolution.
+Resolved 'arch/cris/include/asm/Kbuild' using previous resolution.
+Resolved 'arch/h8300/include/asm/Kbuild' using previous resolution.
+Resolved 'arch/m32r/include/asm/Kbuild' using previous resolution.
+Resolved 'arch/x86/Kconfig' using previous resolution.
+Resolved 'arch/x86/um/Kconfig' using previous resolution.
+Resolved 'arch/xtensa/Kconfig' using previous resolution.
+Resolved 'init/Kconfig' using previous resolution.
+Auto-merging security/keys/trusted.c
+Auto-merging security/keys/keyring.c
+Auto-merging security/keys/keyctl.c
+Auto-merging security/keys/key.c
+Auto-merging scripts/Makefile.modpost
+Auto-merging net/rxrpc/ar-key.c
+Auto-merging net/dns_resolver/dns_key.c
+Auto-merging lib/Makefile
+CONFLICT (content): Merge conflict in lib/Makefile
+Auto-merging kernel/Makefile
+Auto-merging init/Kconfig
+CONFLICT (content): Merge conflict in init/Kconfig
+Auto-merging fs/cifs/cifsacl.c
+Auto-merging crypto/Makefile
+Auto-merging crypto/Kconfig
+Auto-merging arch/xtensa/Kconfig
+CONFLICT (content): Merge conflict in arch/xtensa/Kconfig
+Auto-merging arch/x86/um/Kconfig
+CONFLICT (content): Merge conflict in arch/x86/um/Kconfig
+Auto-merging arch/x86/Kconfig
+CONFLICT (content): Merge conflict in arch/x86/Kconfig
+Auto-merging arch/unicore32/Kconfig
+Auto-merging arch/tile/Kconfig
+Removing arch/sparc/include/asm/module.h
+Auto-merging arch/sparc/include/asm/Kbuild
+Auto-merging arch/sparc/Kconfig
+Auto-merging arch/sh/Kconfig
+Auto-merging arch/score/Kconfig
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/parisc/Kconfig
+Auto-merging arch/mips/kernel/Makefile
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/microblaze/Kconfig
+Auto-merging arch/m68k/Kconfig
+Removing arch/m32r/include/asm/module.h
+Auto-merging arch/m32r/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/m32r/include/asm/Kbuild
+Auto-merging arch/m32r/Kconfig
+Auto-merging arch/ia64/Kconfig
+Removing arch/h8300/include/asm/module.h
+Auto-merging arch/h8300/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/h8300/include/asm/Kbuild
+Auto-merging arch/h8300/Kconfig
+Removing arch/cris/include/asm/module.h
+Auto-merging arch/cris/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/cris/include/asm/Kbuild
+Auto-merging arch/cris/Kconfig
+Auto-merging arch/blackfin/Kconfig
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/Kconfig
+CONFLICT (content): Merge conflict in arch/Kconfig
+Auto-merging Makefile
+CONFLICT (content): Merge conflict in Makefile
+Auto-merging Documentation/kernel-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'arch/Kconfig'.
+Recorded resolution for 'lib/Makefile'.
+[master ad572fa] Merge remote-tracking branch 'modules/modules-next'
+$ git diff -M --stat --summary HEAD^..
+ .gitignore | 14 +
+ Documentation/crypto/asymmetric-keys.txt | 312 ++++++
+ Documentation/kernel-parameters.txt | 6 +
+ Documentation/security/keys.txt | 50 +-
+ Makefile | 6 +-
+ arch/Kconfig | 19 +
+ arch/alpha/Kconfig | 2 +
+ arch/alpha/include/asm/module.h | 10 +-
+ arch/arm/Kconfig | 2 +
+ arch/arm/include/asm/module.h | 8 +-
+ arch/avr32/Kconfig | 2 +
+ arch/avr32/include/asm/module.h | 6 +-
+ arch/blackfin/Kconfig | 2 +
+ arch/blackfin/include/asm/module.h | 4 +-
+ arch/c6x/Kconfig | 1 +
+ arch/c6x/include/asm/module.h | 12 +-
+ arch/cris/Kconfig | 1 +
+ arch/cris/include/asm/Kbuild | 1 +
+ arch/cris/include/asm/module.h | 9 -
+ arch/frv/include/asm/module.h | 8 +-
+ arch/h8300/Kconfig | 1 +
+ arch/h8300/include/asm/Kbuild | 1 +
+ arch/h8300/include/asm/module.h | 11 -
+ arch/hexagon/Kconfig | 1 +
+ arch/ia64/Kconfig | 2 +
+ arch/ia64/include/asm/module.h | 6 +-
+ arch/m32r/Kconfig | 1 +
+ arch/m32r/include/asm/Kbuild | 1 +
+ arch/m32r/include/asm/module.h | 10 -
+ arch/m32r/kernel/module.c | 15 -
+ arch/m68k/Kconfig | 3 +
+ arch/m68k/include/asm/module.h | 6 +-
+ arch/microblaze/Kconfig | 1 +
+ arch/mips/Kconfig | 3 +
+ arch/mips/include/asm/module.h | 10 +-
+ arch/mips/kernel/Makefile | 1 +
+ arch/mips/kernel/module-rela.c | 145 +++
+ arch/mips/kernel/module.c | 121 +--
+ arch/mn10300/Kconfig | 1 +
+ arch/mn10300/include/asm/module.h | 7 +-
+ arch/openrisc/Kconfig | 1 +
+ arch/parisc/Kconfig | 2 +
+ arch/parisc/include/asm/module.h | 16 +-
+ arch/powerpc/Kconfig | 2 +
+ arch/powerpc/include/asm/module.h | 7 +-
+ arch/s390/Kconfig | 2 +
+ arch/s390/include/asm/module.h | 18 +-
+ arch/score/Kconfig | 2 +
+ arch/score/include/asm/module.h | 6 +-
+ arch/score/kernel/module.c | 10 -
+ arch/sh/Kconfig | 2 +
+ arch/sh/include/asm/module.h | 14 +-
+ arch/sparc/Kconfig | 1 +
+ arch/sparc/include/asm/Kbuild | 1 +
+ arch/sparc/include/asm/module.h | 24 -
+ arch/tile/Kconfig | 1 +
+ arch/unicore32/Kconfig | 1 +
+ arch/x86/Kconfig | 2 +
+ arch/x86/um/Kconfig | 2 +
+ arch/xtensa/include/asm/module.h | 9 +-
+ crypto/Kconfig | 1 +
+ crypto/Makefile | 1 +
+ crypto/asymmetric_keys/.gitignore | 1 +
+ crypto/asymmetric_keys/Kconfig | 38 +
+ crypto/asymmetric_keys/Makefile | 27 +
+ crypto/asymmetric_keys/asymmetric_keys.h | 15 +
+ crypto/asymmetric_keys/asymmetric_type.c | 274 +++++
+ crypto/asymmetric_keys/public_key.c | 108 ++
+ crypto/asymmetric_keys/public_key.h | 30 +
+ crypto/asymmetric_keys/rsa.c | 277 ++++++
+ crypto/asymmetric_keys/signature.c | 49 +
+ crypto/asymmetric_keys/x509.asn1 | 60 ++
+ crypto/asymmetric_keys/x509_cert_parser.c | 496 +++++++++
+ crypto/asymmetric_keys/x509_parser.h | 36 +
+ crypto/asymmetric_keys/x509_public_key.c | 239 +++++
+ crypto/asymmetric_keys/x509_rsakey.asn1 | 4 +
+ fs/cifs/cifs_spnego.c | 6 +-
+ fs/cifs/cifsacl.c | 8 +-
+ include/asm-generic/bitops/count_zeros.h | 57 ++
+ include/asm-generic/module.h | 40 +-
+ include/crypto/public_key.h | 108 ++
+ include/keys/asymmetric-parser.h | 37 +
+ include/keys/asymmetric-subtype.h | 55 +
+ include/keys/asymmetric-type.h | 25 +
+ include/keys/user-type.h | 6 +-
+ include/linux/asn1.h | 67 ++
+ include/linux/asn1_ber_bytecode.h | 87 ++
+ include/linux/asn1_decoder.h | 24 +
+ include/linux/key-type.h | 35 +-
+ include/linux/module.h | 8 +
+ include/linux/moduleloader.h | 36 +-
+ include/linux/mpi.h | 1 +
+ include/linux/oid_registry.h | 92 ++
+ init/Kconfig | 68 ++
+ kernel/Makefile | 77 ++
+ kernel/modsign_pubkey.c | 113 +++
+ kernel/module-internal.h | 15 +
+ kernel/module.c | 157 ++-
+ kernel/module_signing.c | 243 +++++
+ lib/.gitignore | 2 +-
+ lib/Kconfig | 5 +
+ lib/Makefile | 18 +
+ lib/asn1_decoder.c | 487 +++++++++
+ lib/build_OID_registry | 209 ++++
+ lib/mpi/Makefile | 1 +
+ lib/mpi/longlong.h | 138 +--
+ lib/mpi/mpi-bit.c | 2 +-
+ lib/mpi/mpi-cmp.c | 70 ++
+ lib/mpi/mpi-pow.c | 4 +-
+ lib/mpi/mpicoder.c | 55 +
+ lib/oid_registry.c | 170 ++++
+ net/ceph/crypto.c | 9 +-
+ net/dns_resolver/dns_key.c | 6 +-
+ net/rxrpc/ar-key.c | 40 +-
+ scripts/.gitignore | 1 +
+ scripts/Makefile | 2 +
+ scripts/Makefile.build | 11 +
+ scripts/Makefile.modpost | 77 +-
+ scripts/asn1_compiler.c | 1545 +++++++++++++++++++++++++++++
+ scripts/sign-file | 115 +++
+ scripts/x509keyid | 268 +++++
+ security/keys/encrypted-keys/encrypted.c | 16 +-
+ security/keys/key.c | 114 ++-
+ security/keys/keyctl.c | 18 +-
+ security/keys/keyring.c | 6 +-
+ security/keys/request_key_auth.c | 8 +-
+ security/keys/trusted.c | 16 +-
+ security/keys/user_defined.c | 14 +-
+ 128 files changed, 6799 insertions(+), 594 deletions(-)
+ create mode 100644 Documentation/crypto/asymmetric-keys.txt
+ delete mode 100644 arch/cris/include/asm/module.h
+ delete mode 100644 arch/h8300/include/asm/module.h
+ delete mode 100644 arch/m32r/include/asm/module.h
+ create mode 100644 arch/mips/kernel/module-rela.c
+ delete mode 100644 arch/sparc/include/asm/module.h
+ create mode 100644 crypto/asymmetric_keys/.gitignore
+ create mode 100644 crypto/asymmetric_keys/Kconfig
+ create mode 100644 crypto/asymmetric_keys/Makefile
+ create mode 100644 crypto/asymmetric_keys/asymmetric_keys.h
+ create mode 100644 crypto/asymmetric_keys/asymmetric_type.c
+ create mode 100644 crypto/asymmetric_keys/public_key.c
+ create mode 100644 crypto/asymmetric_keys/public_key.h
+ create mode 100644 crypto/asymmetric_keys/rsa.c
+ create mode 100644 crypto/asymmetric_keys/signature.c
+ create mode 100644 crypto/asymmetric_keys/x509.asn1
+ create mode 100644 crypto/asymmetric_keys/x509_cert_parser.c
+ create mode 100644 crypto/asymmetric_keys/x509_parser.h
+ create mode 100644 crypto/asymmetric_keys/x509_public_key.c
+ create mode 100644 crypto/asymmetric_keys/x509_rsakey.asn1
+ create mode 100644 include/asm-generic/bitops/count_zeros.h
+ create mode 100644 include/crypto/public_key.h
+ create mode 100644 include/keys/asymmetric-parser.h
+ create mode 100644 include/keys/asymmetric-subtype.h
+ create mode 100644 include/keys/asymmetric-type.h
+ create mode 100644 include/linux/asn1.h
+ create mode 100644 include/linux/asn1_ber_bytecode.h
+ create mode 100644 include/linux/asn1_decoder.h
+ create mode 100644 include/linux/oid_registry.h
+ create mode 100644 kernel/modsign_pubkey.c
+ create mode 100644 kernel/module-internal.h
+ create mode 100644 kernel/module_signing.c
+ create mode 100644 lib/asn1_decoder.c
+ create mode 100755 lib/build_OID_registry
+ create mode 100644 lib/mpi/mpi-cmp.c
+ create mode 100644 lib/oid_registry.c
+ create mode 100644 scripts/asn1_compiler.c
+ create mode 100644 scripts/sign-file
+ create mode 100755 scripts/x509keyid
+Merging virtio/virtio-next (d43b716 Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild)
+$ git merge virtio/virtio-next
+Already up-to-date.
+Merging input/next (7f8d4ca Input: extend the number of event (and other) devices)
+$ git merge input/next
+Auto-merging drivers/input/tablet/wacom_wac.c
+Merge made by the 'recursive' strategy.
+ drivers/input/evdev.c | 99 +++++--------
+ drivers/input/input.c | 114 +++++++--------
+ drivers/input/joydev.c | 88 +++++-------
+ drivers/input/keyboard/samsung-keypad.c | 11 +-
+ drivers/input/mousedev.c | 224 +++++++++++++++---------------
+ drivers/input/tablet/wacom_sys.c | 145 +++++++++++++------
+ drivers/input/tablet/wacom_wac.c | 30 +++-
+ drivers/input/touchscreen/atmel_mxt_ts.c | 6 +-
+ include/linux/input.h | 10 +-
+ 9 files changed, 382 insertions(+), 345 deletions(-)
+Merging input-mt/for-next (51c80b7 Input: bcm5974 - Convert to MT-B)
+$ git merge input-mt/for-next
+Already up-to-date.
+Merging cgroup/for-next (c0a93e2 Merge branch 'for-3.7-hierarchy' into for-next)
+$ git merge cgroup/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging block/for-next (454832b Merge branch 'for-3.7/drivers' into for-next)
+$ git merge block/for-next
+Resolved 'init/Kconfig' using previous resolution.
+Auto-merging lib/scatterlist.c
+Auto-merging init/Kconfig
+CONFLICT (content): Merge conflict in init/Kconfig
+Auto-merging include/linux/fs.h
+Auto-merging drivers/target/target_core_iblock.c
+Auto-merging drivers/md/md.c
+Auto-merging drivers/md/dm.c
+Auto-merging drivers/block/mtip32xx/mtip32xx.h
+Auto-merging drivers/block/mtip32xx/mtip32xx.c
+Auto-merging drivers/block/loop.c
+Auto-merging drivers/block/floppy.c
+Auto-merging drivers/block/Kconfig
+Auto-merging block/ioctl.c
+Auto-merging block/genhd.c
+Auto-merging block/blk-core.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master a90762b] Merge remote-tracking branch 'block/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-block | 14 +
+ Documentation/block/biodoc.txt | 5 -
+ Documentation/percpu-rw-semaphore.txt | 27 +
+ MAINTAINERS | 7 +-
+ block/blk-core.c | 51 +-
+ block/blk-lib.c | 104 +-
+ block/blk-merge.c | 53 +-
+ block/blk-settings.c | 16 +
+ block/blk-sysfs.c | 44 +-
+ block/blk-tag.c | 6 +-
+ block/blk.h | 5 +-
+ block/elevator.c | 6 +-
+ block/genhd.c | 6 +-
+ block/ioctl.c | 27 +
+ drivers/block/Kconfig | 1 +
+ drivers/block/cciss.c | 1 -
+ drivers/block/drbd/drbd_main.c | 13 +-
+ drivers/block/floppy.c | 97 +-
+ drivers/block/loop.c | 17 +-
+ drivers/block/mtip32xx/mtip32xx.c | 19 +-
+ drivers/block/mtip32xx/mtip32xx.h | 3 +
+ drivers/block/osdblk.c | 3 +-
+ drivers/block/pktcdvd.c | 52 +-
+ drivers/block/xen-blkback/common.h | 4 +-
+ drivers/block/xen-blkback/xenbus.c | 9 +-
+ drivers/char/raw.c | 2 +-
+ drivers/md/dm-crypt.c | 16 +-
+ drivers/md/dm-io.c | 11 -
+ drivers/md/dm.c | 74 +-
+ drivers/md/md.c | 44 +-
+ drivers/md/raid0.c | 1 +
+ drivers/memstick/core/Kconfig | 12 +
+ drivers/memstick/core/Makefile | 2 +-
+ drivers/memstick/core/ms_block.c | 2395 +++++++++++++++++++++++++++++++++
+ drivers/memstick/core/ms_block.h | 293 ++++
+ drivers/target/target_core_iblock.c | 9 -
+ fs/bio-integrity.c | 44 +-
+ fs/bio.c | 231 ++--
+ fs/block_dev.c | 69 +-
+ fs/exofs/ore.c | 5 +-
+ include/linux/bio.h | 70 +-
+ include/linux/blk_types.h | 36 +-
+ include/linux/blkdev.h | 82 +-
+ include/linux/fs.h | 6 +
+ include/linux/percpu-rwsem.h | 89 ++
+ include/linux/scatterlist.h | 1 +
+ lib/scatterlist.c | 19 +
+ 47 files changed, 3568 insertions(+), 533 deletions(-)
+ create mode 100644 Documentation/percpu-rw-semaphore.txt
+ create mode 100644 drivers/memstick/core/ms_block.c
+ create mode 100644 drivers/memstick/core/ms_block.h
+ create mode 100644 include/linux/percpu-rwsem.h
+$ git am -3 ../patches/fs-block_devc-set_blocksize-use-mapping_mapped.patch
+Applying: fs/block_dev.c:set_blocksize(): use mapping_mapped()
+$ git reset HEAD^
+Unstaged changes after reset:
+M fs/block_dev.c
+$ git add .
+$ git commit -v -a --amend
+[master 41a0865] Merge remote-tracking branch 'block/for-next'
+Merging quilt/device-mapper (24d047b Use the recently-added bio front_pad field to allocate struct dm_target_io.)
+$ git merge quilt/device-mapper
+Resolved 'drivers/md/dm-thin.c' using previous resolution.
+Resolved 'drivers/md/dm.c' using previous resolution.
+Auto-merging drivers/md/dm.c
+CONFLICT (content): Merge conflict in drivers/md/dm.c
+Auto-merging drivers/md/dm-verity.c
+Auto-merging drivers/md/dm-thin.c
+CONFLICT (content): Merge conflict in drivers/md/dm-thin.c
+Auto-merging drivers/md/dm-mpath.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master b628f2d] Merge branch 'quilt/device-mapper'
+$ git diff -M --stat --summary HEAD^..
+ drivers/md/Kconfig | 7 +
+ drivers/md/Makefile | 1 +
+ drivers/md/dm-bio-prison.c | 415 +++++++++++++++++
+ drivers/md/dm-bio-prison.h | 72 +++
+ drivers/md/dm-bufio.c | 13 +-
+ drivers/md/dm-mpath.c | 3 +-
+ drivers/md/dm-thin.c | 520 ++++------------------
+ drivers/md/dm-verity.c | 2 +-
+ drivers/md/dm.c | 80 ++--
+ drivers/md/persistent-data/dm-space-map-common.c | 4 +-
+ 10 files changed, 624 insertions(+), 493 deletions(-)
+ create mode 100644 drivers/md/dm-bio-prison.c
+ create mode 100644 drivers/md/dm-bio-prison.h
+Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
+$ git merge embedded/master
+Already up-to-date.
+Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
+$ git merge firmware/master
+Already up-to-date.
+Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
+$ git merge pcmcia/master
+Already up-to-date.
+Merging mmc/mmc-next (a1487fb mmc: rtsx_pci_sdmmc: Add realtek pcie sdmmc host driver)
+$ git merge mmc/mmc-next
+Resolved 'drivers/mmc/host/davinci_mmc.c' using previous resolution.
+Resolved 'drivers/mmc/host/omap.c' using previous resolution.
+Auto-merging drivers/mmc/host/vub300.c
+Auto-merging drivers/mmc/host/sdhci-tegra.c
+Auto-merging drivers/mmc/host/sdhci-pci.c
+Auto-merging drivers/mmc/host/pxamci.c
+Auto-merging drivers/mmc/host/omap_hsmmc.c
+Auto-merging drivers/mmc/host/omap.c
+CONFLICT (content): Merge conflict in drivers/mmc/host/omap.c
+Auto-merging drivers/mmc/host/mxcmmc.c
+Auto-merging drivers/mmc/host/davinci_mmc.c
+CONFLICT (content): Merge conflict in drivers/mmc/host/davinci_mmc.c
+Auto-merging drivers/mmc/host/atmel-mci.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 8ec0ef6] Merge remote-tracking branch 'mmc/mmc-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/mmc/atmel-hsmci.txt | 68 +
+ .../devicetree/bindings/mmc/exynos-dw-mshc.txt | 87 ++
+ Documentation/devicetree/bindings/mmc/mmc.txt | 9 +-
+ Documentation/devicetree/bindings/mmc/pxa-mmc.txt | 25 +
+ .../devicetree/bindings/mmc/samsung-sdhci.txt | 53 +
+ .../devicetree/bindings/mmc/sdhci-dove.txt | 14 +
+ .../devicetree/bindings/mmc/sdhci-spear.txt | 18 +
+ .../devicetree/bindings/mmc/synposis-dw-mshc.txt | 79 ++
+ MAINTAINERS | 6 +-
+ arch/arm/boot/dts/spear300-evb.dts | 3 +-
+ arch/arm/boot/dts/spear320-evb.dts | 2 -
+ drivers/mmc/core/core.c | 240 ++--
+ drivers/mmc/core/debugfs.c | 2 +-
+ drivers/mmc/core/mmc.c | 57 +-
+ drivers/mmc/core/mmc_ops.c | 84 +-
+ drivers/mmc/core/sdio_bus.c | 7 -
+ drivers/mmc/core/slot-gpio.c | 8 +-
+ drivers/mmc/host/Kconfig | 16 +
+ drivers/mmc/host/Makefile | 2 +
+ drivers/mmc/host/atmel-mci-regs.h | 7 +
+ drivers/mmc/host/atmel-mci.c | 113 +-
+ drivers/mmc/host/bfin_sdh.c | 210 +--
+ drivers/mmc/host/dw_mmc-exynos.c | 253 ++++
+ drivers/mmc/host/dw_mmc-pci.c | 15 +-
+ drivers/mmc/host/dw_mmc-pltfm.c | 62 +-
+ drivers/mmc/host/dw_mmc-pltfm.h | 20 +
+ drivers/mmc/host/dw_mmc.c | 326 ++++-
+ drivers/mmc/host/dw_mmc.h | 24 +
+ drivers/mmc/host/mmc_spi.c | 15 +-
+ drivers/mmc/host/mmci.c | 13 +-
+ drivers/mmc/host/mxcmmc.c | 76 +-
+ drivers/mmc/host/omap.c | 37 +-
+ drivers/mmc/host/omap_hsmmc.c | 125 +-
+ drivers/mmc/host/pxamci.c | 52 +
+ drivers/mmc/host/rtsx_pci_sdmmc.c | 1332 ++++++++++++++++++++
+ drivers/mmc/host/sdhci-dove.c | 8 +
+ drivers/mmc/host/sdhci-of-esdhc.c | 36 +-
+ drivers/mmc/host/sdhci-pci.c | 19 +-
+ drivers/mmc/host/sdhci-pltfm.c | 3 +
+ drivers/mmc/host/sdhci-pxav2.c | 6 +-
+ drivers/mmc/host/sdhci-pxav3.c | 35 +-
+ drivers/mmc/host/sdhci-s3c.c | 216 +++-
+ drivers/mmc/host/sdhci-spear.c | 67 +-
+ drivers/mmc/host/sdhci-tegra.c | 7 +-
+ drivers/mmc/host/sdhci.c | 205 +--
+ drivers/mmc/host/sh_mmcif.c | 8 +-
+ drivers/mmc/host/via-sdmmc.c | 16 +-
+ drivers/mmc/host/vub300.c | 4 +-
+ include/linux/mmc/card.h | 18 +-
+ include/linux/mmc/core.h | 4 +
+ include/linux/mmc/dw_mmc.h | 15 +-
+ include/linux/mmc/host.h | 5 +-
+ include/linux/mmc/mmc.h | 19 +
+ include/linux/mmc/sdhci.h | 3 +-
+ include/linux/platform_data/pxa_sdhci.h | 1 +
+ 55 files changed, 3535 insertions(+), 620 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mmc/atmel-hsmci.txt
+ create mode 100644 Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
+ create mode 100644 Documentation/devicetree/bindings/mmc/pxa-mmc.txt
+ create mode 100644 Documentation/devicetree/bindings/mmc/samsung-sdhci.txt
+ create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-dove.txt
+ create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-spear.txt
+ create mode 100644 Documentation/devicetree/bindings/mmc/synposis-dw-mshc.txt
+ create mode 100644 drivers/mmc/host/dw_mmc-exynos.c
+ create mode 100644 drivers/mmc/host/dw_mmc-pltfm.h
+ create mode 100644 drivers/mmc/host/rtsx_pci_sdmmc.c
+Merging kgdb/kgdb-next (08f9553 tty/console: fix warnings in drivers/tty/serial/kgdboc.c)
+$ git merge kgdb/kgdb-next
+Auto-merging drivers/tty/serial/kgdboc.c
+Merge made by the 'recursive' strategy.
+ arch/mips/kernel/kgdb.c | 9 +++++++++
+ arch/x86/kernel/kgdb.c | 2 ++
+ drivers/tty/serial/kgdboc.c | 3 ++-
+ include/linux/console.h | 10 ++++++++--
+ 4 files changed, 21 insertions(+), 3 deletions(-)
+Merging slab/for-next (e2087be Merge branch 'slab/tracing' into slab/for-linus)
+$ git merge slab/for-next
+Already up-to-date.
+Merging uclinux/for-next (a0d271c Linux 3.6)
+$ git merge uclinux/for-next
+Already up-to-date.
+Merging md/for-next (c0c6d3f md: writing to sync_action should clear the read-auto state.)
+$ git merge md/for-next
+Resolved 'drivers/md/raid0.c' using previous resolution.
+Resolved 'fs/bio.c' using previous resolution.
+Auto-merging fs/bio.c
+CONFLICT (content): Merge conflict in fs/bio.c
+Auto-merging drivers/md/raid0.c
+CONFLICT (content): Merge conflict in drivers/md/raid0.c
+Auto-merging drivers/md/md.c
+Auto-merging block/blk-core.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master b36c39b] Merge remote-tracking branch 'md/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/device-mapper/dm-raid.txt | 9 +
+ block/blk-core.c | 1 +
+ crypto/xor.c | 4 +-
+ drivers/md/bitmap.c | 17 +-
+ drivers/md/dm-raid.c | 124 ++++--
+ drivers/md/linear.c | 25 +-
+ drivers/md/md.c | 148 +++++--
+ drivers/md/md.h | 17 +-
+ drivers/md/multipath.c | 3 +-
+ drivers/md/raid0.c | 19 +-
+ drivers/md/raid1.c | 34 +-
+ drivers/md/raid10.c | 91 ++++-
+ drivers/md/raid5.c | 664 ++++++++++++++++++++++++++++---
+ drivers/md/raid5.h | 20 +
+ 14 files changed, 1022 insertions(+), 154 deletions(-)
+Merging mfd/for-next (74d8378 ARM: dts: Enable 88pm860x pmic)
+$ git merge mfd/for-next
+Already up-to-date.
+Merging battery/master (18766f0 Merge with upstream to accommodate with MFD changes)
+$ git merge battery/master
+Already up-to-date.
+Merging fbdev/fbdev-next (ebe9f7b video: exynos_mipi_dsi: Remove unnecessary NULL check)
+$ git merge fbdev/fbdev-next
+Resolved 'arch/arm/mach-s3c64xx/mach-mini6410.c' using previous resolution.
+Resolved 'arch/arm/mach-s3c64xx/mach-real6410.c' using previous resolution.
+Resolved 'drivers/video/msm/mddi.c' using previous resolution.
+Resolved 'drivers/video/msm/mdp.c' using previous resolution.
+Auto-merging include/video/samsung_fimd.h
+Auto-merging drivers/video/vermilion/vermilion.c
+Auto-merging drivers/video/ps3fb.c
+Removing drivers/video/pnx4008/sdum.h
+Removing drivers/video/pnx4008/sdum.c
+Removing drivers/video/pnx4008/pnxrgbfb.c
+Removing drivers/video/pnx4008/fbcommon.h
+Removing drivers/video/pnx4008/dum.h
+Removing drivers/video/pnx4008/Makefile
+Auto-merging drivers/video/msm/mdp_hw.h
+CONFLICT (content): Merge conflict in drivers/video/msm/mdp_hw.h
+Auto-merging drivers/video/msm/mdp.c
+CONFLICT (content): Merge conflict in drivers/video/msm/mdp.c
+Auto-merging drivers/video/msm/mddi_client_nt35399.c
+Auto-merging drivers/video/msm/mddi.c
+CONFLICT (content): Merge conflict in drivers/video/msm/mddi.c
+Auto-merging drivers/video/jz4740_fb.c
+Auto-merging drivers/video/imxfb.c
+Auto-merging drivers/video/gbefb.c
+Auto-merging drivers/video/exynos/exynos_mipi_dsi.c
+CONFLICT (modify/delete): drivers/video/epson1355fb.c deleted in HEAD and modified in fbdev/fbdev-next. Version fbdev/fbdev-next of drivers/video/epson1355fb.c left in tree.
+Auto-merging drivers/video/ep93xx-fb.c
+Auto-merging drivers/video/da8xx-fb.c
+Auto-merging drivers/video/Makefile
+Auto-merging drivers/video/Kconfig
+Auto-merging drivers/gpu/drm/exynos/exynos_drm_fimd.c
+Removing arch/arm/plat-samsung/include/plat/regs-fb-v4.h
+Auto-merging arch/arm/mach-s5pv210/mach-smdkv210.c
+Auto-merging arch/arm/mach-s5pv210/mach-goni.c
+Auto-merging arch/arm/mach-s5pc100/mach-smdkc100.c
+Auto-merging arch/arm/mach-s5p64x0/mach-smdk6450.c
+Auto-merging arch/arm/mach-s5p64x0/mach-smdk6440.c
+Auto-merging arch/arm/mach-s3c64xx/mach-smdk6410.c
+Auto-merging arch/arm/mach-s3c64xx/mach-real6410.c
+CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-real6410.c
+Auto-merging arch/arm/mach-s3c64xx/mach-ncp.c
+Auto-merging arch/arm/mach-s3c64xx/mach-mini6410.c
+CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-mini6410.c
+Auto-merging arch/arm/mach-s3c64xx/mach-hmt.c
+Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c
+Auto-merging arch/arm/mach-s3c64xx/mach-anw6410.c
+Auto-merging arch/arm/mach-s3c24xx/mach-smdk2416.c
+Auto-merging arch/arm/mach-exynos/mach-universal_c210.c
+Auto-merging arch/arm/mach-exynos/mach-smdkv310.c
+Auto-merging arch/arm/mach-exynos/mach-smdk4x12.c
+Auto-merging arch/arm/mach-exynos/mach-origen.c
+Auto-merging arch/arm/mach-exynos/mach-nuri.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f drivers/video/epson1355fb.c
+drivers/video/epson1355fb.c: needs merge
+rm 'drivers/video/epson1355fb.c'
+$ git commit -v -a
+Recorded resolution for 'drivers/video/msm/mdp_hw.h'.
+[master fb0c57c] Merge remote-tracking branch 'fbdev/fbdev-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/mach-exynos/mach-nuri.c | 2 +-
+ arch/arm/mach-exynos/mach-origen.c | 2 +-
+ arch/arm/mach-exynos/mach-smdk4x12.c | 2 +-
+ arch/arm/mach-exynos/mach-smdkv310.c | 2 +-
+ arch/arm/mach-exynos/mach-universal_c210.c | 2 +-
+ arch/arm/mach-exynos/setup-fimd0.c | 2 +-
+ arch/arm/mach-s3c24xx/mach-smdk2416.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-anw6410.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-hmt.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-ncp.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-real6410.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-smartq5.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-smartq7.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +-
+ arch/arm/mach-s5p64x0/mach-smdk6440.c | 2 +-
+ arch/arm/mach-s5p64x0/mach-smdk6450.c | 2 +-
+ arch/arm/mach-s5pc100/mach-smdkc100.c | 2 +-
+ arch/arm/mach-s5pv210/mach-aquila.c | 2 +-
+ arch/arm/mach-s5pv210/mach-goni.c | 2 +-
+ arch/arm/mach-s5pv210/mach-smdkv210.c | 2 +-
+ arch/arm/plat-samsung/include/plat/regs-fb-v4.h | 159 ----
+ drivers/gpu/drm/exynos/exynos_drm_fimd.c | 2 +-
+ drivers/video/Kconfig | 15 -
+ drivers/video/Makefile | 2 -
+ drivers/video/amifb.c | 2 -
+ drivers/video/arcfb.c | 1 +
+ drivers/video/atmel_lcdfb.c | 5 +-
+ drivers/video/bf537-lq035.c | 12 +-
+ drivers/video/bf54x-lq043fb.c | 9 +-
+ drivers/video/bfin-lq035q1-fb.c | 13 +-
+ drivers/video/bfin-t350mcqb-fb.c | 1 +
+ drivers/video/bw2.c | 4 +-
+ drivers/video/cg3.c | 3 +-
+ drivers/video/cobalt_lcdfb.c | 5 +-
+ drivers/video/console/font_mini_4x6.c | 2 +-
+ drivers/video/console/font_sun8x16.c | 2 +-
+ drivers/video/cyber2000fb.c | 4 +-
+ drivers/video/da8xx-fb.c | 191 +++--
+ drivers/video/ep93xx-fb.c | 17 +-
+ drivers/video/exynos/exynos_dp_core.c | 314 ++++---
+ drivers/video/exynos/exynos_dp_core.h | 6 +-
+ drivers/video/exynos/exynos_dp_reg.c | 58 +-
+ drivers/video/exynos/exynos_dp_reg.h | 3 +-
+ drivers/video/exynos/exynos_mipi_dsi.c | 6 +-
+ drivers/video/exynos/exynos_mipi_dsi_common.c | 8 -
+ drivers/video/fsl-diu-fb.c | 10 +-
+ drivers/video/gbefb.c | 15 +-
+ drivers/video/hpfb.c | 28 +-
+ drivers/video/imxfb.c | 1 +
+ drivers/video/jz4740_fb.c | 44 +-
+ drivers/video/mb862xx/mb862xxfbdrv.c | 10 +-
+ drivers/video/mbx/mbxfb.c | 25 +-
+ drivers/video/msm/mddi.c | 3 -
+ drivers/video/msm/mddi_client_nt35399.c | 6 +-
+ drivers/video/msm/mdp.c | 1 -
+ drivers/video/msm/mdp_hw.h | 1 -
+ drivers/video/pnx4008/Makefile | 7 -
+ drivers/video/pnx4008/dum.h | 211 -----
+ drivers/video/pnx4008/fbcommon.h | 43 -
+ drivers/video/pnx4008/pnxrgbfb.c | 198 -----
+ drivers/video/pnx4008/sdum.c | 861 --------------------
+ drivers/video/pnx4008/sdum.h | 136 ----
+ drivers/video/ps3fb.c | 7 +-
+ drivers/video/s3c-fb.c | 26 +-
+ drivers/video/s3c2410fb.c | 34 +-
+ drivers/video/sis/initextlfb.c | 2 +-
+ drivers/video/sunxvr1000.c | 4 +-
+ drivers/video/sunxvr2500.c | 4 +-
+ drivers/video/sunxvr500.c | 8 +-
+ drivers/video/uvesafb.c | 2 +
+ drivers/video/vermilion/vermilion.c | 3 +-
+ drivers/video/via/via_clock.c | 19 +
+ .../plat/regs-fb.h => include/video/samsung_fimd.h | 152 +++-
+ 75 files changed, 665 insertions(+), 2084 deletions(-)
+ delete mode 100644 arch/arm/plat-samsung/include/plat/regs-fb-v4.h
+ delete mode 100644 drivers/video/pnx4008/Makefile
+ delete mode 100644 drivers/video/pnx4008/dum.h
+ delete mode 100644 drivers/video/pnx4008/fbcommon.h
+ delete mode 100644 drivers/video/pnx4008/pnxrgbfb.c
+ delete mode 100644 drivers/video/pnx4008/sdum.c
+ delete mode 100644 drivers/video/pnx4008/sdum.h
+ rename arch/arm/plat-samsung/include/plat/regs-fb.h => include/video/samsung_fimd.h (73%)
+Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
+$ git merge viafb/viafb-next
+Already up-to-date.
+Merging omap_dss2/for-next (13b1ba7 OMAPDSS: add missing include for string.h)
+$ git merge omap_dss2/for-next
+Resolved 'drivers/video/omap/lcd_ams_delta.c' using previous resolution.
+Resolved 'drivers/video/omap2/displays/panel-taal.c' using previous resolution.
+Resolved 'drivers/video/omap2/dss/dispc.c' using previous resolution.
+Auto-merging drivers/video/omap2/omapfb/omapfb-main.c
+Auto-merging drivers/video/omap2/dss/dsi.c
+Auto-merging drivers/video/omap2/dss/dispc.c
+CONFLICT (content): Merge conflict in drivers/video/omap2/dss/dispc.c
+Auto-merging drivers/video/omap2/displays/panel-taal.c
+CONFLICT (content): Merge conflict in drivers/video/omap2/displays/panel-taal.c
+Auto-merging drivers/video/omap/lcd_ams_delta.c
+CONFLICT (content): Merge conflict in drivers/video/omap/lcd_ams_delta.c
+Auto-merging drivers/staging/omapdrm/omap_drv.c
+Auto-merging drivers/media/platform/omap/omap_vout.c
+Auto-merging arch/arm/mach-omap2/twl-common.c
+Auto-merging arch/arm/mach-omap2/display.c
+Auto-merging arch/arm/mach-omap2/board-omap4panda.c
+Auto-merging arch/arm/mach-omap2/board-4430sdp.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master e9c9db9] Merge remote-tracking branch 'omap_dss2/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/mach-omap2/board-4430sdp.c | 73 +-
+ arch/arm/mach-omap2/board-omap4panda.c | 27 +-
+ arch/arm/mach-omap2/display.c | 1 -
+ arch/arm/mach-omap2/twl-common.c | 6 +
+ drivers/media/platform/omap/omap_vout.c | 75 +-
+ drivers/staging/omapdrm/omap_drv.c | 5 +-
+ drivers/video/omap/hwa742.c | 1 -
+ drivers/video/omap/lcd_palmte.c | 1 -
+ drivers/video/omap/omapfb_main.c | 9 -
+ drivers/video/omap2/displays/panel-acx565akm.c | 14 +-
+ drivers/video/omap2/displays/panel-generic-dpi.c | 76 +-
+ .../omap2/displays/panel-lgphilips-lb035q02.c | 3 +
+ drivers/video/omap2/displays/panel-n8x0.c | 31 +-
+ .../omap2/displays/panel-nec-nl8048hl11-01b.c | 3 +
+ drivers/video/omap2/displays/panel-picodlp.c | 4 +
+ .../video/omap2/displays/panel-sharp-ls037v7dw01.c | 3 +
+ drivers/video/omap2/displays/panel-taal.c | 239 ++---
+ drivers/video/omap2/displays/panel-tfp410.c | 20 +-
+ .../video/omap2/displays/panel-tpo-td043mtea1.c | 7 +-
+ drivers/video/omap2/dss/Kconfig | 2 +-
+ drivers/video/omap2/dss/Makefile | 4 +-
+ drivers/video/omap2/dss/apply.c | 330 ++-----
+ drivers/video/omap2/dss/core.c | 91 +-
+ drivers/video/omap2/dss/dispc.c | 1018 ++++++++++++++------
+ drivers/video/omap2/dss/dispc.h | 37 +
+ drivers/video/omap2/dss/display.c | 108 ++-
+ drivers/video/omap2/dss/dpi.c | 181 +++-
+ drivers/video/omap2/dss/dsi.c | 675 ++++++++++---
+ drivers/video/omap2/dss/dss.c | 257 +++--
+ drivers/video/omap2/dss/dss.h | 79 +-
+ drivers/video/omap2/dss/dss_features.c | 278 +++++-
+ drivers/video/omap2/dss/dss_features.h | 7 +
+ drivers/video/omap2/dss/hdmi.c | 247 +++--
+ drivers/video/omap2/dss/hdmi_panel.c | 31 +-
+ drivers/video/omap2/dss/manager-sysfs.c | 512 ++++++++++
+ drivers/video/omap2/dss/manager.c | 473 +--------
+ drivers/video/omap2/dss/output.c | 148 +++
+ drivers/video/omap2/dss/overlay-sysfs.c | 456 +++++++++
+ drivers/video/omap2/dss/overlay.c | 492 +---------
+ drivers/video/omap2/dss/rfbi.c | 222 +++--
+ drivers/video/omap2/dss/sdi.c | 126 ++-
+ drivers/video/omap2/dss/venc.c | 337 +++----
+ drivers/video/omap2/dss/venc_panel.c | 251 +++++
+ drivers/video/omap2/omapfb/omapfb-ioctl.c | 7 +-
+ drivers/video/omap2/omapfb/omapfb-main.c | 32 +-
+ drivers/video/omap2/omapfb/omapfb.h | 5 +-
+ drivers/video/omap2/vram.c | 56 --
+ include/video/omapdss.h | 112 ++-
+ 48 files changed, 4575 insertions(+), 2597 deletions(-)
+ create mode 100644 drivers/video/omap2/dss/manager-sysfs.c
+ create mode 100644 drivers/video/omap2/dss/output.c
+ create mode 100644 drivers/video/omap2/dss/overlay-sysfs.c
+ create mode 100644 drivers/video/omap2/dss/venc_panel.c
+Merging regulator/for-next (6a2027a Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/bypass', 'regulator/topic/tol', 'regulator/topic/drivers' and 'regulator/topic/tps6586x' into regulator-next)
+$ git merge regulator/for-next
+Already up-to-date.
+Merging security/next (bf53083 Merge tag 'v3.6-rc7' into next)
+$ git merge security/next
+Already up-to-date.
+Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
+$ git merge selinux/master
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
+$ git merge lblnet/master
+Already up-to-date.
+Merging watchdog/master (58ddfed Merge branch 'master' of ../linux-watchdog)
+$ git merge watchdog/master
+Merge made by the 'recursive' strategy.
+ drivers/watchdog/davinci_wdt.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging iommu/next (0094872 Merge branches 'dma-debug', 'iommu/fixes', 'arm/tegra', 'arm/exynos', 'x86/amd', 'x86/vt-d' and 'x86/amd-irq-remapping' into next)
+$ git merge iommu/next
+Already up-to-date.
+Merging vfio/next (f448d31 vfio: Fix PCI INTx disable consistency)
+$ git merge vfio/next
+Merge made by the 'recursive' strategy.
+ drivers/vfio/pci/vfio_pci_intrs.c | 18 +++++++++++++++---
+ 1 file changed, 15 insertions(+), 3 deletions(-)
+Merging osd/linux-next (7f8d145 pnfs_osd_xdr: Remove unused #include from pnfs_osd_xdr.h)
+$ git merge osd/linux-next
+Already up-to-date.
+Merging jc_docs/docs-next (5c050fb docs: update the development process document)
+$ git merge jc_docs/docs-next
+Already up-to-date.
+Merging trivial/for-next (9c33c51 doc: fix old config name of kprobetrace)
+$ git merge trivial/for-next
+Already up-to-date.
+Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
+$ git merge audit/for-next
+Already up-to-date.
+Merging pm/linux-next (df5a2a1 Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394)
+$ git merge pm/linux-next
+Already up-to-date.
+Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
+$ git merge apm/for-next
+Already up-to-date.
+Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
+$ git merge fsnotify/for-next
+Resolved 'kernel/audit_tree.c' using previous resolution.
+Auto-merging kernel/audit_watch.c
+Auto-merging kernel/audit_tree.c
+CONFLICT (content): Merge conflict in kernel/audit_tree.c
+Auto-merging include/linux/fsnotify_backend.h
+Auto-merging fs/notify/notification.c
+Auto-merging fs/notify/inotify/inotify_user.c
+Auto-merging fs/notify/fanotify/fanotify_user.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 55bb79c] Merge remote-tracking branch 'fsnotify/for-next'
+$ git diff -M --stat --summary HEAD^..
+ fs/notify/dnotify/dnotify.c | 4 +-
+ fs/notify/fanotify/fanotify.c | 6 +++
+ fs/notify/fanotify/fanotify_user.c | 37 +++++++++-----
+ fs/notify/group.c | 47 ++++++++++--------
+ fs/notify/inode_mark.c | 14 ++++--
+ fs/notify/inotify/inotify_fsnotify.c | 4 +-
+ fs/notify/inotify/inotify_user.c | 34 ++++++-------
+ fs/notify/mark.c | 91 +++++++++++++++++++---------------
+ fs/notify/notification.c | 1 +
+ fs/notify/vfsmount_mark.c | 14 ++++--
+ include/linux/fsnotify_backend.h | 31 ++++++++----
+ kernel/audit_tree.c | 10 ++--
+ kernel/audit_watch.c | 4 +-
+ 13 files changed, 178 insertions(+), 119 deletions(-)
+Merging edac/linux_next (cfe5031 edac: edac_mc no longer deals with kobjects directly)
+$ git merge edac/linux_next
+Auto-merging drivers/edac/edac_mc.c
+Merge made by the 'recursive' strategy.
+ drivers/edac/edac_mc.c | 7 -------
+ include/linux/edac.h | 1 -
+ 2 files changed, 8 deletions(-)
+Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next)
+$ git merge edac-amd/for-next
+Resolved 'Documentation/edac.txt' using previous resolution.
+Resolved 'drivers/edac/amd64_edac.c' using previous resolution.
+Auto-merging drivers/edac/amd64_edac.c
+CONFLICT (content): Merge conflict in drivers/edac/amd64_edac.c
+Auto-merging Documentation/edac.txt
+CONFLICT (content): Merge conflict in Documentation/edac.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 153664a] Merge remote-tracking branch 'edac-amd/for-next'
+$ git diff -M --stat --summary HEAD^..
+Merging devicetree/devicetree/next (efd68e7 devicetree: add helper inline for retrieving a node's full name)
+$ git merge devicetree/devicetree/next
+Already up-to-date.
+Merging dt-rh/for-next (36165f5 MAINTAINERS: add scripts/dtc under Devicetree maintainers)
+$ git merge dt-rh/for-next
+Already up-to-date.
+Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices)
+$ git merge spi/spi/next
+Already up-to-date.
+Merging spi-mb/spi-next (43e37b0 spi: tsc2005: delete soon-obsolete e-mail address)
+$ git merge spi-mb/spi-next
+Merge made by the 'recursive' strategy.
+ drivers/spi/spi-rspi.c | 56 ++++++++++++++++++++++++++-----------------
+ include/linux/spi/tsc2005.h | 2 --
+ 2 files changed, 34 insertions(+), 24 deletions(-)
+Merging tip/auto-latest (6b90cb2 Merge branch 'sched/urgent')
+$ git merge tip/auto-latest
+Recorded preimage for 'mm/huge_memory.c'
+Recorded preimage for 'mm/mempolicy.c'
+Auto-merging tools/perf/Makefile
+Auto-merging scripts/kconfig/Makefile
+Auto-merging mm/vmstat.c
+Auto-merging mm/mempolicy.c
+CONFLICT (content): Merge conflict in mm/mempolicy.c
+Auto-merging mm/memory.c
+Auto-merging mm/huge_memory.c
+CONFLICT (content): Merge conflict in mm/huge_memory.c
+Auto-merging lib/Makefile
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/events/core.c
+Auto-merging init/Kconfig
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/mmzone.h
+Auto-merging include/linux/mm_types.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/mempolicy.h
+Auto-merging include/linux/init_task.h
+Auto-merging include/linux/huge_mm.h
+Auto-merging include/linux/acpi.h
+Auto-merging arch/x86/kernel/setup.c
+Auto-merging arch/x86/include/asm/pgtable.h
+Auto-merging arch/x86/include/asm/msr-index.h
+Auto-merging arch/x86/Kconfig
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'mm/huge_memory.c'.
+Recorded resolution for 'mm/mempolicy.c'.
+[master fe59c61] Merge remote-tracking branch 'tip/auto-latest'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/acpi/initrd_table_override.txt | 94 ++
+ MAINTAINERS | 8 +
+ arch/sh/mm/Kconfig | 1 +
+ arch/x86/Kconfig | 31 +
+ arch/x86/include/asm/msr-index.h | 5 +
+ arch/x86/include/asm/pgtable.h | 1 +
+ arch/x86/kernel/acpi/boot.c | 6 +
+ arch/x86/kernel/cpu/Makefile | 2 +-
+ arch/x86/kernel/cpu/intel_cacheinfo.c | 2 +-
+ arch/x86/kernel/cpu/perf_event.h | 2 +
+ arch/x86/kernel/cpu/perf_event_amd_ibs.c | 61 +-
+ arch/x86/kernel/cpu/perf_event_intel.c | 2 +
+ arch/x86/kernel/cpu/perf_event_knc.c | 248 +++++
+ arch/x86/kernel/cpu/perfctr-watchdog.c | 4 +
+ arch/x86/kernel/reboot.c | 8 -
+ arch/x86/kernel/setup.c | 4 +
+ arch/x86/realmode/rm/wakeup_asm.S | 15 +-
+ drivers/acpi/Kconfig | 9 +
+ drivers/acpi/osl.c | 202 +++-
+ drivers/base/node.c | 2 +-
+ include/linux/acpi.h | 16 +
+ include/linux/earlycpio.h | 17 +
+ include/linux/huge_mm.h | 19 +
+ include/linux/init_task.h | 9 +
+ include/linux/mempolicy.h | 30 +-
+ include/linux/migrate.h | 7 +
+ include/linux/migrate_mode.h | 3 +
+ include/linux/mm.h | 115 +-
+ include/linux/mm_types.h | 34 +
+ include/linux/mmzone.h | 15 +-
+ include/linux/page-flags-layout.h | 83 ++
+ include/linux/perf_event.h | 2 +-
+ include/linux/sched.h | 27 +-
+ init/Kconfig | 11 +
+ kernel/events/core.c | 21 +-
+ kernel/sched/core.c | 142 ++-
+ kernel/sched/debug.c | 3 +
+ kernel/sched/fair.c | 545 ++++++++-
+ kernel/sched/features.h | 10 +
+ kernel/sched/sched.h | 37 +
+ kernel/sysctl.c | 13 +-
+ kernel/time/tick-sched.c | 2 +-
+ lib/Makefile | 2 +-
+ lib/earlycpio.c | 145 +++
+ mm/huge_memory.c | 172 ++-
+ mm/memory.c | 105 +-
+ mm/mempolicy.c | 298 +++--
+ mm/migrate.c | 85 +-
+ mm/mprotect.c | 31 +-
+ mm/vmstat.c | 1 -
+ scripts/kconfig/Makefile | 7 +-
+ tools/kvm/.gitignore | 12 +
+ tools/kvm/CREDITS-Git | 30 +
+ tools/kvm/Documentation/kernel-debugging.txt | 15 +
+ tools/kvm/Documentation/kvm-balloon.txt | 24 +
+ tools/kvm/Documentation/kvm-debug.txt | 16 +
+ tools/kvm/Documentation/kvm-list.txt | 16 +
+ tools/kvm/Documentation/kvm-pause.txt | 16 +
+ tools/kvm/Documentation/kvm-resume.txt | 16 +
+ tools/kvm/Documentation/kvm-run.txt | 62 ++
+ tools/kvm/Documentation/kvm-sandbox.txt | 16 +
+ tools/kvm/Documentation/kvm-setup.txt | 15 +
+ tools/kvm/Documentation/kvm-stat.txt | 19 +
+ tools/kvm/Documentation/kvm-stop.txt | 16 +
+ tools/kvm/Documentation/kvm-version.txt | 21 +
+ tools/kvm/Documentation/virtio-console.txt | 41 +
+ tools/kvm/Makefile | 457 ++++++++
+ tools/kvm/README | 112 ++
+ tools/kvm/builtin-balloon.c | 80 ++
+ tools/kvm/builtin-debug.c | 110 ++
+ tools/kvm/builtin-help.c | 63 ++
+ tools/kvm/builtin-list.c | 149 +++
+ tools/kvm/builtin-pause.c | 88 ++
+ tools/kvm/builtin-resume.c | 88 ++
+ tools/kvm/builtin-run.c | 697 ++++++++++++
+ tools/kvm/builtin-sandbox.c | 9 +
+ tools/kvm/builtin-setup.c | 262 +++++
+ tools/kvm/builtin-stat.c | 127 +++
+ tools/kvm/builtin-stop.c | 70 ++
+ tools/kvm/builtin-version.c | 15 +
+ tools/kvm/code16gcc.h | 15 +
+ tools/kvm/command-list.txt | 15 +
+ tools/kvm/config/feature-tests.mak | 177 +++
+ tools/kvm/config/utilities.mak | 196 ++++
+ tools/kvm/disk/blk.c | 76 ++
+ tools/kvm/disk/core.c | 354 ++++++
+ tools/kvm/disk/qcow.c | 1529 ++++++++++++++++++++++++++
+ tools/kvm/disk/raw.c | 141 +++
+ tools/kvm/framebuffer.c | 80 ++
+ tools/kvm/guest/init.c | 72 ++
+ tools/kvm/guest_compat.c | 99 ++
+ tools/kvm/hw/i8042.c | 355 ++++++
+ tools/kvm/hw/pci-shmem.c | 405 +++++++
+ tools/kvm/hw/rtc.c | 139 +++
+ tools/kvm/hw/serial.c | 452 ++++++++
+ tools/kvm/hw/vesa.c | 89 ++
+ tools/kvm/include/asm/hweight.h | 8 +
+ tools/kvm/include/bios/memcpy.h | 9 +
+ tools/kvm/include/kvm/8250-serial.h | 11 +
+ tools/kvm/include/kvm/apic.h | 17 +
+ tools/kvm/include/kvm/brlock.h | 41 +
+ tools/kvm/include/kvm/builtin-balloon.h | 9 +
+ tools/kvm/include/kvm/builtin-debug.h | 20 +
+ tools/kvm/include/kvm/builtin-help.h | 6 +
+ tools/kvm/include/kvm/builtin-list.h | 10 +
+ tools/kvm/include/kvm/builtin-pause.h | 9 +
+ tools/kvm/include/kvm/builtin-resume.h | 9 +
+ tools/kvm/include/kvm/builtin-run.h | 11 +
+ tools/kvm/include/kvm/builtin-sandbox.h | 6 +
+ tools/kvm/include/kvm/builtin-setup.h | 11 +
+ tools/kvm/include/kvm/builtin-stat.h | 9 +
+ tools/kvm/include/kvm/builtin-stop.h | 9 +
+ tools/kvm/include/kvm/builtin-version.h | 6 +
+ tools/kvm/include/kvm/compiler.h | 10 +
+ tools/kvm/include/kvm/disk-image.h | 96 ++
+ tools/kvm/include/kvm/e820.h | 13 +
+ tools/kvm/include/kvm/framebuffer.h | 36 +
+ tools/kvm/include/kvm/guest_compat.h | 9 +
+ tools/kvm/include/kvm/i8042.h | 12 +
+ tools/kvm/include/kvm/ioeventfd.h | 28 +
+ tools/kvm/include/kvm/ioport.h | 70 ++
+ tools/kvm/include/kvm/irq.h | 33 +
+ tools/kvm/include/kvm/kvm-cmd.h | 17 +
+ tools/kvm/include/kvm/kvm-config.h | 60 +
+ tools/kvm/include/kvm/kvm-cpu.h | 26 +
+ tools/kvm/include/kvm/kvm-ipc.h | 26 +
+ tools/kvm/include/kvm/kvm.h | 121 ++
+ tools/kvm/include/kvm/msi.h | 10 +
+ tools/kvm/include/kvm/mutex.h | 33 +
+ tools/kvm/include/kvm/parse-options.h | 218 ++++
+ tools/kvm/include/kvm/pci-shmem.h | 32 +
+ tools/kvm/include/kvm/pci.h | 95 ++
+ tools/kvm/include/kvm/qcow.h | 133 +++
+ tools/kvm/include/kvm/rbtree-interval.h | 28 +
+ tools/kvm/include/kvm/read-write.h | 43 +
+ tools/kvm/include/kvm/rtc.h | 9 +
+ tools/kvm/include/kvm/rwsem.h | 39 +
+ tools/kvm/include/kvm/sdl.h | 28 +
+ tools/kvm/include/kvm/segment.h | 21 +
+ tools/kvm/include/kvm/strbuf.h | 20 +
+ tools/kvm/include/kvm/symbol.h | 30 +
+ tools/kvm/include/kvm/term.h | 24 +
+ tools/kvm/include/kvm/threadpool.h | 38 +
+ tools/kvm/include/kvm/types.h | 7 +
+ tools/kvm/include/kvm/uip.h | 360 ++++++
+ tools/kvm/include/kvm/util-init.h | 51 +
+ tools/kvm/include/kvm/util.h | 97 ++
+ tools/kvm/include/kvm/vesa.h | 18 +
+ tools/kvm/include/kvm/virtio-9p.h | 76 ++
+ tools/kvm/include/kvm/virtio-balloon.h | 9 +
+ tools/kvm/include/kvm/virtio-blk.h | 12 +
+ tools/kvm/include/kvm/virtio-console.h | 10 +
+ tools/kvm/include/kvm/virtio-mmio.h | 58 +
+ tools/kvm/include/kvm/virtio-net.h | 30 +
+ tools/kvm/include/kvm/virtio-pci-dev.h | 38 +
+ tools/kvm/include/kvm/virtio-pci.h | 49 +
+ tools/kvm/include/kvm/virtio-rng.h | 9 +
+ tools/kvm/include/kvm/virtio-scsi.h | 26 +
+ tools/kvm/include/kvm/virtio.h | 102 ++
+ tools/kvm/include/kvm/vnc.h | 22 +
+ tools/kvm/include/linux/bitops.h | 33 +
+ tools/kvm/include/linux/byteorder.h | 7 +
+ tools/kvm/include/linux/compiler.h | 20 +
+ tools/kvm/include/linux/kernel.h | 39 +
+ tools/kvm/include/linux/module.h | 6 +
+ tools/kvm/include/linux/prefetch.h | 6 +
+ tools/kvm/include/linux/stddef.h | 16 +
+ tools/kvm/include/linux/types.h | 51 +
+ tools/kvm/ioeventfd.c | 216 ++++
+ tools/kvm/ioport.c | 198 ++++
+ tools/kvm/kvm-cmd.c | 91 ++
+ tools/kvm/kvm-cpu.c | 242 ++++
+ tools/kvm/kvm-ipc.c | 498 +++++++++
+ tools/kvm/kvm.c | 458 ++++++++
+ tools/kvm/main.c | 19 +
+ tools/kvm/mmio.c | 139 +++
+ tools/kvm/net/uip/arp.c | 30 +
+ tools/kvm/net/uip/buf.c | 114 ++
+ tools/kvm/net/uip/core.c | 190 ++++
+ tools/kvm/net/uip/csum.c | 92 ++
+ tools/kvm/net/uip/dhcp.c | 202 ++++
+ tools/kvm/net/uip/icmp.c | 29 +
+ tools/kvm/net/uip/ipv4.c | 29 +
+ tools/kvm/net/uip/tcp.c | 345 ++++++
+ tools/kvm/net/uip/udp.c | 236 ++++
+ tools/kvm/pci.c | 215 ++++
+ tools/kvm/powerpc/boot.c | 8 +
+ tools/kvm/powerpc/cpu_info.c | 195 ++++
+ tools/kvm/powerpc/cpu_info.h | 42 +
+ tools/kvm/powerpc/include/kvm/barrier.h | 6 +
+ tools/kvm/powerpc/include/kvm/kvm-arch.h | 68 ++
+ tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h | 76 ++
+ tools/kvm/powerpc/ioport.c | 18 +
+ tools/kvm/powerpc/irq.c | 75 ++
+ tools/kvm/powerpc/kvm-cpu.c | 293 +++++
+ tools/kvm/powerpc/kvm.c | 529 +++++++++
+ tools/kvm/powerpc/spapr.h | 93 ++
+ tools/kvm/powerpc/spapr_hcall.c | 134 +++
+ tools/kvm/powerpc/spapr_hvcons.c | 108 ++
+ tools/kvm/powerpc/spapr_hvcons.h | 19 +
+ tools/kvm/powerpc/spapr_pci.c | 423 +++++++
+ tools/kvm/powerpc/spapr_pci.h | 57 +
+ tools/kvm/powerpc/spapr_rtas.c | 229 ++++
+ tools/kvm/powerpc/xics.c | 514 +++++++++
+ tools/kvm/powerpc/xics.h | 23 +
+ tools/kvm/symbol.c | 133 +++
+ tools/kvm/term.c | 171 +++
+ tools/kvm/tests/Makefile | 19 +
+ tools/kvm/tests/boot/Makefile | 13 +
+ tools/kvm/tests/boot/init.c | 11 +
+ tools/kvm/tests/kernel/.gitignore | 2 +
+ tools/kvm/tests/kernel/Makefile | 20 +
+ tools/kvm/tests/kernel/README | 16 +
+ tools/kvm/tests/kernel/kernel.S | 8 +
+ tools/kvm/tests/pit/.gitignore | 2 +
+ tools/kvm/tests/pit/Makefile | 20 +
+ tools/kvm/tests/pit/README | 16 +
+ tools/kvm/tests/pit/tick.S | 101 ++
+ tools/kvm/ui/sdl.c | 321 ++++++
+ tools/kvm/ui/vnc.c | 248 +++++
+ tools/kvm/util/KVMTOOLS-VERSION-GEN | 40 +
+ tools/kvm/util/generate-cmdlist.sh | 23 +
+ tools/kvm/util/init.c | 69 ++
+ tools/kvm/util/kvm-ifup-vbr0 | 6 +
+ tools/kvm/util/parse-options.c | 577 ++++++++++
+ tools/kvm/util/rbtree-interval.c | 89 ++
+ tools/kvm/util/read-write.c | 354 ++++++
+ tools/kvm/util/set_private_br.sh | 51 +
+ tools/kvm/util/strbuf.c | 62 ++
+ tools/kvm/util/threadpool.c | 173 +++
+ tools/kvm/util/util.c | 133 +++
+ tools/kvm/virtio/9p-pdu.c | 287 +++++
+ tools/kvm/virtio/9p.c | 1448 ++++++++++++++++++++++++
+ tools/kvm/virtio/balloon.c | 270 +++++
+ tools/kvm/virtio/blk.c | 315 ++++++
+ tools/kvm/virtio/console.c | 203 ++++
+ tools/kvm/virtio/core.c | 233 ++++
+ tools/kvm/virtio/mmio.c | 264 +++++
+ tools/kvm/virtio/net.c | 670 +++++++++++
+ tools/kvm/virtio/pci.c | 398 +++++++
+ tools/kvm/virtio/rng.c | 193 ++++
+ tools/kvm/virtio/scsi.c | 309 ++++++
+ tools/kvm/x86/bios.c | 174 +++
+ tools/kvm/x86/bios/.gitignore | 3 +
+ tools/kvm/x86/bios/bios-rom.S | 12 +
+ tools/kvm/x86/bios/e820.c | 72 ++
+ tools/kvm/x86/bios/entry.S | 92 ++
+ tools/kvm/x86/bios/gen-offsets.sh | 14 +
+ tools/kvm/x86/bios/int10.c | 110 ++
+ tools/kvm/x86/bios/int15.c | 18 +
+ tools/kvm/x86/bios/local.S | 7 +
+ tools/kvm/x86/bios/macro.S | 25 +
+ tools/kvm/x86/bios/memcpy.c | 23 +
+ tools/kvm/x86/bios/rom.ld.S | 16 +
+ tools/kvm/x86/boot.c | 41 +
+ tools/kvm/x86/cpuid.c | 60 +
+ tools/kvm/x86/include/kvm/assembly.h | 24 +
+ tools/kvm/x86/include/kvm/barrier.h | 20 +
+ tools/kvm/x86/include/kvm/bios-export.h | 13 +
+ tools/kvm/x86/include/kvm/bios.h | 93 ++
+ tools/kvm/x86/include/kvm/boot-protocol.h | 16 +
+ tools/kvm/x86/include/kvm/cpufeature.h | 41 +
+ tools/kvm/x86/include/kvm/interrupt.h | 26 +
+ tools/kvm/x86/include/kvm/kvm-arch.h | 43 +
+ tools/kvm/x86/include/kvm/kvm-cpu-arch.h | 49 +
+ tools/kvm/x86/include/kvm/mptable.h | 9 +
+ tools/kvm/x86/interrupt.c | 28 +
+ tools/kvm/x86/ioport.c | 77 ++
+ tools/kvm/x86/irq.c | 224 ++++
+ tools/kvm/x86/kvm-cpu.c | 425 +++++++
+ tools/kvm/x86/kvm.c | 362 ++++++
+ tools/kvm/x86/mptable.c | 289 +++++
+ tools/perf/Makefile | 83 +-
+ tools/perf/bash_completion | 50 +-
+ tools/perf/builtin-buildid-cache.c | 58 +-
+ tools/perf/builtin-buildid-list.c | 55 +-
+ tools/perf/builtin-diff.c | 68 +-
+ tools/perf/builtin-evlist.c | 21 +-
+ tools/perf/builtin-help.c | 40 +-
+ tools/perf/builtin-inject.c | 88 +-
+ tools/perf/builtin-kmem.c | 66 +-
+ tools/perf/builtin-kvm.c | 460 ++++----
+ tools/perf/builtin-lock.c | 90 +-
+ tools/perf/builtin-probe.c | 26 +-
+ tools/perf/builtin-record.c | 27 +-
+ tools/perf/builtin-report.c | 4 +-
+ tools/perf/builtin-sched.c | 2 +-
+ tools/perf/builtin-script.c | 90 +-
+ tools/perf/builtin-stat.c | 328 +++---
+ tools/perf/builtin-timechart.c | 100 +-
+ tools/perf/builtin-top.c | 11 +-
+ tools/perf/builtin-trace.c | 134 ++-
+ tools/perf/perf.c | 4 +-
+ tools/perf/ui/browsers/hists.c | 12 +-
+ tools/perf/ui/gtk/browser.c | 6 +-
+ tools/perf/ui/gtk/util.c | 2 +-
+ tools/perf/ui/helpline.h | 18 +-
+ tools/perf/ui/hist.c | 145 ++-
+ tools/perf/ui/setup.c | 2 +-
+ tools/perf/ui/stdio/hist.c | 45 +-
+ tools/perf/util/annotate.h | 8 +-
+ tools/perf/util/cache.h | 38 +-
+ tools/perf/util/debug.c | 2 +-
+ tools/perf/util/debug.h | 17 +-
+ tools/perf/util/evlist.c | 88 +-
+ tools/perf/util/evlist.h | 18 +-
+ tools/perf/util/generate-cmdlist.sh | 4 +-
+ tools/perf/util/hist.c | 66 +-
+ tools/perf/util/hist.h | 38 +-
+ tools/perf/util/map.c | 2 +-
+ tools/perf/util/parse-options.c | 8 +
+ tools/perf/util/parse-options.h | 1 +
+ tools/perf/util/path.c | 2 +-
+ tools/perf/util/perf_regs.h | 4 +-
+ tools/perf/util/sort.h | 19 +-
+ tools/perf/util/symbol.h | 10 +-
+ tools/perf/util/unwind.h | 4 +-
+ tools/perf/util/util.c | 4 +-
+ 318 files changed, 29097 insertions(+), 1479 deletions(-)
+ create mode 100644 Documentation/acpi/initrd_table_override.txt
+ create mode 100644 arch/x86/kernel/cpu/perf_event_knc.c
+ create mode 100644 include/linux/earlycpio.h
+ create mode 100644 include/linux/page-flags-layout.h
+ create mode 100644 lib/earlycpio.c
+ create mode 100644 tools/kvm/.gitignore
+ create mode 100644 tools/kvm/CREDITS-Git
+ create mode 100644 tools/kvm/Documentation/kernel-debugging.txt
+ create mode 100644 tools/kvm/Documentation/kvm-balloon.txt
+ create mode 100644 tools/kvm/Documentation/kvm-debug.txt
+ create mode 100644 tools/kvm/Documentation/kvm-list.txt
+ create mode 100644 tools/kvm/Documentation/kvm-pause.txt
+ create mode 100644 tools/kvm/Documentation/kvm-resume.txt
+ create mode 100644 tools/kvm/Documentation/kvm-run.txt
+ create mode 100644 tools/kvm/Documentation/kvm-sandbox.txt
+ create mode 100644 tools/kvm/Documentation/kvm-setup.txt
+ create mode 100644 tools/kvm/Documentation/kvm-stat.txt
+ create mode 100644 tools/kvm/Documentation/kvm-stop.txt
+ create mode 100644 tools/kvm/Documentation/kvm-version.txt
+ create mode 100644 tools/kvm/Documentation/virtio-console.txt
+ create mode 100644 tools/kvm/Makefile
+ create mode 100644 tools/kvm/README
+ create mode 100644 tools/kvm/builtin-balloon.c
+ create mode 100644 tools/kvm/builtin-debug.c
+ create mode 100644 tools/kvm/builtin-help.c
+ create mode 100644 tools/kvm/builtin-list.c
+ create mode 100644 tools/kvm/builtin-pause.c
+ create mode 100644 tools/kvm/builtin-resume.c
+ create mode 100644 tools/kvm/builtin-run.c
+ create mode 100644 tools/kvm/builtin-sandbox.c
+ create mode 100644 tools/kvm/builtin-setup.c
+ create mode 100644 tools/kvm/builtin-stat.c
+ create mode 100644 tools/kvm/builtin-stop.c
+ create mode 100644 tools/kvm/builtin-version.c
+ create mode 100644 tools/kvm/code16gcc.h
+ create mode 100644 tools/kvm/command-list.txt
+ create mode 100644 tools/kvm/config/feature-tests.mak
+ create mode 100644 tools/kvm/config/utilities.mak
+ create mode 100644 tools/kvm/disk/blk.c
+ create mode 100644 tools/kvm/disk/core.c
+ create mode 100644 tools/kvm/disk/qcow.c
+ create mode 100644 tools/kvm/disk/raw.c
+ create mode 100644 tools/kvm/framebuffer.c
+ create mode 100644 tools/kvm/guest/init.c
+ create mode 100644 tools/kvm/guest_compat.c
+ create mode 100644 tools/kvm/hw/i8042.c
+ create mode 100644 tools/kvm/hw/pci-shmem.c
+ create mode 100644 tools/kvm/hw/rtc.c
+ create mode 100644 tools/kvm/hw/serial.c
+ create mode 100644 tools/kvm/hw/vesa.c
+ create mode 100644 tools/kvm/include/asm/hweight.h
+ create mode 100644 tools/kvm/include/bios/memcpy.h
+ create mode 100644 tools/kvm/include/kvm/8250-serial.h
+ create mode 100644 tools/kvm/include/kvm/apic.h
+ create mode 100644 tools/kvm/include/kvm/brlock.h
+ create mode 100644 tools/kvm/include/kvm/builtin-balloon.h
+ create mode 100644 tools/kvm/include/kvm/builtin-debug.h
+ create mode 100644 tools/kvm/include/kvm/builtin-help.h
+ create mode 100644 tools/kvm/include/kvm/builtin-list.h
+ create mode 100644 tools/kvm/include/kvm/builtin-pause.h
+ create mode 100644 tools/kvm/include/kvm/builtin-resume.h
+ create mode 100644 tools/kvm/include/kvm/builtin-run.h
+ create mode 100644 tools/kvm/include/kvm/builtin-sandbox.h
+ create mode 100644 tools/kvm/include/kvm/builtin-setup.h
+ create mode 100644 tools/kvm/include/kvm/builtin-stat.h
+ create mode 100644 tools/kvm/include/kvm/builtin-stop.h
+ create mode 100644 tools/kvm/include/kvm/builtin-version.h
+ create mode 100644 tools/kvm/include/kvm/compiler.h
+ create mode 100644 tools/kvm/include/kvm/disk-image.h
+ create mode 100644 tools/kvm/include/kvm/e820.h
+ create mode 100644 tools/kvm/include/kvm/framebuffer.h
+ create mode 100644 tools/kvm/include/kvm/guest_compat.h
+ create mode 100644 tools/kvm/include/kvm/i8042.h
+ create mode 100644 tools/kvm/include/kvm/ioeventfd.h
+ create mode 100644 tools/kvm/include/kvm/ioport.h
+ create mode 100644 tools/kvm/include/kvm/irq.h
+ create mode 100644 tools/kvm/include/kvm/kvm-cmd.h
+ create mode 100644 tools/kvm/include/kvm/kvm-config.h
+ create mode 100644 tools/kvm/include/kvm/kvm-cpu.h
+ create mode 100644 tools/kvm/include/kvm/kvm-ipc.h
+ create mode 100644 tools/kvm/include/kvm/kvm.h
+ create mode 100644 tools/kvm/include/kvm/msi.h
+ create mode 100644 tools/kvm/include/kvm/mutex.h
+ create mode 100644 tools/kvm/include/kvm/parse-options.h
+ create mode 100644 tools/kvm/include/kvm/pci-shmem.h
+ create mode 100644 tools/kvm/include/kvm/pci.h
+ create mode 100644 tools/kvm/include/kvm/qcow.h
+ create mode 100644 tools/kvm/include/kvm/rbtree-interval.h
+ create mode 100644 tools/kvm/include/kvm/read-write.h
+ create mode 100644 tools/kvm/include/kvm/rtc.h
+ create mode 100644 tools/kvm/include/kvm/rwsem.h
+ create mode 100644 tools/kvm/include/kvm/sdl.h
+ create mode 100644 tools/kvm/include/kvm/segment.h
+ create mode 100644 tools/kvm/include/kvm/strbuf.h
+ create mode 100644 tools/kvm/include/kvm/symbol.h
+ create mode 100644 tools/kvm/include/kvm/term.h
+ create mode 100644 tools/kvm/include/kvm/threadpool.h
+ create mode 100644 tools/kvm/include/kvm/types.h
+ create mode 100644 tools/kvm/include/kvm/uip.h
+ create mode 100644 tools/kvm/include/kvm/util-init.h
+ create mode 100644 tools/kvm/include/kvm/util.h
+ create mode 100644 tools/kvm/include/kvm/vesa.h
+ create mode 100644 tools/kvm/include/kvm/virtio-9p.h
+ create mode 100644 tools/kvm/include/kvm/virtio-balloon.h
+ create mode 100644 tools/kvm/include/kvm/virtio-blk.h
+ create mode 100644 tools/kvm/include/kvm/virtio-console.h
+ create mode 100644 tools/kvm/include/kvm/virtio-mmio.h
+ create mode 100644 tools/kvm/include/kvm/virtio-net.h
+ create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h
+ create mode 100644 tools/kvm/include/kvm/virtio-pci.h
+ create mode 100644 tools/kvm/include/kvm/virtio-rng.h
+ create mode 100644 tools/kvm/include/kvm/virtio-scsi.h
+ create mode 100644 tools/kvm/include/kvm/virtio.h
+ create mode 100644 tools/kvm/include/kvm/vnc.h
+ create mode 100644 tools/kvm/include/linux/bitops.h
+ create mode 100644 tools/kvm/include/linux/byteorder.h
+ create mode 100644 tools/kvm/include/linux/compiler.h
+ create mode 100644 tools/kvm/include/linux/kernel.h
+ create mode 100644 tools/kvm/include/linux/module.h
+ create mode 100644 tools/kvm/include/linux/prefetch.h
+ create mode 100644 tools/kvm/include/linux/stddef.h
+ create mode 100644 tools/kvm/include/linux/types.h
+ create mode 100644 tools/kvm/ioeventfd.c
+ create mode 100644 tools/kvm/ioport.c
+ create mode 100644 tools/kvm/kvm-cmd.c
+ create mode 100644 tools/kvm/kvm-cpu.c
+ create mode 100644 tools/kvm/kvm-ipc.c
+ create mode 100644 tools/kvm/kvm.c
+ create mode 100644 tools/kvm/main.c
+ create mode 100644 tools/kvm/mmio.c
+ create mode 100644 tools/kvm/net/uip/arp.c
+ create mode 100644 tools/kvm/net/uip/buf.c
+ create mode 100644 tools/kvm/net/uip/core.c
+ create mode 100644 tools/kvm/net/uip/csum.c
+ create mode 100644 tools/kvm/net/uip/dhcp.c
+ create mode 100644 tools/kvm/net/uip/icmp.c
+ create mode 100644 tools/kvm/net/uip/ipv4.c
+ create mode 100644 tools/kvm/net/uip/tcp.c
+ create mode 100644 tools/kvm/net/uip/udp.c
+ create mode 100644 tools/kvm/pci.c
+ create mode 100644 tools/kvm/powerpc/boot.c
+ create mode 100644 tools/kvm/powerpc/cpu_info.c
+ create mode 100644 tools/kvm/powerpc/cpu_info.h
+ create mode 100644 tools/kvm/powerpc/include/kvm/barrier.h
+ create mode 100644 tools/kvm/powerpc/include/kvm/kvm-arch.h
+ create mode 100644 tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h
+ create mode 100644 tools/kvm/powerpc/ioport.c
+ create mode 100644 tools/kvm/powerpc/irq.c
+ create mode 100644 tools/kvm/powerpc/kvm-cpu.c
+ create mode 100644 tools/kvm/powerpc/kvm.c
+ create mode 100644 tools/kvm/powerpc/spapr.h
+ create mode 100644 tools/kvm/powerpc/spapr_hcall.c
+ create mode 100644 tools/kvm/powerpc/spapr_hvcons.c
+ create mode 100644 tools/kvm/powerpc/spapr_hvcons.h
+ create mode 100644 tools/kvm/powerpc/spapr_pci.c
+ create mode 100644 tools/kvm/powerpc/spapr_pci.h
+ create mode 100644 tools/kvm/powerpc/spapr_rtas.c
+ create mode 100644 tools/kvm/powerpc/xics.c
+ create mode 100644 tools/kvm/powerpc/xics.h
+ create mode 100644 tools/kvm/symbol.c
+ create mode 100644 tools/kvm/term.c
+ create mode 100644 tools/kvm/tests/Makefile
+ create mode 100644 tools/kvm/tests/boot/Makefile
+ create mode 100644 tools/kvm/tests/boot/init.c
+ create mode 100644 tools/kvm/tests/kernel/.gitignore
+ create mode 100644 tools/kvm/tests/kernel/Makefile
+ create mode 100644 tools/kvm/tests/kernel/README
+ create mode 100644 tools/kvm/tests/kernel/kernel.S
+ create mode 100644 tools/kvm/tests/pit/.gitignore
+ create mode 100644 tools/kvm/tests/pit/Makefile
+ create mode 100644 tools/kvm/tests/pit/README
+ create mode 100644 tools/kvm/tests/pit/tick.S
+ create mode 100644 tools/kvm/ui/sdl.c
+ create mode 100644 tools/kvm/ui/vnc.c
+ create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN
+ create mode 100755 tools/kvm/util/generate-cmdlist.sh
+ create mode 100644 tools/kvm/util/init.c
+ create mode 100755 tools/kvm/util/kvm-ifup-vbr0
+ create mode 100644 tools/kvm/util/parse-options.c
+ create mode 100644 tools/kvm/util/rbtree-interval.c
+ create mode 100644 tools/kvm/util/read-write.c
+ create mode 100755 tools/kvm/util/set_private_br.sh
+ create mode 100644 tools/kvm/util/strbuf.c
+ create mode 100644 tools/kvm/util/threadpool.c
+ create mode 100644 tools/kvm/util/util.c
+ create mode 100644 tools/kvm/virtio/9p-pdu.c
+ create mode 100644 tools/kvm/virtio/9p.c
+ create mode 100644 tools/kvm/virtio/balloon.c
+ create mode 100644 tools/kvm/virtio/blk.c
+ create mode 100644 tools/kvm/virtio/console.c
+ create mode 100644 tools/kvm/virtio/core.c
+ create mode 100644 tools/kvm/virtio/mmio.c
+ create mode 100644 tools/kvm/virtio/net.c
+ create mode 100644 tools/kvm/virtio/pci.c
+ create mode 100644 tools/kvm/virtio/rng.c
+ create mode 100644 tools/kvm/virtio/scsi.c
+ create mode 100644 tools/kvm/x86/bios.c
+ create mode 100644 tools/kvm/x86/bios/.gitignore
+ create mode 100644 tools/kvm/x86/bios/bios-rom.S
+ create mode 100644 tools/kvm/x86/bios/e820.c
+ create mode 100644 tools/kvm/x86/bios/entry.S
+ create mode 100644 tools/kvm/x86/bios/gen-offsets.sh
+ create mode 100644 tools/kvm/x86/bios/int10.c
+ create mode 100644 tools/kvm/x86/bios/int15.c
+ create mode 100644 tools/kvm/x86/bios/local.S
+ create mode 100644 tools/kvm/x86/bios/macro.S
+ create mode 100644 tools/kvm/x86/bios/memcpy.c
+ create mode 100644 tools/kvm/x86/bios/rom.ld.S
+ create mode 100644 tools/kvm/x86/boot.c
+ create mode 100644 tools/kvm/x86/cpuid.c
+ create mode 100644 tools/kvm/x86/include/kvm/assembly.h
+ create mode 100644 tools/kvm/x86/include/kvm/barrier.h
+ create mode 100644 tools/kvm/x86/include/kvm/bios-export.h
+ create mode 100644 tools/kvm/x86/include/kvm/bios.h
+ create mode 100644 tools/kvm/x86/include/kvm/boot-protocol.h
+ create mode 100644 tools/kvm/x86/include/kvm/cpufeature.h
+ create mode 100644 tools/kvm/x86/include/kvm/interrupt.h
+ create mode 100644 tools/kvm/x86/include/kvm/kvm-arch.h
+ create mode 100644 tools/kvm/x86/include/kvm/kvm-cpu-arch.h
+ create mode 100644 tools/kvm/x86/include/kvm/mptable.h
+ create mode 100644 tools/kvm/x86/interrupt.c
+ create mode 100644 tools/kvm/x86/ioport.c
+ create mode 100644 tools/kvm/x86/irq.c
+ create mode 100644 tools/kvm/x86/kvm-cpu.c
+ create mode 100644 tools/kvm/x86/kvm.c
+ create mode 100644 tools/kvm/x86/mptable.c
+Merging rcu/rcu/next (a4fbe35 rcu: Grace-period initialization excludes only RCU notifier)
+$ git merge rcu/rcu/next
+Merge made by the 'recursive' strategy.
+ kernel/rcutree.c | 21 ++++++++++-----------
+ kernel/rcutree.h | 6 ++++++
+ 2 files changed, 16 insertions(+), 11 deletions(-)
+Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
+$ git merge cputime/cputime
+Already up-to-date.
+Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
+$ git merge uprobes/for-next
+Already up-to-date.
+Merging kmemleak/kmemleak (4878677 kmemleak: do not leak object after tree insertion error)
+$ git merge kmemleak/kmemleak
+Recorded preimage for 'mm/kmemleak.c'
+Auto-merging mm/kmemleak.c
+CONFLICT (content): Merge conflict in mm/kmemleak.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'mm/kmemleak.c'.
+[master 3775d54] Merge remote-tracking branch 'kmemleak/kmemleak'
+$ git diff -M --stat --summary HEAD^..
+Merging kvm/linux-next (ecefbd9 Merge tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
+$ git merge kvm/linux-next
+Already up-to-date.
+Merging kvm-ppc/kvm-ppc-next (2c4eb8b KVM: PPC: Move mtspr/mfspr emulation into own functions)
+$ git merge kvm-ppc/kvm-ppc-next
+Auto-merging include/linux/kvm_host.h
+Auto-merging drivers/tty/Kconfig
+Auto-merging arch/powerpc/sysdev/fsl_msi.c
+Auto-merging arch/powerpc/kvm/trace.h
+Auto-merging arch/powerpc/kvm/book3s_hv.c
+Auto-merging arch/powerpc/kvm/book3s_64_mmu_host.c
+Auto-merging arch/powerpc/kvm/book3s_32_mmu_host.c
+Auto-merging arch/powerpc/include/asm/kvm_book3s.h
+Auto-merging arch/powerpc/include/asm/Kbuild
+Merge made by the 'recursive' strategy.
+ Documentation/virtual/kvm/api.txt | 52 ++++-
+ arch/powerpc/include/asm/Kbuild | 1 +
+ arch/powerpc/include/asm/epapr_hcalls.h | 36 +--
+ arch/powerpc/include/asm/fsl_hcalls.h | 36 +--
+ arch/powerpc/include/asm/kvm.h | 59 +++++
+ arch/powerpc/include/asm/kvm_book3s.h | 2 +-
+ arch/powerpc/include/asm/kvm_booke_hv_asm.h | 4 +-
+ arch/powerpc/include/asm/kvm_host.h | 38 ++-
+ arch/powerpc/include/asm/kvm_para.h | 21 +-
+ arch/powerpc/include/asm/kvm_ppc.h | 64 ++++-
+ arch/powerpc/include/asm/reg_booke.h | 7 +
+ arch/powerpc/kernel/epapr_hcalls.S | 28 +++
+ arch/powerpc/kernel/epapr_paravirt.c | 11 +-
+ arch/powerpc/kernel/kvm.c | 2 +-
+ arch/powerpc/kernel/ppc_ksyms.c | 5 +
+ arch/powerpc/kvm/44x.c | 1 +
+ arch/powerpc/kvm/44x_emulate.c | 112 +++++----
+ arch/powerpc/kvm/Kconfig | 3 +
+ arch/powerpc/kvm/book3s.c | 125 ++++++++++
+ arch/powerpc/kvm/book3s_32_mmu_host.c | 1 +
+ arch/powerpc/kvm/book3s_64_mmu_host.c | 1 +
+ arch/powerpc/kvm/book3s_64_mmu_hv.c | 65 ++++--
+ arch/powerpc/kvm/book3s_hv.c | 337 +++++++++++++++++++++------
+ arch/powerpc/kvm/book3s_hv_builtin.c | 4 +-
+ arch/powerpc/kvm/book3s_hv_rm_mmu.c | 4 +-
+ arch/powerpc/kvm/book3s_mmu_hpte.c | 5 -
+ arch/powerpc/kvm/book3s_pr.c | 180 ++++++++++----
+ arch/powerpc/kvm/book3s_rmhandlers.S | 15 +-
+ arch/powerpc/kvm/booke.c | 310 ++++++++++++++++++++----
+ arch/powerpc/kvm/booke_emulate.c | 22 +-
+ arch/powerpc/kvm/e500.h | 3 +-
+ arch/powerpc/kvm/e500_tlb.c | 92 ++++++--
+ arch/powerpc/kvm/emulate.c | 221 ++++++++++--------
+ arch/powerpc/kvm/powerpc.c | 150 ++++++++++--
+ arch/powerpc/kvm/trace.h | 200 +++++++++++++---
+ arch/powerpc/platforms/Kconfig | 1 +
+ arch/powerpc/sysdev/fsl_msi.c | 9 +-
+ arch/powerpc/sysdev/fsl_soc.c | 2 +
+ drivers/tty/Kconfig | 1 +
+ drivers/virt/Kconfig | 1 +
+ include/linux/kvm.h | 10 +-
+ include/linux/kvm_host.h | 1 +
+ 42 files changed, 1760 insertions(+), 482 deletions(-)
+Merging oprofile/for-next (61bccf1 oprofile: Remove 'WQ on CPUx, prefer CPUy' warning)
+$ git merge oprofile/for-next
+Already up-to-date.
+Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
+$ git merge xen/upstream/xen
+Already up-to-date.
+Merging xen-two/linux-next (8825f04 Merge branch 'stable/for-linus-3.7' into linux-next)
+$ git merge xen-two/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/net/xen-netback/netback.c | 11 ++++++--
+ drivers/xen/grant-table.c | 53 ------------------------------------
+ drivers/xen/xenbus/xenbus_client.c | 6 ++--
+ include/xen/grant_table.h | 12 --------
+ 4 files changed, 12 insertions(+), 70 deletions(-)
+$ git am -3 ../patches/0001-The-Xen-tree-tries-to-add-a-line-to.patch
+Applying: The Xen tree tries to add a line to arch/arm/mach-vexpress/Makefile.boot that has been removed by the following commit in Linus' master:
+Using index info to reconstruct a base tree...
+M arch/arm/boot/dts/Makefile
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
+$ git merge xen-pvhvm/linux-next
+Already up-to-date.
+Merging percpu/for-next (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
+$ git merge percpu/for-next
+Already up-to-date.
+Merging workqueues/for-next (2b0f620 Merge branch 'for-3.7' into for-next)
+$ git merge workqueues/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging drivers-x86/linux-next (455f38c eeepc-laptop: fix device reference count leakage in eeepc_rfkill_hotplug())
+$ git merge drivers-x86/linux-next
+Auto-merging drivers/platform/x86/asus-wmi.c
+Merge made by the 'recursive' strategy.
+ drivers/platform/x86/asus-wmi.c | 76 +++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 76 insertions(+)
+Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
+$ git merge hwpoison/hwpoison
+Already up-to-date.
+Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
+$ git merge sysctl/master
+Already up-to-date.
+Merging regmap/for-next (613dac3 Merge remote-tracking branches 'regmap/topic/cache' and 'regmap/topic/irq' into regmap-next)
+$ git merge regmap/for-next
+Already up-to-date.
+Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
+$ git merge hsi/for-next
+Already up-to-date.
+Merging leds/for-next (2f73c39 leds: add output driver configuration for pca9633 led driver)
+$ git merge leds/for-next
+Removing include/linux/platform_data/leds-lm3556.h
+Auto-merging include/linux/leds.h
+Auto-merging drivers/leds/leds-wm8350.c
+Removing drivers/leds/leds-lm3556.c
+Auto-merging drivers/leds/Makefile
+Auto-merging drivers/leds/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/leds/leds-lp5523.txt | 21 +-
+ drivers/leds/Kconfig | 26 +-
+ drivers/leds/Makefile | 3 +-
+ drivers/leds/led-class.c | 15 +
+ drivers/leds/led-core.c | 16 +-
+ drivers/leds/led-triggers.c | 17 +-
+ drivers/leds/leds-clevo-mail.c | 10 +-
+ drivers/leds/leds-gpio.c | 19 +-
+ drivers/leds/leds-lm3530.c | 16 +-
+ drivers/leds/leds-lm3556.c | 512 -------------------------
+ drivers/leds/leds-lm355x.c | 572 ++++++++++++++++++++++++++++
+ drivers/leds/leds-lm3642.c | 462 ++++++++++++++++++++++
+ drivers/leds/leds-lp5523.c | 75 ++--
+ drivers/leds/leds-pca9633.c | 19 +-
+ drivers/leds/leds-wm8350.c | 29 +-
+ drivers/leds/leds.h | 2 +
+ include/linux/leds-lp5523.h | 1 +
+ include/linux/leds.h | 4 +
+ include/linux/platform_data/leds-lm3556.h | 50 ---
+ include/linux/platform_data/leds-lm355x.h | 66 ++++
+ include/linux/platform_data/leds-lm3642.h | 38 ++
+ include/linux/platform_data/leds-pca9633.h | 35 ++
+ 22 files changed, 1350 insertions(+), 658 deletions(-)
+ delete mode 100644 drivers/leds/leds-lm3556.c
+ create mode 100644 drivers/leds/leds-lm355x.c
+ create mode 100644 drivers/leds/leds-lm3642.c
+ delete mode 100644 include/linux/platform_data/leds-lm3556.h
+ create mode 100644 include/linux/platform_data/leds-lm355x.h
+ create mode 100644 include/linux/platform_data/leds-lm3642.h
+ create mode 100644 include/linux/platform_data/leds-pca9633.h
+Merging driver-core/driver-core-next (e0f21e6 memory: tegra{20,30}-mc: Fix reading incorrect register in mc_readl())
+$ git merge driver-core/driver-core-next
+Already up-to-date.
+Merging tty/tty-next (ecefbd9 Merge tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
+$ git merge tty/tty-next
+Already up-to-date.
+Merging usb/usb-next (ecefbd9 Merge tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
+$ git merge usb/usb-next
+Already up-to-date.
+Merging staging/staging-next (e187895 staging: comedi: jr3_pci: fix iomem dereference)
+$ git merge staging/staging-next
+Already up-to-date.
+Merging char-misc/char-misc-next (5dc2db0 drivers/misc/lis3lv02d/lis3lv02d_i2c.c: add lis3lv02d device tree init)
+$ git merge char-misc/char-misc-next
+Already up-to-date.
+Merging tmem/linux-next (a728d5e Merge commit 'v3.6-rc6' into linux-next)
+$ git merge tmem/linux-next
+Auto-merging include/xen/xen.h
+Auto-merging include/xen/interface/xen.h
+Auto-merging arch/x86/xen/smp.c
+Auto-merging arch/x86/xen/setup.c
+Auto-merging arch/x86/include/asm/xen/page.h
+Auto-merging arch/x86/include/asm/xen/interface.h
+Merge made by the 'recursive' strategy.
+ arch/x86/include/asm/xen/interface.h | 3 ++-
+ arch/x86/include/asm/xen/page.h | 3 +++
+ arch/x86/xen/setup.c | 13 +++++++++---
+ arch/x86/xen/smp.c | 39 ++++++++++++++++++----------------
+ drivers/xen/cpu_hotplug.c | 3 ++-
+ include/xen/interface/xen.h | 1 +
+ include/xen/xen.h | 4 ++++
+ 7 files changed, 43 insertions(+), 23 deletions(-)
+Merging writeback/writeback-for-next (2f60d62 CPU hotplug, writeback: Don't call writeback_set_ratelimit() too often during hotplug)
+$ git merge writeback/writeback-for-next
+Auto-merging fs/fs-writeback.c
+Merge made by the 'recursive' strategy.
+ fs/fs-writeback.c | 2 +-
+ mm/backing-dev.c | 50 ++++++++++++++++++++++++++------------------------
+ mm/page-writeback.c | 14 +++++++++++---
+ 3 files changed, 38 insertions(+), 28 deletions(-)
+Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
+$ git merge arm-dt/devicetree/arm-next
+Already up-to-date.
+Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
+$ git merge hwspinlock/linux-next
+Already up-to-date.
+Merging pinctrl/for-next (e1b2dc7 pinctrl: add bcm2835 driver)
+$ git merge pinctrl/for-next
+Already up-to-date.
+Merging vhost/linux-next (e0953c8 tun: experimental zero copy tx support)
+$ git merge vhost/linux-next
+Resolved 'drivers/net/tun.c' using previous resolution.
+Auto-merging drivers/net/tun.c
+CONFLICT (content): Merge conflict in drivers/net/tun.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master b71637e] Merge remote-tracking branch 'vhost/linux-next'
+$ git diff -M --stat --summary HEAD^..
+Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
+$ git merge memblock/memblock-kill-early_node_map
+Already up-to-date.
+Merging remoteproc/for-next (ed26d19 remoteproc: fix (again) the virtio-related build breakage)
+$ git merge remoteproc/for-next
+Merge made by the 'recursive' strategy.
+ drivers/remoteproc/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+Merging irqdomain/irqdomain/next (f5a1ad0 irqdomain: Improve diagnostics when a domain mapping fails)
+$ git merge irqdomain/irqdomain/next
+Already up-to-date.
+Merging gpio/gpio/next (ddf343f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
+$ git merge gpio/gpio/next
+Already up-to-date.
+Merging gpio-lw/for-next (901acf5 gpio: pcf857x: select IRQ_DOMAIN)
+$ git merge gpio-lw/for-next
+Already up-to-date.
+Merging arm-soc/for-next (ab3ee84 Merge branch 'fixes' into for-next)
+$ git merge arm-soc/for-next
+Auto-merging drivers/mmc/host/sdhci-tegra.c
+Auto-merging arch/arm/mach-davinci/da850.c
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ .../brcm,bcm2835-armctrl-ic.txt | 2 +-
+ .../bindings/timer/brcm,bcm2835-system-timer.txt | 2 +-
+ arch/arm/Kconfig | 2 -
+ arch/arm/boot/dts/Makefile | 11 ++---
+ arch/arm/boot/dts/tegra20-seaboard.dts | 2 +-
+ arch/arm/boot/dts/tegra20.dtsi | 4 +-
+ arch/arm/mach-at91/pm.c | 5 +-
+ arch/arm/mach-at91/setup.c | 2 +-
+ arch/arm/mach-davinci/da850.c | 2 +-
+ arch/arm/mach-footbridge/include/mach/irqs.h | 2 -
+ arch/arm/mach-integrator/include/mach/cm.h | 2 +-
+ arch/arm/mach-integrator/include/mach/platform.h | 6 +--
+ arch/arm/mach-integrator/integrator_ap.c | 2 +-
+ arch/arm/mach-integrator/integrator_cp.c | 4 +-
+ arch/arm/mach-iop13xx/iq81340sc.c | 2 +-
+ arch/arm/mach-iop13xx/pci.c | 2 +-
+ arch/arm/mach-ks8695/include/mach/memory.h | 3 +-
+ arch/arm/mach-mv78xx0/addr-map.c | 2 +-
+ arch/arm/mach-mv78xx0/common.c | 2 +-
+ arch/arm/mach-pxa/cm-x2xx.c | 1 +
+ arch/arm/mach-pxa/palmte2.c | 2 +
+ arch/arm/mach-pxa/sharpsl_pm.c | 48 --------------------
+ arch/arm/mach-pxa/viper.c | 3 +-
+ arch/arm/mach-rpc/ecard.c | 4 +-
+ arch/arm/mach-s3c24xx/irq-s3c2416.c | 6 +--
+ arch/arm/mach-s3c24xx/irq-s3c2443.c | 4 +-
+ arch/arm/mach-s3c24xx/simtec-usb.c | 2 +-
+ arch/arm/mach-sa1100/assabet.c | 2 +-
+ arch/arm/mach-shark/pci.c | 2 +-
+ arch/arm/mach-shmobile/include/mach/common.h | 2 +-
+ arch/arm/mach-tegra/Kconfig | 6 +--
+ arch/arm/mach-ux500/Kconfig | 4 +-
+ arch/arm/mach-vt8500/include/mach/uncompress.h | 8 ++--
+ arch/arm/mach-vt8500/vt8500.c | 5 +-
+ drivers/char/ds1620.c | 8 ++--
+ drivers/char/nwflash.c | 4 +-
+ drivers/mmc/host/sdhci-tegra.c | 1 -
+ sound/oss/waveartist.c | 4 +-
+ 38 files changed, 62 insertions(+), 113 deletions(-)
+Merging ep93xx/ep93xx-for-next (70f0f7c Merge branch 'ep93xx-fixes' into ep93xx-for-next)
+$ git merge ep93xx/ep93xx-for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging ixp4xx/next (2346020 IXP4xx: map CPU config registers within VMALLOC region.)
+$ git merge ixp4xx/next
+Resolved 'arch/arm/mach-ixp4xx/common.c' using previous resolution.
+Resolved 'arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h' using previous resolution.
+Auto-merging drivers/crypto/Kconfig
+Auto-merging drivers/char/hw_random/Kconfig
+Auto-merging arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h
+CONFLICT (content): Merge conflict in arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h
+Auto-merging arch/arm/mach-ixp4xx/common.c
+CONFLICT (content): Merge conflict in arch/arm/mach-ixp4xx/common.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master ce4808b] Merge remote-tracking branch 'ixp4xx/next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/common/dmabounce.c | 4 +-
+ arch/arm/mach-ixp4xx/common-pci.c | 1 +
+ arch/arm/mach-ixp4xx/common.c | 13 +++----
+ arch/arm/mach-ixp4xx/goramo_mlr.c | 3 +-
+ arch/arm/mach-ixp4xx/include/mach/debug-macro.S | 4 +-
+ arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h | 46 ++++++++++-------------
+ arch/arm/mach-ixp4xx/include/mach/qmgr.h | 12 +++---
+ arch/arm/mach-ixp4xx/ixp4xx_npe.c | 9 ++++-
+ arch/arm/mach-ixp4xx/ixp4xx_qmgr.c | 14 +------
+ drivers/char/hw_random/Kconfig | 6 +--
+ drivers/char/hw_random/ixp4xx-rng.c | 5 ++-
+ drivers/crypto/Kconfig | 2 +-
+ drivers/crypto/ixp4xx_crypto.c | 12 +++---
+ drivers/net/wan/ixp4xx_hss.c | 2 +-
+ 14 files changed, 62 insertions(+), 71 deletions(-)
+Merging msm/for-next (a0d271c Linux 3.6)
+$ git merge msm/for-next
+Already up-to-date.
+Merging renesas/next (b681273 Merge branch 'heads/boards' into next)
+$ git merge renesas/next
+Resolved 'arch/arm/Kconfig' using previous resolution.
+Auto-merging arch/arm/mach-shmobile/setup-sh7372.c
+Auto-merging arch/arm/mach-shmobile/setup-r8a7740.c
+Auto-merging arch/arm/mach-shmobile/include/mach/sh7372.h
+Auto-merging arch/arm/mach-shmobile/board-kzm9g.c
+Auto-merging arch/arm/configs/kzm9g_defconfig
+Auto-merging arch/arm/Kconfig
+CONFLICT (content): Merge conflict in arch/arm/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master e70863f] Merge remote-tracking branch 'renesas/next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/Kconfig | 9 +++++++++
+ arch/arm/configs/armadillo800eva_defconfig | 1 +
+ arch/arm/configs/kzm9g_defconfig | 4 ++++
+ arch/arm/configs/mackerel_defconfig | 18 ++++++++++++++++--
+ arch/arm/mach-shmobile/board-kzm9g.c | 14 +++++++++++++-
+ arch/arm/mach-shmobile/include/mach/sh7372.h | 4 ++++
+ arch/arm/mach-shmobile/setup-r8a7740.c | 16 ++++++++++++++++
+ arch/arm/mach-shmobile/setup-sh7372.c | 20 ++++++++++++++++++++
+ arch/arm/mm/proc-v7-2level.S | 8 ++++++++
+ 9 files changed, 91 insertions(+), 3 deletions(-)
+Merging samsung/for-next (59e65fd Merge branch 'next/dt-samsung-new' into for-next)
+$ git merge samsung/for-next
+Resolved 'arch/arm/mach-exynos/clock-exynos5.c' using previous resolution.
+Auto-merging arch/arm/mach-exynos/clock-exynos5.c
+CONFLICT (content): Merge conflict in arch/arm/mach-exynos/clock-exynos5.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 0f07345] Merge remote-tracking branch 'samsung/for-next'
+$ git diff -M --stat --summary HEAD^..
+Merging tegra/for-next (979570e Linux 3.6-rc7)
+$ git merge tegra/for-next
+Already up-to-date.
+Merging kvmtool/master (5fd2a45 kvm tools: Drop lchown() calls from 9p)
+$ git merge kvmtool/master
+Merge made by the 'recursive' strategy.
+ tools/kvm/powerpc/ioport.c | 2 +-
+ tools/kvm/powerpc/irq.c | 19 -------------------
+ tools/kvm/powerpc/kvm-cpu.c | 3 ---
+ tools/kvm/powerpc/kvm.c | 8 ++++----
+ tools/kvm/powerpc/spapr_hvcons.c | 6 +++---
+ tools/kvm/powerpc/spapr_rtas.c | 14 +++++++++-----
+ tools/kvm/powerpc/xics.c | 38 +++++++++++++++++++++++---------------
+ tools/kvm/powerpc/xics.h | 5 -----
+ tools/kvm/virtio/9p.c | 16 ----------------
+ 9 files changed, 40 insertions(+), 71 deletions(-)
+Merging dma-mapping/dma-mapping-next (461b6f0 Merge branch 'next-cleanup' into for-v3.7)
+$ git merge dma-mapping/dma-mapping-next
+Already up-to-date.
+Merging pwm/for-next (85f8879 pwm: dt: Fix description of second PWM cell)
+$ git merge pwm/for-next
+Auto-merging drivers/pwm/pwm-ab8500.c
+Auto-merging drivers/pwm/Makefile
+Auto-merging drivers/pwm/Kconfig
+Auto-merging drivers/misc/Kconfig
+Removing arch/unicore32/kernel/pwm.c
+Auto-merging arch/unicore32/Kconfig
+Removing arch/mips/jz4740/timer.h
+Removing arch/mips/jz4740/pwm.c
+Auto-merging Documentation/devicetree/bindings/pwm/mxs-pwm.txt
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/pwm/imx-pwm.txt | 17 ++
+ Documentation/devicetree/bindings/pwm/mxs-pwm.txt | 2 +-
+ .../devicetree/bindings/pwm/nvidia,tegra20-pwm.txt | 2 +-
+ Documentation/driver-model/devres.txt | 4 +
+ Documentation/pwm.txt | 3 +-
+ arch/mips/include/asm/mach-jz4740/platform.h | 1 +
+ arch/mips/include/asm/mach-jz4740/timer.h | 113 ++++++++
+ arch/mips/jz4740/Kconfig | 3 -
+ arch/mips/jz4740/Makefile | 2 +-
+ arch/mips/jz4740/board-qi_lb60.c | 1 +
+ arch/mips/jz4740/platform.c | 6 +
+ arch/mips/jz4740/pwm.c | 177 -------------
+ arch/mips/jz4740/time.c | 2 +-
+ arch/mips/jz4740/timer.c | 4 +-
+ arch/mips/jz4740/timer.h | 136 ----------
+ arch/unicore32/Kconfig | 12 +-
+ arch/unicore32/include/mach/regs-ost.h | 18 +-
+ arch/unicore32/kernel/Makefile | 1 -
+ arch/unicore32/kernel/pwm.c | 263 ------------------
+ drivers/misc/Kconfig | 10 -
+ drivers/misc/Makefile | 1 -
+ drivers/pwm/Kconfig | 29 +-
+ drivers/pwm/Makefile | 3 +
+ drivers/pwm/core.c | 82 +++++-
+ drivers/{misc/ab8500-pwm.c => pwm/pwm-ab8500.c} | 116 ++++----
+ drivers/pwm/pwm-bfin.c | 3 -
+ drivers/pwm/pwm-imx.c | 278 +++++++++++++-------
+ drivers/pwm/pwm-jz4740.c | 221 ++++++++++++++++
+ drivers/pwm/pwm-puv3.c | 161 ++++++++++++
+ drivers/pwm/pwm-pxa.c | 3 -
+ drivers/pwm/pwm-samsung.c | 3 -
+ drivers/pwm/pwm-tiecap.c | 24 +-
+ drivers/pwm/pwm-tiehrpwm.c | 75 ++++--
+ drivers/video/backlight/pwm_bl.c | 7 +-
+ include/linux/pwm.h | 108 +++++++-
+ 35 files changed, 1069 insertions(+), 822 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pwm/imx-pwm.txt
+ delete mode 100644 arch/mips/jz4740/pwm.c
+ delete mode 100644 arch/mips/jz4740/timer.h
+ delete mode 100644 arch/unicore32/kernel/pwm.c
+ rename drivers/{misc/ab8500-pwm.c => pwm/pwm-ab8500.c} (52%)
+ create mode 100644 drivers/pwm/pwm-jz4740.c
+ create mode 100644 drivers/pwm/pwm-puv3.c
+Merging dma-buf/for-next (ba42051 dma-buf: might_sleep() in dma_buf_unmap_attachment())
+$ git merge dma-buf/for-next
+Auto-merging drivers/base/dma-buf.c
+Merge made by the 'recursive' strategy.
+ drivers/base/dma-buf.c | 2 ++
+ 1 file changed, 2 insertions(+)
+Merging userns/for-next (f3d94c2 userns: Fix posix_acl_file_xattr_userns gid conversion)
+$ git merge userns/for-next
+Auto-merging net/bluetooth/af_bluetooth.c
+Merge made by the 'recursive' strategy.
+ fs/xattr_acl.c | 2 +-
+ net/bluetooth/af_bluetooth.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Merging ktest/for-next (95f5783 ktest: Fix ELSE IF statements)
+$ git merge ktest/for-next
+Already up-to-date.
+Merging signal/for-next (12f79be alpha: don't open-code trace_report_syscall_{enter,exit})
+$ git merge signal/for-next
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/fork.c
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/ptrace.h
+Auto-merging include/linux/compat.h
+Auto-merging include/linux/binfmts.h
+Auto-merging fs/exec.c
+CONFLICT (content): Merge conflict in fs/exec.c
+Auto-merging fs/binfmt_elf_fdpic.c
+Auto-merging fs/binfmt_elf.c
+Removing arch/xtensa/include/asm/exec.h
+Auto-merging arch/xtensa/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/xtensa/include/asm/Kbuild
+Auto-merging arch/x86/um/sys_call_table_32.c
+Auto-merging arch/x86/um/Kconfig
+Removing arch/x86/kernel/sys_i386_32.c
+Auto-merging arch/x86/kernel/signal.c
+CONFLICT (content): Merge conflict in arch/x86/kernel/signal.c
+Auto-merging arch/x86/kernel/process_64.c
+Auto-merging arch/x86/kernel/process_32.c
+CONFLICT (content): Merge conflict in arch/x86/kernel/process_32.c
+Auto-merging arch/x86/kernel/process.c
+Auto-merging arch/x86/kernel/entry_64.S
+Auto-merging arch/x86/kernel/entry_32.S
+Auto-merging arch/x86/kernel/Makefile
+Auto-merging arch/x86/include/asm/thread_info.h
+Auto-merging arch/x86/include/asm/sys_ia32.h
+Auto-merging arch/x86/include/asm/processor.h
+Auto-merging arch/x86/ia32/sys_ia32.c
+Auto-merging arch/x86/ia32/ia32entry.S
+Auto-merging arch/x86/Kconfig
+CONFLICT (content): Merge conflict in arch/x86/Kconfig
+Removing arch/unicore32/include/asm/exec.h
+Auto-merging arch/unicore32/include/asm/Kbuild
+Auto-merging arch/um/kernel/syscall.c
+Auto-merging arch/um/kernel/process.c
+Removing arch/um/kernel/internal.h
+Auto-merging arch/um/kernel/exec.c
+CONFLICT (content): Merge conflict in arch/um/kernel/exec.c
+Auto-merging arch/um/include/asm/processor-generic.h
+Auto-merging arch/tile/kernel/compat_signal.c
+Removing arch/tile/include/asm/exec.h
+Auto-merging arch/tile/include/asm/Kbuild
+Removing arch/sparc/include/asm/exec.h
+Auto-merging arch/sparc/include/asm/Kbuild
+Removing arch/sh/include/asm/exec.h
+Auto-merging arch/s390/kernel/process.c
+Auto-merging arch/s390/kernel/entry64.S
+Auto-merging arch/s390/kernel/compat_wrapper.S
+Auto-merging arch/s390/kernel/compat_linux.h
+Auto-merging arch/s390/kernel/compat_linux.c
+Auto-merging arch/s390/include/asm/unistd.h
+Auto-merging arch/s390/include/asm/processor.h
+Auto-merging arch/s390/Kconfig
+CONFLICT (content): Merge conflict in arch/s390/Kconfig
+Auto-merging arch/powerpc/kernel/sys_ppc32.c
+Auto-merging arch/powerpc/kernel/process.c
+Auto-merging arch/powerpc/kernel/ppc_ksyms.c
+Auto-merging arch/powerpc/kernel/entry_64.S
+Auto-merging arch/powerpc/kernel/entry_32.S
+Auto-merging arch/powerpc/include/asm/unistd.h
+Auto-merging arch/powerpc/include/asm/thread_info.h
+Auto-merging arch/powerpc/include/asm/processor.h
+Auto-merging arch/powerpc/Kconfig
+CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
+Removing arch/parisc/include/asm/exec.h
+Auto-merging arch/parisc/include/asm/Kbuild
+Auto-merging arch/mn10300/kernel/process.c
+Removing arch/mn10300/kernel/kthread.S
+Removing arch/mn10300/kernel/kernel_execve.S
+Removing arch/mn10300/include/asm/exec.h
+Auto-merging arch/mn10300/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/mn10300/include/asm/Kbuild
+Auto-merging arch/mn10300/Kconfig
+CONFLICT (content): Merge conflict in arch/mn10300/Kconfig
+Auto-merging arch/mips/include/asm/thread_info.h
+Auto-merging arch/microblaze/kernel/signal.c
+Removing arch/microblaze/include/asm/exec.h
+Auto-merging arch/microblaze/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/microblaze/include/asm/Kbuild
+Auto-merging arch/m68k/kernel/process.c
+Removing arch/m68k/include/asm/exec.h
+Auto-merging arch/m68k/include/asm/Kbuild
+Auto-merging arch/m68k/Kconfig
+CONFLICT (content): Merge conflict in arch/m68k/Kconfig
+Removing arch/m32r/include/asm/exec.h
+Auto-merging arch/m32r/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/m32r/include/asm/Kbuild
+Auto-merging arch/ia64/kernel/signal.c
+Removing arch/ia64/include/asm/exec.h
+Auto-merging arch/ia64/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/ia64/include/asm/Kbuild
+Removing arch/h8300/include/asm/exec.h
+Auto-merging arch/h8300/inclRecorded preimage for 'arch/microblaze/include/asm/Kbuild'
+Resolved 'arch/alpha/Kconfig' using previous resolution.
+Resolved 'arch/arm/Kconfig' using previous resolution.
+Resolved 'arch/arm/include/asm/thread_info.h' using previous resolution.
+Resolved 'arch/avr32/include/asm/Kbuild' using previous resolution.
+Resolved 'arch/c6x/Kconfig' using previous resolution.
+Resolved 'arch/cris/include/asm/Kbuild' using previous resolution.
+Resolved 'arch/frv/include/asm/Kbuild' using previous resolution.
+Resolved 'arch/h8300/include/asm/Kbuild' using previous resolution.
+Resolved 'arch/ia64/include/asm/Kbuild' using previous resolution.
+Resolved 'arch/m32r/include/asm/Kbuild' using previous resolution.
+Resolved 'arch/m68k/Kconfig' using previous resolution.
+Resolved 'arch/mn10300/Kconfig' using previous resolution.
+Resolved 'arch/um/kernel/exec.c' using previous resolution.
+Resolved 'arch/x86/Kconfig' using previous resolution.
+Resolved 'arch/x86/kernel/process_32.c' using previous resolution.
+Resolved 'arch/x86/kernel/signal.c' using previous resolution.
+Resolved 'fs/exec.c' using previous resolution.
+ude/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/h8300/include/asm/Kbuild
+Auto-merging arch/frv/kernel/process.c
+Removing arch/frv/kernel/kernel_thread.S
+Removing arch/frv/kernel/kernel_execve.S
+Removing arch/frv/include/asm/exec.h
+Auto-merging arch/frv/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/frv/include/asm/Kbuild
+Auto-merging arch/frv/Kconfig
+Removing arch/cris/include/asm/exec.h
+Auto-merging arch/cris/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/cris/include/asm/Kbuild
+Auto-merging arch/c6x/include/uapi/asm/unistd.h
+Removing arch/c6x/include/asm/exec.h
+Auto-merging arch/c6x/include/asm/Kbuild
+Auto-merging arch/c6x/Kconfig
+CONFLICT (content): Merge conflict in arch/c6x/Kconfig
+Removing arch/avr32/include/asm/exec.h
+Auto-merging arch/avr32/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/avr32/include/asm/Kbuild
+Auto-merging arch/arm/kernel/process.c
+Auto-merging arch/arm/kernel/entry-common.S
+Auto-merging arch/arm/kernel/calls.S
+Auto-merging arch/arm/include/asm/unistd.h
+Auto-merging arch/arm/include/asm/thread_info.h
+CONFLICT (content): Merge conflict in arch/arm/include/asm/thread_info.h
+Auto-merging arch/arm/include/asm/ptrace.h
+Auto-merging arch/arm/Kconfig
+CONFLICT (content): Merge conflict in arch/arm/Kconfig
+Auto-merging arch/alpha/kernel/process.c
+Removing arch/alpha/include/asm/exec.h
+Auto-merging arch/alpha/include/asm/Kbuild
+Auto-merging arch/alpha/Kconfig
+CONFLICT (content): Merge conflict in arch/alpha/Kconfig
+Auto-merging arch/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'arch/microblaze/include/asm/Kbuild'.
+Recorded resolution for 'arch/mn10300/include/asm/Kbuild'.
+Recorded resolution for 'arch/powerpc/Kconfig'.
+Recorded resolution for 'arch/s390/Kconfig'.
+Recorded resolution for 'arch/xtensa/include/asm/Kbuild'.
+[master c33f94a] Merge remote-tracking branch 'signal/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/Kconfig | 3 +
+ arch/alpha/Kconfig | 1 +
+ arch/alpha/include/asm/Kbuild | 1 +
+ arch/alpha/include/asm/exec.h | 6 --
+ arch/alpha/include/asm/processor.h | 3 -
+ arch/alpha/include/asm/thread_info.h | 3 +-
+ arch/alpha/include/asm/unistd.h | 2 +
+ arch/alpha/kernel/alpha_ksyms.c | 3 -
+ arch/alpha/kernel/entry.S | 82 +++++++---------------
+ arch/alpha/kernel/process.c | 79 ++++++---------------
+ arch/alpha/kernel/ptrace.c | 32 ++++-----
+ arch/arm/Kconfig | 1 +
+ arch/arm/include/asm/processor.h | 5 --
+ arch/arm/include/asm/ptrace.h | 5 ++
+ arch/arm/include/asm/system.h | 1 -
+ arch/arm/include/asm/thread_info.h | 2 -
+ arch/arm/include/asm/unistd.h | 2 +
+ arch/arm/kernel/calls.S | 2 +-
+ arch/arm/kernel/entry-common.S | 29 ++++++--
+ arch/arm/kernel/process.c | 75 ++++----------------
+ arch/arm/kernel/signal.c | 1 -
+ arch/arm/kernel/sys_arm.c | 63 -----------------
+ arch/avr32/include/asm/Kbuild | 1 +
+ arch/avr32/include/asm/exec.h | 13 ----
+ arch/avr32/include/asm/thread_info.h | 18 ++---
+ arch/avr32/kernel/signal.c | 1 -
+ arch/blackfin/include/asm/thread_info.h | 4 --
+ arch/blackfin/kernel/signal.c | 1 -
+ arch/c6x/Kconfig | 1 +
+ arch/c6x/include/asm/Kbuild | 1 +
+ arch/c6x/include/asm/exec.h | 6 --
+ arch/c6x/include/asm/processor.h | 2 -
+ arch/c6x/include/asm/syscalls.h | 5 --
+ arch/c6x/include/asm/thread_info.h | 1 -
+ arch/c6x/include/uapi/asm/unistd.h | 3 +
+ arch/c6x/kernel/asm-offsets.c | 1 -
+ arch/c6x/kernel/entry.S | 56 +++++++--------
+ arch/c6x/kernel/process.c | 72 +++----------------
+ arch/cris/include/asm/Kbuild | 1 +
+ arch/cris/include/asm/exec.h | 6 --
+ arch/cris/include/asm/thread_info.h | 3 -
+ arch/frv/Kconfig | 1 +
+ arch/frv/include/asm/Kbuild | 2 +
+ arch/frv/include/asm/exec.h | 17 -----
+ arch/frv/include/asm/processor.h | 9 +--
+ arch/frv/include/asm/ptrace.h | 1 +
+ arch/frv/include/asm/thread_info.h | 3 -
+ arch/frv/include/asm/unistd.h | 2 +
+ arch/frv/kernel/Makefile | 4 +-
+ arch/frv/kernel/entry.S | 13 ++++
+ arch/frv/kernel/frv_ksyms.c | 1 -
+ arch/frv/kernel/kernel_execve.S | 33 ---------
+ arch/frv/kernel/kernel_thread.S | 77 ---------------------
+ arch/frv/kernel/process.c | 66 +++++++-----------
+ arch/frv/kernel/signal.c | 9 ---
+ arch/h8300/include/asm/Kbuild | 1 +
+ arch/h8300/include/asm/exec.h | 6 --
+ arch/h8300/include/asm/thread_info.h | 7 +-
+ arch/h8300/kernel/signal.c | 1 -
+ arch/hexagon/include/asm/thread_info.h | 5 --
+ arch/hexagon/kernel/signal.c | 1 -
+ arch/hexagon/kernel/syscall.c | 1 -
+ arch/ia64/include/asm/Kbuild | 1 +
+ arch/ia64/include/asm/exec.h | 14 ----
+ arch/ia64/include/asm/thread_info.h | 2 -
+ arch/ia64/kernel/signal.c | 8 ---
+ arch/m32r/include/asm/Kbuild | 1 +
+ arch/m32r/include/asm/exec.h | 14 ----
+ arch/m32r/include/asm/thread_info.h | 9 +--
+ arch/m32r/kernel/signal.c | 3 -
+ arch/m68k/Kconfig | 1 +
+ arch/m68k/include/asm/Kbuild | 1 +
+ arch/m68k/include/asm/exec.h | 6 --
+ arch/m68k/include/asm/processor.h | 25 ++++---
+ arch/m68k/include/asm/ptrace.h | 2 +
+ arch/m68k/include/asm/unistd.h | 2 +
+ arch/m68k/kernel/entry.S | 16 +++++
+ arch/m68k/kernel/process.c | 104 +++++++---------------------
+ arch/m68k/kernel/sys_m68k.c | 17 -----
+ arch/microblaze/include/asm/Kbuild | 2 +-
+ arch/microblaze/include/asm/exec.h | 14 ----
+ arch/microblaze/include/asm/thread_info.h | 3 +-
+ arch/microblaze/kernel/signal.c | 7 +-
+ arch/mips/include/asm/thread_info.h | 3 -
+ arch/mn10300/Kconfig | 1 +
+ arch/mn10300/include/asm/Kbuild | 1 +
+ arch/mn10300/include/asm/exec.h | 16 -----
+ arch/mn10300/include/asm/frame.inc | 2 +-
+ arch/mn10300/include/asm/processor.h | 18 +----
+ arch/mn10300/include/asm/ptrace.h | 1 +
+ arch/mn10300/include/asm/thread_info.h | 3 +-
+ arch/mn10300/include/asm/unistd.h | 2 +
+ arch/mn10300/kernel/Makefile | 4 +-
+ arch/mn10300/kernel/entry.S | 18 +++++
+ arch/mn10300/kernel/internal.h | 6 +-
+ arch/mn10300/kernel/kernel_execve.S | 37 ----------
+ arch/mn10300/kernel/kthread.S | 31 ---------
+ arch/mn10300/kernel/process.c | 91 +++++++-----------------
+ arch/mn10300/kernel/signal.c | 13 ----
+ arch/openrisc/include/asm/thread_info.h | 3 +-
+ arch/parisc/hpux/gate.S | 2 +-
+ arch/parisc/include/asm/Kbuild | 1 +
+ arch/parisc/include/asm/exec.h | 6 --
+ arch/parisc/include/asm/thread_info.h | 5 +-
+ arch/parisc/kernel/signal.c | 45 ++++--------
+ arch/parisc/kernel/syscall.S | 9 +--
+ arch/powerpc/Kconfig | 1 +
+ arch/powerpc/include/asm/processor.h | 3 -
+ arch/powerpc/include/asm/ptrace.h | 2 +
+ arch/powerpc/include/asm/syscalls.h | 3 -
+ arch/powerpc/include/asm/thread_info.h | 2 +
+ arch/powerpc/include/asm/unistd.h | 2 +
+ arch/powerpc/kernel/entry_32.S | 16 +++++
+ arch/powerpc/kernel/entry_64.S | 16 +++++
+ arch/powerpc/kernel/misc.S | 7 --
+ arch/powerpc/kernel/misc_32.S | 33 ---------
+ arch/powerpc/kernel/misc_64.S | 34 ---------
+ arch/powerpc/kernel/ppc_ksyms.c | 1 -
+ arch/powerpc/kernel/process.c | 59 ++++++++--------
+ arch/powerpc/kernel/signal_32.c | 1 -
+ arch/powerpc/kernel/sys_ppc32.c | 22 ------
+ arch/s390/Kconfig | 1 +
+ arch/s390/include/asm/processor.h | 4 +-
+ arch/s390/include/asm/thread_info.h | 4 --
+ arch/s390/include/asm/unistd.h | 2 +
+ arch/s390/kernel/compat_linux.c | 26 -------
+ arch/s390/kernel/compat_linux.h | 2 -
+ arch/s390/kernel/compat_wrapper.S | 2 +-
+ arch/s390/kernel/entry.S | 51 ++++++--------
+ arch/s390/kernel/entry.h | 3 -
+ arch/s390/kernel/entry64.S | 50 ++++++--------
+ arch/s390/kernel/process.c | 107 +++++++++--------------------
+ arch/score/include/asm/thread_info.h | 4 --
+ arch/score/kernel/signal.c | 1 +
+ arch/sh/include/asm/Kbuild | 1 +
+ arch/sh/include/asm/exec.h | 10 ---
+ arch/sh/include/asm/thread_info.h | 3 +
+ arch/sh/kernel/signal_32.c | 1 -
+ arch/sh/kernel/signal_64.c | 1 -
+ arch/sparc/include/asm/Kbuild | 1 +
+ arch/sparc/include/asm/exec.h | 6 --
+ arch/sparc/include/asm/thread_info_32.h | 3 +-
+ arch/sparc/include/asm/thread_info_64.h | 3 +
+ arch/tile/include/asm/Kbuild | 1 +
+ arch/tile/include/asm/exec.h | 20 ------
+ arch/tile/kernel/compat_signal.c | 9 ---
+ arch/tile/kernel/signal.c | 12 +---
+ arch/um/include/asm/processor-generic.h | 2 -
+ arch/um/include/asm/thread_info.h | 3 -
+ arch/um/kernel/exec.c | 25 +------
+ arch/um/kernel/internal.h | 1 -
+ arch/um/kernel/process.c | 17 +----
+ arch/um/kernel/syscall.c | 17 -----
+ arch/unicore32/include/asm/Kbuild | 1 +
+ arch/unicore32/include/asm/exec.h | 15 ----
+ arch/unicore32/include/asm/thread_info.h | 4 +-
+ arch/unicore32/kernel/entry.S | 2 -
+ arch/unicore32/kernel/signal.c | 1 -
+ arch/unicore32/kernel/sys.c | 1 -
+ arch/x86/Kconfig | 1 +
+ arch/x86/ia32/ia32entry.S | 2 +-
+ arch/x86/ia32/sys_ia32.c | 15 ----
+ arch/x86/include/asm/processor.h | 5 --
+ arch/x86/include/asm/sys_ia32.h | 2 -
+ arch/x86/include/asm/syscalls.h | 2 +-
+ arch/x86/include/asm/thread_info.h | 2 -
+ arch/x86/include/asm/unistd.h | 2 +
+ arch/x86/kernel/Makefile | 2 +-
+ arch/x86/kernel/asm-offsets.c | 3 +
+ arch/x86/kernel/entry_32.S | 43 +++++++-----
+ arch/x86/kernel/entry_64.S | 74 +++++++-------------
+ arch/x86/kernel/process.c | 65 ------------------
+ arch/x86/kernel/process_32.c | 37 ++++++++--
+ arch/x86/kernel/process_64.c | 35 ++++++----
+ arch/x86/kernel/signal.c | 4 --
+ arch/x86/kernel/sys_i386_32.c | 40 -----------
+ arch/x86/kernel/vm86_32.c | 6 +-
+ arch/x86/syscalls/syscall_32.tbl | 2 +-
+ arch/x86/um/Kconfig | 1 +
+ arch/x86/um/sys_call_table_32.c | 1 -
+ arch/xtensa/include/asm/Kbuild | 1 +
+ arch/xtensa/include/asm/exec.h | 14 ----
+ arch/xtensa/include/asm/thread_info.h | 5 --
+ arch/xtensa/kernel/signal.c | 4 --
+ fs/binfmt_elf.c | 1 -
+ fs/binfmt_elf_fdpic.c | 1 -
+ fs/exec.c | 61 ++++++++++++++--
+ include/linux/binfmts.h | 6 ++
+ include/linux/compat.h | 8 ++-
+ include/linux/ptrace.h | 4 ++
+ include/linux/sched.h | 3 +
+ kernel/fork.c | 13 +++-
+ kernel/sched/core.c | 2 +-
+ 193 files changed, 733 insertions(+), 1780 deletions(-)
+ delete mode 100644 arch/alpha/include/asm/exec.h
+ delete mode 100644 arch/avr32/include/asm/exec.h
+ delete mode 100644 arch/c6x/include/asm/exec.h
+ delete mode 100644 arch/cris/include/asm/exec.h
+ delete mode 100644 arch/frv/include/asm/exec.h
+ delete mode 100644 arch/frv/kernel/kernel_execve.S
+ delete mode 100644 arch/frv/kernel/kernel_thread.S
+ delete mode 100644 arch/h8300/include/asm/exec.h
+ delete mode 100644 arch/ia64/include/asm/exec.h
+ delete mode 100644 arch/m32r/include/asm/exec.h
+ delete mode 100644 arch/m68k/include/asm/exec.h
+ delete mode 100644 arch/microblaze/include/asm/exec.h
+ delete mode 100644 arch/mn10300/include/asm/exec.h
+ delete mode 100644 arch/mn10300/kernel/kernel_execve.S
+ delete mode 100644 arch/mn10300/kernel/kthread.S
+ delete mode 100644 arch/parisc/include/asm/exec.h
+ delete mode 100644 arch/sh/include/asm/exec.h
+ delete mode 100644 arch/sparc/include/asm/exec.h
+ delete mode 100644 arch/tile/include/asm/exec.h
+ delete mode 100644 arch/um/kernel/internal.h
+ delete mode 100644 arch/unicore32/include/asm/exec.h
+ delete mode 100644 arch/x86/kernel/sys_i386_32.c
+ delete mode 100644 arch/xtensa/include/asm/exec.h
+Merging clk/clk-next (494bfec clk: add of_clk_src_onecell_get() support)
+$ git merge clk/clk-next
+Already up-to-date.
+Merging random/dev (d2e7c96 random: mix in architectural randomness in extract_buf())
+$ git merge random/dev
+Already up-to-date.
+Merging lzo-update/lzo-update (5f70278 lib/lzo: Optimize code for CPUs with inefficient unaligned access)
+$ git merge lzo-update/lzo-update
+Removing lib/lzo/lzo1x_decompress.c
+Merge made by the 'recursive' strategy.
+ include/linux/lzo.h | 15 +-
+ lib/lzo/Makefile | 2 +-
+ lib/lzo/lzo1x_compress.c | 309 +++++++++++++++++++++------------------
+ lib/lzo/lzo1x_decompress.c | 255 --------------------------------
+ lib/lzo/lzo1x_decompress_safe.c | 237 ++++++++++++++++++++++++++++++
+ lib/lzo/lzodefs.h | 34 ++++-
+ 6 files changed, 441 insertions(+), 411 deletions(-)
+ delete mode 100644 lib/lzo/lzo1x_decompress.c
+ create mode 100644 lib/lzo/lzo1x_decompress_safe.c
+Merging scsi-post-merge/merge-base:master ()
+$ git clone -s -l -n -q . ../rebase-tmp
+$ cd ../rebase-tmp
+$ git fetch --no-tags ../next refs/heads/akpm/master:akpm
+From ../next
+ * [new branch] akpm/master -> akpm
+$ git fetch --no-tags ../next refs/heads/akpm/base:akpm-base
+From ../next
+ * [new branch] akpm/base -> akpm-base
+$ git checkout akpm
+Switched to branch 'akpm'
+$ git rebase --onto master akpm-base
+First, rewinding head to replay your work on top of it...
+Applying: CRIS: Fix I/O macros
+Applying: selinux: fix sel_netnode_insert() suspicious rcu dereference
+Applying: vfs: d_obtain_alias() needs to use "/" as default name.
+Applying: x86 cpu_hotplug: unmap cpu2node when the cpu is hotremoved
+Applying: cpu_hotplug-unmap-cpu2node-when-the-cpu-is-hotremoved-fix
+Applying: acpi_memhotplug.c: fix memory leak when memory device is unbound from the module acpi_memhotplug
+Applying: acpi_memhotplug.c: free memory device if acpi_memory_enable_device() failed
+Applying: acpi_memhotplug.c: remove memory info from list before freeing it
+Applying: acpi_memhotplug.c: don't allow to eject the memory device if it is being used
+Applying: acpi_memhotplug.c: bind the memory device when the driver is being loaded
+Applying: acpi_memhotplug.c: auto bind the memory device which is hotplugged before the driver is loaded
+Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
+Applying: x86 numa: don't check if node is NUMA_NO_NODE
+Applying: arch/x86/tools/insn_sanity.c: identify source of messages
+Applying: arch/x86/platform/uv: fix incorrect tlb flush all issue
+Applying: fs/debugsfs: remove unnecessary inode->i_private initialization
+Applying: pcmcia: move unbind/rebind into dev_pm_ops.complete
+Applying: drm/i915: optimize DIV_ROUND_CLOSEST() call
+Applying: timeconst.pl: remove deprecated defined(@array)
+Applying: time: don't inline EXPORT_SYMBOL functions
+Applying: compiler-gcc4.h: correct verion check for __compiletime_error
+Applying: h8300: select generic atomic64_t support
+Using index info to reconstruct a base tree...
+M arch/h8300/Kconfig
+Falling back to patching base and 3-way merge...
+Auto-merging arch/h8300/Kconfig
+CONFLICT (content): Merge conflict in arch/h8300/Kconfig
+Failed to merge in the changes.
+Patch failed at 0022 h8300: select generic atomic64_t support
+
+When you have resolved this problem run "git rebase --continue".
+If you would prefer to skip this patch, instead run "git rebase --skip".
+To check out the original branch and stop rebasing run "git rebase --abort".
+
+$ git rebase --continue
+Applying: cciss: cleanup bitops usage
+Applying: cciss: use check_signature()
+Applying: block: store partition_meta_info.uuid as a string
+Applying: init: reduce PARTUUID min length to 1 from 36
+Applying: block: partition: msdos: provide UUIDs for partitions
+Applying: drbd: use copy_highpage
+Applying: vfs: increment iversion when a file is truncated
+Applying: fs: change return values from -EACCES to -EPERM
+Applying: fs/block_dev.c: no need to check inode->i_bdev in bd_forget()
+Applying: mm/page_alloc.c: remove duplicate check
+Applying: swap: add a simple detector for inappropriate swapin readahead
+Applying: swap-add-a-simple-detector-for-inappropriate-swapin-readahead-fix
+Applying: mm/memblock: reduce overhead in binary search
+Applying: KSM: numa awareness sysfs knob
+Applying: score: select generic atomic64_t support
+Applying: pwm_backlight: add device tree support for Low Threshold Brightness
+Applying: pwm_backlight-add-device-tree-support-for-low-threshold-brightness-fix
+Applying: drivers/firmware/dmi_scan.c: check dmi version when get system uuid
+Applying: drivers-firmware-dmi_scanc-check-dmi-version-when-get-system-uuid-fix
+Applying: drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it exists
+Applying: drivers-firmware-dmi_scanc-fetch-dmi-version-from-smbios-if-it-exists-checkpatch-fixes
+Applying: hfsplus: add on-disk layout declarations related to attributes tree
+Applying: hfsplus: add functionality of manipulating by records in attributes tree
+Applying: hfsplus: rework functionality of getting, setting and deleting of extended attributes
+Applying: hfsplus: add support of manipulation by attributes file
+Applying: hfsplus-add-support-of-manipulation-by-attributes-file-checkpatch-fixes
+Applying: hfsplus: code style fixes - reworked support of extended attributes
+Applying: ipc/sem.c: alternatives to preempt_disable()
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + 2ad4dcc...1091262 akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (1091262 ipc/sem.c: alternatives to preempt_disable())
+$ git merge --no-ff akpm/master
+Merge made by the 'recursive' strategy.
+ .../bindings/video/backlight/pwm-backlight.txt | 10 +
+ Documentation/vm/ksm.txt | 7 +
+ arch/cris/include/asm/io.h | 39 +-
+ arch/h8300/Kconfig | 1 +
+ arch/score/Kconfig | 3 +-
+ arch/x86/include/asm/uv/uv.h | 2 +-
+ arch/x86/kernel/acpi/boot.c | 7 +-
+ arch/x86/mm/numa.c | 3 +-
+ arch/x86/platform/iris/iris.c | 67 ++-
+ arch/x86/platform/uv/tlb_uv.c | 10 +-
+ arch/x86/tools/insn_sanity.c | 10 +-
+ block/genhd.c | 8 +-
+ block/partitions/efi.c | 7 +-
+ block/partitions/msdos.c | 21 +-
+ drivers/acpi/acpi_memhotplug.c | 123 +++--
+ drivers/block/cciss.c | 21 +-
+ drivers/block/drbd/drbd_bitmap.c | 7 +-
+ drivers/firmware/dmi_scan.c | 78 ++-
+ drivers/gpu/drm/i915/intel_pm.c | 3 +-
+ drivers/pcmcia/cs.c | 37 +-
+ drivers/video/backlight/pwm_bl.c | 5 +
+ fs/attr.c | 5 +
+ fs/autofs4/root.c | 2 +-
+ fs/block_dev.c | 8 +-
+ fs/dcache.c | 2 +-
+ fs/debugfs/inode.c | 1 -
+ fs/dlm/config.c | 2 +-
+ fs/gfs2/sys.c | 18 +-
+ fs/hfsplus/Makefile | 3 +-
+ fs/hfsplus/attributes.c | 399 ++++++++++++++
+ fs/hfsplus/bfind.c | 79 ++-
+ fs/hfsplus/bnode.c | 6 +-
+ fs/hfsplus/brec.c | 23 +-
+ fs/hfsplus/btree.c | 8 +
+ fs/hfsplus/catalog.c | 36 +-
+ fs/hfsplus/dir.c | 6 +-
+ fs/hfsplus/extents.c | 4 +-
+ fs/hfsplus/hfsplus_fs.h | 41 +-
+ fs/hfsplus/hfsplus_raw.h | 68 ++-
+ fs/hfsplus/inode.c | 13 +
+ fs/hfsplus/ioctl.c | 542 +++++++++++++++++---
+ fs/hfsplus/super.c | 33 +-
+ fs/hfsplus/unicode.c | 7 +-
+ fs/ncpfs/ioctl.c | 2 +-
+ fs/proc/base.c | 6 +-
+ fs/udf/file.c | 2 +-
+ include/linux/compiler-gcc4.h | 2 +-
+ include/linux/genhd.h | 8 +-
+ include/linux/rmap.h | 3 +
+ init/do_mounts.c | 61 ++-
+ ipc/sem.c | 250 ++++++---
+ kernel/time.c | 4 +-
+ kernel/timeconst.pl | 2 +-
+ mm/internal.h | 48 ++
+ mm/ksm.c | 135 ++++-
+ mm/memblock.c | 5 +
+ mm/memory.c | 3 +-
+ mm/page_alloc.c | 3 +-
+ mm/rmap.c | 3 +
+ mm/shmem.c | 1 +
+ mm/swap_state.c | 6 +
+ security/selinux/netnode.c | 3 +-
+ 62 files changed, 1931 insertions(+), 391 deletions(-)
+ create mode 100644 fs/hfsplus/attributes.c
projects / karo-tx-linux.git / commitdiff