$ date Wednesday 1 May 10:31:33 EST 2013 $ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at 5415ba9 Merge tag 'ktest-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest Merging origin/master (3094566 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial) $ git merge origin/master Updating 5415ba9..3094566 Fast-forward CREDITS | 4 + .../ABI/testing/sysfs-driver-hid-roccat-isku | 12 +- .../ABI/testing/sysfs-driver-hid-roccat-konepure | 105 + Documentation/DocBook/media/dvb/dvbproperty.xml | 52 +- Documentation/DocBook/media/v4l/common.xml | 14 - Documentation/DocBook/media/v4l/compat.xml | 24 +- Documentation/DocBook/media/v4l/controls.xml | 87 +- Documentation/DocBook/media/v4l/io.xml | 6 + .../DocBook/media/v4l/media-ioc-enum-entities.xml | 10 + Documentation/DocBook/media/v4l/subdev-formats.xml | 206 +- Documentation/DocBook/media/v4l/v4l2.xml | 19 +- .../DocBook/media/v4l/vidioc-dbg-g-chip-ident.xml | 9 +- .../DocBook/media/v4l/vidioc-dbg-g-chip-info.xml | 223 ++ .../DocBook/media/v4l/vidioc-dbg-g-register.xml | 29 +- .../DocBook/media/v4l/vidioc-enum-dv-presets.xml | 240 -- .../DocBook/media/v4l/vidioc-enuminput.xml | 5 - .../DocBook/media/v4l/vidioc-enumoutput.xml | 5 - .../DocBook/media/v4l/vidioc-g-dv-preset.xml | 113 - .../DocBook/media/v4l/vidioc-g-ext-ctrls.xml | 9 + .../DocBook/media/v4l/vidioc-query-dv-preset.xml | 78 - Documentation/DocBook/media_api.tmpl | 1 + Documentation/RCU/checklist.txt | 26 +- Documentation/RCU/lockdep.txt | 5 + Documentation/RCU/rcubarrier.txt | 15 +- Documentation/RCU/stallwarn.txt | 33 +- Documentation/RCU/whatisRCU.txt | 4 +- Documentation/SubmittingPatches | 9 +- Documentation/arm/sunxi/clocks.txt | 56 + Documentation/backlight/lp855x-driver.txt | 7 - Documentation/cgroups/cgroups.txt | 3 +- Documentation/cgroups/devices.txt | 70 +- Documentation/cgroups/memory.txt | 72 +- Documentation/clk.txt | 15 +- .../devicetree/bindings/clock/axi-clkgen.txt | 22 + .../bindings/clock/fixed-factor-clock.txt | 24 + .../devicetree/bindings/clock/silabs,si5351.txt | 114 + Documentation/devicetree/bindings/clock/sunxi.txt | 151 + .../devicetree/bindings/i2c/i2c-s3c2410.txt | 2 +- Documentation/devicetree/bindings/leds/tca6507.txt | 2 +- Documentation/devicetree/bindings/media/coda.txt | 30 + .../devicetree/bindings/media/exynos-fimc-lite.txt | 14 + .../devicetree/bindings/media/exynos4-fimc-is.txt | 49 + .../devicetree/bindings/media/samsung-fimc.txt | 197 ++ .../bindings/media/samsung-mipi-csis.txt | 81 + .../devicetree/bindings/media/video-interfaces.txt | 228 ++ .../devicetree/bindings/metag/meta-intc.txt | 2 +- Documentation/devicetree/bindings/mfd/mc13xxx.txt | 36 +- Documentation/devicetree/bindings/misc/sram.txt | 16 + .../bindings/pinctrl/atmel,at91-pinctrl.txt | 2 +- .../bindings/pinctrl/brcm,bcm2835-gpio.txt | 2 +- .../bindings/power_supply/qnap-poweroff.txt | 2 +- .../devicetree/bindings/regulator/max8952.txt | 52 + .../bindings/regulator/max8997-regulator.txt | 2 +- .../bindings/rtc/atmel,at91rm9200-rtc.txt | 15 + .../devicetree/bindings/spi/brcm,bcm2835-spi.txt | 22 + Documentation/devicetree/bindings/spi/fsl-spi.txt | 3 +- .../bindings/spi/nvidia,tegra114-spi.txt | 26 + .../devicetree/bindings/spi/spi-samsung.txt | 8 +- .../devicetree/bindings/usb/samsung-usbphy.txt | 2 +- .../devicetree/bindings/vendor-prefixes.txt | 2 + .../devicetree/bindings/video/backlight/lp855x.txt | 41 + .../video/backlight/tps65217-backlight.txt | 27 + Documentation/filesystems/vfat.txt | 26 +- Documentation/iostats.txt | 2 + Documentation/kernel-parameters.txt | 72 +- Documentation/printk-formats.txt | 2 + Documentation/sysctl/vm.txt | 50 + Documentation/this_cpu_ops.txt | 205 ++ Documentation/trace/tracepoints.txt | 15 - Documentation/trace/uprobetracer.txt | 114 +- Documentation/video4linux/CARDLIST.em28xx | 3 +- Documentation/video4linux/CARDLIST.tuner | 3 + Documentation/video4linux/si476x.txt | 187 ++ Documentation/virtual/virtio-spec.txt | 6 +- Documentation/vm/overcommit-accounting | 8 +- Documentation/x86/x86_64/boot-options.txt | 14 - Documentation/x86/x86_64/mm.txt | 4 +- MAINTAINERS | 147 +- Makefile | 4 +- arch/alpha/include/asm/thread_info.h | 2 - arch/alpha/kernel/process.c | 19 - arch/alpha/kernel/smp.c | 3 +- arch/alpha/kernel/sys_nautilus.c | 5 +- arch/alpha/mm/init.c | 24 +- arch/alpha/mm/numa.c | 3 +- arch/arc/kernel/disasm.c | 2 +- arch/arc/kernel/process.c | 27 +- arch/arc/kernel/smp.c | 2 +- arch/arc/mm/init.c | 23 +- arch/arc/plat-arcfpga/Kconfig | 2 +- arch/arm/Kconfig | 1 + arch/arm/boot/dts/at91sam9260.dtsi | 40 + arch/arm/boot/dts/at91sam9263.dtsi | 40 + arch/arm/boot/dts/at91sam9263ek.dts | 10 + arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 10 + arch/arm/boot/dts/at91sam9g45.dtsi | 40 + arch/arm/boot/dts/at91sam9m10g45ek.dts | 10 + arch/arm/boot/dts/at91sam9n12.dtsi | 40 + arch/arm/boot/dts/at91sam9n12ek.dts | 10 + arch/arm/boot/dts/at91sam9x5.dtsi | 40 + arch/arm/boot/dts/at91sam9x5ek.dtsi | 10 + arch/arm/include/asm/pgtable.h | 9 + arch/arm/include/asm/system_misc.h | 3 - arch/arm/kernel/early_printk.c | 17 +- arch/arm/kernel/process.c | 100 +- arch/arm/kernel/smp.c | 2 +- arch/arm/kernel/topology.c | 2 +- arch/arm/kvm/arm.c | 2 +- arch/arm/mach-at91/at91sam9260.c | 2 + arch/arm/mach-at91/at91sam9g45.c | 2 + arch/arm/mach-at91/at91sam9n12.c | 2 + arch/arm/mach-at91/at91sam9x5.c | 2 + arch/arm/mach-bcm/Kconfig | 1 + arch/arm/mach-bcm/board_bcm.c | 7 +- arch/arm/mach-davinci/board-dm355-evm.c | 71 +- arch/arm/mach-davinci/board-dm365-evm.c | 166 +- arch/arm/mach-davinci/board-dm644x-evm.c | 8 +- arch/arm/mach-davinci/board-dm646x-evm.c | 2 +- arch/arm/mach-davinci/davinci.h | 11 +- arch/arm/mach-davinci/dm355.c | 174 +- arch/arm/mach-davinci/dm365.c | 195 +- arch/arm/mach-davinci/dm644x.c | 11 +- arch/arm/mach-davinci/pm_domain.c | 2 +- arch/arm/mach-exynos/mach-universal_c210.c | 27 +- arch/arm/mach-gemini/idle.c | 4 +- arch/arm/mach-gemini/irq.c | 4 +- arch/arm/mach-imx/clk-busy.c | 2 +- arch/arm/mach-ixp4xx/common.c | 3 +- arch/arm/mach-mvebu/irq-armada-370-xp.c | 2 +- arch/arm/mach-omap1/pm.c | 6 +- arch/arm/mach-omap2/omap_hwmod.c | 7 +- arch/arm/mach-omap2/pm.c | 5 +- arch/arm/mach-omap2/pm44xx.c | 4 +- arch/arm/mach-orion5x/board-dt.c | 3 +- arch/arm/mach-orion5x/common.c | 2 +- arch/arm/mach-shark/core.c | 3 +- arch/arm/mach-shmobile/suspend.c | 6 +- arch/arm/mach-ux500/board-mop500-regulators.c | 774 ++++- arch/arm/mach-ux500/board-mop500-regulators.h | 7 +- arch/arm/mach-ux500/board-mop500.c | 5 +- arch/arm/mach-vexpress/v2m.c | 8 +- arch/arm/mach-w90x900/dev.c | 3 +- arch/arm/mm/init.c | 50 +- arch/arm/plat-samsung/devs.c | 10 + arch/arm64/Kconfig | 11 +- arch/arm64/boot/dts/Makefile | 2 + arch/arm64/boot/dts/foundation-v8.dts | 230 ++ arch/arm64/boot/dts/rtsm_ve-aemv8a.dts | 159 + arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi | 234 ++ arch/arm64/boot/dts/skeleton.dtsi | 13 + arch/arm64/configs/defconfig | 4 + arch/arm64/include/asm/Kbuild | 2 +- arch/arm64/include/asm/bitops.h | 18 +- arch/arm64/include/asm/cmpxchg.h | 3 + arch/arm64/include/asm/compat.h | 22 +- arch/arm64/include/asm/cputype.h | 30 + arch/arm64/include/asm/esr.h | 55 + arch/arm64/include/asm/exception.h | 1 + arch/arm64/include/asm/hardirq.h | 5 + arch/arm64/include/asm/io.h | 4 + arch/arm64/include/asm/irq.h | 1 + .../arm64/{lib/bitops.c => include/asm/smp_plat.h} | 25 +- arch/arm64/include/asm/string.h | 37 + arch/arm64/kernel/arm64ksyms.c | 21 +- arch/arm64/kernel/early_printk.c | 35 + arch/arm64/kernel/entry.S | 53 +- arch/arm64/kernel/head.S | 4 +- arch/arm64/kernel/irq.c | 19 +- arch/arm64/kernel/process.c | 51 +- arch/arm64/kernel/setup.c | 12 + arch/arm64/kernel/smp.c | 115 +- arch/arm64/kernel/smp_psci.c | 5 +- arch/arm64/lib/Makefile | 4 +- arch/arm64/lib/bitops.S | 68 + arch/arm64/lib/memchr.S | 44 + arch/arm64/lib/memcpy.S | 53 + arch/arm64/lib/memmove.S | 57 + arch/arm64/lib/memset.S | 53 + arch/arm64/lib/strchr.S | 42 + arch/arm64/lib/strrchr.S | 43 + arch/arm64/mm/fault.c | 6 +- arch/arm64/mm/init.c | 26 +- arch/arm64/mm/mmu.c | 13 +- arch/avr32/kernel/process.c | 13 +- arch/avr32/kernel/time.c | 9 +- arch/avr32/mach-at32ap/include/mach/pm.h | 24 - arch/avr32/mach-at32ap/pm-at32ap700x.S | 7 - arch/avr32/mm/init.c | 24 +- arch/blackfin/include/asm/bfin_sport3.h | 2 +- arch/blackfin/kernel/early_printk.c | 2 - arch/blackfin/kernel/process.c | 32 +- arch/blackfin/mach-bf609/boards/ezkit.c | 8 +- arch/blackfin/mach-common/smp.c | 2 +- arch/blackfin/mm/init.c | 22 +- arch/c6x/kernel/process.c | 28 +- arch/c6x/mm/init.c | 30 +- arch/cris/arch-v10/kernel/process.c | 3 +- arch/cris/arch-v32/kernel/process.c | 12 +- arch/cris/arch-v32/kernel/smp.c | 4 +- arch/cris/include/asm/processor.h | 7 - arch/cris/kernel/process.c | 49 +- arch/cris/mm/init.c | 16 +- arch/frv/kernel/process.c | 27 +- arch/frv/mm/init.c | 38 +- arch/h8300/kernel/process.c | 35 +- arch/h8300/mm/init.c | 30 +- arch/hexagon/kernel/process.c | 23 +- arch/hexagon/kernel/smp.c | 2 +- arch/ia64/include/asm/hugetlb.h | 1 + arch/ia64/include/asm/irqflags.h | 1 + arch/ia64/include/asm/thread_info.h | 2 - arch/ia64/kernel/perfmon.c | 14 +- arch/ia64/kernel/process.c | 78 +- arch/ia64/kernel/smpboot.c | 2 +- arch/ia64/mm/contig.c | 2 + arch/ia64/mm/discontig.c | 9 +- arch/ia64/mm/init.c | 23 +- arch/ia64/mm/numa.c | 15 +- arch/m32r/kernel/process.c | 18 - arch/m32r/kernel/smpboot.c | 2 +- arch/m32r/kernel/traps.c | 6 +- arch/m32r/mm/init.c | 26 +- arch/m68k/Kconfig.bus | 10 + arch/m68k/Kconfig.devices | 24 + arch/m68k/atari/ataints.c | 152 + arch/m68k/atari/config.c | 239 ++ arch/m68k/include/asm/atarihw.h | 6 + arch/m68k/include/asm/atariints.h | 11 +- arch/m68k/include/asm/cmpxchg.h | 3 + arch/m68k/include/asm/delay.h | 23 + arch/m68k/include/asm/io_mm.h | 136 +- arch/m68k/include/asm/irq.h | 6 +- arch/m68k/include/asm/raw_io.h | 109 +- arch/m68k/include/asm/string.h | 14 - arch/m68k/kernel/process.c | 32 +- arch/m68k/kernel/setup_mm.c | 6 + arch/m68k/lib/string.c | 2 +- arch/m68k/mm/init.c | 24 +- arch/metag/Kconfig | 4 + arch/metag/Makefile | 2 + arch/metag/boot/dts/Makefile | 10 +- arch/metag/configs/meta1_defconfig | 1 - arch/metag/configs/meta2_defconfig | 1 - arch/metag/configs/meta2_smp_defconfig | 1 - arch/metag/include/asm/metag_mem.h | 3 + arch/metag/include/asm/thread_info.h | 2 - arch/metag/include/uapi/asm/Kbuild | 1 + arch/metag/include/uapi/asm/ech.h | 15 + arch/metag/kernel/cachepart.c | 16 +- arch/metag/kernel/da.c | 2 + arch/metag/kernel/head.S | 8 + arch/metag/kernel/perf/perf_event.c | 74 +- arch/metag/kernel/process.c | 35 +- arch/metag/kernel/ptrace.c | 34 + arch/metag/kernel/setup.c | 1 + arch/metag/kernel/smp.c | 117 +- arch/metag/mm/Kconfig | 3 - arch/metag/mm/init.c | 31 +- arch/metag/oprofile/Makefile | 17 + arch/metag/oprofile/backtrace.c | 63 + arch/metag/oprofile/backtrace.h | 6 + arch/metag/oprofile/common.c | 66 + arch/microblaze/Kconfig | 4 +- arch/microblaze/include/asm/processor.h | 5 - arch/microblaze/include/asm/setup.h | 1 - arch/microblaze/include/asm/thread_info.h | 1 - arch/microblaze/kernel/early_printk.c | 26 +- arch/microblaze/kernel/process.c | 65 - arch/microblaze/mm/init.c | 34 +- arch/mips/bcm63xx/dev-spi.c | 11 - arch/mips/include/asm/hugetlb.h | 1 + .../include/asm/mach-bcm63xx/bcm63xx_dev_spi.h | 1 - arch/mips/kernel/early_printk.c | 12 +- arch/mips/kernel/process.c | 48 +- arch/mips/kernel/smp.c | 2 +- arch/mips/mm/init.c | 37 +- arch/mips/sgi-ip27/ip27-memory.c | 4 +- arch/mn10300/include/asm/thread_info.h | 2 - arch/mn10300/kernel/process.c | 70 +- arch/mn10300/kernel/smp.c | 7 +- arch/mn10300/mm/init.c | 23 +- arch/openrisc/include/asm/thread_info.h | 2 - arch/openrisc/kernel/Makefile | 2 +- arch/openrisc/kernel/idle.c | 73 - arch/openrisc/mm/init.c | 27 +- arch/parisc/include/asm/thread_info.h | 2 - arch/parisc/kernel/process.c | 22 - arch/parisc/kernel/smp.c | 2 +- arch/parisc/mm/init.c | 25 +- arch/powerpc/include/asm/hugetlb.h | 1 + arch/powerpc/include/asm/thread_info.h | 2 - arch/powerpc/include/asm/uprobes.h | 1 + arch/powerpc/kernel/crash_dump.c | 5 +- arch/powerpc/kernel/fadump.c | 5 +- arch/powerpc/kernel/idle.c | 89 +- arch/powerpc/kernel/kvm.c | 7 +- arch/powerpc/kernel/nvram_64.c | 3 +- arch/powerpc/kernel/smp.c | 2 +- arch/powerpc/kernel/udbg.c | 6 +- arch/powerpc/kernel/uprobes.c | 29 +- arch/powerpc/kvm/book3s_pr.c | 2 +- arch/powerpc/mm/init_64.c | 11 +- arch/powerpc/mm/mem.c | 35 +- arch/powerpc/mm/numa.c | 10 +- arch/powerpc/platforms/512x/mpc512x_shared.c | 5 +- arch/powerpc/platforms/pseries/hotplug-memory.c | 12 + arch/s390/include/asm/hugetlb.h | 56 +- arch/s390/include/asm/pgtable.h | 95 +- arch/s390/kernel/irq.c | 2 +- arch/s390/kernel/process.c | 32 +- arch/s390/kernel/smp.c | 3 +- arch/s390/kernel/vtime.c | 5 - arch/s390/kvm/trace.h | 2 +- arch/s390/mm/hugetlbpage.c | 2 +- arch/s390/mm/init.c | 35 +- arch/s390/mm/vmem.c | 15 +- arch/s390/oprofile/init.c | 1 + arch/score/kernel/process.c | 18 - arch/score/mm/init.c | 33 +- arch/sh/Kconfig | 4 +- arch/sh/drivers/pci/pcie-sh7786.c | 2 +- arch/sh/include/asm/hugetlb.h | 1 + arch/sh/include/asm/thread_info.h | 2 - arch/sh/kernel/idle.c | 101 +- arch/sh/kernel/sh_bios.c | 4 +- arch/sh/kernel/smp.c | 2 +- arch/sh/mm/init.c | 26 +- arch/sparc/include/asm/hugetlb.h | 1 + arch/sparc/include/asm/thread_info_32.h | 2 - arch/sparc/include/asm/thread_info_64.h | 2 - arch/sparc/kernel/hvtramp.S | 3 +- arch/sparc/kernel/process_32.c | 21 +- arch/sparc/kernel/process_64.c | 49 +- arch/sparc/kernel/smp_32.c | 2 +- arch/sparc/kernel/smp_64.c | 2 + arch/sparc/kernel/trampoline_64.S | 3 +- arch/sparc/mm/init_32.c | 12 +- arch/sparc/mm/init_64.c | 7 +- arch/tile/include/asm/hugetlb.h | 1 + arch/tile/include/asm/thread_info.h | 2 - arch/tile/kernel/early_printk.c | 27 +- arch/tile/kernel/process.c | 65 +- arch/tile/kernel/smpboot.c | 4 +- arch/tile/mm/pgtable.c | 7 +- arch/um/kernel/early_printk.c | 8 +- arch/um/kernel/mem.c | 26 +- arch/um/kernel/process.c | 27 +- arch/unicore32/kernel/early_printk.c | 12 +- arch/unicore32/kernel/process.c | 21 +- arch/unicore32/mm/init.c | 31 +- arch/unicore32/mm/ioremap.c | 17 +- arch/x86/Kconfig | 93 +- arch/x86/Kconfig.debug | 2 +- arch/x86/boot/compressed/head_64.S | 2 +- arch/x86/include/asm/cmpxchg.h | 2 +- arch/x86/include/asm/context_tracking.h | 21 - arch/x86/include/asm/cpufeature.h | 22 + arch/x86/include/asm/fixmap.h | 7 +- arch/x86/include/asm/hugetlb.h | 1 + arch/x86/include/asm/hypervisor.h | 16 +- arch/x86/include/asm/mce.h | 4 +- arch/x86/include/asm/msr.h | 14 +- arch/x86/include/asm/page_64_types.h | 1 - arch/x86/include/asm/paravirt.h | 4 - arch/x86/include/asm/paravirt_types.h | 2 +- arch/x86/include/asm/perf_event_p4.h | 62 +- arch/x86/include/asm/pgtable_types.h | 1 - arch/x86/include/asm/processor.h | 25 +- arch/x86/include/asm/suspend_32.h | 1 - arch/x86/include/asm/suspend_64.h | 3 - arch/x86/include/asm/thread_info.h | 2 - arch/x86/include/asm/uprobes.h | 1 + arch/x86/include/uapi/asm/msr-index.h | 5 + arch/x86/kernel/acpi/sleep.c | 2 +- arch/x86/kernel/acpi/wakeup_32.S | 5 +- arch/x86/kernel/alternative.c | 2 +- arch/x86/kernel/amd_nb.c | 5 +- arch/x86/kernel/aperture_64.c | 2 +- arch/x86/kernel/cpu/Makefile | 9 +- arch/x86/kernel/cpu/amd.c | 48 +- arch/x86/kernel/cpu/bugs.c | 34 +- arch/x86/kernel/cpu/common.c | 4 + arch/x86/kernel/cpu/cyrix.c | 5 +- arch/x86/kernel/cpu/intel.c | 34 +- arch/x86/kernel/cpu/mcheck/mce.c | 2 +- arch/x86/kernel/cpu/mcheck/mce_amd.c | 39 +- arch/x86/kernel/cpu/mcheck/mce_intel.c | 25 +- arch/x86/kernel/cpu/mkcapflags.pl | 48 - arch/x86/kernel/cpu/mkcapflags.sh | 41 + arch/x86/kernel/cpu/perf_event.c | 89 +- arch/x86/kernel/cpu/perf_event.h | 56 +- arch/x86/kernel/cpu/perf_event_amd.c | 138 +- arch/x86/kernel/cpu/perf_event_amd_uncore.c | 547 +++ arch/x86/kernel/cpu/perf_event_intel.c | 38 +- arch/x86/kernel/cpu/perf_event_intel_ds.c | 182 +- arch/x86/kernel/cpu/perf_event_intel_uncore.c | 876 ++++- arch/x86/kernel/cpu/perf_event_intel_uncore.h | 64 +- arch/x86/kernel/cpu/perf_event_knc.c | 4 +- arch/x86/kernel/cpu/perf_event_p4.c | 9 +- arch/x86/kernel/cpu/perf_event_p6.c | 2 +- arch/x86/kernel/cpu/proc.c | 6 +- arch/x86/kernel/doublefault_32.c | 2 +- arch/x86/kernel/early_printk.c | 21 +- arch/x86/kernel/head64.c | 6 +- arch/x86/kernel/kprobes/core.c | 6 +- arch/x86/kernel/kvm.c | 8 +- arch/x86/kernel/paravirt.c | 1 - arch/x86/kernel/process.c | 107 +- arch/x86/kernel/quirks.c | 18 +- arch/x86/kernel/rtc.c | 69 +- arch/x86/kernel/setup.c | 3 - arch/x86/kernel/smpboot.c | 2 +- arch/x86/kernel/traps.c | 77 +- arch/x86/kernel/tsc.c | 6 +- arch/x86/kernel/uprobes.c | 29 + arch/x86/kernel/vmlinux.lds.S | 4 - arch/x86/kvm/svm.c | 2 +- arch/x86/kvm/vmx.c | 2 +- arch/x86/lguest/Kconfig | 3 +- arch/x86/lib/checksum_32.S | 2 +- arch/x86/lib/memcpy_32.c | 6 +- arch/x86/lib/memcpy_64.S | 2 +- arch/x86/lib/memmove_64.S | 6 +- arch/x86/mm/amdtopology.c | 3 +- arch/x86/mm/fault.c | 10 +- arch/x86/mm/highmem_32.c | 1 - arch/x86/mm/init.c | 5 +- arch/x86/mm/init_32.c | 10 +- arch/x86/mm/init_64.c | 75 +- arch/x86/mm/ioremap.c | 7 +- arch/x86/mm/numa.c | 9 +- arch/x86/mm/pageattr-test.c | 5 +- arch/x86/mm/pageattr.c | 9 +- arch/x86/platform/efi/efi.c | 24 +- arch/x86/platform/mrst/mrst.c | 3 +- arch/x86/platform/mrst/vrtc.c | 44 +- arch/x86/platform/olpc/olpc-xo1-sci.c | 4 +- arch/x86/platform/uv/uv_time.c | 3 +- arch/x86/power/cpu.c | 13 +- arch/x86/tools/Makefile | 1 + arch/x86/tools/relocs.c | 783 +++-- arch/x86/tools/relocs.h | 36 + arch/x86/tools/relocs_32.c | 17 + arch/x86/tools/relocs_64.c | 17 + arch/x86/tools/relocs_common.c | 76 + arch/x86/xen/Kconfig | 2 +- arch/x86/xen/enlighten.c | 1 - arch/x86/xen/mmu.c | 4 +- arch/x86/xen/smp.c | 2 +- arch/xtensa/kernel/process.c | 14 +- arch/xtensa/mm/init.c | 21 +- block/blk-cgroup.h | 2 - crypto/async_tx/raid6test.c | 9 +- drivers/ata/pata_pdc2027x.c | 2 + drivers/ata/sata_fsl.c | 2 +- drivers/base/base.h | 2 + drivers/base/bus.c | 73 +- drivers/base/core.c | 2 +- drivers/base/cpu.c | 25 +- drivers/base/memory.c | 49 +- drivers/base/node.c | 8 +- drivers/base/regmap/internal.h | 40 +- drivers/base/regmap/regcache-lzo.c | 6 +- drivers/base/regmap/regcache-rbtree.c | 100 +- drivers/base/regmap/regcache.c | 196 +- drivers/base/regmap/regmap-debugfs.c | 94 +- drivers/base/regmap/regmap-irq.c | 3 +- drivers/base/regmap/regmap.c | 92 +- drivers/block/drbd/drbd_receiver.c | 5 +- drivers/clk/Kconfig | 18 + drivers/clk/Makefile | 4 + drivers/clk/clk-axi-clkgen.c | 331 ++ drivers/clk/clk-composite.c | 210 ++ drivers/clk/clk-divider.c | 5 +- drivers/clk/clk-fixed-factor.c | 36 + drivers/clk/clk-mux.c | 50 +- drivers/clk/clk-prima2.c | 2 +- drivers/clk/clk-si5351.c | 1510 +++++++++ drivers/clk/clk-si5351.h | 155 + drivers/clk/clk-vt8500.c | 2 + drivers/clk/clk-zynq.c | 1 + drivers/clk/clk.c | 406 ++- drivers/clk/mvebu/clk-core.c | 8 +- drivers/clk/mvebu/clk-cpu.c | 17 +- drivers/clk/mvebu/clk-cpu.h | 22 - drivers/clk/mvebu/clk.c | 6 +- drivers/clk/mxs/clk.c | 1 + drivers/clk/spear/spear1340_clock.c | 18 +- drivers/clk/sunxi/Makefile | 5 + drivers/clk/sunxi/clk-factors.c | 180 + drivers/clk/sunxi/clk-factors.h | 27 + drivers/clk/sunxi/clk-sunxi.c | 469 +++ drivers/clk/tegra/clk.h | 27 +- drivers/clk/ux500/Makefile | 1 + drivers/clk/ux500/abx500-clk.c | 71 +- drivers/clk/ux500/clk-prcmu.c | 136 +- drivers/clk/ux500/clk-sysctrl.c | 221 ++ drivers/clk/ux500/clk.h | 34 +- drivers/clk/versatile/Makefile | 2 +- drivers/clk/versatile/clk-sp810.c | 188 ++ drivers/clk/versatile/clk-vexpress.c | 49 - drivers/clocksource/Makefile | 1 + drivers/clocksource/bcm_kona_timer.c | 211 ++ drivers/clocksource/sunxi_timer.c | 4 +- drivers/crypto/caam/ctrl.c | 2 +- drivers/edac/amd64_edac.c | 65 +- drivers/edac/amd64_edac.h | 4 +- drivers/edac/i7300_edac.c | 19 +- drivers/edac/sb_edac.c | 53 +- drivers/firmware/memmap.c | 9 +- drivers/gpu/drm/i915/intel_dp.c | 2 +- drivers/gpu/drm/i915/intel_sdvo.c | 2 +- drivers/gpu/drm/radeon/radeon_irq_kms.c | 2 +- drivers/hid/Kconfig | 117 +- drivers/hid/Makefile | 5 +- drivers/hid/hid-apple.c | 5 - drivers/hid/hid-appleir.c | 352 ++ drivers/hid/hid-axff.c | 6 +- drivers/hid/hid-core.c | 63 +- drivers/hid/hid-debug.c | 36 + drivers/hid/hid-dr.c | 8 +- drivers/hid/hid-emsff.c | 6 +- drivers/hid/hid-gaff.c | 10 +- drivers/hid/hid-holtekff.c | 4 +- drivers/hid/hid-icade.c | 2 +- drivers/hid/hid-ids.h | 9 +- drivers/hid/hid-input.c | 77 + drivers/hid/hid-kye.c | 4 +- drivers/hid/hid-lenovo-tpkbd.c | 6 +- drivers/hid/hid-lg2ff.c | 6 +- drivers/hid/hid-lg3ff.c | 6 +- drivers/hid/hid-lg4ff.c | 20 +- drivers/hid/hid-lgff.c | 8 +- drivers/hid/hid-logitech-dj.c | 53 +- drivers/hid/hid-logitech-dj.h | 1 - drivers/hid/hid-magicmouse.c | 1 - drivers/hid/hid-microsoft.c | 2 + drivers/hid/hid-multitouch.c | 273 +- drivers/hid/hid-ntrig.c | 10 +- drivers/hid/hid-picolcd.h | 6 +- drivers/hid/hid-picolcd_backlight.c | 4 +- drivers/hid/hid-picolcd_cir.c | 2 - drivers/hid/hid-picolcd_core.c | 8 +- drivers/hid/hid-picolcd_debugfs.c | 2 - drivers/hid/hid-picolcd_fb.c | 12 +- drivers/hid/hid-picolcd_lcd.c | 4 +- drivers/hid/hid-picolcd_leds.c | 4 +- drivers/hid/hid-pl.c | 6 +- drivers/hid/hid-prodikeys.c | 3 +- drivers/hid/hid-roccat-isku.c | 17 +- drivers/hid/hid-roccat-isku.h | 4 +- drivers/hid/hid-roccat-kone.c | 3 +- drivers/hid/hid-roccat-kone.h | 1 + drivers/hid/hid-roccat-konepure.c | 304 ++ drivers/hid/hid-roccat-konepure.h | 72 + drivers/hid/hid-roccat.c | 2 +- drivers/hid/hid-sensor-hub.c | 12 +- drivers/hid/hid-sjoy.c | 6 +- drivers/hid/hid-speedlink.c | 2 - drivers/hid/hid-steelseries.c | 16 +- drivers/hid/hid-thingm.c | 1 - drivers/hid/hid-tmff.c | 6 +- drivers/hid/hid-wiimote-core.c | 43 +- drivers/hid/hid-zpff.c | 6 +- drivers/hid/i2c-hid/i2c-hid.c | 31 + drivers/hid/usbhid/hid-core.c | 35 +- drivers/hid/usbhid/hid-pidff.c | 80 +- drivers/hid/usbhid/hiddev.c | 8 +- drivers/hid/usbhid/usbhid.h | 3 - drivers/hv/Kconfig | 2 +- drivers/i2c/busses/i2c-puv3.c | 2 +- drivers/infiniband/Kconfig | 1 + drivers/infiniband/Makefile | 1 + drivers/infiniband/hw/amso1100/c2.h | 1 - drivers/infiniband/hw/amso1100/c2_qp.c | 3 +- drivers/infiniband/hw/mlx4/cm.c | 4 +- drivers/infiniband/ulp/isert/Kconfig | 5 + drivers/infiniband/ulp/isert/Makefile | 2 + drivers/infiniband/ulp/isert/ib_isert.c | 2281 +++++++++++++ drivers/infiniband/ulp/isert/ib_isert.h | 138 + drivers/infiniband/ulp/isert/isert_proto.h | 47 + drivers/iommu/dmar.c | 3 +- drivers/irqchip/irq-versatile-fpga.c | 2 +- drivers/isdn/i4l/isdn_tty.c | 1 - drivers/lguest/page_tables.c | 2 +- drivers/media/common/Kconfig | 4 + drivers/media/common/Makefile | 1 + drivers/media/common/b2c2/flexcop-fe-tuner.c | 4 +- .../{usb/dvb-usb-v2 => common}/cypress_firmware.c | 82 +- .../{usb/dvb-usb-v2 => common}/cypress_firmware.h | 9 +- drivers/media/common/saa7146/saa7146_video.c | 4 +- drivers/media/common/siano/Kconfig | 12 + drivers/media/common/siano/Makefile | 5 + drivers/media/common/siano/sms-cards.c | 115 +- drivers/media/common/siano/sms-cards.h | 14 + drivers/media/common/siano/smscoreapi.c | 1298 +++++--- drivers/media/common/siano/smscoreapi.h | 1007 ++++-- drivers/media/common/siano/smsdvb-debugfs.c | 551 ++++ drivers/media/common/siano/smsdvb-main.c | 1230 +++++++ drivers/media/common/siano/smsdvb.c | 1078 ------ drivers/media/common/siano/smsdvb.h | 130 + drivers/media/common/siano/smsendian.c | 44 +- drivers/media/common/siano/smsir.h | 1 - drivers/media/dvb-core/demux.h | 39 - drivers/media/dvb-core/dmxdev.c | 5 +- drivers/media/dvb-core/dvb-usb-ids.h | 3 +- drivers/media/dvb-core/dvb_demux.c | 30 +- drivers/media/dvb-core/dvb_demux.h | 4 +- drivers/media/dvb-core/dvb_frontend.c | 333 +- drivers/media/dvb-core/dvb_frontend.h | 4 +- drivers/media/dvb-core/dvb_net.c | 2 +- drivers/media/dvb-frontends/Kconfig | 2 +- drivers/media/dvb-frontends/a8293.h | 5 +- drivers/media/dvb-frontends/af9013.h | 4 +- drivers/media/dvb-frontends/af9033.c | 138 +- drivers/media/dvb-frontends/af9033.h | 20 +- drivers/media/dvb-frontends/af9033_priv.h | 1506 ++++++++- drivers/media/dvb-frontends/atbm8830.h | 4 +- drivers/media/dvb-frontends/au8522.h | 4 +- drivers/media/dvb-frontends/au8522_decoder.c | 125 +- drivers/media/dvb-frontends/au8522_priv.h | 6 +- drivers/media/dvb-frontends/cx22702.h | 4 +- drivers/media/dvb-frontends/cx24113.h | 5 +- drivers/media/dvb-frontends/cx24116.h | 4 +- drivers/media/dvb-frontends/cx24123.c | 28 +- drivers/media/dvb-frontends/cx24123.h | 4 +- drivers/media/dvb-frontends/cxd2820r.h | 4 +- drivers/media/dvb-frontends/cxd2820r_core.c | 3 +- drivers/media/dvb-frontends/cxd2820r_t2.c | 17 + drivers/media/dvb-frontends/dib0090.c | 434 ++- drivers/media/dvb-frontends/dib3000mc.h | 5 +- drivers/media/dvb-frontends/dib7000m.h | 5 +- drivers/media/dvb-frontends/dib7000p.c | 17 +- drivers/media/dvb-frontends/dib7000p.h | 12 +- drivers/media/dvb-frontends/dib8000.c | 2268 +++++++------ drivers/media/dvb-frontends/dib8000.h | 6 +- drivers/media/dvb-frontends/dibx000_common.h | 3 +- drivers/media/dvb-frontends/drxd.h | 4 +- drivers/media/dvb-frontends/drxk.h | 4 +- drivers/media/dvb-frontends/drxk_hard.c | 309 +- drivers/media/dvb-frontends/drxk_hard.h | 2 + drivers/media/dvb-frontends/drxk_map.h | 3 + drivers/media/dvb-frontends/ds3000.h | 4 +- drivers/media/dvb-frontends/dvb_dummy_fe.h | 4 +- drivers/media/dvb-frontends/ec100.h | 4 +- drivers/media/dvb-frontends/hd29l2.h | 4 +- drivers/media/dvb-frontends/isl6421.c | 28 +- drivers/media/dvb-frontends/isl6421.h | 4 +- drivers/media/dvb-frontends/it913x-fe.h | 4 +- drivers/media/dvb-frontends/ix2505v.h | 4 +- drivers/media/dvb-frontends/lg2160.h | 8 +- drivers/media/dvb-frontends/lgdt3305.h | 4 +- drivers/media/dvb-frontends/lgs8gl5.h | 4 +- drivers/media/dvb-frontends/lgs8gxx.h | 4 +- drivers/media/dvb-frontends/lnbh24.h | 5 +- drivers/media/dvb-frontends/lnbp21.h | 5 +- drivers/media/dvb-frontends/lnbp22.h | 5 +- drivers/media/dvb-frontends/m88rs2000.h | 4 +- drivers/media/dvb-frontends/mb86a20s.c | 505 ++- drivers/media/dvb-frontends/mb86a20s.h | 12 +- drivers/media/dvb-frontends/rtl2830.h | 4 +- drivers/media/dvb-frontends/rtl2832.c | 85 +- drivers/media/dvb-frontends/rtl2832.h | 5 +- drivers/media/dvb-frontends/rtl2832_priv.h | 28 + drivers/media/dvb-frontends/s5h1409.h | 4 +- drivers/media/dvb-frontends/s5h1411.h | 4 +- drivers/media/dvb-frontends/s5h1432.h | 4 +- drivers/media/dvb-frontends/s921.h | 4 +- drivers/media/dvb-frontends/si21xx.h | 4 +- drivers/media/dvb-frontends/stb6000.h | 4 +- drivers/media/dvb-frontends/stv0288.h | 4 +- drivers/media/dvb-frontends/stv0367.h | 4 +- drivers/media/dvb-frontends/stv0900.h | 4 +- drivers/media/dvb-frontends/stv090x.c | 22 +- drivers/media/dvb-frontends/stv6110.h | 4 +- drivers/media/dvb-frontends/tda10048.h | 4 +- drivers/media/dvb-frontends/tda10071.h | 4 +- drivers/media/dvb-frontends/tda18271c2dd.h | 6 +- drivers/media/dvb-frontends/ts2020.h | 4 +- drivers/media/dvb-frontends/zl10036.h | 4 +- drivers/media/dvb-frontends/zl10039.h | 5 +- drivers/media/firewire/firedtv-dvb.c | 14 +- drivers/media/i2c/Kconfig | 70 +- drivers/media/i2c/Makefile | 8 +- drivers/media/i2c/ad9389b.c | 2 +- drivers/media/i2c/adp1653.c | 4 +- drivers/media/i2c/adv7180.c | 4 + drivers/media/i2c/adv7183.c | 2 +- drivers/media/i2c/adv7604.c | 2 +- drivers/media/i2c/ak881x.c | 2 +- drivers/media/i2c/cs5345.c | 2 +- drivers/media/i2c/cx25840/cx25840-core.c | 6 +- drivers/media/i2c/ir-kbd-i2c.c | 14 +- drivers/media/i2c/m52790.c | 2 +- drivers/media/i2c/msp3400-driver.c | 4 +- drivers/media/i2c/mt9m032.c | 48 +- drivers/media/i2c/mt9p031.c | 58 +- drivers/media/i2c/mt9v011.c | 2 +- .../go7007/wis-ov7640.c => media/i2c/ov7640.c} | 70 +- drivers/media/i2c/ov7670.c | 2 +- drivers/media/i2c/s5c73m3/s5c73m3-core.c | 23 +- drivers/media/i2c/saa6588.c | 2 +- drivers/media/i2c/saa7115.c | 80 +- drivers/media/i2c/saa7127.c | 2 +- drivers/media/i2c/saa717x.c | 4 +- drivers/media/i2c/smiapp/smiapp-core.c | 4 +- drivers/media/i2c/soc_camera/Kconfig | 2 - drivers/media/i2c/soc_camera/mt9m001.c | 2 +- drivers/media/i2c/soc_camera/mt9m111.c | 11 +- drivers/media/i2c/soc_camera/mt9t031.c | 2 +- drivers/media/i2c/soc_camera/mt9t112.c | 2 +- drivers/media/i2c/soc_camera/mt9v022.c | 21 +- drivers/media/i2c/soc_camera/ov2640.c | 2 +- drivers/media/i2c/soc_camera/ov5642.c | 2 +- drivers/media/i2c/soc_camera/ov6650.c | 2 +- drivers/media/i2c/soc_camera/ov772x.c | 2 +- drivers/media/i2c/soc_camera/ov9640.c | 2 +- drivers/media/i2c/soc_camera/ov9740.c | 2 +- drivers/media/i2c/soc_camera/rj54n1cb0c.c | 2 +- drivers/media/i2c/soc_camera/tw9910.c | 2 +- drivers/media/i2c/sony-btf-mpx.c | 399 +++ drivers/media/i2c/tda7432.c | 276 +- drivers/media/i2c/tda9840.c | 2 +- drivers/media/i2c/ths7303.c | 351 +- drivers/media/i2c/tvaudio.c | 6 +- drivers/media/i2c/tvp514x.c | 163 +- drivers/media/i2c/tvp5150.c | 2 +- drivers/media/i2c/tvp7002.c | 184 +- drivers/media/i2c/tw2804.c | 453 +++ drivers/media/i2c/tw9903.c | 279 ++ drivers/media/i2c/tw9906.c | 247 ++ .../go7007/wis-uda1342.c => media/i2c/uda1342.c} | 83 +- drivers/media/i2c/upd64031a.c | 4 +- drivers/media/i2c/upd64083.c | 2 +- drivers/media/i2c/vp27smpx.c | 2 +- drivers/media/i2c/vs6624.c | 2 +- drivers/media/i2c/wm8775.c | 2 +- drivers/media/media-device.c | 111 +- drivers/media/media-devnode.c | 31 +- drivers/media/mmc/siano/smssdio.c | 27 +- drivers/media/parport/pms.c | 4 +- drivers/media/pci/bt8xx/bttv-cards.c | 21 +- drivers/media/pci/bt8xx/bttv-driver.c | 1226 +++---- drivers/media/pci/bt8xx/bttv-i2c.c | 8 + drivers/media/pci/bt8xx/bttv-input.c | 30 +- drivers/media/pci/bt8xx/bttv.h | 3 + drivers/media/pci/bt8xx/bttvp.h | 38 +- drivers/media/pci/cx18/cx18-av-core.c | 6 +- drivers/media/pci/cx18/cx18-driver.c | 2 +- drivers/media/pci/cx18/cx18-ioctl.c | 52 +- drivers/media/pci/cx18/cx18-ioctl.h | 4 +- drivers/media/pci/cx23885/altera-ci.h | 5 +- drivers/media/pci/cx23885/cx23885-417.c | 10 +- drivers/media/pci/cx23885/cx23885-ioctl.c | 9 +- drivers/media/pci/cx23885/cx23885-ioctl.h | 2 +- drivers/media/pci/cx23885/cx23885-video.c | 14 +- drivers/media/pci/cx23885/cx23885.h | 2 +- drivers/media/pci/cx23885/cx23888-ir.c | 2 +- drivers/media/pci/cx25821/Kconfig | 7 +- drivers/media/pci/cx25821/Makefile | 7 +- drivers/media/pci/cx25821/cx25821-alsa.c | 83 +- drivers/media/pci/cx25821/cx25821-audio-upstream.c | 43 +- drivers/media/pci/cx25821/cx25821-cards.c | 23 - drivers/media/pci/cx25821/cx25821-core.c | 133 +- drivers/media/pci/cx25821/cx25821-gpio.c | 1 + drivers/media/pci/cx25821/cx25821-i2c.c | 3 +- drivers/media/pci/cx25821/cx25821-medusa-video.c | 46 +- .../media/pci/cx25821/cx25821-video-upstream-ch2.c | 800 ----- .../media/pci/cx25821/cx25821-video-upstream-ch2.h | 138 - drivers/media/pci/cx25821/cx25821-video-upstream.c | 519 +-- drivers/media/pci/cx25821/cx25821-video.c | 1842 +++-------- drivers/media/pci/cx25821/cx25821-video.h | 125 +- drivers/media/pci/cx25821/cx25821.h | 304 +- drivers/media/pci/cx88/cx88-blackbird.c | 8 +- drivers/media/pci/cx88/cx88-cards.c | 30 +- drivers/media/pci/cx88/cx88-core.c | 12 +- drivers/media/pci/cx88/cx88-dvb.c | 16 +- drivers/media/pci/cx88/cx88-mpeg.c | 10 +- drivers/media/pci/cx88/cx88-video.c | 35 +- drivers/media/pci/cx88/cx88.h | 5 +- drivers/media/pci/ivtv/ivtv-driver.c | 4 +- drivers/media/pci/ivtv/ivtv-firmware.c | 4 +- drivers/media/pci/ivtv/ivtv-gpio.c | 2 +- drivers/media/pci/ivtv/ivtv-ioctl.c | 57 +- drivers/media/pci/ivtv/ivtv-ioctl.h | 6 +- drivers/media/pci/ivtv/ivtvfb.c | 3 +- drivers/media/pci/meye/meye.c | 2 +- drivers/media/pci/saa7134/saa7134-cards.c | 94 +- drivers/media/pci/saa7134/saa7134-core.c | 3 +- drivers/media/pci/saa7134/saa7134-dvb.c | 31 +- drivers/media/pci/saa7134/saa7134-empress.c | 2 +- drivers/media/pci/saa7134/saa7134-i2c.c | 1 + drivers/media/pci/saa7134/saa7134-input.c | 3 + drivers/media/pci/saa7134/saa7134-tvaudio.c | 1 + drivers/media/pci/saa7134/saa7134-video.c | 189 +- drivers/media/pci/saa7134/saa7134.h | 11 +- drivers/media/pci/saa7146/mxb.c | 9 +- drivers/media/pci/saa7164/saa7164-core.c | 2 +- drivers/media/pci/saa7164/saa7164-encoder.c | 14 +- drivers/media/pci/saa7164/saa7164-vbi.c | 12 +- drivers/media/pci/sta2x11/Kconfig | 1 + drivers/media/pci/sta2x11/sta2x11_vip.c | 18 +- drivers/media/pci/ttpci/av7110.c | 6 +- drivers/media/pci/ttpci/av7110_v4l.c | 4 +- drivers/media/pci/ttpci/budget.c | 12 + drivers/media/pci/zoran/zoran_driver.c | 4 +- drivers/media/pci/zoran/zoran_procfs.c | 2 +- drivers/media/platform/Kconfig | 3 +- drivers/media/platform/Makefile | 2 +- drivers/media/platform/blackfin/bfin_capture.c | 13 +- drivers/media/platform/coda.c | 50 +- drivers/media/platform/davinci/Kconfig | 103 +- drivers/media/platform/davinci/Makefile | 17 +- drivers/media/platform/davinci/dm355_ccdc.c | 49 +- drivers/media/platform/davinci/dm355_ccdc_regs.h | 2 +- drivers/media/platform/davinci/dm644x_ccdc.c | 57 +- drivers/media/platform/davinci/dm644x_ccdc_regs.h | 2 +- drivers/media/platform/davinci/isif.c | 30 +- drivers/media/platform/davinci/isif_regs.h | 4 +- drivers/media/platform/davinci/vpbe.c | 16 +- drivers/media/platform/davinci/vpbe_display.c | 17 +- drivers/media/platform/davinci/vpbe_osd.c | 3 + drivers/media/platform/davinci/vpbe_venc.c | 36 +- drivers/media/platform/davinci/vpfe_capture.c | 62 +- drivers/media/platform/davinci/vpif.c | 32 +- drivers/media/platform/davinci/vpif.h | 2 +- drivers/media/platform/davinci/vpif_capture.c | 12 +- drivers/media/platform/davinci/vpif_display.c | 16 +- drivers/media/platform/davinci/vpss.c | 36 +- drivers/media/platform/exynos-gsc/gsc-m2m.c | 5 + drivers/media/platform/exynos-gsc/gsc-regs.c | 1 - .../platform/{s5p-fimc => exynos4-is}/Kconfig | 21 +- .../platform/{s5p-fimc => exynos4-is}/Makefile | 5 +- .../{s5p-fimc => exynos4-is}/fimc-capture.c | 411 ++- .../platform/{s5p-fimc => exynos4-is}/fimc-core.c | 312 +- .../platform/{s5p-fimc => exynos4-is}/fimc-core.h | 86 +- .../media/platform/exynos4-is/fimc-is-command.h | 137 + drivers/media/platform/exynos4-is/fimc-is-errno.c | 272 ++ drivers/media/platform/exynos4-is/fimc-is-errno.h | 248 ++ drivers/media/platform/exynos4-is/fimc-is-i2c.c | 126 + drivers/media/platform/exynos4-is/fimc-is-i2c.h | 15 + drivers/media/platform/exynos4-is/fimc-is-param.c | 900 +++++ drivers/media/platform/exynos4-is/fimc-is-param.h | 1020 ++++++ drivers/media/platform/exynos4-is/fimc-is-regs.c | 243 ++ drivers/media/platform/exynos4-is/fimc-is-regs.h | 164 + drivers/media/platform/exynos4-is/fimc-is-sensor.c | 305 ++ drivers/media/platform/exynos4-is/fimc-is-sensor.h | 89 + drivers/media/platform/exynos4-is/fimc-is.c | 1007 ++++++ drivers/media/platform/exynos4-is/fimc-is.h | 345 ++ drivers/media/platform/exynos4-is/fimc-isp.c | 703 ++++ drivers/media/platform/exynos4-is/fimc-isp.h | 181 + .../{s5p-fimc => exynos4-is}/fimc-lite-reg.c | 4 +- .../{s5p-fimc => exynos4-is}/fimc-lite-reg.h | 8 +- .../platform/{s5p-fimc => exynos4-is}/fimc-lite.c | 429 ++- .../platform/{s5p-fimc => exynos4-is}/fimc-lite.h | 20 +- .../platform/{s5p-fimc => exynos4-is}/fimc-m2m.c | 40 +- .../platform/{s5p-fimc => exynos4-is}/fimc-reg.c | 87 +- .../platform/{s5p-fimc => exynos4-is}/fimc-reg.h | 27 +- .../fimc-mdevice.c => exynos4-is/media-dev.c} | 725 +++- .../fimc-mdevice.h => exynos4-is/media-dev.h} | 54 +- .../platform/{s5p-fimc => exynos4-is}/mipi-csis.c | 169 +- .../platform/{s5p-fimc => exynos4-is}/mipi-csis.h | 1 + drivers/media/platform/fsl-viu.c | 6 +- drivers/media/platform/m2m-deinterlace.c | 5 + drivers/media/platform/marvell-ccic/mcam-core.c | 4 +- drivers/media/platform/mem2mem_testdev.c | 12 +- drivers/media/platform/mx2_emmaprp.c | 5 + drivers/media/platform/omap/omap_vout.c | 14 +- drivers/media/platform/s3c-camif/camif-capture.c | 16 +- drivers/media/platform/s5p-g2d/g2d.c | 36 +- drivers/media/platform/s5p-jpeg/jpeg-core.c | 5 + drivers/media/platform/s5p-mfc/s5p_mfc.c | 19 +- drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c | 12 +- drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c | 12 +- drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 76 +- drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 112 +- drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 124 +- drivers/media/platform/s5p-tv/hdmi_drv.c | 129 +- drivers/media/platform/s5p-tv/hdmiphy_drv.c | 55 +- drivers/media/platform/s5p-tv/mixer_video.c | 52 +- drivers/media/platform/s5p-tv/sii9234_drv.c | 3 - drivers/media/platform/sh_veu.c | 20 +- drivers/media/platform/sh_vou.c | 27 +- drivers/media/platform/soc_camera/atmel-isi.c | 16 +- drivers/media/platform/soc_camera/mx1_camera.c | 17 +- drivers/media/platform/soc_camera/mx2_camera.c | 8 +- drivers/media/platform/soc_camera/mx3_camera.c | 3 +- drivers/media/platform/soc_camera/omap1_camera.c | 6 +- drivers/media/platform/soc_camera/pxa_camera.c | 12 +- .../platform/soc_camera/sh_mobile_ceu_camera.c | 12 +- drivers/media/platform/soc_camera/sh_mobile_csi2.c | 9 +- drivers/media/platform/soc_camera/soc_camera.c | 48 +- .../platform/soc_camera/soc_camera_platform.c | 2 +- drivers/media/platform/soc_camera/soc_mediabus.c | 46 +- drivers/media/platform/timblogiw.c | 8 +- drivers/media/platform/via-camera.c | 2 +- drivers/media/platform/vino.c | 10 +- drivers/media/platform/vivi.c | 10 + drivers/media/radio/Kconfig | 16 + drivers/media/radio/Makefile | 1 + drivers/media/radio/dsbr100.c | 4 +- drivers/media/radio/radio-cadet.c | 48 +- drivers/media/radio/radio-isa.c | 15 +- drivers/media/radio/radio-keene.c | 8 +- drivers/media/radio/radio-ma901.c | 4 +- drivers/media/radio/radio-miropcm20.c | 12 +- drivers/media/radio/radio-mr800.c | 14 +- drivers/media/radio/radio-rtrack2.c | 5 +- drivers/media/radio/radio-sf16fmi.c | 4 +- drivers/media/radio/radio-shark.c | 2 +- drivers/media/radio/radio-shark2.c | 2 +- drivers/media/radio/radio-si4713.c | 204 +- drivers/media/radio/radio-si476x.c | 1599 +++++++++ drivers/media/radio/radio-tea5764.c | 4 +- drivers/media/radio/radio-tea5777.c | 9 +- drivers/media/radio/radio-timb.c | 4 +- drivers/media/radio/radio-wl1273.c | 4 +- drivers/media/radio/si470x/radio-si470x-common.c | 4 +- drivers/media/radio/si4713-i2c.c | 1049 ++---- drivers/media/radio/si4713-i2c.h | 66 +- drivers/media/radio/tef6862.c | 4 +- drivers/media/radio/wl128x/fmdrv_v4l2.c | 8 +- drivers/media/rc/ene_ir.c | 1 + drivers/media/rc/imon.c | 46 +- drivers/media/rc/ir-jvc-decoder.c | 2 +- drivers/media/rc/ir-lirc-codec.c | 2 +- drivers/media/rc/ir-mce_kbd-decoder.c | 2 +- drivers/media/rc/ir-nec-decoder.c | 2 +- drivers/media/rc/ir-raw.c | 2 +- drivers/media/rc/ir-rc5-decoder.c | 6 +- drivers/media/rc/ir-rc5-sz-decoder.c | 2 +- drivers/media/rc/ir-rc6-decoder.c | 2 +- drivers/media/rc/ir-rx51.c | 4 +- drivers/media/rc/ir-sanyo-decoder.c | 2 +- drivers/media/rc/ir-sony-decoder.c | 8 +- drivers/media/rc/ite-cir.c | 1 + drivers/media/rc/keymaps/Makefile | 3 +- drivers/media/rc/keymaps/rc-reddo.c | 86 + drivers/media/rc/mceusb.c | 11 +- drivers/media/rc/nuvoton-cir.c | 1 + drivers/media/rc/rc-core-priv.h | 1 - drivers/media/rc/rc-main.c | 46 +- drivers/media/rc/redrat3.c | 457 +-- drivers/media/rc/ttusbir.c | 1 + drivers/media/rc/winbond-cir.c | 1 + drivers/media/tuners/Kconfig | 14 + drivers/media/tuners/Makefile | 2 + drivers/media/tuners/e4000.h | 4 +- drivers/media/tuners/fc0011.h | 4 +- drivers/media/tuners/fc0012.h | 4 +- drivers/media/tuners/fc0013.h | 4 +- drivers/media/tuners/fc2580.h | 4 +- drivers/media/tuners/max2165.h | 5 +- drivers/media/tuners/mc44s803.h | 5 +- drivers/media/tuners/mxl5005s.h | 5 +- drivers/media/tuners/r820t.c | 2355 +++++++++++++ drivers/media/tuners/r820t.h | 59 + drivers/media/tuners/tda18212.h | 4 +- drivers/media/tuners/tda18218.h | 4 +- drivers/media/tuners/tda18271-fe.c | 9 +- drivers/media/tuners/tda827x.c | 10 +- drivers/media/tuners/tda827x.h | 3 +- drivers/media/tuners/tda8290.c | 75 +- drivers/media/tuners/tda8290.h | 12 +- drivers/media/tuners/tda9887.c | 14 +- drivers/media/tuners/tua9001.h | 4 +- drivers/media/tuners/tuner-simple.c | 5 +- drivers/media/tuners/tuner-types.c | 69 + drivers/media/tuners/tuner-xc2028.c | 3 +- drivers/media/tuners/tuner_it913x.c | 447 +++ drivers/media/tuners/tuner_it913x.h | 45 + drivers/media/tuners/tuner_it913x_priv.h | 78 + drivers/media/tuners/xc5000.c | 20 +- drivers/media/tuners/xc5000.h | 4 +- drivers/media/usb/au0828/au0828-core.c | 61 +- drivers/media/usb/au0828/au0828-video.c | 299 +- drivers/media/usb/au0828/au0828.h | 7 + drivers/media/usb/cx231xx/cx231xx-417.c | 1182 +++---- drivers/media/usb/cx231xx/cx231xx-audio.c | 8 +- drivers/media/usb/cx231xx/cx231xx-avcore.c | 85 +- drivers/media/usb/cx231xx/cx231xx-cards.c | 59 +- drivers/media/usb/cx231xx/cx231xx-core.c | 2 +- drivers/media/usb/cx231xx/cx231xx-dvb.c | 4 +- drivers/media/usb/cx231xx/cx231xx-pcb-cfg.c | 2 +- drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h | 5 - drivers/media/usb/cx231xx/cx231xx-vbi.c | 25 +- drivers/media/usb/cx231xx/cx231xx-video.c | 601 +--- drivers/media/usb/cx231xx/cx231xx.h | 55 +- drivers/media/usb/dvb-usb-v2/Kconfig | 8 +- drivers/media/usb/dvb-usb-v2/Makefile | 5 +- drivers/media/usb/dvb-usb-v2/af9015.c | 79 +- drivers/media/usb/dvb-usb-v2/af9015.h | 2 + drivers/media/usb/dvb-usb-v2/af9035.c | 600 ++-- drivers/media/usb/dvb-usb-v2/af9035.h | 49 +- drivers/media/usb/dvb-usb-v2/anysee.c | 48 +- drivers/media/usb/dvb-usb-v2/anysee.h | 3 +- drivers/media/usb/dvb-usb-v2/az6007.c | 2 +- drivers/media/usb/dvb-usb-v2/dvb_usb.h | 9 +- drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 311 +- drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c | 43 +- drivers/media/usb/dvb-usb-v2/it913x.c | 1 + drivers/media/usb/dvb-usb-v2/lmedm04.c | 8 +- drivers/media/usb/dvb-usb-v2/mxl111sf-demod.h | 4 +- drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h | 5 +- drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 36 + drivers/media/usb/dvb-usb-v2/rtl28xxu.h | 1 + drivers/media/usb/dvb-usb-v2/usb_urb.c | 36 +- drivers/media/usb/dvb-usb/cinergyT2-fe.c | 3 +- drivers/media/usb/dvb-usb/dib0700_devices.c | 465 ++- drivers/media/usb/dvb-usb/dibusb-common.c | 5 +- drivers/media/usb/dvb-usb/dw2102.c | 19 +- drivers/media/usb/dvb-usb/m920x.c | 10 +- drivers/media/usb/dvb-usb/opera1.c | 2 +- drivers/media/usb/em28xx/Kconfig | 1 + drivers/media/usb/em28xx/Makefile | 2 +- drivers/media/usb/em28xx/em28xx-camera.c | 434 +++ drivers/media/usb/em28xx/em28xx-cards.c | 366 +-- drivers/media/usb/em28xx/em28xx-core.c | 45 +- drivers/media/usb/em28xx/em28xx-dvb.c | 125 +- drivers/media/usb/em28xx/em28xx-i2c.c | 691 ++-- drivers/media/usb/em28xx/em28xx-input.c | 5 +- drivers/media/usb/em28xx/em28xx-reg.h | 35 +- drivers/media/usb/em28xx/em28xx-video.c | 415 ++- drivers/media/usb/em28xx/em28xx.h | 231 +- drivers/media/usb/gspca/autogain_functions.h | 183 -- drivers/media/usb/gspca/benq.c | 2 +- drivers/media/usb/gspca/conex.c | 12 +- drivers/media/usb/gspca/cpia1.c | 33 +- drivers/media/usb/gspca/etoms.c | 12 +- drivers/media/usb/gspca/gl860/gl860.c | 224 +- drivers/media/usb/gspca/gspca.c | 240 +- drivers/media/usb/gspca/gspca.h | 70 +- drivers/media/usb/gspca/jeilinj.c | 2 +- drivers/media/usb/gspca/konica.c | 28 +- drivers/media/usb/gspca/m5602/m5602_bridge.h | 27 +- drivers/media/usb/gspca/m5602/m5602_core.c | 22 +- drivers/media/usb/gspca/m5602/m5602_mt9m111.c | 404 +-- drivers/media/usb/gspca/m5602/m5602_mt9m111.h | 2 + drivers/media/usb/gspca/m5602/m5602_ov7660.c | 312 +- drivers/media/usb/gspca/m5602/m5602_ov7660.h | 3 + drivers/media/usb/gspca/m5602/m5602_ov9650.c | 469 +-- drivers/media/usb/gspca/m5602/m5602_ov9650.h | 2 + drivers/media/usb/gspca/m5602/m5602_po1030.c | 471 +-- drivers/media/usb/gspca/m5602/m5602_po1030.h | 2 + drivers/media/usb/gspca/m5602/m5602_s5k4aa.c | 352 +- drivers/media/usb/gspca/m5602/m5602_s5k4aa.h | 2 + drivers/media/usb/gspca/m5602/m5602_s5k83a.c | 291 +- drivers/media/usb/gspca/m5602/m5602_s5k83a.h | 9 +- drivers/media/usb/gspca/m5602/m5602_sensor.h | 3 + drivers/media/usb/gspca/mr97310a.c | 8 +- drivers/media/usb/gspca/ov519.c | 81 +- drivers/media/usb/gspca/ov534.c | 2 +- drivers/media/usb/gspca/pac207.c | 2 +- drivers/media/usb/gspca/pac7302.c | 9 +- drivers/media/usb/gspca/pac7311.c | 5 +- drivers/media/usb/gspca/pac_common.h | 2 +- drivers/media/usb/gspca/sn9c2028.c | 4 +- drivers/media/usb/gspca/sn9c20x.c | 2 +- drivers/media/usb/gspca/sonixb.c | 22 - drivers/media/usb/gspca/sonixj.c | 556 +--- drivers/media/usb/gspca/spca1528.c | 4 +- drivers/media/usb/gspca/spca500.c | 36 +- drivers/media/usb/gspca/spca501.c | 44 +- drivers/media/usb/gspca/spca505.c | 42 +- drivers/media/usb/gspca/spca508.c | 41 +- drivers/media/usb/gspca/spca561.c | 70 +- drivers/media/usb/gspca/sq905.c | 2 +- drivers/media/usb/gspca/sq905c.c | 6 +- drivers/media/usb/gspca/sq930x.c | 4 +- drivers/media/usb/gspca/stv0680.c | 14 +- drivers/media/usb/gspca/stv06xx/stv06xx.c | 17 +- drivers/media/usb/gspca/stv06xx/stv06xx_hdcs.c | 8 +- drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.c | 14 +- drivers/media/usb/gspca/stv06xx/stv06xx_st6422.c | 2 + drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c | 10 +- drivers/media/usb/gspca/sunplus.c | 27 +- drivers/media/usb/gspca/vc032x.c | 9 +- drivers/media/usb/gspca/w996Xcf.c | 5 +- drivers/media/usb/gspca/zc3xx.c | 3 +- drivers/media/usb/hdpvr/hdpvr-core.c | 15 +- drivers/media/usb/hdpvr/hdpvr-video.c | 945 +++--- drivers/media/usb/hdpvr/hdpvr.h | 19 +- drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 2 +- drivers/media/usb/pvrusb2/pvrusb2-hdw.h | 2 +- drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 10 +- drivers/media/usb/pwc/pwc-if.c | 1 + drivers/media/usb/s2255/s2255drv.c | 441 ++- drivers/media/usb/siano/smsusb.c | 158 +- drivers/media/usb/stk1160/stk1160-v4l.c | 14 +- drivers/media/usb/stkwebcam/stk-webcam.c | 309 +- drivers/media/usb/stkwebcam/stk-webcam.h | 8 +- drivers/media/usb/tlg2300/pd-common.h | 26 +- drivers/media/usb/tlg2300/pd-main.c | 16 +- drivers/media/usb/tlg2300/pd-radio.c | 229 +- drivers/media/usb/tlg2300/pd-video.c | 303 +- drivers/media/usb/tm6000/tm6000-video.c | 16 +- drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 10 +- drivers/media/usb/ttusb-dec/ttusb_dec.c | 20 +- drivers/media/usb/usbvision/usbvision-video.c | 10 +- drivers/media/usb/uvc/uvc_ctrl.c | 2 +- drivers/media/usb/uvc/uvc_queue.c | 1 + drivers/media/v4l2-core/Kconfig | 1 + drivers/media/v4l2-core/Makefile | 3 + drivers/media/v4l2-core/tuner-core.c | 72 +- drivers/media/v4l2-core/v4l2-common.c | 54 +- drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 4 - drivers/media/v4l2-core/v4l2-ctrls.c | 25 +- drivers/media/v4l2-core/v4l2-dev.c | 9 +- drivers/media/v4l2-core/v4l2-ioctl.c | 219 +- drivers/media/v4l2-core/v4l2-mem2mem.c | 34 +- drivers/media/v4l2-core/v4l2-of.c | 266 ++ drivers/media/v4l2-core/videobuf-dma-contig.c | 130 +- drivers/media/v4l2-core/videobuf2-core.c | 32 +- drivers/media/v4l2-core/videobuf2-dma-contig.c | 8 +- drivers/media/v4l2-core/videobuf2-dma-sg.c | 25 +- drivers/media/v4l2-core/videobuf2-vmalloc.c | 4 +- drivers/mfd/ab3100-core.c | 1 + drivers/misc/Kconfig | 11 +- drivers/misc/Makefile | 1 + drivers/misc/mei/amthif.c | 6 +- drivers/misc/mei/client.c | 24 +- drivers/misc/mei/hbm.c | 9 +- drivers/misc/mei/hw-me.c | 8 +- drivers/misc/mei/interrupt.c | 4 +- drivers/misc/mei/pci-me.c | 1 + drivers/misc/mei/wd.c | 1 + drivers/misc/sram.c | 121 + drivers/mmc/core/core.c | 4 +- drivers/net/ethernet/atheros/atl1c/atl1c_hw.c | 2 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 4 +- drivers/net/ethernet/sfc/Kconfig | 2 +- drivers/net/ethernet/smsc/Kconfig | 4 +- drivers/net/ethernet/ti/cpts.c | 2 +- drivers/of/base.c | 1 + drivers/power/pm2301_charger.c | 2 +- drivers/regulator/88pm8607.c | 36 +- drivers/regulator/Makefile | 2 +- drivers/regulator/ab3100.c | 236 +- drivers/regulator/ab8500-ext.c | 407 +++ drivers/regulator/ab8500.c | 2786 ++++++++++++++-- drivers/regulator/arizona-ldo1.c | 2 +- drivers/regulator/as3711-regulator.c | 67 +- drivers/regulator/core.c | 220 +- drivers/regulator/dbx500-prcmu.h | 2 - drivers/regulator/fan53555.c | 4 +- drivers/regulator/lp3971.c | 2 + drivers/regulator/lp3972.c | 2 + drivers/regulator/lp872x.c | 3 + drivers/regulator/lp8788-buck.c | 2 + drivers/regulator/lp8788-ldo.c | 157 +- drivers/regulator/max1586.c | 5 +- drivers/regulator/max77686.c | 32 +- drivers/regulator/max8649.c | 45 +- drivers/regulator/max8660.c | 3 +- drivers/regulator/max8925-regulator.c | 5 +- drivers/regulator/max8952.c | 75 +- drivers/regulator/max8973-regulator.c | 10 +- drivers/regulator/max8997.c | 4 +- drivers/regulator/max8998.c | 9 +- drivers/regulator/mc13783-regulator.c | 44 +- drivers/regulator/mc13892-regulator.c | 46 +- drivers/regulator/mc13xxx-regulator-core.c | 17 +- drivers/regulator/mc13xxx.h | 4 +- drivers/regulator/palmas-regulator.c | 365 +- drivers/regulator/rc5t583-regulator.c | 6 - drivers/regulator/s5m8767.c | 8 +- drivers/regulator/tps62360-regulator.c | 2 +- drivers/regulator/tps65023-regulator.c | 48 +- drivers/regulator/tps6507x-regulator.c | 1 + drivers/regulator/tps6524x-regulator.c | 4 +- drivers/regulator/tps6586x-regulator.c | 7 +- drivers/regulator/tps65910-regulator.c | 4 + drivers/regulator/tps80031-regulator.c | 45 +- drivers/regulator/twl-regulator.c | 34 +- drivers/regulator/wm8994-regulator.c | 61 +- drivers/remoteproc/remoteproc_core.c | 2 +- drivers/rpmsg/virtio_rpmsg_bus.c | 4 +- drivers/rtc/Kconfig | 4 +- drivers/rtc/class.c | 70 + drivers/rtc/rtc-88pm80x.c | 5 +- drivers/rtc/rtc-88pm860x.c | 29 +- drivers/rtc/rtc-ab3100.c | 21 +- drivers/rtc/rtc-ab8500.c | 18 +- drivers/rtc/rtc-at32ap700x.c | 39 +- drivers/rtc/rtc-at91rm9200.c | 50 +- drivers/rtc/rtc-at91sam9.c | 57 +- drivers/rtc/rtc-au1xxx.c | 18 +- drivers/rtc/rtc-bfin.c | 34 +- drivers/rtc/rtc-bq32k.c | 5 +- drivers/rtc/rtc-bq4802.c | 29 +- drivers/rtc/rtc-cmos.c | 4 +- drivers/rtc/rtc-coh901331.c | 42 +- drivers/rtc/rtc-da9052.c | 5 +- drivers/rtc/rtc-da9055.c | 5 +- drivers/rtc/rtc-davinci.c | 24 +- drivers/rtc/rtc-dm355evm.c | 7 +- drivers/rtc/rtc-ds1216.c | 44 +- drivers/rtc/rtc-ds1286.c | 49 +- drivers/rtc/rtc-ds1302.c | 22 +- drivers/rtc/rtc-ds1305.c | 35 +- drivers/rtc/rtc-ds1307.c | 74 +- drivers/rtc/rtc-ds1374.c | 35 +- drivers/rtc/rtc-ds1390.c | 15 +- drivers/rtc/rtc-ds1511.c | 8 +- drivers/rtc/rtc-ds1553.c | 6 +- drivers/rtc/rtc-ds1672.c | 8 +- drivers/rtc/rtc-ds1742.c | 8 +- drivers/rtc/rtc-ds2404.c | 12 +- drivers/rtc/rtc-ds3232.c | 25 +- drivers/rtc/rtc-ds3234.c | 9 +- drivers/rtc/rtc-efi.c | 19 +- drivers/rtc/rtc-em3027.c | 7 +- drivers/rtc/rtc-ep93xx.c | 11 +- drivers/rtc/rtc-fm3130.c | 11 +- drivers/rtc/rtc-generic.c | 21 +- drivers/rtc/rtc-hid-sensor-time.c | 7 +- drivers/rtc/rtc-imxdi.c | 23 +- drivers/rtc/rtc-isl12022.c | 30 +- drivers/rtc/rtc-lp8788.c | 5 +- drivers/rtc/rtc-lpc32xx.c | 5 +- drivers/rtc/rtc-ls1x.c | 5 +- drivers/rtc/rtc-m41t80.c | 16 +- drivers/rtc/rtc-m41t93.c | 11 +- drivers/rtc/rtc-m41t94.c | 11 +- drivers/rtc/rtc-m48t35.c | 42 +- drivers/rtc/rtc-m48t86.c | 11 +- drivers/rtc/rtc-max6900.c | 9 +- drivers/rtc/rtc-max6902.c | 29 +- drivers/rtc/rtc-max77686.c | 73 +- drivers/rtc/rtc-max8907.c | 20 +- drivers/rtc/rtc-max8925.c | 26 +- drivers/rtc/rtc-max8997.c | 19 +- drivers/rtc/rtc-max8998.c | 18 +- drivers/rtc/rtc-mc13xxx.c | 23 +- drivers/rtc/rtc-msm6242.c | 45 +- drivers/rtc/rtc-mv.c | 23 +- drivers/rtc/rtc-mxc.c | 15 +- drivers/rtc/rtc-nuc900.c | 72 +- drivers/rtc/rtc-omap.c | 81 +- drivers/rtc/rtc-palmas.c | 19 +- drivers/rtc/rtc-pcap.c | 53 +- drivers/rtc/rtc-pcf2123.c | 12 +- drivers/rtc/rtc-pcf50633.c | 15 +- drivers/rtc/rtc-pcf8523.c | 6 +- drivers/rtc/rtc-pcf8563.c | 28 +- drivers/rtc/rtc-pcf8583.c | 24 +- drivers/rtc/rtc-ps3.c | 16 +- drivers/rtc/rtc-puv3.c | 27 +- drivers/rtc/rtc-pxa.c | 24 +- drivers/rtc/rtc-r9701.c | 9 +- drivers/rtc/rtc-rc5t583.c | 19 +- drivers/rtc/rtc-rp5c01.c | 39 +- drivers/rtc/rtc-rs5c313.c | 6 +- drivers/rtc/rtc-rs5c348.c | 12 +- drivers/rtc/rtc-rs5c372.c | 30 +- drivers/rtc/rtc-rv3029c2.c | 16 +- drivers/rtc/rtc-rx4581.c | 9 +- drivers/rtc/rtc-rx8581.c | 8 +- drivers/rtc/rtc-s35390a.c | 14 +- drivers/rtc/rtc-s3c.c | 37 +- drivers/rtc/rtc-sa1100.c | 29 +- drivers/rtc/rtc-sh.c | 22 +- drivers/rtc/rtc-snvs.c | 6 +- drivers/rtc/rtc-spear.c | 23 +- drivers/rtc/rtc-starfire.c | 23 +- drivers/rtc/rtc-stk17ta8.c | 6 +- drivers/rtc/rtc-stmp3xxx.c | 51 +- drivers/rtc/rtc-sun4v.c | 22 +- drivers/rtc/rtc-tegra.c | 64 +- drivers/rtc/rtc-test.c | 10 +- drivers/rtc/rtc-tile.c | 9 +- drivers/rtc/rtc-tps6586x.c | 14 +- drivers/rtc/rtc-tps65910.c | 13 +- drivers/rtc/rtc-tps80031.c | 11 +- drivers/rtc/rtc-twl.c | 16 +- drivers/rtc/rtc-tx4939.c | 19 +- drivers/rtc/rtc-v3020.c | 13 +- drivers/rtc/rtc-vt8500.c | 8 +- drivers/rtc/rtc-wm831x.c | 6 +- drivers/rtc/rtc-wm8350.c | 19 +- drivers/rtc/rtc-x1205.c | 14 +- drivers/scsi/aacraid/aacraid.h | 6 +- drivers/scsi/aacraid/comminit.c | 2 +- drivers/scsi/aacraid/src.c | 26 +- drivers/scsi/be2iscsi/be_iscsi.c | 2 +- drivers/scsi/be2iscsi/be_mgmt.c | 2 +- drivers/scsi/bnx2i/bnx2i.h | 12 +- drivers/scsi/csiostor/csio_hw.c | 5 - drivers/scsi/csiostor/csio_mb.c | 12 +- drivers/scsi/device_handler/scsi_dh_alua.c | 17 +- drivers/scsi/fcoe/fcoe_ctlr.c | 4 +- drivers/scsi/isci/init.c | 6 +- drivers/scsi/iscsi_tcp.c | 18 +- drivers/scsi/libiscsi.c | 4 +- drivers/scsi/lpfc/lpfc_attr.c | 12 +- drivers/scsi/lpfc/lpfc_bsg.c | 1109 ++++--- drivers/scsi/lpfc/lpfc_crtn.h | 1 + drivers/scsi/lpfc/lpfc_els.c | 21 +- drivers/scsi/lpfc/lpfc_hbadisc.c | 74 +- drivers/scsi/lpfc/lpfc_hw4.h | 3 + drivers/scsi/lpfc/lpfc_init.c | 106 +- drivers/scsi/lpfc/lpfc_mbox.c | 24 +- drivers/scsi/lpfc/lpfc_nportdisc.c | 1 - drivers/scsi/lpfc/lpfc_scsi.c | 8 +- drivers/scsi/lpfc/lpfc_sli.c | 115 +- drivers/scsi/lpfc/lpfc_version.h | 2 +- drivers/scsi/mpt3sas/mpt3sas_config.c | 2 +- drivers/scsi/osd/osd_initiator.c | 2 +- drivers/scsi/qla2xxx/Makefile | 2 +- drivers/scsi/qla2xxx/qla_attr.c | 35 +- drivers/scsi/qla2xxx/qla_bsg.c | 154 +- drivers/scsi/qla2xxx/qla_bsg.h | 1 + drivers/scsi/qla2xxx/qla_dbg.c | 27 +- drivers/scsi/qla2xxx/qla_def.h | 236 +- drivers/scsi/qla2xxx/qla_gbl.h | 47 +- drivers/scsi/qla2xxx/qla_gs.c | 16 +- drivers/scsi/qla2xxx/qla_init.c | 52 +- drivers/scsi/qla2xxx/qla_inline.h | 41 +- drivers/scsi/qla2xxx/qla_iocb.c | 67 +- drivers/scsi/qla2xxx/qla_isr.c | 20 +- drivers/scsi/qla2xxx/qla_mbx.c | 10 +- drivers/scsi/qla2xxx/qla_mr.c | 3476 ++++++++++++++++++++ drivers/scsi/qla2xxx/qla_mr.h | 510 +++ drivers/scsi/qla2xxx/qla_os.c | 212 +- drivers/scsi/qla2xxx/qla_target.c | 19 - drivers/scsi/qla2xxx/qla_target.h | 1 - drivers/scsi/qla2xxx/qla_version.h | 4 +- drivers/scsi/qla4xxx/ql4_83xx.c | 28 + drivers/scsi/qla4xxx/ql4_83xx.h | 10 + drivers/scsi/qla4xxx/ql4_dbg.h | 7 + drivers/scsi/qla4xxx/ql4_def.h | 19 + drivers/scsi/qla4xxx/ql4_fw.h | 38 + drivers/scsi/qla4xxx/ql4_glbl.h | 9 +- drivers/scsi/qla4xxx/ql4_isr.c | 47 +- drivers/scsi/qla4xxx/ql4_mbx.c | 120 +- drivers/scsi/qla4xxx/ql4_nx.c | 21 +- drivers/scsi/qla4xxx/ql4_os.c | 1937 ++++++++++- drivers/scsi/qla4xxx/ql4_version.h | 2 +- drivers/scsi/scsi_transport_iscsi.c | 1002 +++++- drivers/spi/Kconfig | 30 +- drivers/spi/Makefile | 3 + drivers/spi/spi-atmel.c | 728 +++- drivers/spi/spi-bcm2835.c | 422 +++ drivers/spi/spi-bcm63xx.c | 78 +- drivers/spi/spi-fsl-cpm.c | 387 +++ drivers/spi/spi-fsl-cpm.h | 43 + drivers/spi/spi-fsl-lib.c | 8 + drivers/spi/spi-fsl-lib.h | 15 +- drivers/spi/spi-fsl-spi.c | 601 ++-- drivers/spi/spi-fsl-spi.h | 72 + drivers/spi/spi-gpio.c | 2 +- drivers/spi/spi-mpc512x-psc.c | 41 +- drivers/spi/spi-mxs.c | 1 + drivers/spi/spi-oc-tiny.c | 4 +- drivers/spi/spi-omap2-mcspi.c | 43 +- drivers/spi/spi-pxa2xx-pci.c | 6 +- drivers/spi/spi-pxa2xx.c | 14 +- drivers/spi/spi-s3c64xx.c | 292 +- drivers/spi/spi-sh-msiof.c | 4 +- drivers/spi/spi-sirf.c | 2 +- drivers/spi/spi-tegra114.c | 1246 +++++++ drivers/spi/spi-tegra20-sflash.c | 41 +- drivers/spi/spi-tegra20-slink.c | 84 +- drivers/spi/spi-topcliff-pch.c | 16 +- drivers/spi/spi.c | 8 + drivers/spi/spidev.c | 2 +- drivers/staging/media/as102/Makefile | 2 +- drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 2 +- drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 3 +- drivers/staging/media/davinci_vpfe/dm365_isif.c | 4 +- drivers/staging/media/davinci_vpfe/dm365_resizer.c | 2 +- .../staging/media/davinci_vpfe/vpfe_mc_capture.c | 24 +- drivers/staging/media/davinci_vpfe/vpfe_video.c | 18 +- drivers/staging/media/dt3155v4l/dt3155v4l.c | 11 +- drivers/staging/media/go7007/Kconfig | 103 +- drivers/staging/media/go7007/Makefile | 23 +- drivers/staging/media/go7007/README | 142 +- drivers/staging/media/go7007/go7007-driver.c | 390 ++- drivers/staging/media/go7007/go7007-fw.c | 88 +- drivers/staging/media/go7007/go7007-i2c.c | 21 +- drivers/staging/media/go7007/go7007-loader.c | 144 + drivers/staging/media/go7007/go7007-priv.h | 104 +- drivers/staging/media/go7007/go7007-usb.c | 394 ++- drivers/staging/media/go7007/go7007-v4l2.c | 1747 +++------- drivers/staging/media/go7007/go7007.h | 74 - drivers/staging/media/go7007/s2250-board.c | 171 +- drivers/staging/media/go7007/s2250-loader.c | 169 - drivers/staging/media/go7007/s2250-loader.h | 24 - drivers/staging/media/go7007/saa7134-go7007.c | 171 +- drivers/staging/media/go7007/snd-go7007.c | 11 +- drivers/staging/media/go7007/wis-i2c.h | 42 - drivers/staging/media/go7007/wis-saa7113.c | 324 -- drivers/staging/media/go7007/wis-saa7115.c | 457 --- drivers/staging/media/go7007/wis-sony-tuner.c | 707 ---- drivers/staging/media/go7007/wis-tw2804.c | 348 -- drivers/staging/media/go7007/wis-tw9903.c | 328 -- drivers/staging/media/lirc/lirc_sir.c | 10 - drivers/staging/media/solo6x10/Kconfig | 3 +- drivers/staging/media/solo6x10/Makefile | 4 +- drivers/staging/media/solo6x10/TODO | 39 +- drivers/staging/media/solo6x10/core.c | 321 -- drivers/staging/media/solo6x10/offsets.h | 74 - drivers/staging/media/solo6x10/osd-font.h | 154 - drivers/staging/media/solo6x10/p2m.c | 306 -- drivers/staging/media/solo6x10/solo6x10-core.c | 709 ++++ .../media/solo6x10/{disp.c => solo6x10-disp.c} | 129 +- drivers/staging/media/solo6x10/solo6x10-eeprom.c | 154 + .../media/solo6x10/{enc.c => solo6x10-enc.c} | 239 +- .../media/solo6x10/{g723.c => solo6x10-g723.c} | 94 +- .../media/solo6x10/{gpio.c => solo6x10-gpio.c} | 13 +- .../media/solo6x10/{i2c.c => solo6x10-i2c.c} | 26 +- drivers/staging/media/solo6x10/solo6x10-jpeg.h | 94 +- drivers/staging/media/solo6x10/solo6x10-offsets.h | 85 + drivers/staging/media/solo6x10/solo6x10-p2m.c | 333 ++ .../solo6x10/{registers.h => solo6x10-regs.h} | 88 +- .../media/solo6x10/{tw28.c => solo6x10-tw28.c} | 187 +- .../media/solo6x10/{tw28.h => solo6x10-tw28.h} | 12 +- drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c | 1385 ++++++++ drivers/staging/media/solo6x10/solo6x10-v4l2.c | 734 +++++ drivers/staging/media/solo6x10/solo6x10.h | 265 +- drivers/staging/media/solo6x10/v4l2-enc.c | 1829 ---------- drivers/staging/media/solo6x10/v4l2.c | 961 ------ drivers/target/iscsi/Makefile | 3 +- drivers/target/iscsi/iscsi_target.c | 1184 ++++--- drivers/target/iscsi/iscsi_target.h | 3 +- drivers/target/iscsi/iscsi_target_auth.c | 28 +- drivers/target/iscsi/iscsi_target_configfs.c | 98 +- drivers/target/iscsi/iscsi_target_core.h | 26 +- drivers/target/iscsi/iscsi_target_device.c | 7 +- drivers/target/iscsi/iscsi_target_erl1.c | 13 +- drivers/target/iscsi/iscsi_target_login.c | 472 ++- drivers/target/iscsi/iscsi_target_login.h | 6 + drivers/target/iscsi/iscsi_target_nego.c | 194 +- drivers/target/iscsi/iscsi_target_nego.h | 11 +- drivers/target/iscsi/iscsi_target_parameters.c | 87 +- drivers/target/iscsi/iscsi_target_parameters.h | 16 +- drivers/target/iscsi/iscsi_target_tmr.c | 4 +- drivers/target/iscsi/iscsi_target_tpg.c | 6 +- drivers/target/iscsi/iscsi_target_transport.c | 55 + drivers/target/iscsi/iscsi_target_util.c | 53 +- drivers/target/iscsi/iscsi_target_util.h | 1 + drivers/target/target_core_file.c | 122 +- drivers/target/target_core_iblock.c | 108 +- drivers/target/target_core_sbc.c | 85 + drivers/target/target_core_transport.c | 13 +- drivers/target/tcm_fc/tfc_io.c | 9 +- drivers/target/tcm_fc/tfc_sess.c | 9 +- drivers/usb/misc/iowarrior.c | 4 +- drivers/usb/misc/uss720.c | 2 +- drivers/uwb/rsv.c | 4 +- drivers/vhost/tcm_vhost.c | 262 +- drivers/vhost/tcm_vhost.h | 13 + drivers/video/Kconfig | 9 + drivers/video/Makefile | 1 + drivers/video/amifb.c | 2 +- drivers/video/auo_k190x.c | 2 +- drivers/video/backlight/Kconfig | 9 +- drivers/video/backlight/Makefile | 1 + drivers/video/backlight/adp5520_bl.c | 28 +- drivers/video/backlight/adp8860_bl.c | 23 +- drivers/video/backlight/adp8870_bl.c | 33 +- drivers/video/backlight/ams369fg06.c | 21 +- drivers/video/backlight/as3711_bl.c | 118 +- drivers/video/backlight/atmel-pwm-bl.c | 14 +- drivers/video/backlight/corgi_lcd.c | 18 +- drivers/video/backlight/da903x_bl.c | 30 +- drivers/video/backlight/ep93xx_bl.c | 20 +- drivers/video/backlight/generic_bl.c | 6 +- drivers/video/backlight/hp680_bl.c | 18 +- drivers/video/backlight/ili922x.c | 555 ++++ drivers/video/backlight/ili9320.c | 26 +- drivers/video/backlight/ili9320.h | 2 +- drivers/video/backlight/jornada720_bl.c | 18 +- drivers/video/backlight/jornada720_lcd.c | 21 +- drivers/video/backlight/kb3886_bl.c | 18 +- drivers/video/backlight/l4f00242t03.c | 27 +- drivers/video/backlight/ld9040.c | 20 +- drivers/video/backlight/lm3533_bl.c | 22 +- drivers/video/backlight/lms501kf03.c | 22 +- drivers/video/backlight/locomolcd.c | 16 +- drivers/video/backlight/lp855x_bl.c | 105 +- drivers/video/backlight/ltv350qv.c | 18 +- drivers/video/backlight/omap1_bl.c | 26 +- drivers/video/backlight/platform_lcd.c | 12 +- drivers/video/backlight/s6e63m0.c | 20 +- drivers/video/backlight/tdo24m.c | 18 +- drivers/video/backlight/tosa_bl.c | 18 +- drivers/video/backlight/tosa_lcd.c | 18 +- drivers/video/backlight/tps65217_bl.c | 15 +- drivers/video/backlight/vgg2432a4.c | 18 +- drivers/video/console/fbcon_cw.c | 3 +- drivers/video/ep93xx-fb.c | 18 +- drivers/video/exynos/exynos_dp_core.c | 4 +- drivers/video/exynos/exynos_mipi_dsi.c | 8 +- drivers/video/goldfishfb.c | 2 +- drivers/video/hyperv_fb.c | 829 +++++ drivers/video/matrox/matroxfb_maven.c | 16 +- drivers/video/mmp/hw/mmp_ctrl.h | 479 +-- drivers/video/s1d13xxxfb.c | 2 +- drivers/video/ssd1307fb.c | 4 +- drivers/video/uvesafb.c | 2 +- fs/Makefile | 3 +- fs/befs/btree.c | 3 +- fs/buffer.c | 11 +- fs/direct-io.c | 31 +- fs/dlm/plock.c | 18 +- fs/exec.c | 4 +- fs/ext3/super.c | 1 - fs/f2fs/f2fs.h | 2 +- fs/f2fs/gc.c | 2 +- fs/f2fs/super.c | 2 +- fs/fat/dir.c | 23 + fs/fat/fat.h | 40 +- fs/fat/file.c | 5 + fs/fat/inode.c | 74 +- fs/fat/nfs.c | 221 +- fs/fscache/stats.c | 2 +- fs/gfs2/aops.c | 2 +- fs/gfs2/bmap.c | 2 +- fs/gfs2/glock.c | 32 +- fs/gfs2/glock.h | 1 - fs/gfs2/glops.c | 4 +- fs/gfs2/incore.h | 19 +- fs/gfs2/inode.c | 188 +- fs/gfs2/log.c | 104 +- fs/gfs2/lops.c | 32 +- fs/gfs2/lops.h | 5 +- fs/gfs2/meta_io.c | 2 +- fs/gfs2/rgrp.c | 24 +- fs/gfs2/rgrp.h | 2 +- fs/gfs2/super.c | 2 +- fs/gfs2/trace_gfs2.h | 11 +- fs/gfs2/trans.c | 7 +- fs/jbd/commit.c | 25 +- fs/jbd/journal.c | 2 - fs/jbd2/journal.c | 2 - fs/lockd/clntlock.c | 3 + fs/lockd/clntproc.c | 3 - fs/nfs/callback.c | 3 + fs/nfs/callback_proc.c | 2 +- fs/nfs/client.c | 2 + fs/nfs/delegation.c | 121 +- fs/nfs/delegation.h | 5 +- fs/nfs/dir.c | 2 + fs/nfs/file.c | 9 + fs/nfs/inode.c | 8 +- fs/nfs/internal.h | 7 + fs/nfs/nfs4_fs.h | 16 +- fs/nfs/nfs4client.c | 30 +- fs/nfs/nfs4filelayout.c | 34 +- fs/nfs/nfs4namespace.c | 43 +- fs/nfs/nfs4proc.c | 557 +++- fs/nfs/nfs4state.c | 141 +- fs/nfs/nfs4super.c | 2 + fs/nfs/nfs4xdr.c | 176 +- fs/nfs/objlayout/objio_osd.c | 2 +- fs/nfs/objlayout/objlayout.h | 2 +- fs/nfs/pagelist.c | 53 + fs/nfs/pnfs.c | 2 + fs/nfs/read.c | 2 + fs/nfs/super.c | 80 +- fs/nfs/write.c | 2 + fs/nfsd/nfs4state.c | 7 +- fs/nfsd/nfs4xdr.c | 24 +- fs/notify/inotify/inotify_user.c | 8 +- fs/ocfs2/dlm/dlmrecovery.c | 6 +- fs/ocfs2/ioctl.c | 22 +- fs/ocfs2/move_extents.c | 53 +- fs/proc/Makefile | 2 +- fs/proc/base.c | 100 + fs/proc/internal.h | 18 - fs/proc/kcore.c | 9 +- fs/proc/meminfo.c | 1 + fs/proc/mmu.c | 60 - fs/read_write.c | 2 +- fs/ufs/util.c | 3 +- include/asm-generic/hugetlb.h | 40 + include/asm-generic/pgtable.h | 10 + include/linux/async.h | 13 +- include/linux/blk_types.h | 3 +- include/linux/bootmem.h | 1 - include/linux/buffer_head.h | 1 + include/linux/cgroup.h | 178 +- include/linux/clk-private.h | 2 +- include/linux/clk-provider.h | 63 +- include/linux/clk.h | 8 +- include/linux/clk/sunxi.h | 22 + include/linux/clockchips.h | 12 + include/linux/clocksource.h | 1 + include/linux/compiler-gcc4.h | 2 +- include/linux/compiler.h | 6 + include/linux/console.h | 1 + include/linux/context_tracking.h | 24 +- include/linux/cpu.h | 16 + include/linux/cpumask.h | 15 + include/linux/cpuset.h | 1 - include/linux/ctype.h | 6 + include/linux/debug_locks.h | 2 +- include/linux/device.h | 2 + include/linux/evm.h | 2 +- include/linux/exportfs.h | 11 + include/linux/fsnotify_backend.h | 1 - include/linux/genalloc.h | 18 + include/linux/hid-debug.h | 6 +- include/linux/hid.h | 101 +- include/linux/hrtimer.h | 5 +- include/linux/huge_mm.h | 11 +- include/linux/hugetlb.h | 4 + include/linux/hyperv.h | 11 + include/linux/idr.h | 2 + include/linux/iio/gyro/itg3200.h | 2 +- include/linux/ima.h | 4 +- include/linux/integrity.h | 2 +- include/linux/ioport.h | 4 + include/linux/jiffies.h | 1 - include/linux/kprobes.h | 6 +- include/linux/list_bl.h | 5 + include/linux/math64.h | 19 +- include/linux/memory.h | 17 +- include/linux/memory_hotplug.h | 4 +- include/linux/mfd/abx500/ab8500.h | 11 +- include/linux/mfd/palmas.h | 24 +- include/linux/mfd/tps65217.h | 1 + include/linux/mm.h | 79 +- include/linux/mmzone.h | 2 +- include/linux/net.h | 4 +- include/linux/nfs_fs.h | 8 + include/linux/nfs_fs_sb.h | 3 + include/linux/nfs_xdr.h | 27 +- include/linux/notifier.h | 5 +- include/linux/pagemap.h | 2 +- include/linux/pci_ids.h | 2 + include/linux/perf_event.h | 24 +- include/linux/platform_data/coda.h | 18 + include/linux/platform_data/lp855x.h | 15 +- include/linux/platform_data/si5351.h | 114 + include/linux/platform_data/spi-s3c64xx.h | 3 + include/linux/posix-timers.h | 1 + include/linux/printk.h | 7 + include/linux/ramfs.h | 8 +- include/linux/rculist_bl.h | 2 +- include/linux/rcupdate.h | 1 + include/linux/regmap.h | 1 + include/linux/regulator/ab8500.h | 217 +- include/linux/regulator/consumer.h | 14 +- include/linux/regulator/driver.h | 9 +- include/linux/regulator/max8952.h | 10 +- include/linux/res_counter.h | 2 +- include/linux/rtc.h | 6 + include/linux/sched.h | 250 +- include/linux/spi/spi-tegra.h | 40 - include/linux/spi/spi.h | 8 + include/linux/sunrpc/auth.h | 9 + include/linux/sunrpc/clnt.h | 1 + include/linux/sunrpc/gss_api.h | 30 +- include/linux/sunrpc/xprt.h | 5 + include/linux/swap.h | 10 +- include/linux/time.h | 3 + include/linux/timekeeper_internal.h | 9 +- include/linux/timex.h | 7 - include/linux/uprobes.h | 8 + include/linux/vmalloc.h | 34 +- include/linux/vmpressure.h | 47 + include/linux/vmstat.h | 7 +- include/linux/workqueue.h | 166 +- include/media/davinci/dm355_ccdc.h | 6 +- include/media/davinci/dm644x_ccdc.h | 24 +- include/media/davinci/vpbe.h | 2 +- include/media/davinci/vpbe_types.h | 3 +- include/media/media-devnode.h | 1 + include/media/mt9p031.h | 2 - include/media/rc-core.h | 2 + include/media/rc-map.h | 1 + include/media/s5p_fimc.h | 64 + include/media/saa7115.h | 32 +- include/media/si476x.h | 37 + include/media/soc_camera.h | 7 +- include/media/soc_mediabus.h | 3 + include/media/ths7303.h | 42 + include/media/tuner.h | 6 +- include/media/uda1342.h | 29 + include/media/v4l2-chip-ident.h | 11 + include/media/v4l2-common.h | 1 - include/media/v4l2-ctrls.h | 29 +- include/media/v4l2-device.h | 13 + include/media/v4l2-ioctl.h | 22 +- include/media/v4l2-of.h | 111 + include/media/v4l2-subdev.h | 25 +- include/media/videobuf-dma-contig.h | 10 - include/media/videobuf2-core.h | 11 +- include/net/sctp/sctp.h | 2 +- include/scsi/iscsi_if.h | 117 + include/scsi/libiscsi.h | 1 + include/scsi/scsi_transport_iscsi.h | 151 + include/sound/pcm.h | 2 +- include/target/iscsi/iscsi_transport.h | 83 + include/target/target_core_backend.h | 4 + include/target/target_core_fabric.h | 2 +- include/trace/events/filemap.h | 58 + include/trace/events/printk.h | 25 +- include/trace/events/rcu.h | 55 + include/trace/events/regmap.h | 48 + include/trace/events/timer.h | 10 +- include/uapi/linux/dvb/dmx.h | 2 +- include/uapi/linux/elf.h | 1 + include/uapi/linux/fs.h | 1 - include/uapi/linux/media.h | 2 + include/uapi/linux/perf_event.h | 71 +- include/uapi/linux/time.h | 6 +- include/uapi/linux/v4l2-controls.h | 28 + include/uapi/linux/v4l2-dv-timings.h | 18 + include/uapi/linux/v4l2-mediabus.h | 6 +- include/uapi/linux/videodev2.h | 111 +- include/video/platform_lcd.h | 1 + init/Kconfig | 74 +- init/main.c | 48 +- ipc/util.c | 15 +- kernel/Makefile | 1 + kernel/async.c | 40 +- kernel/audit.c | 12 +- kernel/audit.h | 3 - kernel/audit_tree.c | 2 +- kernel/auditfilter.c | 4 + kernel/auditsc.c | 14 +- kernel/cgroup.c | 780 ++--- kernel/cpu/Makefile | 1 + kernel/cpu/idle.c | 116 + kernel/cpuset.c | 143 +- kernel/events/core.c | 54 +- kernel/events/uprobes.c | 300 +- kernel/extable.c | 6 +- kernel/fork.c | 2 +- kernel/hrtimer.c | 26 +- kernel/kexec.c | 13 +- kernel/kthread.c | 46 +- kernel/posix-timers.c | 121 +- kernel/printk.c | 35 +- kernel/rcutree.c | 260 +- kernel/rcutree.h | 41 +- kernel/rcutree_plugin.h | 601 ++-- kernel/rcutree_trace.c | 2 - kernel/resource.c | 198 +- kernel/sched/Makefile | 1 + kernel/sched/core.c | 268 +- kernel/sched/cpuacct.c | 296 ++ kernel/sched/cpuacct.h | 17 + kernel/sched/cputime.c | 214 +- kernel/sched/fair.c | 148 +- kernel/sched/idle_task.c | 16 + kernel/sched/sched.h | 219 +- kernel/sysctl.c | 15 +- kernel/test_kprobes.c | 2 +- kernel/time.c | 11 +- kernel/time/ntp.c | 105 +- kernel/time/ntp_internal.h | 12 + kernel/time/tick-broadcast.c | 239 +- kernel/time/tick-common.c | 2 + kernel/time/tick-internal.h | 5 +- kernel/time/tick-sched.c | 4 +- kernel/time/timekeeping.c | 396 ++- kernel/time/timer_list.c | 104 +- kernel/trace/trace.c | 2 +- kernel/trace/trace.h | 5 - kernel/trace/trace_uprobe.c | 203 +- kernel/watchdog.c | 5 + kernel/workqueue.c | 2946 +++++++++++------ kernel/workqueue_internal.h | 9 +- lib/argv_split.c | 87 +- lib/div64.c | 19 +- lib/dynamic_debug.c | 1 - lib/fault-inject.c | 2 +- lib/genalloc.c | 81 + lib/idr.c | 27 + lib/int_sqrt.c | 32 +- lib/list_sort.c | 2 +- lib/show_mem.c | 3 + lib/uuid.c | 8 +- lib/vsprintf.c | 18 +- mm/Kconfig | 8 +- mm/Makefile | 2 +- mm/bounce.c | 21 +- mm/filemap.c | 34 +- mm/huge_memory.c | 77 +- mm/hugetlb.c | 43 +- mm/madvise.c | 31 +- mm/memblock.c | 12 +- mm/memcontrol.c | 338 +- mm/memory-failure.c | 4 +- mm/memory.c | 13 +- mm/memory_hotplug.c | 93 +- mm/migrate.c | 24 +- mm/mmap.c | 196 +- mm/nobootmem.c | 6 +- mm/nommu.c | 68 +- mm/page-writeback.c | 4 - mm/page_alloc.c | 77 +- mm/page_io.c | 36 +- mm/rmap.c | 3 + mm/shmem.c | 5 +- mm/slab.c | 8 +- mm/slub.c | 9 +- mm/sparse-vmemmap.c | 27 +- mm/sparse.c | 82 +- mm/swap.c | 11 +- mm/swap_state.c | 6 +- mm/swapfile.c | 2 +- mm/vmalloc.c | 218 +- mm/vmpressure.c | 374 +++ mm/vmscan.c | 14 +- mm/vmstat.c | 6 +- net/core/pktgen.c | 42 +- net/netfilter/nf_conntrack_core.c | 4 +- net/sched/sch_choke.c | 2 +- net/sctp/associola.c | 16 +- net/sctp/protocol.c | 2 +- net/sunrpc/Kconfig | 2 +- net/sunrpc/auth.c | 75 +- net/sunrpc/auth_gss/auth_gss.c | 3 + net/sunrpc/auth_gss/gss_krb5_mech.c | 6 +- net/sunrpc/auth_gss/gss_krb5_wrap.c | 4 +- net/sunrpc/auth_gss/gss_mech_switch.c | 119 +- net/sunrpc/auth_gss/svcauth_gss.c | 4 +- net/sunrpc/cache.c | 1 - net/sunrpc/clnt.c | 43 +- net/sunrpc/xprt.c | 61 +- net/sunrpc/xprtsock.c | 14 +- samples/hidraw/hid-example.c | 3 +- scripts/checkpatch.pl | 33 +- scripts/decodecode | 8 +- scripts/get_maintainer.pl | 2 +- scripts/kconfig/streamline_config.pl | 26 +- security/device_cgroup.c | 267 +- sound/i2c/other/tea575x-tuner.c | 6 +- sound/pci/mixart/mixart.c | 2 +- sound/soc/codecs/wm8974.c | 2 +- sound/soc/ux500/Kconfig | 4 +- tools/Makefile | 16 +- tools/lib/lk/Makefile | 35 + tools/{perf/util => lib/lk}/debugfs.c | 49 +- tools/lib/lk/debugfs.h | 29 + tools/perf/Documentation/perf-annotate.txt | 3 + tools/perf/Documentation/perf-mem.txt | 48 + tools/perf/Documentation/perf-record.txt | 6 + tools/perf/Documentation/perf-report.txt | 6 +- tools/perf/Documentation/perf-stat.txt | 12 +- tools/perf/Documentation/perf-top.txt | 2 +- tools/perf/MANIFEST | 1 + tools/perf/Makefile | 61 +- tools/perf/arch/arm/util/dwarf-regs.c | 5 +- tools/perf/arch/powerpc/util/dwarf-regs.c | 5 +- tools/perf/arch/s390/util/dwarf-regs.c | 2 +- tools/perf/arch/sh/util/dwarf-regs.c | 2 +- tools/perf/arch/sparc/util/dwarf-regs.c | 2 +- tools/perf/arch/x86/util/dwarf-regs.c | 2 +- tools/perf/builtin-annotate.c | 25 +- tools/perf/builtin-diff.c | 7 +- tools/perf/builtin-kvm.c | 2 +- tools/perf/builtin-mem.c | 242 ++ tools/perf/builtin-probe.c | 2 +- tools/perf/builtin-record.c | 15 +- tools/perf/builtin-report.c | 150 +- tools/perf/builtin-sched.c | 1 - tools/perf/builtin-stat.c | 398 ++- tools/perf/builtin-top.c | 9 +- tools/perf/builtin-trace.c | 28 +- tools/perf/builtin.h | 1 + tools/perf/command-list.txt | 15 +- tools/perf/config/feature-tests.mak | 12 +- tools/perf/perf.c | 12 +- tools/perf/perf.h | 1 + tools/perf/tests/attr.c | 11 +- tools/perf/tests/attr.py | 5 +- tools/perf/tests/attr/base-record | 1 + tools/perf/tests/attr/base-stat | 1 + tools/perf/tests/attr/test-record-C0 | 13 + tools/perf/tests/attr/test-stat-C0 | 9 + tools/perf/tests/bp_signal.c | 186 ++ tools/perf/tests/bp_signal_overflow.c | 126 + tools/perf/tests/builtin-test.c | 16 + tools/perf/tests/evsel-roundtrip-name.c | 4 +- tools/perf/tests/hists_link.c | 6 +- tools/perf/tests/mmap-basic.c | 4 +- tools/perf/tests/open-syscall-tp-fields.c | 10 +- tools/perf/tests/parse-events.c | 6 +- tools/perf/tests/perf-record.c | 9 +- tools/perf/tests/sw-clock.c | 119 + tools/perf/tests/task-exit.c | 123 + tools/perf/tests/tests.h | 4 + tools/perf/ui/browser.c | 9 +- tools/perf/ui/browser.h | 1 + tools/perf/ui/browsers/annotate.c | 158 +- tools/perf/ui/browsers/hists.c | 7 +- tools/perf/ui/browsers/map.c | 60 +- tools/perf/ui/browsers/scripts.c | 1 - tools/perf/ui/gtk/annotate.c | 26 +- tools/perf/ui/gtk/hists.c | 7 +- tools/perf/ui/hist.c | 7 +- tools/perf/ui/tui/setup.c | 21 +- tools/perf/ui/ui.h | 2 +- tools/perf/util/annotate.c | 262 +- tools/perf/util/annotate.h | 51 +- tools/perf/util/cpumap.c | 86 +- tools/perf/util/cpumap.h | 12 + tools/perf/util/debugfs.h | 12 - tools/perf/util/event.h | 9 + tools/perf/util/evlist.c | 73 +- tools/perf/util/evlist.h | 9 +- tools/perf/util/evsel.c | 32 +- tools/perf/util/evsel.h | 25 + tools/perf/util/header.c | 15 +- tools/perf/util/hist.c | 110 +- tools/perf/util/hist.h | 28 +- tools/perf/util/machine.c | 64 +- tools/perf/util/machine.h | 4 +- tools/perf/util/parse-events.c | 2 +- tools/perf/util/probe-event.c | 2 +- tools/perf/util/python-ext-sources | 1 - tools/perf/util/session.c | 20 +- tools/perf/util/session.h | 1 - tools/perf/util/setup.py | 3 +- tools/perf/util/sort.c | 414 ++- tools/perf/util/sort.h | 12 +- tools/perf/util/symbol-elf.c | 9 +- tools/perf/util/symbol.c | 1 + tools/perf/util/symbol.h | 9 +- tools/perf/util/thread_map.h | 5 + tools/perf/util/trace-event-info.c | 380 ++- tools/perf/util/trace-event-parse.c | 37 - tools/perf/util/trace-event-read.c | 473 +-- tools/perf/util/trace-event.h | 6 +- tools/perf/util/util.c | 27 + tools/perf/util/util.h | 9 +- tools/power/cpupower/debug/i386/intel_gsic.c | 2 +- tools/scripts/Makefile.include | 6 +- tools/vm/Makefile | 17 +- tools/vm/page-types.c | 85 +- 1936 files changed, 93286 insertions(+), 45707 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-konepure create mode 100644 Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-info.xml delete mode 100644 Documentation/DocBook/media/v4l/vidioc-enum-dv-presets.xml delete mode 100644 Documentation/DocBook/media/v4l/vidioc-g-dv-preset.xml delete mode 100644 Documentation/DocBook/media/v4l/vidioc-query-dv-preset.xml create mode 100644 Documentation/arm/sunxi/clocks.txt create mode 100644 Documentation/devicetree/bindings/clock/axi-clkgen.txt create mode 100644 Documentation/devicetree/bindings/clock/fixed-factor-clock.txt create mode 100644 Documentation/devicetree/bindings/clock/silabs,si5351.txt create mode 100644 Documentation/devicetree/bindings/clock/sunxi.txt create mode 100644 Documentation/devicetree/bindings/media/coda.txt create mode 100644 Documentation/devicetree/bindings/media/exynos-fimc-lite.txt create mode 100644 Documentation/devicetree/bindings/media/exynos4-fimc-is.txt create mode 100644 Documentation/devicetree/bindings/media/samsung-fimc.txt create mode 100644 Documentation/devicetree/bindings/media/samsung-mipi-csis.txt create mode 100644 Documentation/devicetree/bindings/media/video-interfaces.txt create mode 100644 Documentation/devicetree/bindings/misc/sram.txt create mode 100644 Documentation/devicetree/bindings/regulator/max8952.txt create mode 100644 Documentation/devicetree/bindings/rtc/atmel,at91rm9200-rtc.txt create mode 100644 Documentation/devicetree/bindings/spi/brcm,bcm2835-spi.txt create mode 100644 Documentation/devicetree/bindings/spi/nvidia,tegra114-spi.txt create mode 100644 Documentation/devicetree/bindings/video/backlight/lp855x.txt create mode 100644 Documentation/devicetree/bindings/video/backlight/tps65217-backlight.txt create mode 100644 Documentation/this_cpu_ops.txt create mode 100644 Documentation/video4linux/si476x.txt create mode 100644 arch/arm64/boot/dts/foundation-v8.dts create mode 100644 arch/arm64/boot/dts/rtsm_ve-aemv8a.dts create mode 100644 arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi create mode 100644 arch/arm64/boot/dts/skeleton.dtsi create mode 100644 arch/arm64/include/asm/esr.h rename arch/arm64/{lib/bitops.c => include/asm/smp_plat.h} (58%) create mode 100644 arch/arm64/include/asm/string.h create mode 100644 arch/arm64/lib/bitops.S create mode 100644 arch/arm64/lib/memchr.S create mode 100644 arch/arm64/lib/memcpy.S create mode 100644 arch/arm64/lib/memmove.S create mode 100644 arch/arm64/lib/memset.S create mode 100644 arch/arm64/lib/strchr.S create mode 100644 arch/arm64/lib/strrchr.S create mode 100644 arch/metag/include/uapi/asm/ech.h create mode 100644 arch/metag/oprofile/Makefile create mode 100644 arch/metag/oprofile/backtrace.c create mode 100644 arch/metag/oprofile/backtrace.h create mode 100644 arch/metag/oprofile/common.c delete mode 100644 arch/openrisc/kernel/idle.c delete mode 100644 arch/x86/kernel/cpu/mkcapflags.pl create mode 100644 arch/x86/kernel/cpu/mkcapflags.sh create mode 100644 arch/x86/kernel/cpu/perf_event_amd_uncore.c create mode 100644 arch/x86/tools/relocs.h create mode 100644 arch/x86/tools/relocs_32.c create mode 100644 arch/x86/tools/relocs_64.c create mode 100644 arch/x86/tools/relocs_common.c create mode 100644 drivers/clk/clk-axi-clkgen.c create mode 100644 drivers/clk/clk-composite.c create mode 100644 drivers/clk/clk-si5351.c create mode 100644 drivers/clk/clk-si5351.h delete mode 100644 drivers/clk/mvebu/clk-cpu.h create mode 100644 drivers/clk/sunxi/Makefile create mode 100644 drivers/clk/sunxi/clk-factors.c create mode 100644 drivers/clk/sunxi/clk-factors.h create mode 100644 drivers/clk/sunxi/clk-sunxi.c create mode 100644 drivers/clk/ux500/clk-sysctrl.c create mode 100644 drivers/clk/versatile/clk-sp810.c create mode 100644 drivers/clocksource/bcm_kona_timer.c create mode 100644 drivers/hid/hid-appleir.c create mode 100644 drivers/hid/hid-roccat-konepure.c create mode 100644 drivers/hid/hid-roccat-konepure.h create mode 100644 drivers/infiniband/ulp/isert/Kconfig create mode 100644 drivers/infiniband/ulp/isert/Makefile create mode 100644 drivers/infiniband/ulp/isert/ib_isert.c create mode 100644 drivers/infiniband/ulp/isert/ib_isert.h create mode 100644 drivers/infiniband/ulp/isert/isert_proto.h rename drivers/media/{usb/dvb-usb-v2 => common}/cypress_firmware.c (84%) rename drivers/media/{usb/dvb-usb-v2 => common}/cypress_firmware.h (68%) create mode 100644 drivers/media/common/siano/smsdvb-debugfs.c create mode 100644 drivers/media/common/siano/smsdvb-main.c delete mode 100644 drivers/media/common/siano/smsdvb.c create mode 100644 drivers/media/common/siano/smsdvb.h rename drivers/{staging/media/go7007/wis-ov7640.c => media/i2c/ov7640.c} (53%) create mode 100644 drivers/media/i2c/sony-btf-mpx.c create mode 100644 drivers/media/i2c/tw2804.c create mode 100644 drivers/media/i2c/tw9903.c create mode 100644 drivers/media/i2c/tw9906.c rename drivers/{staging/media/go7007/wis-uda1342.c => media/i2c/uda1342.c} (52%) delete mode 100644 drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c delete mode 100644 drivers/media/pci/cx25821/cx25821-video-upstream-ch2.h rename drivers/media/platform/{s5p-fimc => exynos4-is}/Kconfig (69%) rename drivers/media/platform/{s5p-fimc => exynos4-is}/Makefile (58%) rename drivers/media/platform/{s5p-fimc => exynos4-is}/fimc-capture.c (87%) rename drivers/media/platform/{s5p-fimc => exynos4-is}/fimc-core.c (85%) rename drivers/media/platform/{s5p-fimc => exynos4-is}/fimc-core.h (92%) create mode 100644 drivers/media/platform/exynos4-is/fimc-is-command.h create mode 100644 drivers/media/platform/exynos4-is/fimc-is-errno.c create mode 100644 drivers/media/platform/exynos4-is/fimc-is-errno.h create mode 100644 drivers/media/platform/exynos4-is/fimc-is-i2c.c create mode 100644 drivers/media/platform/exynos4-is/fimc-is-i2c.h create mode 100644 drivers/media/platform/exynos4-is/fimc-is-param.c create mode 100644 drivers/media/platform/exynos4-is/fimc-is-param.h create mode 100644 drivers/media/platform/exynos4-is/fimc-is-regs.c create mode 100644 drivers/media/platform/exynos4-is/fimc-is-regs.h create mode 100644 drivers/media/platform/exynos4-is/fimc-is-sensor.c create mode 100644 drivers/media/platform/exynos4-is/fimc-is-sensor.h create mode 100644 drivers/media/platform/exynos4-is/fimc-is.c create mode 100644 drivers/media/platform/exynos4-is/fimc-is.h create mode 100644 drivers/media/platform/exynos4-is/fimc-isp.c create mode 100644 drivers/media/platform/exynos4-is/fimc-isp.h rename drivers/media/platform/{s5p-fimc => exynos4-is}/fimc-lite-reg.c (98%) rename drivers/media/platform/{s5p-fimc => exynos4-is}/fimc-lite-reg.h (96%) rename drivers/media/platform/{s5p-fimc => exynos4-is}/fimc-lite.c (86%) rename drivers/media/platform/{s5p-fimc => exynos4-is}/fimc-lite.h (95%) rename drivers/media/platform/{s5p-fimc => exynos4-is}/fimc-m2m.c (95%) rename drivers/media/platform/{s5p-fimc => exynos4-is}/fimc-reg.c (91%) rename drivers/media/platform/{s5p-fimc => exynos4-is}/fimc-reg.h (93%) rename drivers/media/platform/{s5p-fimc/fimc-mdevice.c => exynos4-is/media-dev.c} (59%) rename drivers/media/platform/{s5p-fimc/fimc-mdevice.h => exynos4-is/media-dev.h} (69%) rename drivers/media/platform/{s5p-fimc => exynos4-is}/mipi-csis.c (85%) rename drivers/media/platform/{s5p-fimc => exynos4-is}/mipi-csis.h (93%) create mode 100644 drivers/media/radio/radio-si476x.c create mode 100644 drivers/media/rc/keymaps/rc-reddo.c create mode 100644 drivers/media/tuners/r820t.c create mode 100644 drivers/media/tuners/r820t.h create mode 100644 drivers/media/tuners/tuner_it913x.c create mode 100644 drivers/media/tuners/tuner_it913x.h create mode 100644 drivers/media/tuners/tuner_it913x_priv.h create mode 100644 drivers/media/usb/em28xx/em28xx-camera.c delete mode 100644 drivers/media/usb/gspca/autogain_functions.h create mode 100644 drivers/media/v4l2-core/v4l2-of.c create mode 100644 drivers/misc/sram.c create mode 100644 drivers/regulator/ab8500-ext.c create mode 100644 drivers/scsi/qla2xxx/qla_mr.c create mode 100644 drivers/scsi/qla2xxx/qla_mr.h create mode 100644 drivers/spi/spi-bcm2835.c create mode 100644 drivers/spi/spi-fsl-cpm.c create mode 100644 drivers/spi/spi-fsl-cpm.h create mode 100644 drivers/spi/spi-fsl-spi.h create mode 100644 drivers/spi/spi-tegra114.c create mode 100644 drivers/staging/media/go7007/go7007-loader.c delete mode 100644 drivers/staging/media/go7007/s2250-loader.c delete mode 100644 drivers/staging/media/go7007/s2250-loader.h delete mode 100644 drivers/staging/media/go7007/wis-i2c.h delete mode 100644 drivers/staging/media/go7007/wis-saa7113.c delete mode 100644 drivers/staging/media/go7007/wis-saa7115.c delete mode 100644 drivers/staging/media/go7007/wis-sony-tuner.c delete mode 100644 drivers/staging/media/go7007/wis-tw2804.c delete mode 100644 drivers/staging/media/go7007/wis-tw9903.c delete mode 100644 drivers/staging/media/solo6x10/core.c delete mode 100644 drivers/staging/media/solo6x10/offsets.h delete mode 100644 drivers/staging/media/solo6x10/osd-font.h delete mode 100644 drivers/staging/media/solo6x10/p2m.c create mode 100644 drivers/staging/media/solo6x10/solo6x10-core.c rename drivers/staging/media/solo6x10/{disp.c => solo6x10-disp.c} (74%) create mode 100644 drivers/staging/media/solo6x10/solo6x10-eeprom.c rename drivers/staging/media/solo6x10/{enc.c => solo6x10-enc.c} (50%) rename drivers/staging/media/solo6x10/{g723.c => solo6x10-g723.c} (83%) rename drivers/staging/media/solo6x10/{gpio.c => solo6x10-gpio.c} (91%) rename drivers/staging/media/solo6x10/{i2c.c => solo6x10-i2c.c} (92%) create mode 100644 drivers/staging/media/solo6x10/solo6x10-offsets.h create mode 100644 drivers/staging/media/solo6x10/solo6x10-p2m.c rename drivers/staging/media/solo6x10/{registers.h => solo6x10-regs.h} (90%) rename drivers/staging/media/solo6x10/{tw28.c => solo6x10-tw28.c} (84%) rename drivers/staging/media/solo6x10/{tw28.h => solo6x10-tw28.h} (88%) create mode 100644 drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c create mode 100644 drivers/staging/media/solo6x10/solo6x10-v4l2.c delete mode 100644 drivers/staging/media/solo6x10/v4l2-enc.c delete mode 100644 drivers/staging/media/solo6x10/v4l2.c create mode 100644 drivers/target/iscsi/iscsi_target_transport.c create mode 100644 drivers/video/backlight/ili922x.c create mode 100644 drivers/video/hyperv_fb.c delete mode 100644 fs/proc/mmu.c create mode 100644 include/asm-generic/hugetlb.h create mode 100644 include/linux/clk/sunxi.h create mode 100644 include/linux/platform_data/coda.h create mode 100644 include/linux/platform_data/si5351.h delete mode 100644 include/linux/spi/spi-tegra.h create mode 100644 include/linux/vmpressure.h create mode 100644 include/media/si476x.h create mode 100644 include/media/ths7303.h create mode 100644 include/media/uda1342.h create mode 100644 include/media/v4l2-of.h create mode 100644 include/target/iscsi/iscsi_transport.h create mode 100644 include/trace/events/filemap.h create mode 100644 kernel/cpu/Makefile create mode 100644 kernel/cpu/idle.c create mode 100644 kernel/sched/cpuacct.c create mode 100644 kernel/sched/cpuacct.h create mode 100644 kernel/time/ntp_internal.h create mode 100644 mm/vmpressure.c create mode 100644 tools/lib/lk/Makefile rename tools/{perf/util => lib/lk}/debugfs.c (68%) create mode 100644 tools/lib/lk/debugfs.h create mode 100644 tools/perf/Documentation/perf-mem.txt create mode 100644 tools/perf/builtin-mem.c create mode 100644 tools/perf/tests/attr/test-record-C0 create mode 100644 tools/perf/tests/attr/test-stat-C0 create mode 100644 tools/perf/tests/bp_signal.c create mode 100644 tools/perf/tests/bp_signal_overflow.c create mode 100644 tools/perf/tests/sw-clock.c create mode 100644 tools/perf/tests/task-exit.c delete mode 100644 tools/perf/util/debugfs.h Merging fixes/master (96d8683 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client) $ git merge fixes/master Already up-to-date. Merging kbuild-current/rc-fixes (a54292f kbuild: generate generic headers before recursing into scripts) $ git merge kbuild-current/rc-fixes Already up-to-date. Merging arc-current/for-curr (561daec ARC: [mm] Lazy D-cache flush (non aliasing VIPT)) $ git merge arc-current/for-curr Auto-merging arch/arc/mm/init.c Auto-merging arch/arc/kernel/disasm.c Merge made by the 'recursive' strategy. arch/arc/Kconfig | 29 ++- arch/arc/Makefile | 15 +- arch/arc/boot/Makefile | 19 +- arch/arc/boot/dts/Makefile | 4 +- arch/arc/boot/dts/abilis_tb100.dtsi | 340 ++++++++++++++++++++++++++++++++ arch/arc/boot/dts/abilis_tb100_dvk.dts | 127 ++++++++++++ arch/arc/boot/dts/abilis_tb101.dtsi | 349 +++++++++++++++++++++++++++++++++ arch/arc/boot/dts/abilis_tb101_dvk.dts | 127 ++++++++++++ arch/arc/boot/dts/abilis_tb10x.dtsi | 247 +++++++++++++++++++++++ arch/arc/boot/dts/nsimosci.dts | 77 ++++++++ arch/arc/configs/fpga_defconfig | 3 +- arch/arc/configs/nsimosci_defconfig | 75 +++++++ arch/arc/configs/tb10x_defconfig | 117 +++++++++++ arch/arc/include/asm/cacheflush.h | 16 +- arch/arc/include/asm/irq.h | 3 +- arch/arc/include/asm/serial.h | 10 + arch/arc/include/asm/tlb.h | 16 +- arch/arc/kernel/asm-offsets.c | 2 +- arch/arc/kernel/clk.c | 2 +- arch/arc/kernel/disasm.c | 2 +- arch/arc/kernel/entry.S | 8 +- arch/arc/kernel/irq.c | 25 ++- arch/arc/kernel/kprobes.c | 1 - arch/arc/kernel/module.c | 4 +- arch/arc/kernel/setup.c | 36 ++-- arch/arc/kernel/time.c | 1 - arch/arc/kernel/traps.c | 24 +-- arch/arc/kernel/troubleshoot.c | 50 +++-- arch/arc/mm/cache_arc700.c | 269 ++++++------------------- arch/arc/mm/extable.c | 4 +- arch/arc/mm/fault.c | 1 - arch/arc/mm/init.c | 3 - arch/arc/mm/ioremap.c | 2 +- arch/arc/mm/tlb.c | 22 ++- arch/arc/plat-arcfpga/platform.c | 12 ++ arch/arc/plat-tb10x/Kconfig | 36 ++++ arch/arc/plat-tb10x/Makefile | 21 ++ arch/arc/plat-tb10x/tb10x.c | 71 +++++++ 38 files changed, 1835 insertions(+), 335 deletions(-) create mode 100644 arch/arc/boot/dts/abilis_tb100.dtsi create mode 100644 arch/arc/boot/dts/abilis_tb100_dvk.dts create mode 100644 arch/arc/boot/dts/abilis_tb101.dtsi create mode 100644 arch/arc/boot/dts/abilis_tb101_dvk.dts create mode 100644 arch/arc/boot/dts/abilis_tb10x.dtsi create mode 100644 arch/arc/boot/dts/nsimosci.dts create mode 100644 arch/arc/configs/nsimosci_defconfig create mode 100644 arch/arc/configs/tb10x_defconfig create mode 100644 arch/arc/plat-tb10x/Kconfig create mode 100644 arch/arc/plat-tb10x/Makefile create mode 100644 arch/arc/plat-tb10x/tb10x.c Merging arm-current/fixes (1783d45 ARM: 7700/2: Make cpu_init() notrace) $ git merge arm-current/fixes Merge made by the 'recursive' strategy. arch/arm/kernel/setup.c | 2 +- arch/arm/kernel/smp_tlb.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) Merging m68k-current/for-linus (e00c73e m68k: Remove inline strlen() implementation) $ git merge m68k-current/for-linus Already up-to-date. Merging powerpc-merge/merge (5676005 powerpc/pseries/lparcfg: Fix possible overflow are more than 1026) $ git merge powerpc-merge/merge Auto-merging arch/powerpc/kernel/process.c Merge made by the 'recursive' strategy. arch/powerpc/kernel/lparcfg.c | 1 + arch/powerpc/kernel/process.c | 8 ++++---- arch/powerpc/kernel/vdso.c | 4 ++++ arch/powerpc/kernel/vdso32/gettimeofday.S | 26 ++++++++++++++++++++++++++ arch/powerpc/kernel/vdso32/vdso32.lds.S | 1 + arch/powerpc/kernel/vdso64/gettimeofday.S | 26 ++++++++++++++++++++++++++ arch/powerpc/kernel/vdso64/vdso64.lds.S | 1 + drivers/macintosh/smu.c | 6 +----- drivers/macintosh/via-pmu.c | 5 +++-- 9 files changed, 67 insertions(+), 11 deletions(-) Merging sparc/master (0fbd067 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) $ git merge sparc/master Already up-to-date. Merging net/master (79f632c unix/stream: fix peeking with an offset larger than data in queue) $ git merge net/master Merge made by the 'recursive' strategy. drivers/isdn/mISDN/socket.c | 1 + drivers/isdn/sc/init.c | 4 +- drivers/net/bonding/bond_main.c | 6 +- drivers/net/caif/caif_spi.c | 1 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 11 ++- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 19 +++- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 32 +++--- drivers/net/ethernet/emulex/benet/be.h | 7 ++ drivers/net/ethernet/emulex/benet/be_cmds.c | 70 ++++++++++--- drivers/net/ethernet/emulex/benet/be_cmds.h | 13 +++ drivers/net/ethernet/emulex/benet/be_ethtool.c | 3 +- drivers/net/ethernet/emulex/benet/be_main.c | 121 +++++++++++++++++++---- drivers/net/ethernet/freescale/gianfar_ptp.c | 3 +- drivers/net/ethernet/realtek/r8169.c | 9 ++ drivers/net/ethernet/sfc/mcdi.c | 2 +- drivers/net/tun.c | 15 ++- include/net/tcp.h | 1 + net/appletalk/ddp.c | 2 +- net/batman-adv/routing.c | 11 +-- net/core/datagram.c | 22 +++-- net/mac802154/mac802154.h | 2 +- net/netfilter/ipvs/ip_vs_pe_sip.c | 6 +- net/netrom/af_netrom.c | 2 + net/nfc/llcp/sock.c | 5 +- net/unix/af_unix.c | 25 +++-- net/vmw_vsock/af_vsock.c | 4 +- 26 files changed, 291 insertions(+), 106 deletions(-) Merging ipsec/master (da241ef Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) $ git merge ipsec/master Already up-to-date. Merging sound-current/for-linus (c5a4698 Merge tag 'asoc-maintainers-v3.9-rc6' 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 (d46fc8b x86/pci/mrst: Use configuration mechanism 1 for 00:00.0, 00:02.0, 00:03.0) $ git merge pci-current/for-linus Merge made by the 'recursive' strategy. arch/x86/pci/mrst.c | 10 ++++++---- drivers/pci/msi.c | 6 ++++-- 2 files changed, 10 insertions(+), 6 deletions(-) Merging wireless/master (a8a48e6 Merge tag 'nfc-next-3.10-4' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next) $ git merge wireless/master Auto-merging net/nfc/llcp_sock.c Auto-merging net/nfc/llcp_core.c Auto-merging net/nfc/llcp_commands.c Removing net/nfc/llcp/Kconfig Auto-merging net/nfc/llcp.h Auto-merging net/bluetooth/sco.c Auto-merging net/bluetooth/rfcomm/sock.c Auto-merging net/bluetooth/af_bluetooth.c Removing drivers/net/wireless/iwlwifi/pcie/cfg.h Auto-merging drivers/net/wireless/iwlwifi/iwl-7000.c Auto-merging drivers/net/wireless/iwlwifi/iwl-6000.c Auto-merging drivers/net/wireless/iwlwifi/iwl-5000.c Auto-merging drivers/net/wireless/iwlwifi/iwl-2000.c Auto-merging drivers/net/wireless/iwlwifi/iwl-1000.c Removing drivers/net/wireless/ath/wil6210/dbg_hexdump.h Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. Documentation/DocBook/80211.tmpl | 2 +- MAINTAINERS | 2 +- drivers/bcma/core.c | 8 +- drivers/bcma/driver_chipcommon.c | 5 +- drivers/bcma/driver_chipcommon_pmu.c | 34 +- drivers/bcma/main.c | 5 + drivers/bcma/scan.c | 16 +- drivers/bcma/sprom.c | 1 + drivers/bluetooth/ath3k.c | 2 + drivers/bluetooth/btmrvl_debugfs.c | 266 +- drivers/bluetooth/btmrvl_sdio.c | 49 +- drivers/bluetooth/btusb.c | 418 +++- drivers/bluetooth/hci_h4.c | 3 + drivers/bluetooth/hci_ldisc.c | 15 +- drivers/net/wireless/adm8211.c | 3 +- drivers/net/wireless/at76c50x-usb.c | 4 +- drivers/net/wireless/ath/ar5523/ar5523.c | 16 +- drivers/net/wireless/ath/ath5k/Makefile | 1 + drivers/net/wireless/ath/ath5k/ath5k.h | 3 +- drivers/net/wireless/ath/ath5k/base.c | 2 +- drivers/net/wireless/ath/ath5k/eeprom.c | 6 +- drivers/net/wireless/ath/ath5k/eeprom.h | 3 - drivers/net/wireless/ath/ath5k/mac80211-ops.c | 4 +- drivers/net/wireless/ath/ath5k/phy.c | 20 +- drivers/net/wireless/ath/ath5k/reset.c | 4 +- drivers/net/wireless/ath/ath5k/trace.h | 2 +- drivers/net/wireless/ath/ath6kl/Kconfig | 9 + drivers/net/wireless/ath/ath6kl/Makefile | 5 + drivers/net/wireless/ath/ath6kl/cfg80211.c | 15 +- drivers/net/wireless/ath/ath6kl/core.h | 3 - drivers/net/wireless/ath/ath6kl/debug.c | 72 +- drivers/net/wireless/ath/ath6kl/debug.h | 11 +- drivers/net/wireless/ath/ath6kl/hif.c | 3 + drivers/net/wireless/ath/ath6kl/htc_mbox.c | 21 +- drivers/net/wireless/ath/ath6kl/htc_pipe.c | 15 +- drivers/net/wireless/ath/ath6kl/init.c | 116 +- drivers/net/wireless/ath/ath6kl/main.c | 41 +- drivers/net/wireless/ath/ath6kl/sdio.c | 16 +- drivers/net/wireless/ath/ath6kl/target.h | 2 +- drivers/net/wireless/ath/ath6kl/trace.c | 23 + drivers/net/wireless/ath/ath6kl/trace.h | 332 +++ drivers/net/wireless/ath/ath6kl/txrx.c | 5 +- drivers/net/wireless/ath/ath6kl/usb.c | 38 +- drivers/net/wireless/ath/ath6kl/wmi.c | 6 + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 92 +- drivers/net/wireless/ath/ath9k/ar9002_calib.c | 9 +- drivers/net/wireless/ath/ath9k/ar9002_hw.c | 17 +- drivers/net/wireless/ath/ath9k/ar9003_calib.c | 3 +- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 17 + .../net/wireless/ath/ath9k/ar9462_2p0_initvals.h | 49 +- drivers/net/wireless/ath/ath9k/ath9k.h | 9 +- drivers/net/wireless/ath/ath9k/beacon.c | 2 +- drivers/net/wireless/ath/ath9k/calib.c | 6 +- drivers/net/wireless/ath/ath9k/calib.h | 6 + drivers/net/wireless/ath/ath9k/common.c | 19 +- drivers/net/wireless/ath/ath9k/common.h | 3 +- drivers/net/wireless/ath/ath9k/debug.c | 7 +- drivers/net/wireless/ath/ath9k/debug.h | 2 + drivers/net/wireless/ath/ath9k/dfs.c | 10 +- drivers/net/wireless/ath/ath9k/dfs_debug.c | 20 + .../net/wireless/ath/ath9k/dfs_pattern_detector.c | 43 +- .../net/wireless/ath/ath9k/dfs_pattern_detector.h | 6 +- drivers/net/wireless/ath/ath9k/dfs_pri_detector.c | 49 +- drivers/net/wireless/ath/ath9k/dfs_pri_detector.h | 27 +- drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 2 +- drivers/net/wireless/ath/ath9k/htc_drv_main.c | 18 +- drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 18 +- drivers/net/wireless/ath/ath9k/hw.c | 198 +- drivers/net/wireless/ath/ath9k/hw.h | 14 - drivers/net/wireless/ath/ath9k/init.c | 41 +- drivers/net/wireless/ath/ath9k/link.c | 2 +- drivers/net/wireless/ath/ath9k/mac.c | 8 + drivers/net/wireless/ath/ath9k/mac.h | 1 + drivers/net/wireless/ath/ath9k/main.c | 46 +- drivers/net/wireless/ath/ath9k/rc.c | 4 +- drivers/net/wireless/ath/ath9k/recv.c | 177 +- drivers/net/wireless/ath/ath9k/reg.h | 3 - drivers/net/wireless/ath/ath9k/xmit.c | 137 +- drivers/net/wireless/ath/carl9170/carl9170.h | 8 +- drivers/net/wireless/ath/carl9170/debug.c | 4 +- drivers/net/wireless/ath/carl9170/mac.c | 8 +- drivers/net/wireless/ath/carl9170/main.c | 11 +- drivers/net/wireless/ath/carl9170/phy.c | 85 +- drivers/net/wireless/ath/carl9170/tx.c | 69 +- drivers/net/wireless/ath/hw.c | 6 + drivers/net/wireless/ath/key.c | 9 +- drivers/net/wireless/ath/reg.h | 4 + drivers/net/wireless/ath/wil6210/Makefile | 4 +- drivers/net/wireless/ath/wil6210/cfg80211.c | 33 +- drivers/net/wireless/ath/wil6210/dbg_hexdump.h | 20 - drivers/net/wireless/ath/wil6210/debugfs.c | 58 +- drivers/net/wireless/ath/wil6210/interrupt.c | 25 +- drivers/net/wireless/ath/wil6210/main.c | 60 +- drivers/net/wireless/ath/wil6210/netdev.c | 3 - drivers/net/wireless/ath/wil6210/pcie_bus.c | 3 - drivers/net/wireless/ath/wil6210/txrx.c | 34 +- drivers/net/wireless/ath/wil6210/txrx.h | 49 +- drivers/net/wireless/ath/wil6210/wil6210.h | 17 +- drivers/net/wireless/ath/wil6210/wmi.c | 154 +- drivers/net/wireless/ath/wil6210/wmi.h | 363 ++- drivers/net/wireless/b43/Kconfig | 6 +- drivers/net/wireless/b43/b43.h | 10 +- drivers/net/wireless/b43/main.c | 38 +- drivers/net/wireless/b43/phy_ht.c | 708 +++++- drivers/net/wireless/b43/phy_ht.h | 83 +- drivers/net/wireless/b43/phy_lcn.c | 5 +- drivers/net/wireless/b43/phy_lp.c | 16 +- drivers/net/wireless/b43/phy_n.c | 716 +++--- drivers/net/wireless/b43/phy_n.h | 146 ++ drivers/net/wireless/b43/radio_2056.c | 6 +- drivers/net/wireless/b43/radio_2059.c | 39 +- drivers/net/wireless/b43/radio_2059.h | 14 +- drivers/net/wireless/b43/sdio.h | 4 +- drivers/net/wireless/b43/tables_nphy.c | 101 +- drivers/net/wireless/b43/tables_nphy.h | 29 +- drivers/net/wireless/b43/tables_phy_lcn.c | 6 +- drivers/net/wireless/b43legacy/main.c | 9 +- drivers/net/wireless/brcm80211/Kconfig | 14 +- drivers/net/wireless/brcm80211/brcmfmac/Makefile | 6 +- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 269 ++- .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 176 +- drivers/net/wireless/brcm80211/brcmfmac/btcoex.c | 497 ++++ drivers/net/wireless/brcm80211/brcmfmac/btcoex.h | 29 + drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 41 +- drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 15 +- drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c | 34 +- .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 33 + drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c | 80 + drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h | 55 +- .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 148 +- .../net/wireless/brcm80211/brcmfmac/dhd_proto.h | 2 +- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 794 +++--- drivers/net/wireless/brcm80211/brcmfmac/fweh.c | 25 +- drivers/net/wireless/brcm80211/brcmfmac/fweh.h | 6 +- drivers/net/wireless/brcm80211/brcmfmac/fwil.c | 1 + drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 2067 ++++++++++++++++ drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h | 33 + drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 288 ++- .../net/wireless/brcm80211/brcmfmac/sdio_chip.c | 369 ++- .../net/wireless/brcm80211/brcmfmac/sdio_chip.h | 101 +- .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 32 +- .../net/wireless/brcm80211/brcmfmac/tracepoint.c | 22 + .../net/wireless/brcm80211/brcmfmac/tracepoint.h | 101 + drivers/net/wireless/brcm80211/brcmfmac/usb.c | 37 +- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 594 +++-- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 25 +- drivers/net/wireless/brcm80211/brcmsmac/Makefile | 7 +- drivers/net/wireless/brcm80211/brcmsmac/aiutils.c | 6 - drivers/net/wireless/brcm80211/brcmsmac/channel.c | 4 +- drivers/net/wireless/brcm80211/brcmsmac/d11.h | 1 + drivers/net/wireless/brcm80211/brcmsmac/led.c | 126 + drivers/net/wireless/brcm80211/brcmsmac/led.h | 36 + .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 97 +- .../net/wireless/brcm80211/brcmsmac/mac80211_if.h | 4 + drivers/net/wireless/brcm80211/brcmsmac/main.c | 377 ++- drivers/net/wireless/brcm80211/brcmsmac/main.h | 25 +- .../net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c | 40 +- .../net/wireless/brcm80211/brcmsmac/phy/phy_int.h | 1 - .../net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c | 35 +- .../net/wireless/brcm80211/brcmsmac/phy/phy_n.c | 14 +- drivers/net/wireless/brcm80211/brcmsmac/pmu.c | 54 - drivers/net/wireless/brcm80211/brcmsmac/pmu.h | 6 - drivers/net/wireless/brcm80211/brcmsmac/pub.h | 17 +- drivers/net/wireless/brcm80211/brcmutil/Makefile | 9 +- drivers/net/wireless/brcm80211/brcmutil/d11.c | 162 ++ drivers/net/wireless/brcm80211/brcmutil/utils.c | 37 +- .../net/wireless/brcm80211/include/brcm_hw_ids.h | 2 + drivers/net/wireless/brcm80211/include/brcmu_d11.h | 145 ++ .../net/wireless/brcm80211/include/brcmu_utils.h | 27 + .../net/wireless/brcm80211/include/brcmu_wifi.h | 28 +- .../net/wireless/brcm80211/include/chipcommon.h | 14 +- drivers/net/wireless/ipw2x00/ipw2100.c | 32 +- drivers/net/wireless/iwlegacy/3945-mac.c | 2 +- drivers/net/wireless/iwlegacy/3945-rs.c | 2 +- drivers/net/wireless/iwlegacy/3945.h | 4 - drivers/net/wireless/iwlegacy/4965-mac.c | 61 +- drivers/net/wireless/iwlegacy/4965-rs.c | 2 +- drivers/net/wireless/iwlegacy/4965.c | 2 +- drivers/net/wireless/iwlegacy/common.c | 7 +- drivers/net/wireless/iwlegacy/common.h | 6 +- drivers/net/wireless/iwlwifi/Kconfig | 11 +- drivers/net/wireless/iwlwifi/Makefile | 3 +- drivers/net/wireless/iwlwifi/dvm/agn.h | 10 +- drivers/net/wireless/iwlwifi/dvm/calib.c | 2 +- drivers/net/wireless/iwlwifi/dvm/calib.h | 2 +- drivers/net/wireless/iwlwifi/dvm/commands.h | 3 +- drivers/net/wireless/iwlwifi/dvm/debugfs.c | 42 +- drivers/net/wireless/iwlwifi/dvm/devices.c | 10 +- drivers/net/wireless/iwlwifi/dvm/lib.c | 18 +- drivers/net/wireless/iwlwifi/dvm/mac80211.c | 32 +- drivers/net/wireless/iwlwifi/dvm/main.c | 6 +- drivers/net/wireless/iwlwifi/dvm/rs.c | 2 +- drivers/net/wireless/iwlwifi/dvm/rxon.c | 11 +- drivers/net/wireless/iwlwifi/dvm/scan.c | 2 +- drivers/net/wireless/iwlwifi/dvm/sta.c | 5 +- drivers/net/wireless/iwlwifi/dvm/testmode.c | 2 +- drivers/net/wireless/iwlwifi/dvm/tx.c | 58 +- drivers/net/wireless/iwlwifi/dvm/ucode.c | 2 +- .../wireless/iwlwifi/{pcie/1000.c => iwl-1000.c} | 1 - .../wireless/iwlwifi/{pcie/2000.c => iwl-2000.c} | 1 - .../wireless/iwlwifi/{pcie/5000.c => iwl-5000.c} | 1 - .../wireless/iwlwifi/{pcie/6000.c => iwl-6000.c} | 1 - .../wireless/iwlwifi/{pcie/7000.c => iwl-7000.c} | 63 +- drivers/net/wireless/iwlwifi/iwl-agn-hw.h | 2 +- drivers/net/wireless/iwlwifi/iwl-config.h | 49 +- drivers/net/wireless/iwlwifi/iwl-csr.h | 2 +- drivers/net/wireless/iwlwifi/iwl-debug.c | 13 +- drivers/net/wireless/iwlwifi/iwl-devtrace.h | 2 +- drivers/net/wireless/iwlwifi/iwl-drv.c | 32 +- drivers/net/wireless/iwlwifi/iwl-drv.h | 17 +- drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c | 9 +- drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h | 2 +- drivers/net/wireless/iwlwifi/iwl-eeprom-read.c | 5 +- drivers/net/wireless/iwlwifi/iwl-eeprom-read.h | 2 +- drivers/net/wireless/iwlwifi/iwl-fh.h | 2 +- drivers/net/wireless/iwlwifi/iwl-fw-file.h | 2 +- drivers/net/wireless/iwlwifi/iwl-fw.h | 29 +- drivers/net/wireless/iwlwifi/iwl-io.c | 19 +- drivers/net/wireless/iwlwifi/iwl-modparams.h | 6 +- drivers/net/wireless/iwlwifi/iwl-notif-wait.c | 15 +- drivers/net/wireless/iwlwifi/iwl-notif-wait.h | 2 +- drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 51 +- drivers/net/wireless/iwlwifi/iwl-nvm-parse.h | 2 +- drivers/net/wireless/iwlwifi/iwl-op-mode.h | 2 +- drivers/net/wireless/iwlwifi/iwl-phy-db.c | 11 +- drivers/net/wireless/iwlwifi/iwl-phy-db.h | 2 +- drivers/net/wireless/iwlwifi/iwl-prph.h | 2 +- drivers/net/wireless/iwlwifi/iwl-test.c | 14 +- drivers/net/wireless/iwlwifi/iwl-test.h | 2 +- drivers/net/wireless/iwlwifi/iwl-testmode.h | 2 +- drivers/net/wireless/iwlwifi/iwl-trans.h | 8 +- drivers/net/wireless/iwlwifi/mvm/Makefile | 2 +- drivers/net/wireless/iwlwifi/mvm/binding.c | 2 +- drivers/net/wireless/iwlwifi/mvm/bt-coex.c | 589 +++++ drivers/net/wireless/iwlwifi/mvm/d3.c | 267 ++- drivers/net/wireless/iwlwifi/mvm/debugfs.c | 257 +- drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h | 319 +++ drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h | 53 +- drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h | 2 +- drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 66 +- drivers/net/wireless/iwlwifi/mvm/fw-api-rs.h | 2 +- drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 2 +- drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h | 2 +- drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h | 8 +- drivers/net/wireless/iwlwifi/mvm/fw-api.h | 83 +- drivers/net/wireless/iwlwifi/mvm/fw.c | 37 +- drivers/net/wireless/iwlwifi/mvm/led.c | 2 +- drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 87 +- drivers/net/wireless/iwlwifi/mvm/mac80211.c | 119 +- drivers/net/wireless/iwlwifi/mvm/mvm.h | 59 +- drivers/net/wireless/iwlwifi/mvm/nvm.c | 145 +- drivers/net/wireless/iwlwifi/mvm/ops.c | 48 +- drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c | 14 +- drivers/net/wireless/iwlwifi/mvm/power.c | 117 +- drivers/net/wireless/iwlwifi/mvm/quota.c | 5 +- drivers/net/wireless/iwlwifi/mvm/rs.c | 50 +- drivers/net/wireless/iwlwifi/mvm/rx.c | 2 +- drivers/net/wireless/iwlwifi/mvm/scan.c | 6 +- drivers/net/wireless/iwlwifi/mvm/sta.c | 99 +- drivers/net/wireless/iwlwifi/mvm/sta.h | 6 +- drivers/net/wireless/iwlwifi/mvm/time-event.c | 50 +- drivers/net/wireless/iwlwifi/mvm/time-event.h | 5 +- drivers/net/wireless/iwlwifi/mvm/tx.c | 28 +- drivers/net/wireless/iwlwifi/mvm/utils.c | 9 +- drivers/net/wireless/iwlwifi/pcie/cfg.h | 115 - drivers/net/wireless/iwlwifi/pcie/drv.c | 6 +- drivers/net/wireless/iwlwifi/pcie/trans.c | 25 +- drivers/net/wireless/iwlwifi/pcie/tx.c | 9 +- drivers/net/wireless/libertas_tf/main.c | 8 +- drivers/net/wireless/mac80211_hwsim.c | 125 +- drivers/net/wireless/mwifiex/11ac.c | 43 +- drivers/net/wireless/mwifiex/11ac.h | 17 + drivers/net/wireless/mwifiex/11n.c | 22 + drivers/net/wireless/mwifiex/11n_aggr.c | 14 +- drivers/net/wireless/mwifiex/11n_rxreorder.c | 2 +- drivers/net/wireless/mwifiex/Makefile | 1 + drivers/net/wireless/mwifiex/cfg80211.c | 255 +- drivers/net/wireless/mwifiex/cmdevt.c | 39 +- drivers/net/wireless/mwifiex/decl.h | 11 +- drivers/net/wireless/mwifiex/ethtool.c | 70 + drivers/net/wireless/mwifiex/fw.h | 83 +- drivers/net/wireless/mwifiex/init.c | 33 +- drivers/net/wireless/mwifiex/ioctl.h | 31 + drivers/net/wireless/mwifiex/join.c | 23 + drivers/net/wireless/mwifiex/main.c | 15 +- drivers/net/wireless/mwifiex/main.h | 23 +- drivers/net/wireless/mwifiex/pcie.c | 216 +- drivers/net/wireless/mwifiex/scan.c | 37 +- drivers/net/wireless/mwifiex/sta_cmd.c | 83 +- drivers/net/wireless/mwifiex/sta_cmdresp.c | 6 +- drivers/net/wireless/mwifiex/sta_ioctl.c | 30 +- drivers/net/wireless/mwifiex/txrx.c | 2 + drivers/net/wireless/mwifiex/uap_cmd.c | 55 + drivers/net/wireless/mwifiex/util.c | 6 +- drivers/net/wireless/mwifiex/wmm.c | 208 +- drivers/net/wireless/mwifiex/wmm.h | 3 + drivers/net/wireless/mwl8k.c | 167 +- drivers/net/wireless/orinoco/orinoco_usb.c | 2 +- drivers/net/wireless/p54/fwio.c | 4 +- drivers/net/wireless/p54/main.c | 6 +- drivers/net/wireless/p54/txrx.c | 4 +- drivers/net/wireless/ray_cs.c | 6 +- drivers/net/wireless/rndis_wlan.c | 5 +- drivers/net/wireless/rt2x00/Kconfig | 7 + drivers/net/wireless/rt2x00/rt2400pci.c | 323 +-- drivers/net/wireless/rt2x00/rt2500pci.c | 353 +-- drivers/net/wireless/rt2x00/rt2500usb.c | 35 +- drivers/net/wireless/rt2x00/rt2800.h | 103 +- drivers/net/wireless/rt2x00/rt2800lib.c | 1597 +++++++++--- drivers/net/wireless/rt2x00/rt2800pci.c | 377 ++- drivers/net/wireless/rt2x00/rt2800usb.c | 111 +- drivers/net/wireless/rt2x00/rt2x00.h | 95 +- drivers/net/wireless/rt2x00/rt2x00config.c | 10 +- drivers/net/wireless/rt2x00/rt2x00debug.c | 8 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 24 +- drivers/net/wireless/rt2x00/rt2x00firmware.c | 25 +- drivers/net/wireless/rt2x00/rt2x00leds.c | 2 +- drivers/net/wireless/rt2x00/rt2x00mac.c | 19 +- drivers/net/wireless/rt2x00/rt2x00mmio.c | 52 +- drivers/net/wireless/rt2x00/rt2x00mmio.h | 52 +- drivers/net/wireless/rt2x00/rt2x00pci.c | 14 +- drivers/net/wireless/rt2x00/rt2x00queue.c | 57 +- drivers/net/wireless/rt2x00/rt2x00queue.h | 15 +- drivers/net/wireless/rt2x00/rt2x00soc.c | 4 +- drivers/net/wireless/rt2x00/rt2x00usb.c | 44 +- drivers/net/wireless/rt2x00/rt61pci.c | 550 ++--- drivers/net/wireless/rt2x00/rt73usb.c | 32 +- drivers/net/wireless/rtl818x/rtl8180/dev.c | 4 +- drivers/net/wireless/rtl818x/rtl8180/grf5101.c | 3 +- drivers/net/wireless/rtl818x/rtl8180/max2820.c | 2 +- drivers/net/wireless/rtl818x/rtl8180/rtl8225.c | 3 +- drivers/net/wireless/rtl818x/rtl8180/sa2400.c | 3 +- drivers/net/wireless/rtl818x/rtl8187/dev.c | 4 +- drivers/net/wireless/rtl818x/rtl8187/rtl8225.c | 3 +- drivers/net/wireless/rtlwifi/Kconfig | 9 + drivers/net/wireless/rtlwifi/Makefile | 1 + drivers/net/wireless/rtlwifi/base.c | 383 ++- drivers/net/wireless/rtlwifi/base.h | 14 +- drivers/net/wireless/rtlwifi/core.c | 221 +- drivers/net/wireless/rtlwifi/debug.c | 5 +- drivers/net/wireless/rtlwifi/debug.h | 13 +- drivers/net/wireless/rtlwifi/efuse.c | 53 +- drivers/net/wireless/rtlwifi/efuse.h | 1 - drivers/net/wireless/rtlwifi/pci.c | 150 +- drivers/net/wireless/rtlwifi/pci.h | 2 + drivers/net/wireless/rtlwifi/ps.c | 330 ++- drivers/net/wireless/rtlwifi/ps.h | 2 + drivers/net/wireless/rtlwifi/rtl8188ee/Makefile | 16 + drivers/net/wireless/rtlwifi/rtl8188ee/def.h | 324 +++ drivers/net/wireless/rtlwifi/rtl8188ee/dm.c | 1794 ++++++++++++++ drivers/net/wireless/rtlwifi/rtl8188ee/dm.h | 326 +++ drivers/net/wireless/rtlwifi/rtl8188ee/fw.c | 830 +++++++ drivers/net/wireless/rtlwifi/rtl8188ee/fw.h | 301 +++ drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | 2530 ++++++++++++++++++++ drivers/net/wireless/rtlwifi/rtl8188ee/hw.h | 68 + drivers/net/wireless/rtlwifi/rtl8188ee/led.c | 157 ++ drivers/net/wireless/rtlwifi/rtl8188ee/led.h | 38 + drivers/net/wireless/rtlwifi/rtl8188ee/phy.c | 2202 +++++++++++++++++ drivers/net/wireless/rtlwifi/rtl8188ee/phy.h | 236 ++ drivers/net/wireless/rtlwifi/rtl8188ee/pwrseq.c | 109 + drivers/net/wireless/rtlwifi/rtl8188ee/pwrseq.h | 327 +++ drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.c | 140 ++ drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.h | 97 + drivers/net/wireless/rtlwifi/rtl8188ee/reg.h | 2258 +++++++++++++++++ drivers/net/wireless/rtlwifi/rtl8188ee/rf.c | 467 ++++ drivers/net/wireless/rtlwifi/rtl8188ee/rf.h | 46 + drivers/net/wireless/rtlwifi/rtl8188ee/sw.c | 400 ++++ drivers/net/wireless/rtlwifi/rtl8188ee/sw.h | 36 + drivers/net/wireless/rtlwifi/rtl8188ee/table.c | 643 +++++ drivers/net/wireless/rtlwifi/rtl8188ee/table.h | 47 + drivers/net/wireless/rtlwifi/rtl8188ee/trx.c | 817 +++++++ drivers/net/wireless/rtlwifi/rtl8188ee/trx.h | 795 ++++++ drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 105 +- drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 99 +- drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h | 4 + drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 118 +- drivers/net/wireless/rtlwifi/rtl8192ce/hw.h | 4 + drivers/net/wireless/rtlwifi/rtl8192ce/reg.h | 1 + drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 4 +- drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 328 +-- drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 20 +- drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 2 +- drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 10 +- drivers/net/wireless/rtlwifi/rtl8192de/dm.c | 32 +- drivers/net/wireless/rtlwifi/rtl8192de/hw.c | 2 +- drivers/net/wireless/rtlwifi/rtl8192de/phy.c | 40 +- drivers/net/wireless/rtlwifi/rtl8192de/reg.h | 2 +- drivers/net/wireless/rtlwifi/rtl8192de/sw.c | 6 +- drivers/net/wireless/rtlwifi/rtl8192de/trx.c | 4 +- drivers/net/wireless/rtlwifi/rtl8192se/def.h | 7 - drivers/net/wireless/rtlwifi/rtl8192se/dm.c | 49 +- drivers/net/wireless/rtlwifi/rtl8192se/hw.c | 150 +- drivers/net/wireless/rtlwifi/rtl8192se/hw.h | 3 +- drivers/net/wireless/rtlwifi/rtl8192se/phy.c | 61 +- drivers/net/wireless/rtlwifi/rtl8192se/phy.h | 1 + drivers/net/wireless/rtlwifi/rtl8192se/sw.c | 3 +- drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 300 +-- drivers/net/wireless/rtlwifi/rtl8723ae/dm.c | 88 +- drivers/net/wireless/rtlwifi/rtl8723ae/dm.h | 6 + drivers/net/wireless/rtlwifi/rtl8723ae/fw.c | 97 +- drivers/net/wireless/rtlwifi/rtl8723ae/fw.h | 7 +- drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | 70 +- drivers/net/wireless/rtlwifi/rtl8723ae/led.c | 22 +- drivers/net/wireless/rtlwifi/rtl8723ae/sw.c | 2 +- drivers/net/wireless/rtlwifi/rtl8723ae/trx.c | 14 +- drivers/net/wireless/rtlwifi/usb.c | 226 +- drivers/net/wireless/rtlwifi/usb.h | 5 +- drivers/net/wireless/rtlwifi/wifi.h | 224 +- drivers/net/wireless/ti/wl1251/main.c | 5 +- drivers/net/wireless/ti/wl1251/sdio.c | 4 +- drivers/net/wireless/ti/wl12xx/cmd.c | 2 +- drivers/net/wireless/ti/wl12xx/main.c | 1 + drivers/net/wireless/ti/wl12xx/wl12xx.h | 2 + drivers/net/wireless/ti/wl18xx/cmd.c | 6 +- drivers/net/wireless/ti/wl18xx/main.c | 25 +- drivers/net/wireless/ti/wl18xx/reg.h | 29 + drivers/net/wireless/ti/wl18xx/wl18xx.h | 4 +- drivers/net/wireless/ti/wlcore/acx.c | 29 + drivers/net/wireless/ti/wlcore/acx.h | 16 +- drivers/net/wireless/ti/wlcore/cmd.c | 32 + drivers/net/wireless/ti/wlcore/debug.h | 33 +- drivers/net/wireless/ti/wlcore/debugfs.c | 3 +- drivers/net/wireless/ti/wlcore/event.c | 9 +- drivers/net/wireless/ti/wlcore/main.c | 205 +- drivers/net/wireless/ti/wlcore/ps.c | 4 +- drivers/net/wireless/ti/wlcore/tx.c | 39 +- drivers/net/wireless/ti/wlcore/wlcore.h | 3 + drivers/net/wireless/ti/wlcore/wlcore_i.h | 29 +- drivers/net/wireless/zd1211rw/zd_mac.c | 4 +- drivers/nfc/Kconfig | 10 + drivers/nfc/Makefile | 1 + drivers/nfc/mei_phy.c | 164 ++ drivers/nfc/mei_phy.h | 30 + drivers/nfc/microread/Kconfig | 2 +- drivers/nfc/microread/mei.c | 139 +- drivers/nfc/pn533.c | 653 +++-- drivers/nfc/pn544/Kconfig | 13 +- drivers/nfc/pn544/Makefile | 2 + drivers/nfc/pn544/mei.c | 121 + drivers/ssb/driver_chipcommon.c | 2 +- drivers/ssb/driver_chipcommon_pmu.c | 60 +- drivers/ssb/driver_mipscore.c | 25 +- drivers/ssb/driver_pcicore.c | 15 +- drivers/ssb/embedded.c | 5 +- drivers/ssb/main.c | 51 +- drivers/ssb/pci.c | 120 +- drivers/ssb/pcmcia.c | 46 +- drivers/ssb/scan.c | 31 +- drivers/ssb/sprom.c | 4 +- drivers/ssb/ssb_private.h | 19 +- include/linux/bcma/bcma.h | 55 + include/linux/bcma/bcma_driver_chipcommon.h | 6 + include/linux/bcma/bcma_regs.h | 1 + include/linux/ieee80211.h | 125 +- include/linux/platform_data/brcmfmac-sdio.h | 124 + include/linux/socket.h | 1 + include/linux/ssb/ssb.h | 60 +- include/linux/ssb/ssb_regs.h | 10 +- include/net/bluetooth/bluetooth.h | 17 +- include/net/bluetooth/hci.h | 30 +- include/net/bluetooth/hci_core.h | 128 +- include/net/bluetooth/l2cap.h | 15 + include/net/bluetooth/rfcomm.h | 6 - include/net/cfg80211.h | 164 +- include/net/mac80211.h | 224 +- include/net/nfc/nfc.h | 2 + include/uapi/linux/nfc.h | 19 + include/uapi/linux/nl80211.h | 156 +- include/uapi/linux/rfkill.h | 2 + net/bluetooth/a2mp.c | 6 +- net/bluetooth/af_bluetooth.c | 15 +- net/bluetooth/bnep/sock.c | 4 +- net/bluetooth/cmtp/sock.c | 4 +- net/bluetooth/hci_conn.c | 42 +- net/bluetooth/hci_core.c | 901 +++++-- net/bluetooth/hci_event.c | 781 ++---- net/bluetooth/hci_sock.c | 9 +- net/bluetooth/hci_sysfs.c | 21 +- net/bluetooth/hidp/core.c | 994 ++++---- net/bluetooth/hidp/hidp.h | 67 +- net/bluetooth/hidp/sock.c | 26 +- net/bluetooth/l2cap_core.c | 134 +- net/bluetooth/l2cap_sock.c | 10 +- net/bluetooth/mgmt.c | 703 ++++-- net/bluetooth/rfcomm/core.c | 167 +- net/bluetooth/rfcomm/sock.c | 3 +- net/bluetooth/sco.c | 52 +- net/bluetooth/smp.c | 2 +- net/mac80211/cfg.c | 235 +- net/mac80211/chan.c | 54 +- net/mac80211/debugfs_key.c | 10 +- net/mac80211/debugfs_netdev.c | 33 +- net/mac80211/debugfs_sta.c | 33 + net/mac80211/driver-ops.h | 67 +- net/mac80211/ht.c | 52 +- net/mac80211/ibss.c | 175 +- net/mac80211/ieee80211_i.h | 86 +- net/mac80211/iface.c | 150 +- net/mac80211/key.c | 208 +- net/mac80211/key.h | 18 +- net/mac80211/main.c | 159 +- net/mac80211/mesh.c | 70 +- net/mac80211/mesh.h | 15 +- net/mac80211/mesh_hwmp.c | 28 +- net/mac80211/mesh_pathtbl.c | 56 +- net/mac80211/mesh_plink.c | 43 +- net/mac80211/mlme.c | 554 +++-- net/mac80211/offchannel.c | 16 +- net/mac80211/pm.c | 132 +- net/mac80211/rate.c | 324 ++- net/mac80211/rc80211_minstrel.c | 342 +-- net/mac80211/rc80211_minstrel.h | 34 +- net/mac80211/rc80211_minstrel_debugfs.c | 16 +- net/mac80211/rc80211_minstrel_ht.c | 273 ++- net/mac80211/rc80211_minstrel_ht.h | 8 +- net/mac80211/rx.c | 85 +- net/mac80211/scan.c | 20 +- net/mac80211/sta_info.c | 56 +- net/mac80211/sta_info.h | 11 +- net/mac80211/trace.h | 97 +- net/mac80211/tx.c | 161 +- net/mac80211/util.c | 224 +- net/mac80211/vht.c | 212 +- net/nfc/Kconfig | 2 +- net/nfc/Makefile | 6 +- net/nfc/core.c | 43 + net/nfc/{llcp => }/llcp.h | 39 +- net/nfc/llcp/Kconfig | 7 - net/nfc/{llcp/commands.c => llcp_commands.c} | 229 +- net/nfc/{llcp/llcp.c => llcp_core.c} | 241 +- net/nfc/{llcp/sock.c => llcp_sock.c} | 163 +- net/nfc/netlink.c | 175 +- net/nfc/nfc.h | 60 +- net/rfkill/core.c | 4 +- net/rfkill/rfkill-gpio.c | 7 +- net/rfkill/rfkill-regulator.c | 2 +- net/wireless/ap.c | 62 - net/wireless/core.c | 77 +- net/wireless/core.h | 25 +- net/wireless/mesh.c | 15 +- net/wireless/mlme.c | 235 +- net/wireless/nl80211.c | 2142 +++++++++++------ net/wireless/nl80211.h | 68 - net/wireless/rdev-ops.h | 44 +- net/wireless/reg.c | 8 +- net/wireless/sme.c | 28 +- net/wireless/sysfs.c | 25 +- net/wireless/trace.h | 81 + net/wireless/util.c | 28 +- 549 files changed, 42487 insertions(+), 12591 deletions(-) create mode 100644 drivers/net/wireless/ath/ath6kl/trace.c create mode 100644 drivers/net/wireless/ath/ath6kl/trace.h delete mode 100644 drivers/net/wireless/ath/wil6210/dbg_hexdump.h create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/btcoex.c create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/btcoex.h create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/tracepoint.c create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/led.c create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/led.h create mode 100644 drivers/net/wireless/brcm80211/brcmutil/d11.c create mode 100644 drivers/net/wireless/brcm80211/include/brcmu_d11.h rename drivers/net/wireless/iwlwifi/{pcie/1000.c => iwl-1000.c} (99%) rename drivers/net/wireless/iwlwifi/{pcie/2000.c => iwl-2000.c} (99%) rename drivers/net/wireless/iwlwifi/{pcie/5000.c => iwl-5000.c} (99%) rename drivers/net/wireless/iwlwifi/{pcie/6000.c => iwl-6000.c} (99%) rename drivers/net/wireless/iwlwifi/{pcie/7000.c => iwl-7000.c} (58%) create mode 100644 drivers/net/wireless/iwlwifi/mvm/bt-coex.c create mode 100644 drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h delete mode 100644 drivers/net/wireless/iwlwifi/pcie/cfg.h create mode 100644 drivers/net/wireless/mwifiex/ethtool.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8188ee/Makefile create mode 100644 drivers/net/wireless/rtlwifi/rtl8188ee/def.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8188ee/dm.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8188ee/dm.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8188ee/fw.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8188ee/fw.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8188ee/hw.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8188ee/hw.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8188ee/led.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8188ee/led.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8188ee/phy.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8188ee/phy.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8188ee/pwrseq.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8188ee/pwrseq.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8188ee/reg.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8188ee/rf.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8188ee/rf.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8188ee/sw.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8188ee/sw.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8188ee/table.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8188ee/table.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8188ee/trx.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8188ee/trx.h create mode 100644 drivers/nfc/mei_phy.c create mode 100644 drivers/nfc/mei_phy.h create mode 100644 drivers/nfc/pn544/mei.c create mode 100644 include/linux/platform_data/brcmfmac-sdio.h rename net/nfc/{llcp => }/llcp.h (86%) delete mode 100644 net/nfc/llcp/Kconfig rename net/nfc/{llcp/commands.c => llcp_commands.c} (72%) rename net/nfc/{llcp/llcp.c => llcp_core.c} (87%) rename net/nfc/{llcp/sock.c => llcp_sock.c} (86%) Merging driver-core.current/driver-core-linus (c1be5a5 Linux 3.9) $ git merge driver-core.current/driver-core-linus Already up-to-date. Merging tty.current/tty-linus (c1be5a5 Linux 3.9) $ git merge tty.current/tty-linus Already up-to-date. Merging usb.current/usb-linus (c1be5a5 Linux 3.9) $ git merge usb.current/usb-linus Already up-to-date. Merging staging.current/staging-linus (c1be5a5 Linux 3.9) $ git merge staging.current/staging-linus Already up-to-date. Merging char-misc.current/char-misc-linus (c1be5a5 Linux 3.9) $ git merge char-misc.current/char-misc-linus Already up-to-date. Merging input-current/for-linus (5846115 Input: wacom - fix "can not retrieve extra class descriptor" for DTH2242) $ git merge input-current/for-linus Already up-to-date. Merging md-current/for-linus (32f9f57 MD: ignore discard request for hard disks of hybid raid1/raid10 array) $ git merge md-current/for-linus Merge made by the 'recursive' strategy. Documentation/device-mapper/dm-raid.txt | 84 +++++++++--- Documentation/md.txt | 16 +-- drivers/md/bitmap.c | 4 +- drivers/md/dm-raid.c | 111 ++++++++++++++- drivers/md/md.c | 235 +++++++++++++++++++------------- drivers/md/md.h | 1 + drivers/md/raid1.c | 8 +- drivers/md/raid10.c | 24 +++- drivers/md/raid5.c | 16 ++- 9 files changed, 368 insertions(+), 131 deletions(-) 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 (72a763d crypto: algif - suppress sending source address information in recvmsg) $ git merge crypto-current/master Already up-to-date. Merging ide/master (bf6b438 ide: gayle: use module_platform_driver_probe()) $ git merge ide/master Merge made by the 'recursive' strategy. drivers/ide/gayle.c | 15 +-------------- drivers/ide/tx4938ide.c | 13 +------------ drivers/ide/tx4939ide.c | 13 +------------ 3 files changed, 3 insertions(+), 38 deletions(-) Merging dwmw2/master (5950f08 pcmcia: remove RPX board stuff) $ git merge dwmw2/master Merge made by the 'recursive' strategy. arch/m68k/include/asm/commproc.h | 17 ----- drivers/pcmcia/m8xx_pcmcia.c | 140 ------------------------------------- drivers/platform/x86/dell-laptop.c | 10 +-- kernel/params.c | 5 +- 4 files changed, 10 insertions(+), 162 deletions(-) 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 (a0d271c Linux 3.6) $ git merge irqdomain-current/irqdomain/merge Already up-to-date. Merging devicetree-current/devicetree/merge (ab28698 of: define struct device in of_platform.h if !OF_DEVICE and !OF_ADDRESS) $ git merge devicetree-current/devicetree/merge Already up-to-date. Merging spi-current/spi/merge (0d2d0cc spi/davinci: fix module build error) $ git merge spi-current/spi/merge Auto-merging include/linux/spi/spi.h Auto-merging drivers/spi/spi.c Auto-merging drivers/spi/spi-atmel.c Merge made by the 'recursive' strategy. drivers/spi/spi-atmel.c | 4 ++-- drivers/spi/spi-davinci.c | 2 +- drivers/spi/spi.c | 9 ++++++--- include/linux/spi/spi.h | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) Merging gpio-current/gpio/merge (e97f9b5 gpio/gpio-ich: fix ichx_gpio_check_available() return what callers expect) $ git merge gpio-current/gpio/merge Already up-to-date. Merging rr-fixes/fixes (c1be5a5 Linux 3.9) $ git merge rr-fixes/fixes Already up-to-date. Merging mfd-fixes/master (31880c3 Linux 3.9-rc6) $ git merge mfd-fixes/master Already up-to-date. Merging vfio-fixes/for-linus (904c680 vfio-pci: Fix possible integer overflow) $ git merge vfio-fixes/for-linus Already up-to-date. Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu) $ git merge asm-generic/master Already up-to-date. Merging arc/for-next (07961ac Linux 3.9-rc5) $ git merge arc/for-next Already up-to-date. Merging arm/for-next (4b6cce6 Merge branches 'devel-stable', 'entry', 'fixes', 'mach-types', 'misc' and 'smp-hotplug' into for-next) $ git merge arm/for-next Resolved 'arch/arm/kvm/arm.c' using previous resolution. Auto-merging arch/arm/mach-omap2/omap_hwmod.c Auto-merging arch/arm/kvm/arm.c CONFLICT (content): Merge conflict in arch/arm/kvm/arm.c Auto-merging arch/arm/kernel/smp.c Auto-merging arch/arm/kernel/process.c Auto-merging arch/arm/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 28af7ba] Merge remote-tracking branch 'arm/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/arm/cluster-pm-race-avoidance.txt | 498 ++++++++++++ Documentation/arm/vlocks.txt | 211 +++++ arch/arm/Kconfig | 12 +- arch/arm/Kconfig.debug | 11 + arch/arm/boot/compressed/Makefile | 3 + arch/arm/boot/compressed/debug.S | 12 + arch/arm/boot/compressed/misc.c | 8 +- arch/arm/common/Makefile | 1 + arch/arm/common/mcpm_entry.c | 263 +++++++ arch/arm/common/mcpm_head.S | 219 ++++++ arch/arm/common/mcpm_platsmp.c | 92 +++ arch/arm/common/vlock.S | 108 +++ arch/arm/common/vlock.h | 29 + arch/arm/include/asm/atomic.h | 24 + arch/arm/include/asm/cacheflush.h | 75 ++ arch/arm/include/asm/cp15.h | 16 +- arch/arm/include/asm/cputype.h | 61 +- arch/arm/include/asm/glue-df.h | 20 +- arch/arm/include/asm/io.h | 8 +- arch/arm/include/asm/kvm_arm.h | 4 + arch/arm/include/asm/kvm_asm.h | 2 +- arch/arm/include/asm/kvm_emulate.h | 107 ++- arch/arm/include/asm/kvm_host.h | 42 +- arch/arm/include/asm/kvm_mmu.h | 67 ++ arch/arm/include/asm/kvm_vgic.h | 1 - arch/arm/include/asm/mach/pci.h | 11 + arch/arm/include/asm/mcpm.h | 209 +++++ arch/arm/include/asm/thread_info.h | 1 + arch/arm/include/asm/tlbflush.h | 2 +- arch/arm/include/debug/uncompress.h | 7 + arch/arm/include/uapi/asm/kvm.h | 12 +- arch/arm/kernel/asm-offsets.c | 12 +- arch/arm/kernel/bios32.c | 6 + arch/arm/kernel/entry-armv.S | 59 +- arch/arm/kernel/entry-common.S | 8 +- arch/arm/kernel/entry-header.S | 66 +- arch/arm/kernel/head-common.S | 9 +- arch/arm/kernel/head-nommu.S | 8 +- arch/arm/kernel/process.c | 13 +- arch/arm/kernel/return_address.c | 5 +- arch/arm/kernel/setup.c | 2 +- arch/arm/kernel/smp.c | 42 +- arch/arm/kernel/smp_scu.c | 2 +- arch/arm/kvm/Makefile | 2 +- arch/arm/kvm/arm.c | 194 +---- arch/arm/kvm/coproc.c | 28 +- arch/arm/kvm/coproc.h | 4 +- arch/arm/kvm/emulate.c | 75 +- arch/arm/kvm/guest.c | 17 + arch/arm/kvm/handle_exit.c | 164 ++++ arch/arm/kvm/interrupts.S | 13 +- arch/arm/kvm/mmio.c | 46 +- arch/arm/kvm/mmu.c | 184 +++-- arch/arm/kvm/vgic.c | 2 +- arch/arm/mach-exynos/hotplug.c | 1 - arch/arm/mach-exynos/mach-nuri.c | 2 +- arch/arm/mach-highbank/hotplug.c | 2 - arch/arm/mach-imx/devices/devices.c | 2 +- arch/arm/mach-imx/hotplug.c | 2 - arch/arm/mach-integrator/integrator_ap.c | 6 +- arch/arm/mach-integrator/integrator_cp.c | 7 +- arch/arm/mach-msm/hotplug.c | 4 - arch/arm/mach-omap2/board-omap3beagle.c | 2 +- arch/arm/mach-omap2/clock.c | 2 +- arch/arm/mach-omap2/gpmc-onenand.c | 4 +- arch/arm/mach-omap2/gpmc.c | 8 +- arch/arm/mach-omap2/id.c | 4 +- arch/arm/mach-omap2/omap-hotplug.c | 3 - arch/arm/mach-omap2/omap-smp.c | 2 +- arch/arm/mach-omap2/omap_device.c | 13 +- arch/arm/mach-omap2/omap_hwmod.c | 4 +- arch/arm/mach-omap2/pm-debug.c | 6 +- arch/arm/mach-omap2/powerdomain.c | 2 +- arch/arm/mach-omap2/timer.c | 2 +- arch/arm/mach-prima2/hotplug.c | 3 - arch/arm/mach-realview/hotplug.c | 2 - arch/arm/mach-shmobile/smp-sh73a0.c | 8 - arch/arm/mach-spear13xx/hotplug.c | 2 - arch/arm/mach-tegra/board-harmony-pcie.c | 6 +- arch/arm/mach-tegra/common.h | 1 - arch/arm/mach-tegra/hotplug.c | 10 - arch/arm/mach-tegra/platsmp.c | 1 - arch/arm/mach-tegra/tegra2_emc.c | 2 +- arch/arm/mach-ux500/cpu.c | 5 +- arch/arm/mach-ux500/hotplug.c | 3 - arch/arm/mach-vexpress/hotplug.c | 2 - arch/arm/mm/Kconfig | 9 +- arch/arm/mm/alignment.c | 2 + arch/arm/mm/dma-mapping.c | 15 +- arch/arm/mm/flush.c | 15 +- arch/arm/mm/ioremap.c | 12 +- arch/arm/mm/mmu.c | 17 + arch/arm/mm/proc-v6.S | 2 - arch/arm/mm/proc-v7-2level.S | 3 +- arch/arm/mm/proc-v7-3level.S | 3 +- arch/arm/mm/proc-v7.S | 7 +- arch/arm/plat-omap/dmtimer.c | 12 +- arch/arm/tools/mach-types | 991 ++++++++++-------------- 98 files changed, 3089 insertions(+), 1219 deletions(-) create mode 100644 Documentation/arm/cluster-pm-race-avoidance.txt create mode 100644 Documentation/arm/vlocks.txt create mode 100644 arch/arm/boot/compressed/debug.S create mode 100644 arch/arm/common/mcpm_entry.c create mode 100644 arch/arm/common/mcpm_head.S create mode 100644 arch/arm/common/mcpm_platsmp.c create mode 100644 arch/arm/common/vlock.S create mode 100644 arch/arm/common/vlock.h create mode 100644 arch/arm/include/asm/mcpm.h create mode 100644 arch/arm/include/debug/uncompress.h create mode 100644 arch/arm/kvm/handle_exit.c Merging arm-perf/for-next/perf (ab87304 Merge branches 'perf/fixes' and 'hw-breakpoint' into for-next/perf) $ git merge arm-perf/for-next/perf Merge made by the 'recursive' strategy. Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) $ git merge davinci/davinci-next Already up-to-date. Merging xilinx/arm-next (64e3fd3 arm: zynq: Add support for pmu) $ git merge xilinx/arm-next Resolved 'drivers/clocksource/Makefile' using previous resolution. Auto-merging include/linux/clocksource.h Auto-merging drivers/clocksource/Makefile CONFLICT (content): Merge conflict in drivers/clocksource/Makefile Removing arch/arm/mach-zynq/timer.c Auto-merging arch/arm/mach-vexpress/v2m.c Auto-merging arch/arm/mach-omap2/timer.c Auto-merging arch/arm/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 60e9ba7] Merge remote-tracking branch 'xilinx/arm-next' $ git diff -M --stat --summary HEAD^.. .../bindings/timer/cadence,ttc-timer.txt | 17 + arch/arm/Kconfig | 1 + arch/arm/boot/dts/zynq-7000.dtsi | 59 +-- arch/arm/boot/dts/zynq-zc702.dts | 10 - arch/arm/include/asm/smp_twd.h | 8 - arch/arm/kernel/smp_twd.c | 17 +- arch/arm/mach-highbank/highbank.c | 5 +- arch/arm/mach-imx/mach-imx6q.c | 5 +- arch/arm/mach-omap2/timer.c | 2 +- arch/arm/mach-spear13xx/spear13xx.c | 4 +- arch/arm/mach-ux500/timer.c | 3 +- arch/arm/mach-vexpress/v2m.c | 6 +- arch/arm/mach-zynq/Kconfig | 2 + arch/arm/mach-zynq/Makefile | 6 +- arch/arm/mach-zynq/common.c | 68 ++-- arch/arm/mach-zynq/common.h | 20 +- arch/arm/mach-zynq/headsmp.S | 24 ++ arch/arm/mach-zynq/hotplug.c | 104 +++++ arch/arm/mach-zynq/platsmp.c | 152 +++++++ arch/arm/mach-zynq/slcr.c | 125 ++++++ arch/arm/mach-zynq/timer.c | 324 --------------- drivers/clocksource/Kconfig | 3 + drivers/clocksource/Makefile | 1 + drivers/clocksource/bcm2835_timer.c | 12 +- drivers/clocksource/cadence_ttc_timer.c | 436 +++++++++++++++++++++ drivers/clocksource/clksrc-of.c | 5 +- drivers/clocksource/tegra20_timer.c | 73 ++-- drivers/clocksource/vt8500_timer.c | 16 +- include/linux/clocksource.h | 12 +- 29 files changed, 1007 insertions(+), 513 deletions(-) create mode 100644 Documentation/devicetree/bindings/timer/cadence,ttc-timer.txt create mode 100644 arch/arm/mach-zynq/headsmp.S create mode 100644 arch/arm/mach-zynq/hotplug.c create mode 100644 arch/arm/mach-zynq/platsmp.c create mode 100644 arch/arm/mach-zynq/slcr.c delete mode 100644 arch/arm/mach-zynq/timer.c create mode 100644 drivers/clocksource/cadence_ttc_timer.c Merging arm64/upstream (16c85a1 arm64: Use acquire/release semantics instead of explicit DMB) $ git merge arm64/upstream Already up-to-date. Merging blackfin/for-linus (f656c24 blackfin: time-ts: Remove duplicate assignment) $ git merge blackfin/for-linus Already up-to-date. Merging c6x/for-linux-next (f934af0 add memory barrier to arch_local_irq_restore) $ git merge c6x/for-linux-next Already up-to-date. Merging cris/for-next (32ade6a CRIS: Add kvm_para.h which includes generic file) $ git merge cris/for-next Auto-merging arch/cris/include/asm/processor.h Auto-merging arch/cris/arch-v32/drivers/Kconfig Auto-merging arch/cris/Kconfig Merge made by the 'recursive' strategy. arch/cris/Kconfig | 81 ------- arch/cris/arch-v10/drivers/Kconfig | 70 ------ arch/cris/arch-v10/drivers/Makefile | 2 - arch/cris/arch-v32/drivers/Kconfig | 394 ---------------------------------- arch/cris/arch-v32/mach-a3/Kconfig | 4 - arch/cris/include/asm/processor.h | 1 - arch/cris/include/uapi/asm/kvm_para.h | 1 + 7 files changed, 1 insertion(+), 552 deletions(-) create mode 100644 arch/cris/include/uapi/asm/kvm_para.h Merging hexagon/linux-next (e0e34de Hexagon: add v4 CS regs to core copyout macro) $ git merge hexagon/linux-next Removing arch/hexagon/kernel/topology.c Auto-merging arch/hexagon/kernel/process.c Merge made by the 'recursive' strategy. arch/hexagon/Kconfig | 33 ++-- arch/hexagon/Makefile | 17 +- arch/hexagon/include/asm/Kbuild | 2 +- arch/hexagon/include/asm/atomic.h | 22 +-- arch/hexagon/include/asm/elf.h | 23 ++- arch/hexagon/include/asm/hexagon_vm.h | 56 +++--- arch/hexagon/include/asm/io.h | 16 +- arch/hexagon/include/asm/mem-layout.h | 28 +-- arch/hexagon/include/asm/page.h | 12 +- arch/hexagon/include/asm/processor.h | 51 +++++- arch/hexagon/include/asm/vm_mmu.h | 11 +- arch/hexagon/include/uapi/asm/ptrace.h | 5 + arch/hexagon/include/uapi/asm/registers.h | 17 +- arch/hexagon/include/uapi/asm/signal.h | 4 + arch/hexagon/include/uapi/asm/unistd.h | 3 + arch/hexagon/include/uapi/asm/user.h | 6 + arch/hexagon/kernel/Makefile | 2 +- arch/hexagon/kernel/asm-offsets.c | 5 +- arch/hexagon/kernel/dma.c | 27 +-- arch/hexagon/kernel/head.S | 107 ++++++++++-- arch/hexagon/kernel/kgdb.c | 4 +- arch/hexagon/kernel/process.c | 42 ++++- arch/hexagon/kernel/ptrace.c | 26 ++- arch/hexagon/kernel/setup.c | 9 +- arch/hexagon/kernel/signal.c | 45 ++--- arch/hexagon/kernel/topology.c | 52 ------ arch/hexagon/kernel/traps.c | 36 ++-- arch/hexagon/kernel/vm_entry.S | 282 +++++++++++++++++++++--------- arch/hexagon/kernel/vm_events.c | 4 +- arch/hexagon/kernel/vm_vectors.S | 4 +- arch/hexagon/kernel/vmlinux.lds.S | 12 +- arch/hexagon/mm/init.c | 35 ++-- arch/hexagon/mm/vm_fault.c | 4 +- arch/openrisc/Kconfig | 3 - 34 files changed, 659 insertions(+), 346 deletions(-) delete mode 100644 arch/hexagon/kernel/topology.c Merging ia64/next (797f6a6 Add size restriction to the kdump documentation) $ git merge ia64/next Already up-to-date. Merging m68k/for-next (e00c73e m68k: Remove inline strlen() implementation) $ git merge m68k/for-next Already up-to-date. Merging m68knommu/for-next (2842e5b0 m68knommu: enable Timer on coldfire 532x) $ git merge m68knommu/for-next Auto-merging drivers/tty/serial/68328serial.c Auto-merging arch/m68k/platform/coldfire/m53xx.c Auto-merging arch/m68k/include/asm/m53xxsim.h Removing arch/m68k/include/asm/dbg.h Merge made by the 'recursive' strategy. arch/m68k/Kconfig.cpu | 12 ++++++++++++ arch/m68k/Kconfig.machine | 16 +++++++--------- arch/m68k/Makefile | 1 + arch/m68k/include/asm/dbg.h | 6 ------ arch/m68k/include/asm/dma.h | 2 +- arch/m68k/include/asm/m53xxacr.h | 4 ++-- arch/m68k/include/asm/{m532xsim.h => m53xxsim.h} | 12 ++++++------ arch/m68k/include/asm/m54xxacr.h | 7 ++++++- arch/m68k/include/asm/mcfgpio.h | 10 +++++----- arch/m68k/include/asm/mcfsim.h | 4 ++-- arch/m68k/include/asm/mcftimer.h | 2 +- arch/m68k/platform/coldfire/Makefile | 2 +- arch/m68k/platform/coldfire/{m532x.c => m53xx.c} | 23 +++++++++++------------ arch/m68k/platform/coldfire/timers.c | 2 +- drivers/tty/serial/68328serial.c | 1 - fs/romfs/mmap-nommu.c | 5 ++++- 16 files changed, 60 insertions(+), 49 deletions(-) delete mode 100644 arch/m68k/include/asm/dbg.h rename arch/m68k/include/asm/{m532xsim.h => m53xxsim.h} (99%) rename arch/m68k/platform/coldfire/{m532x.c => m53xx.c} (98%) Merging metag/for-next (164c013 metag: defconfigs: increase log buffer 8KiB => 128KiB) $ git merge metag/for-next Already up-to-date. Merging microblaze/next (01cc2cb microblaze: intc: set the default irq_domain) $ git merge microblaze/next Merge made by the 'recursive' strategy. arch/microblaze/kernel/intc.c | 2 ++ arch/microblaze/pci/pci-common.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) Merging mips/mips-for-linux-next (6eac6e6 Merge branches 'next/3.9-fixes', 'next/kvm' and 'next/micromips' into mips-for-linux-next) $ git merge mips/mips-for-linux-next Auto-merging arch/mips/kernel/smp.c Auto-merging arch/mips/Kconfig Merge made by the 'recursive' strategy. arch/mips/Kbuild | 4 + arch/mips/Kconfig | 22 + arch/mips/configs/malta_kvm_defconfig | 2267 +++++++++++++++++++++++++++ arch/mips/configs/malta_kvm_guest_defconfig | 2237 ++++++++++++++++++++++++++ arch/mips/include/asm/hazards.h | 371 +++-- arch/mips/include/asm/irqflags.h | 153 +- arch/mips/include/asm/kvm.h | 55 + arch/mips/include/asm/kvm_host.h | 667 ++++++++ arch/mips/include/asm/mach-generic/spaces.h | 9 +- arch/mips/include/asm/mipsregs.h | 18 + arch/mips/include/asm/mmu_context.h | 19 +- arch/mips/include/asm/pgtable.h | 1 + arch/mips/include/asm/processor.h | 5 + arch/mips/include/asm/spinlock.h | 116 +- arch/mips/include/asm/thread_info.h | 8 +- arch/mips/include/asm/uaccess.h | 11 +- arch/mips/include/asm/uasm.h | 66 +- arch/mips/include/uapi/asm/inst.h | 449 ++++++ arch/mips/kernel/asm-offsets.c | 66 + arch/mips/kernel/binfmt_elfo32.c | 4 + arch/mips/kernel/cevt-r4k.c | 4 + arch/mips/kernel/smp.c | 1 + arch/mips/kernel/traps.c | 18 +- arch/mips/kvm/00README.txt | 31 + arch/mips/kvm/Kconfig | 49 + arch/mips/kvm/Makefile | 13 + arch/mips/kvm/kvm_cb.c | 14 + arch/mips/kvm/kvm_locore.S | 650 ++++++++ arch/mips/kvm/kvm_mips.c | 958 +++++++++++ arch/mips/kvm/kvm_mips_comm.h | 23 + arch/mips/kvm/kvm_mips_commpage.c | 37 + arch/mips/kvm/kvm_mips_dyntrans.c | 149 ++ arch/mips/kvm/kvm_mips_emul.c | 1829 +++++++++++++++++++++ arch/mips/kvm/kvm_mips_int.c | 243 +++ arch/mips/kvm/kvm_mips_int.h | 49 + arch/mips/kvm/kvm_mips_opcode.h | 24 + arch/mips/kvm/kvm_mips_stats.c | 82 + arch/mips/kvm/kvm_tlb.c | 932 +++++++++++ arch/mips/kvm/kvm_trap_emul.c | 482 ++++++ arch/mips/kvm/trace.h | 46 + arch/mips/lib/mips-atomic.c | 149 +- arch/mips/mm/Makefile | 4 +- arch/mips/mm/c-r4k.c | 6 +- arch/mips/mm/cache.c | 1 + arch/mips/mm/tlb-r4k.c | 2 + arch/mips/mm/tlbex.c | 22 +- arch/mips/mm/uasm-micromips.c | 220 +++ arch/mips/mm/uasm-mips.c | 196 +++ arch/mips/mm/uasm.c | 326 +--- arch/mips/mti-malta/Platform | 6 +- arch/mips/mti-malta/malta-time.c | 13 + arch/mips/sgi-ip27/ip27-timer.c | 2 +- mm/bootmem.c | 1 + virt/kvm/kvm_main.c | 2 +- 54 files changed, 12486 insertions(+), 646 deletions(-) create mode 100644 arch/mips/configs/malta_kvm_defconfig create mode 100644 arch/mips/configs/malta_kvm_guest_defconfig create mode 100644 arch/mips/include/asm/kvm.h create mode 100644 arch/mips/include/asm/kvm_host.h create mode 100644 arch/mips/kvm/00README.txt create mode 100644 arch/mips/kvm/Kconfig create mode 100644 arch/mips/kvm/Makefile create mode 100644 arch/mips/kvm/kvm_cb.c create mode 100644 arch/mips/kvm/kvm_locore.S create mode 100644 arch/mips/kvm/kvm_mips.c create mode 100644 arch/mips/kvm/kvm_mips_comm.h create mode 100644 arch/mips/kvm/kvm_mips_commpage.c create mode 100644 arch/mips/kvm/kvm_mips_dyntrans.c create mode 100644 arch/mips/kvm/kvm_mips_emul.c create mode 100644 arch/mips/kvm/kvm_mips_int.c create mode 100644 arch/mips/kvm/kvm_mips_int.h create mode 100644 arch/mips/kvm/kvm_mips_opcode.h create mode 100644 arch/mips/kvm/kvm_mips_stats.c create mode 100644 arch/mips/kvm/kvm_tlb.c create mode 100644 arch/mips/kvm/kvm_trap_emul.c create mode 100644 arch/mips/kvm/trace.h create mode 100644 arch/mips/mm/uasm-micromips.c create mode 100644 arch/mips/mm/uasm-mips.c Merging openrisc/for-upstream (6af6095 openrisc: remove HAVE_VIRT_TO_BUS) $ git merge openrisc/for-upstream Already up-to-date. Merging parisc/for-next (6c700d7 [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve()) $ git merge parisc/for-next Already up-to-date. Merging powerpc/next (1f6aaac powerpc: Update tlbie/tlbiel as per ISA doc) $ git merge powerpc/next Recorded preimage for 'arch/powerpc/mm/numa.c' Resolved 'arch/metag/mm/Kconfig' using previous resolution. Auto-merging drivers/pci/probe.c Removing arch/powerpc/platforms/prep/Kconfig Auto-merging arch/powerpc/platforms/512x/mpc512x_shared.c Auto-merging arch/powerpc/platforms/512x/mpc512x_generic.c Auto-merging arch/powerpc/platforms/512x/Kconfig Auto-merging arch/powerpc/mm/numa.c CONFLICT (content): Merge conflict in arch/powerpc/mm/numa.c Auto-merging arch/powerpc/mm/mem.c Auto-merging arch/powerpc/mm/init_64.c Auto-merging arch/powerpc/include/asm/hugetlb.h Auto-merging arch/powerpc/boot/dts/fsl/qoriq-sec5.0-0.dtsi Auto-merging arch/metag/mm/Kconfig CONFLICT (content): Merge conflict in arch/metag/mm/Kconfig Removing Documentation/powerpc/zImage_layout.txt Removing Documentation/powerpc/sound.txt Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/powerpc/mm/numa.c'. [master 8072b19] Merge remote-tracking branch 'powerpc/next' $ git diff -M --stat --summary HEAD^.. .../devicetree/bindings/powerpc/fsl/cpus.txt | 22 + Documentation/powerpc/00-INDEX | 4 - Documentation/powerpc/ptrace.txt | 1 + Documentation/powerpc/sound.txt | 81 --- Documentation/powerpc/zImage_layout.txt | 47 -- arch/metag/mm/Kconfig | 5 - arch/powerpc/Kconfig | 20 +- arch/powerpc/boot/dts/ac14xx.dts | 392 ++++++++++++++ arch/powerpc/boot/dts/b4420qds.dts | 50 ++ arch/powerpc/boot/dts/b4860qds.dts | 61 +++ arch/powerpc/boot/dts/b4qds.dts | 169 ++++++ arch/powerpc/boot/dts/fsl/b4420si-post.dtsi | 98 ++++ arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi | 73 +++ arch/powerpc/boot/dts/fsl/b4860si-post.dtsi | 142 +++++ arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi | 83 +++ arch/powerpc/boot/dts/fsl/b4si-post.dtsi | 268 ++++++++++ arch/powerpc/boot/dts/fsl/e500mc_power_isa.dtsi | 1 + arch/powerpc/boot/dts/fsl/e5500_power_isa.dtsi | 1 + arch/powerpc/boot/dts/fsl/e6500_power_isa.dtsi | 65 +++ arch/powerpc/boot/dts/fsl/p1023si-post.dtsi | 1 + arch/powerpc/boot/dts/fsl/p2041si-post.dtsi | 2 +- arch/powerpc/boot/dts/fsl/p3041si-post.dtsi | 2 +- arch/powerpc/boot/dts/fsl/p4080si-post.dtsi | 2 +- arch/powerpc/boot/dts/fsl/p5020si-post.dtsi | 2 +- arch/powerpc/boot/dts/fsl/p5040si-post.dtsi | 2 +- arch/powerpc/boot/dts/fsl/pq3-sec4.4-0.dtsi | 1 + arch/powerpc/boot/dts/fsl/qonverge-usb2-dr-0.dtsi | 41 ++ arch/powerpc/boot/dts/fsl/qoriq-gpio-1.dtsi | 41 ++ arch/powerpc/boot/dts/fsl/qoriq-gpio-2.dtsi | 41 ++ arch/powerpc/boot/dts/fsl/qoriq-gpio-3.dtsi | 41 ++ arch/powerpc/boot/dts/fsl/qoriq-sec4.0-0.dtsi | 1 + arch/powerpc/boot/dts/fsl/qoriq-sec4.2-0.dtsi | 1 + .../{qoriq-sec4.1-0.dtsi => qoriq-sec5.0-0.dtsi} | 27 +- arch/powerpc/boot/dts/fsl/qoriq-sec5.2-0.dtsi | 1 + arch/powerpc/boot/dts/fsl/qoriq-sec5.3-0.dtsi | 119 +++++ arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 442 +++++++++++++++ arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi | 128 +++++ arch/powerpc/boot/dts/mpc5121.dtsi | 2 +- arch/powerpc/boot/dts/mpc5121ads.dts | 2 +- arch/powerpc/boot/dts/mpc5125twr.dts | 233 ++++++++ arch/powerpc/boot/dts/mpc8536ds_36b.dts | 6 +- arch/powerpc/boot/dts/p1021rdb-pc.dtsi | 12 +- arch/powerpc/boot/dts/p1025rdb_36b.dts | 5 + arch/powerpc/boot/dts/pdm360ng.dts | 2 +- arch/powerpc/boot/dts/t4240qds.dts | 224 ++++++++ arch/powerpc/configs/corenet64_smp_defconfig | 46 +- arch/powerpc/configs/mpc512x_defconfig | 2 +- arch/powerpc/configs/mpc85xx_defconfig | 40 +- arch/powerpc/configs/mpc85xx_smp_defconfig | 32 ++ arch/powerpc/configs/ps3_defconfig | 2 +- arch/powerpc/include/asm/bitops.h | 11 +- arch/powerpc/include/asm/cputable.h | 3 +- arch/powerpc/include/asm/dma.h | 5 - arch/powerpc/include/asm/elf.h | 1 + arch/powerpc/include/asm/exception-64s.h | 2 +- arch/powerpc/include/asm/firmware.h | 6 +- arch/powerpc/include/asm/hardirq.h | 3 + arch/powerpc/include/asm/hugetlb.h | 30 ++ arch/powerpc/include/asm/io.h | 4 - arch/powerpc/include/asm/kvm_asm.h | 4 + arch/powerpc/include/asm/machdep.h | 3 +- arch/powerpc/include/asm/mmu-book3e.h | 4 + arch/powerpc/include/asm/mmu-hash64.h | 60 ++- arch/powerpc/include/asm/opal.h | 2 + arch/powerpc/include/asm/page.h | 19 + arch/powerpc/include/asm/page_64.h | 3 +- arch/powerpc/include/asm/parport.h | 4 +- arch/powerpc/include/asm/pci-bridge.h | 11 +- arch/powerpc/include/asm/perf_event_server.h | 9 + arch/powerpc/include/asm/pgalloc-32.h | 45 ++ arch/powerpc/include/asm/pgalloc-64.h | 158 +++++- arch/powerpc/include/asm/pgalloc.h | 46 +- arch/powerpc/include/asm/pgtable-ppc64-64k.h | 6 +- arch/powerpc/include/asm/pgtable-ppc64.h | 3 +- arch/powerpc/include/asm/pgtable.h | 8 + arch/powerpc/include/asm/ppc-opcode.h | 8 + arch/powerpc/include/asm/processor.h | 9 +- arch/powerpc/include/asm/prom.h | 69 +++ arch/powerpc/include/asm/ptrace.h | 3 +- arch/powerpc/include/asm/reg.h | 17 + arch/powerpc/include/asm/rtas.h | 6 + arch/powerpc/include/asm/smp.h | 2 + arch/powerpc/include/asm/topology.h | 5 + arch/powerpc/include/asm/xics.h | 1 + arch/powerpc/include/uapi/asm/ptrace.h | 1 + arch/powerpc/kernel/cpu_setup_fsl_booke.S | 16 + arch/powerpc/kernel/cpu_setup_power.S | 28 + arch/powerpc/kernel/cputable.c | 9 +- arch/powerpc/kernel/dbell.c | 2 + arch/powerpc/kernel/epapr_hcalls.S | 2 + arch/powerpc/kernel/exceptions-64e.S | 47 ++ arch/powerpc/kernel/exceptions-64s.S | 22 +- arch/powerpc/kernel/head_64.S | 1 + arch/powerpc/kernel/head_booke.h | 5 - arch/powerpc/kernel/idle_book3e.S | 32 +- arch/powerpc/kernel/iommu.c | 2 +- arch/powerpc/kernel/irq.c | 12 + arch/powerpc/kernel/kgdb.c | 2 +- arch/powerpc/kernel/pci-common.c | 56 +- arch/powerpc/kernel/prom_init.c | 98 +--- arch/powerpc/kernel/ptrace.c | 31 +- arch/powerpc/kernel/ptrace32.c | 15 +- arch/powerpc/kernel/rtas_flash.c | 51 +- arch/powerpc/kernel/rtas_pci.c | 4 +- arch/powerpc/kernel/rtasd.c | 49 +- arch/powerpc/kernel/setup-common.c | 6 - arch/powerpc/kernel/setup_64.c | 4 +- arch/powerpc/kernel/time.c | 4 +- arch/powerpc/kvm/book3s_64_mmu_host.c | 2 +- arch/powerpc/kvm/book3s_hv.c | 8 +- arch/powerpc/kvm/book3s_hv_interrupts.S | 6 + arch/powerpc/mm/gup.c | 18 +- arch/powerpc/mm/hash_low_64.S | 22 +- arch/powerpc/mm/hash_native_64.c | 178 +++++-- arch/powerpc/mm/hash_utils_64.c | 183 +++++-- arch/powerpc/mm/hugetlbpage-hash64.c | 33 +- arch/powerpc/mm/hugetlbpage.c | 192 +++++-- arch/powerpc/mm/icswx.c | 2 +- arch/powerpc/mm/init_64.c | 3 +- arch/powerpc/mm/mem.c | 3 +- arch/powerpc/mm/mmu_context_hash64.c | 37 ++ arch/powerpc/mm/numa.c | 278 +++++++--- arch/powerpc/mm/pgtable_64.c | 118 ++++ arch/powerpc/mm/slice.c | 223 ++++---- arch/powerpc/mm/tlb_nohash.c | 18 +- arch/powerpc/perf/Makefile | 5 +- arch/powerpc/perf/bhrb.S | 44 ++ arch/powerpc/perf/core-book3s.c | 231 +++++++- arch/powerpc/perf/power5+-pmu.c | 2 +- arch/powerpc/perf/power5-pmu.c | 1 + arch/powerpc/perf/power8-pmu.c | 592 +++++++++++++++++++++ arch/powerpc/platforms/40x/Kconfig | 7 - arch/powerpc/platforms/512x/Kconfig | 8 +- arch/powerpc/platforms/512x/Makefile | 2 +- arch/powerpc/platforms/512x/clock.c | 9 +- arch/powerpc/platforms/512x/mpc512x.h | 1 + .../512x/{mpc5121_generic.c => mpc512x_generic.c} | 12 +- arch/powerpc/platforms/512x/mpc512x_shared.c | 33 +- arch/powerpc/platforms/85xx/Kconfig | 34 ++ arch/powerpc/platforms/85xx/Makefile | 2 + arch/powerpc/platforms/85xx/b4_qds.c | 102 ++++ arch/powerpc/platforms/85xx/corenet_ds.c | 5 +- arch/powerpc/platforms/85xx/smp.c | 2 +- arch/powerpc/platforms/85xx/t4240_qds.c | 98 ++++ arch/powerpc/platforms/Kconfig | 4 +- arch/powerpc/platforms/Kconfig.cputype | 2 +- arch/powerpc/platforms/cell/beat_htab.c | 26 +- arch/powerpc/platforms/cell/pmu.c | 2 +- arch/powerpc/platforms/cell/spufs/file.c | 2 +- arch/powerpc/platforms/cell/spufs/inode.c | 1 + arch/powerpc/platforms/embedded6xx/Kconfig | 5 - arch/powerpc/platforms/powernv/Kconfig | 5 + arch/powerpc/platforms/powernv/opal-wrappers.S | 1 + arch/powerpc/platforms/powernv/pci-ioda.c | 307 +++++++++-- arch/powerpc/platforms/powernv/pci-p5ioc2.c | 15 +- arch/powerpc/platforms/powernv/pci.c | 113 +--- arch/powerpc/platforms/powernv/pci.h | 26 +- arch/powerpc/platforms/prep/Kconfig | 23 - arch/powerpc/platforms/ps3/htab.c | 8 +- arch/powerpc/platforms/ps3/time.c | 4 +- arch/powerpc/platforms/pseries/firmware.c | 54 +- arch/powerpc/platforms/pseries/iommu.c | 26 + arch/powerpc/platforms/pseries/lpar.c | 8 +- arch/powerpc/platforms/pseries/mobility.c | 41 +- arch/powerpc/platforms/pseries/plpar_wrappers.h | 15 +- arch/powerpc/platforms/pseries/pseries.h | 5 +- arch/powerpc/platforms/pseries/setup.c | 40 +- arch/powerpc/platforms/wsp/Kconfig | 5 - arch/powerpc/sysdev/Kconfig | 1 + arch/powerpc/sysdev/fsl_msi.c | 4 +- arch/powerpc/sysdev/fsl_pci.c | 114 ++-- arch/powerpc/sysdev/fsl_pci.h | 13 + arch/powerpc/sysdev/indirect_pci.c | 10 +- arch/powerpc/sysdev/qe_lib/Kconfig | 2 +- arch/powerpc/sysdev/rtc_cmos_setup.c | 5 +- arch/powerpc/sysdev/xics/icp-native.c | 2 +- arch/powerpc/xmon/xmon.c | 2 +- arch/sh/mm/Kconfig | 7 - drivers/pci/probe.c | 2 +- drivers/pnp/pnpbios/core.c | 9 +- drivers/video/cirrusfb.c | 62 +-- fs/binfmt_elf.c | 3 + fs/binfmt_elf_fdpic.c | 8 +- include/uapi/linux/auxvec.h | 1 + 184 files changed, 6353 insertions(+), 1299 deletions(-) create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/cpus.txt delete mode 100644 Documentation/powerpc/sound.txt delete mode 100644 Documentation/powerpc/zImage_layout.txt create mode 100644 arch/powerpc/boot/dts/ac14xx.dts create mode 100644 arch/powerpc/boot/dts/b4420qds.dts create mode 100644 arch/powerpc/boot/dts/b4860qds.dts create mode 100644 arch/powerpc/boot/dts/b4qds.dts create mode 100644 arch/powerpc/boot/dts/fsl/b4420si-post.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/b4860si-post.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/b4si-post.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/e6500_power_isa.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/qonverge-usb2-dr-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-gpio-1.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-gpio-2.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-gpio-3.dtsi rename arch/powerpc/boot/dts/fsl/{qoriq-sec4.1-0.dtsi => qoriq-sec5.0-0.dtsi} (83%) create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sec5.3-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/t4240si-post.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi create mode 100644 arch/powerpc/boot/dts/mpc5125twr.dts create mode 100644 arch/powerpc/boot/dts/t4240qds.dts create mode 100644 arch/powerpc/perf/bhrb.S create mode 100644 arch/powerpc/perf/power8-pmu.c rename arch/powerpc/platforms/512x/{mpc5121_generic.c => mpc512x_generic.c} (83%) create mode 100644 arch/powerpc/platforms/85xx/b4_qds.c create mode 100644 arch/powerpc/platforms/85xx/t4240_qds.c delete mode 100644 arch/powerpc/platforms/prep/Kconfig Merging 4xx/next (2074b1d powerpc: Fix irq distribution) $ git merge 4xx/next Already up-to-date. Merging mpc5xxx/next (fdeaf0e powerpc/512x: add ifm ac14xx board) $ git merge mpc5xxx/next Already up-to-date. Merging galak/next (9e2ecdb powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4) $ git merge galak/next Already up-to-date. Merging s390/features (1c21351 s390/pci: use pci_scan_root_bus) $ git merge s390/features Already up-to-date. Merging sh/sh-latest (37284bd Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest) $ git merge sh/sh-latest Merge made by the 'recursive' strategy. .../bindings/tty/serial/renesas,sci-serial.txt | 53 +++++++ arch/sh/include/asm/hw_breakpoint.h | 12 +- arch/sh/include/cpu-common/cpu/ubc.h | 17 +++ arch/sh/include/cpu-sh2a/cpu/ubc.h | 14 ++ arch/sh/kernel/cpu/sh2a/Makefile | 3 +- arch/sh/kernel/cpu/sh2a/ubc.c | 154 +++++++++++++++++++++ arch/sh/kernel/hw_breakpoint.c | 8 ++ drivers/tty/serial/sh-sci.c | 127 ++++++++++++++++- include/linux/serial_sci.h | 4 + 9 files changed, 376 insertions(+), 16 deletions(-) create mode 100644 Documentation/devicetree/bindings/tty/serial/renesas,sci-serial.txt create mode 100644 arch/sh/include/cpu-common/cpu/ubc.h create mode 100644 arch/sh/include/cpu-sh2a/cpu/ubc.h create mode 100644 arch/sh/kernel/cpu/sh2a/ubc.c Merging sparc-next/master (07df841 sparc64: Do not save/restore interrupts in get_new_mmu_context()) $ git merge sparc-next/master Auto-merging arch/sparc/mm/init_64.c Auto-merging arch/sparc/Kconfig Merge made by the 'recursive' strategy. arch/sparc/Kconfig | 20 +- arch/sparc/Makefile | 1 + arch/sparc/include/asm/cmpxchg_64.h | 1 + arch/sparc/include/asm/head_32.h | 6 +- arch/sparc/include/asm/hibernate.h | 23 + arch/sparc/include/asm/leon_pci.h | 1 + arch/sparc/include/asm/mmu_context_64.h | 2 +- arch/sparc/include/asm/processor_64.h | 3 - arch/sparc/kernel/Makefile | 3 +- arch/sparc/kernel/asm-offsets.c | 15 + arch/sparc/kernel/leon_pci.c | 2 + arch/sparc/kernel/leon_pci_grpci1.c | 724 ++++++++++++++++++++++++++++++++ arch/sparc/kernel/leon_pci_grpci2.c | 5 + arch/sparc/kernel/leon_pmc.c | 4 +- arch/sparc/mm/init_64.c | 7 +- arch/sparc/power/Makefile | 3 + arch/sparc/power/hibernate.c | 42 ++ arch/sparc/power/hibernate_asm.S | 131 ++++++ 18 files changed, 977 insertions(+), 16 deletions(-) create mode 100644 arch/sparc/include/asm/hibernate.h create mode 100644 arch/sparc/kernel/leon_pci_grpci1.c create mode 100644 arch/sparc/power/Makefile create mode 100644 arch/sparc/power/hibernate.c create mode 100644 arch/sparc/power/hibernate_asm.S Merging tile/master (9fc1894 arch/tile: Fix syscall return value passed to tracepoint) $ git merge tile/master Auto-merging arch/tile/include/asm/thread_info.h Merge made by the 'recursive' strategy. arch/tile/Kconfig | 17 +++------------- arch/tile/include/asm/atomic.h | 21 ++++++++++++++++++++ arch/tile/include/asm/ptrace.h | 3 ++- arch/tile/include/asm/syscall.h | 6 ++++++ arch/tile/include/asm/syscalls.h | 6 ------ arch/tile/include/asm/thread_info.h | 8 ++++++++ arch/tile/include/uapi/asm/unistd.h | 2 ++ arch/tile/kernel/intvec_32.S | 10 ++++++++-- arch/tile/kernel/intvec_64.S | 24 +++++++++++++++++------ arch/tile/kernel/ptrace.c | 39 +++++++++++++++++++------------------ arch/tile/kernel/time.c | 6 +++++- 11 files changed, 93 insertions(+), 49 deletions(-) Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL) $ git merge unicore32/unicore32 Already up-to-date. Merging xtensa/for_next (4e34bf6 xtensa: provide default platform_pcibios_init implementation) $ git merge xtensa/for_next Merge made by the 'recursive' strategy. Documentation/xtensa/mmu.txt | 46 ++++++++++++ arch/xtensa/Kconfig | 44 +++++++---- arch/xtensa/boot/boot-elf/Makefile | 1 + arch/xtensa/boot/boot-elf/boot.lds.S | 64 +++++++--------- arch/xtensa/boot/boot-elf/bootstrap.S | 101 +++++++++++++++++++++---- arch/xtensa/boot/boot-uboot/Makefile | 6 +- arch/xtensa/include/asm/initialize_mmu.h | 107 ++++++++++++++++++++++++++ arch/xtensa/include/asm/vectors.h | 125 +++++++++++++++++++++++++++++++ arch/xtensa/kernel/Makefile | 2 + arch/xtensa/kernel/head.S | 39 +++++++--- arch/xtensa/kernel/platform.c | 1 + arch/xtensa/kernel/vectors.S | 3 +- arch/xtensa/kernel/vmlinux.lds.S | 48 ++++++++---- arch/xtensa/kernel/xtensa_ksyms.c | 5 ++ arch/xtensa/mm/mmu.c | 14 ++-- arch/xtensa/oprofile/backtrace.c | 4 +- arch/xtensa/platforms/iss/setup.c | 8 +- arch/xtensa/platforms/xt2000/setup.c | 2 + arch/xtensa/platforms/xtfpga/setup.c | 2 + 19 files changed, 512 insertions(+), 110 deletions(-) create mode 100644 Documentation/xtensa/mmu.txt create mode 100644 arch/xtensa/include/asm/vectors.h Merging btrfs/next (6aec51f Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into for-linus-3.9) $ git merge btrfs/next Already up-to-date! Merge made by the 'recursive' strategy. Merging ceph/testing (1de1777 rbd: refactor rbd_dev_probe_update_spec()) $ git merge ceph/testing Resolved 'drivers/block/rbd.c' using previous resolution. Resolved 'fs/ceph/addr.c' using previous resolution. Resolved 'net/ceph/osdmap.c' using previous resolution. Auto-merging net/ceph/osdmap.c CONFLICT (content): Merge conflict in net/ceph/osdmap.c Auto-merging fs/dcache.c Auto-merging fs/ceph/super.h Auto-merging fs/ceph/super.c Auto-merging fs/ceph/mds_client.c Auto-merging fs/ceph/ioctl.c Auto-merging fs/ceph/inode.c Auto-merging fs/ceph/file.c Auto-merging fs/ceph/dir.c Auto-merging fs/ceph/caps.c Auto-merging fs/ceph/addr.c CONFLICT (content): Merge conflict in fs/ceph/addr.c Auto-merging drivers/block/rbd.c CONFLICT (content): Merge conflict in drivers/block/rbd.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 2a50ec4] Merge remote-tracking branch 'ceph/testing' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/sysfs-bus-rbd | 20 - drivers/block/rbd.c | 2165 +++++++++++++++++++++---------- fs/ceph/addr.c | 222 ++-- fs/ceph/caps.c | 33 +- fs/ceph/dir.c | 65 +- fs/ceph/file.c | 241 ++-- fs/ceph/inode.c | 59 +- fs/ceph/ioctl.c | 5 +- fs/ceph/mds_client.c | 79 +- fs/ceph/mdsmap.c | 8 +- fs/ceph/super.c | 7 +- fs/ceph/super.h | 65 +- fs/dcache.c | 31 +- include/linux/ceph/auth.h | 18 + include/linux/ceph/ceph_features.h | 2 + include/linux/ceph/decode.h | 30 +- include/linux/ceph/libceph.h | 1 + include/linux/ceph/messenger.h | 104 +- include/linux/ceph/msgr.h | 1 + include/linux/ceph/osd_client.h | 203 ++- include/linux/ceph/osdmap.h | 30 +- net/ceph/auth.c | 117 +- net/ceph/auth_x.c | 24 +- net/ceph/auth_x.h | 1 + net/ceph/debugfs.c | 4 +- net/ceph/messenger.c | 972 +++++++++----- net/ceph/mon_client.c | 7 +- net/ceph/osd_client.c | 1060 ++++++++++----- net/ceph/osdmap.c | 45 +- 29 files changed, 3692 insertions(+), 1927 deletions(-) Merging cifs/for-next (bf81710 Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending) $ git merge cifs/for-next Already up-to-date. 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 (f6161aa Linux 3.9-rc2) $ git merge ecryptfs/next Already up-to-date. Merging ext3/for_next (e162b2f jbd: use kmem_cache_zalloc instead of kmem_cache_alloc/memset) $ git merge ext3/for_next Auto-merging fs/jbd/journal.c Merge made by the 'recursive' strategy. fs/ext3/inode.c | 3 ++- fs/jbd/journal.c | 11 +++++++++++ fs/jbd/transaction.c | 1 - include/linux/jbd.h | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) Merging ext4/dev (0d606e2 ext4: fix type-widening bug in inode table readahead code) $ git merge ext4/dev Auto-merging include/linux/buffer_head.h Auto-merging fs/jbd2/journal.c Auto-merging fs/buffer.c Merge made by the 'recursive' strategy. Documentation/filesystems/ext4.txt | 21 ++ fs/buffer.c | 5 + fs/ext4/Kconfig | 3 +- fs/ext4/balloc.c | 53 +++- fs/ext4/dir.c | 20 +- fs/ext4/ext4.h | 101 +++++-- fs/ext4/ext4_extents.h | 5 + fs/ext4/ext4_jbd2.c | 8 + fs/ext4/ext4_jbd2.h | 12 +- fs/ext4/extents.c | 522 +++++++++++++-------------------- fs/ext4/fsync.c | 3 +- fs/ext4/ialloc.c | 88 +++--- fs/ext4/indirect.c | 473 ++++-------------------------- fs/ext4/inline.c | 178 ++++++++++-- fs/ext4/inode.c | 580 +++++++++++++++++++++++++------------ fs/ext4/ioctl.c | 218 +++++++++++++- fs/ext4/mballoc.c | 253 +++++++++++----- fs/ext4/migrate.c | 62 +++- fs/ext4/mmp.c | 6 +- fs/ext4/move_extent.c | 73 +++-- fs/ext4/namei.c | 48 ++- fs/ext4/page-io.c | 280 +++++++++--------- fs/ext4/resize.c | 16 +- fs/ext4/super.c | 131 +++++++-- fs/ext4/xattr.c | 13 +- fs/ext4/xattr.h | 1 + fs/jbd2/commit.c | 50 ++-- fs/jbd2/journal.c | 31 ++ fs/jbd2/transaction.c | 9 +- include/linux/buffer_head.h | 4 + include/linux/jbd2.h | 4 +- include/linux/journal-head.h | 11 +- include/trace/events/ext4.h | 16 +- include/trace/events/jbd2.h | 21 ++ 34 files changed, 1900 insertions(+), 1419 deletions(-) Merging f2fs/dev (d23bfc6 f2fs: avoid deadlock during evict after f2fs_gc) $ git merge f2fs/dev Auto-merging fs/f2fs/super.c Auto-merging fs/f2fs/gc.c Auto-merging fs/f2fs/f2fs.h Merge made by the 'recursive' strategy. Documentation/filesystems/f2fs.txt | 4 +- fs/f2fs/checkpoint.c | 63 ++-- fs/f2fs/data.c | 195 ++++++----- fs/f2fs/debug.c | 10 +- fs/f2fs/dir.c | 110 +++--- fs/f2fs/f2fs.h | 93 +++-- fs/f2fs/file.c | 116 +++---- fs/f2fs/gc.c | 123 ++++--- fs/f2fs/gc.h | 12 +- fs/f2fs/inode.c | 68 ++-- fs/f2fs/namei.c | 74 ++-- fs/f2fs/node.c | 361 +++++++++++--------- fs/f2fs/node.h | 20 +- fs/f2fs/recovery.c | 75 ++-- fs/f2fs/segment.c | 137 +++++--- fs/f2fs/segment.h | 41 ++- fs/f2fs/super.c | 61 +++- fs/f2fs/xattr.c | 28 +- include/linux/f2fs_fs.h | 17 +- include/trace/events/f2fs.h | 682 +++++++++++++++++++++++++++++++++++++ 20 files changed, 1624 insertions(+), 666 deletions(-) create mode 100644 include/trace/events/f2fs.h Merging fuse/for-next (efb9fa9 fuse: truncate file if async dio failed) $ git merge fuse/for-next Merge made by the 'recursive' strategy. fs/fuse/cuse.c | 10 ++- fs/fuse/dev.c | 80 +++++++++++++---- fs/fuse/dir.c | 17 ++-- fs/fuse/file.c | 268 +++++++++++++++++++++++++++++++++++++++++++++++-------- fs/fuse/fuse_i.h | 33 ++++++- fs/fuse/inode.c | 8 +- 6 files changed, 348 insertions(+), 68 deletions(-) Merging gfs2/master (222cb53 GFS2: Flush work queue before clearing glock hash tables) $ git merge gfs2/master Already up-to-date. Merging jfs/jfs-next (9d48017 jfs: avoid undefined behavior from left-shifting by 32 bits) $ git merge jfs/jfs-next Merge made by the 'recursive' strategy. fs/jfs/jfs_imap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found) $ git merge logfs/master Auto-merging fs/logfs/super.c Merge made by the 'recursive' strategy. fs/logfs/dev_mtd.c | 2 +- fs/logfs/super.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) Merging nfs/linux-next (8dbec78 NFSv4.x: Fix handling of partially delegated locks) $ git merge nfs/linux-next Merge made by the 'recursive' strategy. fs/nfs/nfs4proc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Merging nfsd/nfsd-next (d28fcc8 svcrpc: fix gss-proxy to respect user namespaces) $ git merge nfsd/nfsd-next Auto-merging net/sunrpc/cache.c Auto-merging fs/nfsd/nfs4state.c Merge made by the 'recursive' strategy. Documentation/filesystems/nfs/00-INDEX | 2 + Documentation/filesystems/nfs/rpc-server-gss.txt | 91 +++ fs/nfsd/cache.h | 1 + fs/nfsd/netns.h | 1 + fs/nfsd/nfs4callback.c | 33 +- fs/nfsd/nfs4proc.c | 77 ++- fs/nfsd/nfs4state.c | 747 +++++++++++--------- fs/nfsd/nfs4xdr.c | 75 +- fs/nfsd/nfscache.c | 195 ++++-- fs/nfsd/nfsctl.c | 13 +- fs/nfsd/state.h | 27 +- fs/nfsd/vfs.c | 6 +- fs/nfsd/xdr4.h | 3 +- fs/nfsd/xdr4cb.h | 23 + include/linux/sunrpc/clnt.h | 1 + include/linux/sunrpc/gss_api.h | 6 + include/linux/sunrpc/msg_prot.h | 3 + include/linux/sunrpc/xprt.h | 1 + net/sunrpc/auth_gss/Makefile | 3 +- net/sunrpc/auth_gss/auth_gss.c | 2 +- net/sunrpc/auth_gss/gss_krb5_mech.c | 7 +- net/sunrpc/auth_gss/gss_mech_switch.c | 7 +- net/sunrpc/auth_gss/gss_rpc_upcall.c | 358 ++++++++++ net/sunrpc/auth_gss/gss_rpc_upcall.h | 48 ++ net/sunrpc/auth_gss/gss_rpc_xdr.c | 838 +++++++++++++++++++++++ net/sunrpc/auth_gss/gss_rpc_xdr.h | 264 +++++++ net/sunrpc/auth_gss/svcauth_gss.c | 359 +++++++++- net/sunrpc/cache.c | 4 +- net/sunrpc/clnt.c | 3 + net/sunrpc/netns.h | 6 + net/sunrpc/xprt.c | 2 + net/sunrpc/xprtsock.c | 3 + 32 files changed, 2671 insertions(+), 538 deletions(-) create mode 100644 Documentation/filesystems/nfs/rpc-server-gss.txt create mode 100644 fs/nfsd/xdr4cb.h create mode 100644 net/sunrpc/auth_gss/gss_rpc_upcall.c create mode 100644 net/sunrpc/auth_gss/gss_rpc_upcall.h create mode 100644 net/sunrpc/auth_gss/gss_rpc_xdr.c create mode 100644 net/sunrpc/auth_gss/gss_rpc_xdr.h Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.) $ git merge ocfs2/linux-next Auto-merging fs/ocfs2/dlm/dlmrecovery.c Auto-merging fs/ocfs2/dlm/dlmmaster.c 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 | 8 +++++++- fs/ocfs2/dlm/dlmrecovery.c | 7 +++++++ 4 files changed, 25 insertions(+), 33 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 (b6f4bee fs/9p: Fix atomic_open) $ git merge v9fs/for-next Already up-to-date. Merging ubifs/linux-next (c1be5a5 Linux 3.9) $ git merge ubifs/linux-next Already up-to-date. Merging xfs/for-next (123887e xfs: Teach dquot recovery about CONFIG_XFS_QUOTA) $ git merge xfs/for-next Resolved 'fs/xfs/xfs_iomap.c' using previous resolution. Auto-merging fs/xfs/xfs_iomap.c CONFLICT (content): Merge conflict in fs/xfs/xfs_iomap.c Auto-merging fs/xfs/xfs_buf.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master e6474b0] Merge remote-tracking branch 'xfs/for-next' $ git diff -M --stat --summary HEAD^.. .../filesystems/xfs-self-describing-metadata.txt | 350 + fs/xfs/Makefile | 6 +- fs/xfs/xfs_ag.h | 56 +- fs/xfs/xfs_alloc.c | 201 +- fs/xfs/xfs_alloc_btree.c | 105 +- fs/xfs/xfs_alloc_btree.h | 12 +- fs/xfs/xfs_aops.c | 12 +- fs/xfs/xfs_attr.c | 454 +- fs/xfs/xfs_attr.h | 1 - fs/xfs/xfs_attr_leaf.c | 1781 ++-- fs/xfs/xfs_attr_leaf.h | 122 +- fs/xfs/xfs_attr_remote.c | 550 ++ fs/xfs/xfs_attr_remote.h | 46 + fs/xfs/xfs_bmap.c | 9214 ++++++++++---------- fs/xfs/xfs_bmap_btree.c | 110 +- fs/xfs/xfs_bmap_btree.h | 19 +- fs/xfs/xfs_btree.c | 256 +- fs/xfs/xfs_btree.h | 64 +- fs/xfs/xfs_buf.c | 4 +- fs/xfs/xfs_buf_item.h | 64 +- fs/xfs/xfs_da_btree.c | 1501 ++-- fs/xfs/xfs_da_btree.h | 130 +- fs/xfs/xfs_dinode.h | 43 +- fs/xfs/xfs_dir2_block.c | 179 +- fs/xfs/xfs_dir2_data.c | 266 +- fs/xfs/xfs_dir2_format.h | 278 +- fs/xfs/xfs_dir2_leaf.c | 898 +- fs/xfs/xfs_dir2_node.c | 1007 ++- fs/xfs/xfs_dir2_priv.h | 50 +- fs/xfs/xfs_dir2_sf.c | 12 +- fs/xfs/xfs_dquot.c | 160 +- fs/xfs/xfs_dquot.h | 16 +- fs/xfs/xfs_error.c | 4 +- fs/xfs/xfs_extfree_item.c | 27 +- fs/xfs/xfs_extfree_item.h | 14 +- fs/xfs/xfs_file.c | 2 +- fs/xfs/xfs_fsops.c | 34 +- fs/xfs/xfs_ialloc.c | 109 +- fs/xfs/xfs_ialloc_btree.c | 87 +- fs/xfs/xfs_ialloc_btree.h | 9 +- fs/xfs/xfs_inode.c | 212 +- fs/xfs/xfs_inode.h | 31 +- fs/xfs/xfs_inode_item.c | 2 +- fs/xfs/xfs_iomap.c | 163 +- fs/xfs/xfs_linux.h | 1 + fs/xfs/xfs_log.c | 2 +- fs/xfs/xfs_log_cil.c | 4 - fs/xfs/xfs_log_priv.h | 1 - fs/xfs/xfs_log_recover.c | 247 +- fs/xfs/xfs_message.h | 26 + fs/xfs/xfs_mount.c | 146 +- fs/xfs/xfs_mount.h | 2 +- fs/xfs/xfs_qm.c | 25 +- fs/xfs/xfs_qm.h | 4 +- fs/xfs/xfs_qm_syscalls.c | 9 +- fs/xfs/xfs_quota.h | 11 +- fs/xfs/xfs_sb.h | 166 +- fs/xfs/xfs_symlink.c | 730 ++ fs/xfs/xfs_symlink.h | 66 + fs/xfs/xfs_trace.c | 2 +- fs/xfs/xfs_trace.h | 24 + fs/xfs/xfs_trans_buf.c | 63 +- fs/xfs/xfs_trans_dquot.c | 10 +- fs/xfs/xfs_vnodeops.c | 478 +- 64 files changed, 12382 insertions(+), 8296 deletions(-) create mode 100644 Documentation/filesystems/xfs-self-describing-metadata.txt create mode 100644 fs/xfs/xfs_attr_remote.c create mode 100644 fs/xfs/xfs_attr_remote.h create mode 100644 fs/xfs/xfs_symlink.c create mode 100644 fs/xfs/xfs_symlink.h Merging vfs/for-next (3c3a685 minimal !CONFIG_PROC_FS fixes) $ git merge vfs/for-next Auto-merging net/sunrpc/cache.c Auto-merging net/core/pktgen.c Auto-merging net/bluetooth/sco.c Auto-merging net/bluetooth/rfcomm/sock.c Auto-merging net/bluetooth/l2cap_sock.c Auto-merging net/bluetooth/hidp/sock.c Auto-merging net/bluetooth/hci_sock.c Auto-merging net/bluetooth/cmtp/sock.c Auto-merging net/bluetooth/bnep/sock.c Auto-merging net/bluetooth/af_bluetooth.c Auto-merging mm/vmalloc.c Auto-merging mm/filemap.c Auto-merging kernel/user_namespace.c Auto-merging kernel/user.c Auto-merging kernel/pid_namespace.c Auto-merging kernel/exit.c Auto-merging kernel/cpuset.c Auto-merging kernel/cgroup.c Auto-merging ipc/util.c Auto-merging include/net/bluetooth/bluetooth.h Auto-merging include/linux/tty.h Auto-merging include/linux/signal.h Auto-merging include/linux/netdevice.h Auto-merging include/linux/cpuset.h Auto-merging include/linux/cgroup.h Auto-merging fs/xfs/xfs_file.c Auto-merging fs/read_write.c Auto-merging fs/proc/root.c Auto-merging fs/proc/kcore.c Auto-merging fs/proc/internal.h CONFLICT (content): Merge conflict in fs/proc/internal.h Auto-merging fs/proc/base.c Auto-merging fs/pnode.h Auto-merging fs/pnode.c Auto-merging fs/notify/inotify/inotify_user.c Auto-merging fs/nfsd/nfsctl.c Auto-merging fs/namespace.c Auto-merging fs/jbd2/journal.c Auto-merging fs/inode.c Auto-merging fs/fuse/file.c Auto-merging fs/fuse/dev.c Removing fs/fifo.c Auto-merging fs/f2fs/file.c Auto-merging fs/f2fs/dir.c Auto-merging fs/ext4/super.c Auto-merging fs/ext4/mballoc.c Auto-merging fs/exec.c Auto-merging fs/btrfs/file.c Auto-merging fs/binfmt_elf_fdpic.c Auto-merging fs/aio.c Auto-merging fs/Makefile Auto-merging drivers/usb/storage/scsiglue.c Auto-merging drivers/usb/host/sl811-hcd.c Auto-merging drivers/usb/gadget/lpc32xx_udc.c Auto-merging drivers/usb/gadget/goku_udc.c Auto-merging drivers/usb/gadget/fsl_udc_core.c Auto-merging drivers/usb/gadget/at91_udc.c Auto-merging drivers/tty/serial/serial_core.c Auto-merging drivers/staging/vt6656/main_usb.c Auto-merging drivers/staging/vt6655/device_main.c CONFLICT (content): Merge conflict in drivers/staging/vt6655/device_main.c Auto-merging drivers/staging/silicom/bpctl_mod.c Removing drivers/staging/silicom/bp_proc.c Auto-merging drivers/staging/rts5139/rts51x_scsi.h Auto-merging drivers/staging/rts5139/rts51x_scsi.c Removing drivers/staging/rtl8192e/rtl8192e/rtl_debug.c Auto-merging drivers/staging/dgrp/dgrp_specproc.c CONFLICT (content): Merge conflict in drivers/staging/dgrp/dgrp_specproc.c Auto-merging drivers/staging/dgrp/dgrp_ports_ops.c CONFLICT (content): Merge conflict in drivers/staging/dgrp/dgrp_ports_ops.c Auto-merging drivers/staging/dgrp/dgrp_net_ops.c CONFLICT (content): Merge conflict in drivers/staging/dgrp/dgrp_net_ops.c Auto-merging drivers/staging/dgrp/dgrp_mon_ops.c CONFLICT (content): Merge conflict in drivers/staging/dgrp/dgrp_mon_ops.c Auto-merging drivers/staging/dgrp/dgrp_dpa_ops.c CONFLICT (content): Merge conflict in drivers/staging/dgrp/dgrp_dpa_ops.c Auto-merging drivers/staging/dgrp/dgrp_common.h Auto-merging drivers/staging/csr/drv.c CONFLICT (modify/delete): drivers/staging/ccg/rndis.c deleted in HEAD and modified in vfs/for-next. Version vfs/for-next of drivers/staging/ccg/rndis.c left in tree. CONFLICT (modify/delete): drivers/staging/ccg/f_fs.c deleted in HEAD and modified in vfs/for-next. Version vfs/for-next of drivers/staging/ccg/f_fs.c left in tree. Auto-merging drivers/scsi/qla2xxx/qla_os.c Auto-merging drivers/scsi/lpfc/lpfc_init.c Auto-merging drivers/platform/x86/thinkpad_acpi.c Auto-merging drivers/of/base.c Auto-merging drivers/net/wireless/ray_cs.c Auto-merging drivers/net/wireless/ath/wil6210/debugfs.c Auto-merging drivers/media/rc/ir-lirc-codec.c Auto-merging drivers/media/pci/zoran/zoran_procfs.c Auto-merging drivers/media/pci/cx25821/cx25821-audio-upstream.c Auto-merging drivers/media/dvb-core/dvb_net.c Auto-merging drivers/media/dvb-core/dvb_frontend.c Auto-merging drivers/macintosh/via-pmu.c Auto-merging drivers/firmware/efivars.c CONFLICT (content): Merge conflict in drivers/firmware/efivars.c Auto-merging drivers/block/loop.c Recorded preimage for 'arch/powerpc/kernel/rtas_flash.c' Recorded preimage for 'fs/proc/internal.h' Resolved 'drivers/firmware/efivars.c' using previous resolution. Resolved 'drivers/staging/dgrp/dgrp_dpa_ops.c' using previous resolution. Resolved 'drivers/staging/dgrp/dgrp_mon_ops.c' using previous resolution. Resolved 'drivers/staging/dgrp/dgrp_net_ops.c' using previous resolution. Resolved 'drivers/staging/dgrp/dgrp_ports_ops.c' using previous resolution. Resolved 'drivers/staging/dgrp/dgrp_specproc.c' using previous resolution. Resolved 'drivers/staging/vt6655/device_main.c' using previous resolution. Auto-merging drivers/block/cciss.c Auto-merging arch/x86/platform/efi/efi.c Auto-merging arch/x86/mm/init_64.c Auto-merging arch/score/mm/init.c Auto-merging arch/s390/kernel/irq.c Auto-merging arch/powerpc/platforms/cell/spufs/file.c Auto-merging arch/powerpc/kvm/book3s_hv.c Auto-merging arch/powerpc/kernel/rtas_flash.c CONFLICT (content): Merge conflict in arch/powerpc/kernel/rtas_flash.c Auto-merging arch/powerpc/kernel/lparcfg.c Auto-merging arch/mips/mm/init.c Auto-merging arch/arm/mach-omap1/pm.c Automatic merge failed; fix conflicts and then commit the result. $ git rm -f drivers/staging/ccg/f_fs.c drivers/staging/ccg/rndis.c drivers/staging/ccg/f_fs.c: needs merge drivers/staging/ccg/rndis.c: needs merge rm 'drivers/staging/ccg/f_fs.c' rm 'drivers/staging/ccg/rndis.c' $ git commit -v -a Recorded resolution for 'arch/powerpc/kernel/rtas_flash.c'. Recorded resolution for 'fs/proc/internal.h'. [master 8238136] Merge remote-tracking branch 'vfs/for-next' $ git diff -M --stat --summary HEAD^.. arch/alpha/kernel/srm_env.c | 93 +- arch/arm/kernel/atags_proc.c | 28 +- arch/arm/kernel/swp_emulate.c | 43 +- arch/arm/mach-msm/last_radio_log.c | 20 +- arch/arm/mach-omap1/pm.c | 78 +- arch/blackfin/kernel/cplbinfo.c | 4 +- arch/cris/arch-v10/kernel/fasttimer.c | 301 ++- arch/cris/arch-v32/kernel/fasttimer.c | 299 ++- arch/h8300/kernel/gpio.c | 35 +- arch/ia64/kernel/palinfo.c | 502 +++-- arch/ia64/kernel/salinfo.c | 57 +- arch/ia64/sn/kernel/sn2/prominfo_proc.c | 146 +- arch/mips/kernel/smtc-proc.c | 64 +- arch/mips/lasat/picvue_proc.c | 4 +- arch/mips/mm/init.c | 1 + arch/mips/pci/ops-pmcmsp.c | 95 +- arch/mips/sibyte/sb1250/bus_watcher.c | 81 +- arch/parisc/kernel/pdc_chassis.c | 47 +- arch/powerpc/kernel/lparcfg.c | 11 +- arch/powerpc/kernel/proc_powerpc.c | 21 +- arch/powerpc/kernel/rtas_flash.c | 448 ++--- arch/powerpc/kvm/book3s_64_mmu_hv.c | 2 +- arch/powerpc/kvm/book3s_64_vio.c | 2 +- arch/powerpc/kvm/book3s_hv.c | 2 +- arch/powerpc/platforms/cell/spufs/file.c | 2 - arch/powerpc/platforms/pseries/reconfig.c | 2 +- arch/powerpc/platforms/pseries/scanlog.c | 32 +- arch/s390/kernel/compat_wrapper.S | 16 - arch/s390/kernel/irq.c | 6 +- arch/s390/kernel/os_info.c | 1 + arch/s390/kernel/syscalls.S | 4 +- arch/score/mm/init.c | 2 +- arch/sh/drivers/dma/dma-api.c | 28 +- arch/sh/mm/alignment.c | 2 +- arch/sparc/kernel/ioport.c | 2 +- arch/sparc/kernel/sun4d_irq.c | 1 + arch/tile/kernel/hardwall.c | 2 +- arch/um/drivers/mconsole_kern.c | 3 +- arch/x86/ia32/ia32_aout.c | 30 +- arch/x86/mm/init_64.c | 1 + arch/x86/platform/efi/efi.c | 1 + arch/x86/platform/efi/efi_64.c | 1 + arch/xtensa/platforms/iss/simdisk.c | 36 +- drivers/acpi/ac.c | 2 +- drivers/acpi/battery.c | 2 +- drivers/acpi/button.c | 2 +- drivers/acpi/proc.c | 4 +- drivers/acpi/sbs.c | 29 +- drivers/ata/sata_svw.c | 29 +- drivers/block/DAC960.c | 8 +- drivers/block/cciss.c | 2 +- drivers/block/cciss_scsi.c | 96 +- drivers/block/cpqarray.c | 2 +- drivers/block/drbd/drbd_proc.c | 2 +- drivers/block/loop.c | 2 + drivers/block/pktcdvd.c | 2 +- drivers/block/ps3vram.c | 2 +- drivers/char/ds1620.c | 34 +- drivers/char/efirtc.c | 83 +- drivers/char/genrtc.c | 48 +- drivers/char/ipmi/ipmi_msghandler.c | 8 +- drivers/char/ipmi/ipmi_si_intf.c | 6 +- drivers/firmware/efivars.c | 1 + drivers/gpu/drm/drm_proc.c | 43 +- drivers/gpu/drm/drm_stub.c | 2 +- drivers/ide/ide-cd.c | 2 +- drivers/ide/ide-disk_proc.c | 8 +- drivers/ide/ide-floppy_proc.c | 2 +- drivers/ide/ide-proc.c | 22 +- drivers/ide/ide-tape.c | 2 +- drivers/input/misc/hp_sdc_rtc.c | 58 +- drivers/isdn/gigaset/capi.c | 2 +- drivers/isdn/hardware/avm/b1.c | 2 +- drivers/isdn/hardware/avm/b1dma.c | 2 +- drivers/isdn/hardware/avm/c4.c | 2 +- drivers/isdn/hardware/eicon/divasproc.c | 12 +- drivers/isdn/hysdn/hycapi.c | 2 +- drivers/isdn/hysdn/hysdn_procconf.c | 32 +- drivers/isdn/hysdn/hysdn_proclog.c | 71 +- drivers/isdn/mISDN/timerdev.c | 76 +- drivers/macintosh/via-pmu.c | 2 +- drivers/media/dvb-core/dvb_frontend.c | 5 +- drivers/media/dvb-core/dvb_net.c | 5 +- drivers/media/pci/cx25821/cx25821-audio-upstream.c | 179 +- drivers/media/pci/ttpci/av7110_ir.c | 2 +- drivers/media/pci/zoran/zoran_procfs.c | 4 +- drivers/media/rc/ir-lirc-codec.c | 2 +- drivers/media/rc/lirc_dev.c | 2 +- drivers/message/fusion/mptbase.c | 4 +- drivers/message/fusion/mptctl.c | 8 - drivers/message/fusion/mptfc.c | 2 +- drivers/message/fusion/mptsas.c | 2 +- drivers/message/fusion/mptscsih.c | 98 +- drivers/message/fusion/mptscsih.h | 2 +- drivers/message/fusion/mptspi.c | 2 +- drivers/message/i2o/i2o_proc.c | 97 +- drivers/misc/lis3lv02d/lis3lv02d.c | 1 - drivers/misc/sgi-gru/gruprocfs.c | 2 +- drivers/mtd/mtdcore.c | 1 + drivers/net/bonding/bond_procfs.c | 4 +- drivers/net/irda/vlsi_ir.c | 4 +- drivers/net/wireless/airo.c | 116 +- drivers/net/wireless/ath/wil6210/debugfs.c | 4 +- drivers/net/wireless/atmel.c | 69 +- drivers/net/wireless/hostap/hostap_ap.c | 375 ++-- drivers/net/wireless/hostap/hostap_download.c | 68 +- drivers/net/wireless/hostap/hostap_hw.c | 38 +- drivers/net/wireless/hostap/hostap_proc.c | 609 ++++--- drivers/net/wireless/hostap/hostap_wlan.h | 3 +- drivers/net/wireless/ray_cs.c | 2 +- drivers/nubus/nubus.c | 55 - drivers/nubus/proc.c | 80 +- drivers/of/base.c | 11 +- drivers/parisc/led.c | 4 +- drivers/pci/proc.c | 34 +- drivers/platform/x86/thinkpad_acpi.c | 4 +- drivers/platform/x86/toshiba_acpi.c | 18 +- drivers/pnp/isapnp/proc.c | 6 +- drivers/pnp/pnpbios/proc.c | 4 +- drivers/pps/clients/pps_parport.c | 1 + drivers/rtc/rtc-proc.c | 2 +- drivers/s390/cio/qdio_debug.c | 2 +- drivers/scsi/BusLogic.c | 83 +- drivers/scsi/BusLogic.h | 1 - drivers/scsi/NCR5380.c | 61 +- drivers/scsi/NCR5380.h | 6 +- drivers/scsi/a2091.c | 3 +- drivers/scsi/a3000.c | 3 +- drivers/scsi/advansys.c | 1164 ++++-------- drivers/scsi/aha152x.c | 61 +- drivers/scsi/aha1740.c | 29 +- drivers/scsi/aic7xxx/aic79xx_osm.c | 9 +- drivers/scsi/aic7xxx/aic79xx_osm.h | 12 +- drivers/scsi/aic7xxx/aic79xx_proc.c | 163 +- drivers/scsi/aic7xxx/aic7xxx_osm.c | 9 +- drivers/scsi/aic7xxx/aic7xxx_osm.h | 12 +- drivers/scsi/aic7xxx/aic7xxx_proc.c | 153 +- drivers/scsi/aic7xxx_old.c | 2 +- drivers/scsi/aic7xxx_old/aic7xxx_proc.c | 221 +-- drivers/scsi/arm/acornscsi.c | 58 +- drivers/scsi/arm/arxescsi.c | 40 +- drivers/scsi/arm/cumana_1.c | 1 - drivers/scsi/arm/cumana_2.c | 43 +- drivers/scsi/arm/eesox.c | 42 +- drivers/scsi/arm/fas216.c | 31 +- drivers/scsi/arm/fas216.h | 6 +- drivers/scsi/arm/oak.c | 6 +- drivers/scsi/arm/powertec.c | 29 +- drivers/scsi/atari_NCR5380.c | 145 +- drivers/scsi/atari_scsi.c | 2 +- drivers/scsi/atari_scsi.h | 2 +- drivers/scsi/atp870u.c | 40 +- drivers/scsi/dc395x.c | 20 +- drivers/scsi/dpt_i2o.c | 102 +- drivers/scsi/dtc.c | 3 +- drivers/scsi/dtc.h | 3 +- drivers/scsi/eata_pio.c | 56 +- drivers/scsi/g_NCR5380.c | 51 +- drivers/scsi/gdth.c | 3 +- drivers/scsi/gdth.h | 3 +- drivers/scsi/gdth_proc.c | 211 +-- drivers/scsi/gdth_proc.h | 5 - drivers/scsi/gvp11.c | 3 +- drivers/scsi/imm.c | 40 +- drivers/scsi/in2000.c | 178 +- drivers/scsi/ips.c | 238 +-- drivers/scsi/ips.h | 9 - drivers/scsi/lpfc/lpfc_init.c | 33 +- drivers/scsi/mac_scsi.c | 3 +- drivers/scsi/mac_scsi.h | 3 +- drivers/scsi/megaraid.c | 1040 ++++------- drivers/scsi/megaraid.h | 17 - drivers/scsi/mpt2sas/mpt2sas_ctl.c | 14 - drivers/scsi/mpt3sas/mpt3sas_ctl.c | 14 - drivers/scsi/mvme147.c | 3 +- drivers/scsi/nsp32.c | 39 +- drivers/scsi/pas16.c | 3 +- drivers/scsi/pas16.h | 3 +- drivers/scsi/pcmcia/nsp_cs.c | 36 +- drivers/scsi/pcmcia/nsp_cs.h | 9 +- drivers/scsi/pmcraid.c | 14 - drivers/scsi/ppa.c | 36 +- drivers/scsi/qla2xxx/qla_os.c | 2 +- drivers/scsi/scsi_debug.c | 53 +- drivers/scsi/scsi_proc.c | 74 +- drivers/scsi/sym53c8xx_2/sym_glue.c | 115 +- drivers/scsi/t128.c | 3 +- drivers/scsi/t128.h | 3 +- drivers/scsi/wd33c93.c | 194 +- drivers/scsi/wd33c93.h | 3 +- drivers/scsi/wd7000.c | 31 +- drivers/staging/comedi/proc.c | 55 +- drivers/staging/csr/csr_wifi_hip_udi.c | 353 ++-- drivers/staging/csr/csr_wifi_hip_unifi_udi.h | 17 +- drivers/staging/csr/drv.c | 4 +- drivers/staging/csr/io.c | 151 +- drivers/staging/cxt1e1/Makefile | 3 +- drivers/staging/cxt1e1/sbeproc.c | 460 ++--- drivers/staging/cxt1e1/sbeproc.h | 14 +- drivers/staging/dgrp/dgrp_common.c | 31 - drivers/staging/dgrp/dgrp_common.h | 65 +- drivers/staging/dgrp/dgrp_dpa_ops.c | 29 +- drivers/staging/dgrp/dgrp_mon_ops.c | 26 +- drivers/staging/dgrp/dgrp_net_ops.c | 30 +- drivers/staging/dgrp/dgrp_ports_ops.c | 18 +- drivers/staging/dgrp/dgrp_specproc.c | 399 +--- drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | 130 +- drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 2 +- drivers/staging/ft1000/ft1000-usb/ft1000_proc.c | 129 +- drivers/staging/keucr/scsiglue.c | 45 +- drivers/staging/rtl8187se/r8180.h | 1 - drivers/staging/rtl8187se/r8180_core.c | 146 +- drivers/staging/rtl8192e/rtl8192e/Makefile | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 5 - drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 - drivers/staging/rtl8192e/rtl8192e/rtl_debug.c | 1029 ----------- drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 21 +- drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 44 +- drivers/staging/rtl8192e/rtllib_crypt_wep.c | 6 +- drivers/staging/rtl8192e/rtllib_module.c | 54 +- .../staging/rtl8192u/ieee80211/ieee80211_module.c | 53 +- drivers/staging/rtl8192u/ieee80211/proc.c | 8 +- drivers/staging/rtl8192u/r8192U.h | 1 - drivers/staging/rtl8192u/r8192U_core.c | 211 +-- drivers/staging/rts5139/rts51x_scsi.c | 30 +- drivers/staging/rts5139/rts51x_scsi.h | 2 - drivers/staging/silicom/Makefile | 3 - drivers/staging/silicom/bp_proc.c | 1327 -------------- drivers/staging/silicom/{bp_mod.c => bpctl_mod.c} | 1927 ++++++-------------- drivers/staging/vt6655/device_main.c | 62 +- drivers/staging/vt6656/main_usb.c | 63 +- drivers/staging/wlags49_h2/wl_main.c | 331 ++-- drivers/target/loopback/tcm_loop.c | 9 +- drivers/tty/serial/serial_core.c | 2 +- drivers/usb/gadget/at91_udc.c | 2 +- drivers/usb/gadget/f_fs.c | 2 - drivers/usb/gadget/fsl_udc_core.c | 124 +- drivers/usb/gadget/goku_udc.c | 89 +- drivers/usb/gadget/inode.c | 2 - drivers/usb/gadget/lpc32xx_udc.c | 2 +- drivers/usb/gadget/rndis.c | 4 +- drivers/usb/host/isp1362-hcd.c | 7 +- drivers/usb/host/sl811-hcd.c | 2 +- drivers/usb/misc/yurex.c | 2 - drivers/usb/storage/scsiglue.c | 42 +- drivers/video/bfin_adv7393fb.c | 43 +- drivers/video/pxa3xx-gcu.c | 36 +- drivers/zorro/proc.c | 4 +- fs/Makefile | 2 +- fs/afs/proc.c | 8 +- fs/aio.c | 4 + fs/binfmt_aout.c | 25 +- fs/binfmt_elf_fdpic.c | 7 +- fs/binfmt_flat.c | 37 +- fs/btrfs/file.c | 3 - fs/cachefiles/rdwr.c | 2 + fs/cifs/file.c | 3 - fs/coda/file.c | 2 + fs/compat.c | 184 -- fs/coredump.c | 6 +- fs/exec.c | 9 + fs/ext4/mballoc.c | 2 +- fs/ext4/super.c | 2 +- fs/f2fs/acl.c | 2 +- fs/f2fs/dir.c | 2 +- fs/f2fs/file.c | 4 +- fs/fifo.c | 153 -- fs/file.c | 68 +- fs/fuse/dev.c | 2 +- fs/fuse/file.c | 2 - fs/hpfs/file.c | 36 +- fs/hppfs/hppfs.c | 20 +- fs/inode.c | 2 +- fs/internal.h | 5 + fs/jbd2/journal.c | 2 +- fs/mount.h | 7 + fs/namespace.c | 340 ++-- fs/nfsd/nfsctl.c | 4 +- fs/notify/inotify/inotify_user.c | 3 - fs/ntfs/file.c | 2 - fs/ocfs2/file.c | 9 +- fs/pipe.c | 458 ++--- fs/pnode.c | 10 +- fs/pnode.h | 7 +- fs/proc/base.c | 56 +- fs/proc/fd.h | 5 + fs/proc/generic.c | 377 +--- fs/proc/inode.c | 283 ++- fs/proc/internal.h | 313 ++-- fs/proc/kcore.c | 2 + fs/proc/namespaces.c | 17 +- fs/proc/proc_devtree.c | 2 +- fs/proc/proc_net.c | 4 + fs/proc/root.c | 2 + fs/proc/self.c | 47 +- fs/proc/vmcore.c | 5 +- fs/read_write.c | 205 ++- fs/read_write.h | 4 - fs/reiserfs/file.c | 61 +- fs/reiserfs/procfs.c | 62 +- fs/seq_file.c | 18 + fs/splice.c | 14 +- fs/xfs/xfs_file.c | 3 - include/drm/drmP.h | 5 +- include/linux/binfmts.h | 1 + include/linux/cgroup.h | 2 +- include/linux/cpuset.h | 3 +- include/linux/fdtable.h | 1 - include/linux/fs.h | 19 +- include/linux/kcore.h | 38 + include/linux/netdevice.h | 1 - include/linux/nubus.h | 4 + include/linux/of.h | 10 + include/linux/pid_namespace.h | 1 + include/linux/pipe_fs_i.h | 11 +- include/linux/proc_fs.h | 325 +--- include/linux/proc_ns.h | 74 + include/linux/profile.h | 4 +- include/linux/seq_file.h | 1 + include/linux/signal.h | 5 + include/linux/tty.h | 7 + include/net/bluetooth/bluetooth.h | 3 +- include/net/lib80211.h | 4 +- include/scsi/scsi_host.h | 6 +- init/version.c | 2 +- ipc/msgutil.c | 2 +- ipc/namespace.c | 2 +- ipc/util.c | 68 +- kernel/acct.c | 2 + kernel/cgroup.c | 15 +- kernel/configs.c | 2 +- kernel/cpuset.c | 15 +- kernel/exit.c | 2 +- kernel/irq/proc.c | 20 +- kernel/nsproxy.c | 6 +- kernel/pid.c | 1 + kernel/pid_namespace.c | 2 +- kernel/profile.c | 6 +- kernel/sched/stats.c | 7 +- kernel/user.c | 2 +- kernel/user_namespace.c | 2 +- kernel/utsname.c | 2 +- lib/notifier-error-inject.c | 4 +- mm/filemap.c | 2 - mm/filemap_xip.c | 3 - mm/vmalloc.c | 45 +- net/8021q/vlanproc.c | 11 +- net/atm/proc.c | 2 +- net/bluetooth/af_bluetooth.c | 27 +- net/bluetooth/bnep/sock.c | 2 +- net/bluetooth/cmtp/capi.c | 2 +- net/bluetooth/cmtp/sock.c | 2 +- net/bluetooth/hci_sock.c | 2 +- net/bluetooth/hidp/sock.c | 2 +- net/bluetooth/l2cap_sock.c | 2 +- net/bluetooth/rfcomm/sock.c | 2 +- net/bluetooth/sco.c | 2 +- net/can/bcm.c | 2 +- net/can/proc.c | 2 +- net/core/neighbour.c | 2 +- net/core/net-sysfs.c | 12 +- net/core/net_namespace.c | 7 +- net/core/pktgen.c | 12 +- net/ipv4/fib_trie.c | 13 +- net/ipv4/netfilter/ipt_CLUSTERIP.c | 10 +- net/ipv4/tcp_ipv4.c | 2 +- net/ipv4/udp.c | 2 +- net/ipv6/proc.c | 5 +- net/netfilter/x_tables.c | 6 +- net/netfilter/xt_hashlimit.c | 16 +- net/netfilter/xt_recent.c | 9 +- net/socket.c | 9 - net/sunrpc/cache.c | 24 +- net/sunrpc/stats.c | 2 +- net/wireless/lib80211_crypt_ccmp.c | 29 +- net/wireless/lib80211_crypt_tkip.c | 44 +- net/wireless/lib80211_crypt_wep.c | 5 +- net/x25/x25_proc.c | 47 +- security/apparmor/lib.c | 24 +- security/tomoyo/common.c | 5 +- security/tomoyo/common.h | 2 +- security/tomoyo/securityfs_if.c | 5 +- sound/core/info.c | 45 +- sound/oss/dmasound/dmasound_core.c | 6 +- sound/sound_firmware.c | 9 +- 385 files changed, 7398 insertions(+), 14629 deletions(-) delete mode 100644 drivers/staging/rtl8192e/rtl8192e/rtl_debug.c delete mode 100644 drivers/staging/silicom/bp_proc.c rename drivers/staging/silicom/{bp_mod.c => bpctl_mod.c} (84%) delete mode 100644 fs/fifo.c create mode 100644 include/linux/kcore.h create mode 100644 include/linux/proc_ns.h $ git am -3 ../patches/0001-fs-fix-up-for-changes-to-proc_fs-include-files.patch Applying: fs: fix up for changes to proc_fs include files $ git reset HEAD^ Unstaged changes after reset: M fs/namespace.c $ git add -A . $ git commit -v -a --amend [master e08654a] Merge remote-tracking branch 'vfs/for-next' $ git am -3 ../patches/0001-SUNRPC-update-for-PDE-removal.patch Applying: SUNRPC: update for PDE removal $ git reset HEAD^ Unstaged changes after reset: M net/sunrpc/auth_gss/svcauth_gss.c $ git add -A . $ git commit -v -a --amend [master f12e141] Merge remote-tracking branch 'vfs/for-next' Merging pci/next (d4f09c5 Merge branch 'pci/gavin-msi-cleanup' into next) $ git merge pci/next Already up-to-date. Merging hid/for-next (46b1897 Merge branch 'for-3.10/hid-debug' into for-next) $ git merge hid/for-next Merge made by the 'recursive' strategy. Merging i2c/i2c/for-next (c39e8e4 i2c: xiic: must always write 16-bit words to TX_FIFO) $ git merge i2c/i2c/for-next Resolved 'drivers/media/pci/bt8xx/bttv-input.c' using previous resolution. Resolved 'drivers/staging/media/go7007/go7007-driver.c' using previous resolution. Removing include/linux/i2c-tegra.h Auto-merging drivers/staging/media/go7007/go7007-driver.c CONFLICT (content): Merge conflict in drivers/staging/media/go7007/go7007-driver.c Auto-merging drivers/media/pci/bt8xx/bttv-input.c CONFLICT (content): Merge conflict in drivers/media/pci/bt8xx/bttv-input.c Auto-merging drivers/i2c/busses/i2c-puv3.c Auto-merging drivers/i2c/busses/i2c-designware-platdrv.c Removing arch/arm/plat-samsung/include/plat/regs-iic.h Auto-merging arch/arm/plat-samsung/devs.c Auto-merging MAINTAINERS Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 5e2576b] Merge remote-tracking branch 'i2c/i2c/for-next' $ git diff -M --stat --summary HEAD^.. .../bindings/i2c/i2c-arb-gpio-challenge.txt | 80 +++++++ MAINTAINERS | 1 - arch/arm/mach-s3c24xx/mach-rx1950.c | 1 - arch/arm/mach-tegra/board-dt-tegra20.c | 2 - arch/arm/plat-samsung/devs.c | 1 - arch/arm/plat-samsung/include/plat/regs-iic.h | 56 ----- drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c | 3 +- drivers/i2c/busses/i2c-amd756-s4882.c | 6 +- drivers/i2c/busses/i2c-at91.c | 58 +++-- drivers/i2c/busses/i2c-cbus-gpio.c | 4 +- drivers/i2c/busses/i2c-davinci.c | 77 ++----- drivers/i2c/busses/i2c-designware-core.c | 39 +++- drivers/i2c/busses/i2c-designware-pcidrv.c | 73 ++---- drivers/i2c/busses/i2c-designware-platdrv.c | 83 ++----- drivers/i2c/busses/i2c-gpio.c | 75 ++++-- drivers/i2c/busses/i2c-intel-mid.c | 3 +- drivers/i2c/busses/i2c-ismt.c | 2 +- drivers/i2c/busses/i2c-mv64xxx.c | 5 +- drivers/i2c/busses/i2c-mxs.c | 104 +++++++-- drivers/i2c/busses/i2c-nforce2-s4985.c | 6 +- drivers/i2c/busses/i2c-octeon.c | 10 +- drivers/i2c/busses/i2c-powermac.c | 10 +- drivers/i2c/busses/i2c-puv3.c | 10 +- drivers/i2c/busses/i2c-pxa.c | 20 +- drivers/i2c/busses/i2c-s3c2410.c | 48 +++- drivers/i2c/busses/i2c-tegra.c | 26 +-- drivers/i2c/busses/i2c-viperboard.c | 5 +- drivers/i2c/busses/i2c-xiic.c | 6 +- drivers/i2c/i2c-core.c | 246 ++++++++++++++++---- drivers/i2c/i2c-mux.c | 9 +- drivers/i2c/muxes/Kconfig | 12 + drivers/i2c/muxes/Makefile | 2 + drivers/i2c/muxes/i2c-arb-gpio-challenge.c | 251 +++++++++++++++++++++ drivers/i2c/muxes/i2c-mux-gpio.c | 17 +- drivers/i2c/muxes/i2c-mux-pca954x.c | 6 +- drivers/media/pci/mantis/mantis_i2c.c | 4 +- drivers/net/ethernet/sfc/falcon.c | 6 +- drivers/staging/media/go7007/go7007-driver.c | 7 +- include/linux/i2c-mux.h | 2 +- include/linux/i2c-tegra.h | 25 -- include/linux/i2c.h | 50 +++- 41 files changed, 957 insertions(+), 494 deletions(-) create mode 100644 Documentation/devicetree/bindings/i2c/i2c-arb-gpio-challenge.txt delete mode 100644 arch/arm/plat-samsung/include/plat/regs-iic.h create mode 100644 drivers/i2c/muxes/i2c-arb-gpio-challenge.c delete mode 100644 include/linux/i2c-tegra.h $ git am -3 ../patches/0001-i2c-fixup-for-code-movement-from-bttv_input.c.patch Applying: i2c: fixup for code movement from bttv_input.c $ git reset HEAD^ Unstaged changes after reset: M drivers/media/pci/bt8xx/bttv-i2c.c $ git add -A . $ git commit -v -a --amend [master 21a9ea4] Merge remote-tracking branch 'i2c/i2c/for-next' Merging jdelvare-hwmon/master (c662b7a hwmon: (lm75) Add support for the Dallas/Maxim DS7505) $ git merge jdelvare-hwmon/master Auto-merging drivers/hwmon/Kconfig Merge made by the 'recursive' strategy. Documentation/hwmon/lm75 | 15 ++++---- drivers/hwmon/Kconfig | 2 +- drivers/hwmon/lm75.c | 92 ++++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 94 insertions(+), 15 deletions(-) Merging hwmon-staging/hwmon-next (6445e66 hwmon: (nct6775) Fix coding style problems) $ git merge hwmon-staging/hwmon-next Already up-to-date. Merging v4l-dvb/master (1d62caa Merge /home/v4l/v4l/patchwork) $ git merge v4l-dvb/master Merge made by the 'recursive' strategy. drivers/media/platform/omap3isp/isp.c | 277 +++++++++++++++++++++++++--------- drivers/media/platform/omap3isp/isp.h | 22 ++- include/media/omap3isp.h | 10 +- 3 files changed, 225 insertions(+), 84 deletions(-) Merging kbuild/for-next (1567364 Merge branch 'kbuild/kconfig' into kbuild/for-next) $ git merge kbuild/for-next Removing scripts/headers_install.pl Auto-merging Makefile Merge made by the 'recursive' strategy. Documentation/coccinelle.txt | 11 ++++- Documentation/kbuild/kconfig.txt | 36 +++++++++++++++ Documentation/kbuild/makefiles.txt | 7 +-- Makefile | 2 + scripts/Kbuild.include | 2 +- scripts/Makefile.headersinst | 4 +- scripts/coccicheck | 31 +++++++------ scripts/headers_install.pl | 63 ------------------------- scripts/headers_install.sh | 43 +++++++++++++++++ scripts/kconfig/Makefile | 4 +- scripts/kconfig/conf.c | 12 ++++- scripts/kconfig/confdata.c | 59 ++++++++++++++++++++++-- scripts/kconfig/list.h | 40 ++++++++++++++++ scripts/kconfig/lxdialog/check-lxdialog.sh | 6 ++- scripts/kconfig/lxdialog/dialog.h | 7 +++ scripts/kconfig/lxdialog/util.c | 45 +++++++++++++++++- scripts/kconfig/mconf.c | 74 +++++++++++++++++++++++++++++- scripts/kconfig/merge_config.sh | 10 +++- scripts/package/Makefile | 39 ++++++---------- scripts/package/buildtar | 2 +- scripts/tags.sh | 4 +- 21 files changed, 380 insertions(+), 121 deletions(-) delete mode 100644 scripts/headers_install.pl create mode 100644 scripts/headers_install.sh 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 (2cc1144 sata_highbank: Rename proc_name to the module name) $ git merge libata/NEXT Auto-merging drivers/ata/sata_fsl.c Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/ata/imx-pata.txt | 17 +++++ drivers/ata/libata-acpi.c | 82 ++++++++-------------- drivers/ata/libata-scsi.c | 7 +- drivers/ata/pata_at32.c | 13 +--- drivers/ata/pata_imx.c | 36 +++++++--- drivers/ata/pata_legacy.c | 2 +- drivers/ata/pata_octeon_cf.c | 2 +- drivers/ata/sata_fsl.c | 55 +++++++++++++++ drivers/ata/sata_highbank.c | 4 +- drivers/ata/sata_rcar.c | 7 +- 10 files changed, 140 insertions(+), 85 deletions(-) create mode 100644 Documentation/devicetree/bindings/ata/imx-pata.txt Merging infiniband/for-next (f1258ea Merge branches 'misc' and 'mlx4' into for-next) $ git merge infiniband/for-next Merge made by the 'recursive' strategy. drivers/infiniband/core/iwcm.c | 2 + drivers/infiniband/core/verbs.c | 3 +- drivers/infiniband/hw/cxgb3/cxio_resource.c | 4 +- drivers/infiniband/hw/cxgb3/iwch_provider.c | 2 +- drivers/infiniband/hw/cxgb4/id_table.c | 4 +- drivers/infiniband/hw/cxgb4/qp.c | 25 ++--- drivers/infiniband/hw/ipath/ipath_verbs.c | 19 ++-- drivers/infiniband/hw/mlx4/cq.c | 21 +++++ drivers/infiniband/hw/mlx4/mad.c | 2 +- drivers/infiniband/hw/mlx4/qp.c | 6 ++ drivers/infiniband/hw/qib/qib_sysfs.c | 6 +- drivers/infiniband/hw/qib/qib_verbs.c | 3 +- drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 +- drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 +- drivers/infiniband/ulp/srpt/ib_srpt.c | 2 +- drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 2 +- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 16 ++-- drivers/net/ethernet/mellanox/mlx4/eq.c | 4 +- drivers/net/ethernet/mellanox/mlx4/mcg.c | 120 +++++++++++++++--------- drivers/net/ethernet/mellanox/mlx4/mlx4.h | 79 ---------------- drivers/net/ethernet/mellanox/mlx4/srq.c | 15 +++ include/linux/mlx4/device.h | 104 ++++++++++++++++++-- include/linux/mlx4/srq.h | 2 + 23 files changed, 272 insertions(+), 173 deletions(-) Merging pstore/master (bd08ec3 pstore/ram: Restore ecc information block) $ git merge pstore/master Merge made by the 'recursive' strategy. fs/pstore/ram.c | 26 +++++++++++------- fs/pstore/ram_core.c | 66 ++++++++++++++++++++++++++-------------------- include/linux/pstore_ram.h | 14 +++++++--- 3 files changed, 64 insertions(+), 42 deletions(-) Merging pm/linux-next (371deb9 Merge branch 'pm-cpufreq') $ git merge pm/linux-next Resolved 'drivers/acpi/scan.c' using previous resolution. Resolved 'include/linux/clockchips.h' using previous resolution. Auto-merging include/linux/clockchips.h CONFLICT (content): Merge conflict in include/linux/clockchips.h Auto-merging include/linux/acpi.h Auto-merging drivers/pnp/pnpbios/proc.c Auto-merging drivers/cpufreq/unicore2-cpufreq.c Auto-merging drivers/cpufreq/tegra-cpufreq.c Auto-merging drivers/cpufreq/sparc-us3-cpufreq.c Auto-merging drivers/cpufreq/sparc-us2e-cpufreq.c Auto-merging drivers/cpufreq/sh-cpufreq.c Auto-merging drivers/cpufreq/sa1110-cpufreq.c Auto-merging drivers/cpufreq/sa1100-cpufreq.c Auto-merging drivers/cpufreq/pxa3xx-cpufreq.c Auto-merging drivers/cpufreq/pxa2xx-cpufreq.c Auto-merging drivers/cpufreq/ppc_cbe_cpufreq_pmi.c Auto-merging drivers/cpufreq/ppc_cbe_cpufreq_pervasive.c Auto-merging drivers/cpufreq/ppc_cbe_cpufreq.h Auto-merging drivers/cpufreq/ppc_cbe_cpufreq.c Auto-merging drivers/cpufreq/loongson2_cpufreq.c Auto-merging drivers/cpufreq/integrator-cpufreq.c Auto-merging drivers/cpufreq/ia64-acpi-cpufreq.c Auto-merging drivers/cpufreq/davinci-cpufreq.c Auto-merging drivers/cpufreq/cris-etraxfs-cpufreq.c Auto-merging drivers/cpufreq/cris-artpec3-cpufreq.c Auto-merging drivers/cpufreq/blackfin-cpufreq.c Auto-merging drivers/cpufreq/at32ap-cpufreq.c Removing drivers/clk/x86/clk-lpss.h Removing drivers/clk/x86/clk-lpss.c Auto-merging drivers/acpi/scan.c CONFLICT (content): Merge conflict in drivers/acpi/scan.c Auto-merging drivers/acpi/pci_root.c Auto-merging drivers/acpi/button.c Auto-merging drivers/acpi/battery.c Auto-merging arch/x86/include/asm/cpufeature.h Auto-merging arch/sparc/kernel/Makefile Auto-merging arch/sparc/Kconfig Auto-merging arch/sh/Kconfig Removing arch/mips/kernel/cpufreq/Makefile Removing arch/mips/kernel/cpufreq/Kconfig Auto-merging arch/mips/Kconfig Removing arch/ia64/kernel/cpufreq/Makefile Removing arch/ia64/kernel/cpufreq/Kconfig Auto-merging arch/ia64/Kconfig Auto-merging arch/arm/mach-omap2/pm.c Removing arch/arm/mach-imx/cpuidle.c Auto-merging arch/arm/Kconfig Auto-merging MAINTAINERS Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master fe84acf] Merge remote-tracking branch 'pm/linux-next' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/sysfs-devices-lpss_ltr | 44 + .../testing/sysfs-devices-power_resources_wakeup | 13 + Documentation/ABI/testing/sysfs-firmware-acpi | 26 + Documentation/cpu-freq/cpu-drivers.txt | 9 +- Documentation/cpu-freq/governors.txt | 27 + Documentation/cpuidle/driver.txt | 6 + .../bindings/cpufreq/arm_big_little_dt.txt | 65 + .../devicetree/bindings/cpufreq/cpufreq-cpu0.txt | 2 +- .../bindings/cpufreq/cpufreq-exynos5440.txt | 28 + MAINTAINERS | 22 + arch/arm/Kconfig | 25 - arch/arm/configs/kirkwood_defconfig | 1 - arch/arm/mach-at91/cpuidle.c | 18 +- arch/arm/mach-davinci/Makefile | 1 - arch/arm/mach-davinci/cpuidle.c | 29 +- arch/arm/mach-exynos/Kconfig | 2 + arch/arm/mach-exynos/cpuidle.c | 1 - arch/arm/mach-imx/Makefile | 2 +- arch/arm/mach-imx/cpufreq.c | 8 +- arch/arm/mach-imx/cpuidle-imx5.c | 37 + arch/arm/mach-imx/cpuidle-imx6q.c | 26 +- arch/arm/mach-imx/cpuidle.c | 80 -- arch/arm/mach-imx/cpuidle.h | 10 +- arch/arm/mach-imx/pm-imx5.c | 30 +- arch/arm/mach-integrator/Makefile | 1 - arch/arm/mach-omap2/common.h | 5 - arch/arm/mach-omap2/cpuidle34xx.c | 52 +- arch/arm/mach-omap2/cpuidle44xx.c | 84 +- arch/arm/mach-omap2/omap-mpuss-lowpower.c | 14 - arch/arm/mach-omap2/pm.c | 9 + arch/arm/mach-pxa/Makefile | 6 - arch/arm/mach-pxa/include/mach/generic.h | 1 + arch/arm/mach-s3c24xx/cpufreq.c | 8 +- arch/arm/mach-s3c64xx/cpuidle.c | 15 +- arch/arm/mach-sa1100/Kconfig | 26 +- arch/arm/mach-sa1100/Makefile | 3 - arch/arm/mach-sa1100/include/mach/generic.h | 1 + arch/arm/mach-shmobile/cpuidle.c | 23 +- arch/arm/mach-shmobile/include/mach/common.h | 3 - arch/arm/mach-shmobile/pm-sh7372.c | 6 +- arch/arm/mach-tegra/Makefile | 1 - arch/arm/mach-tegra/cpuidle-tegra114.c | 28 +- arch/arm/mach-tegra/cpuidle-tegra20.c | 72 +- arch/arm/mach-tegra/cpuidle-tegra30.c | 29 +- arch/arm/mach-ux500/cpuidle.c | 58 +- arch/avr32/Kconfig | 13 - arch/avr32/configs/atngw100_defconfig | 2 +- arch/avr32/configs/atngw100_evklcd100_defconfig | 2 +- arch/avr32/configs/atngw100_evklcd101_defconfig | 2 +- arch/avr32/configs/atngw100_mrmt_defconfig | 2 +- arch/avr32/configs/atngw100mkii_defconfig | 2 +- .../avr32/configs/atngw100mkii_evklcd100_defconfig | 2 +- .../avr32/configs/atngw100mkii_evklcd101_defconfig | 2 +- arch/avr32/configs/atstk1002_defconfig | 2 +- arch/avr32/configs/atstk1003_defconfig | 2 +- arch/avr32/configs/atstk1004_defconfig | 2 +- arch/avr32/configs/atstk1006_defconfig | 2 +- arch/avr32/configs/favr-32_defconfig | 2 +- arch/avr32/configs/hammerhead_defconfig | 2 +- arch/avr32/configs/mimc200_defconfig | 2 +- arch/avr32/mach-at32ap/Makefile | 1 - arch/blackfin/mach-common/Makefile | 1 - arch/cris/arch-v32/mach-a3/Makefile | 1 - arch/cris/arch-v32/mach-fs/Makefile | 1 - arch/ia64/Kconfig | 6 +- arch/ia64/kernel/Makefile | 1 - arch/ia64/kernel/cpufreq/Kconfig | 29 - arch/ia64/kernel/cpufreq/Makefile | 2 - arch/mips/Kconfig | 9 +- arch/mips/kernel/Makefile | 2 - arch/mips/kernel/cpufreq/Kconfig | 41 - arch/mips/kernel/cpufreq/Makefile | 5 - arch/powerpc/platforms/cell/Kconfig | 26 +- arch/powerpc/platforms/cell/Makefile | 3 - arch/powerpc/platforms/pasemi/cpufreq.c | 5 +- arch/powerpc/platforms/powermac/cpufreq_32.c | 14 +- arch/powerpc/platforms/powermac/cpufreq_64.c | 5 +- arch/powerpc/platforms/pseries/processor_idle.c | 34 +- arch/sh/Kconfig | 18 - arch/sh/include/asm/suspend.h | 4 +- arch/sh/kernel/Makefile | 1 - arch/sh/kernel/cpu/shmobile/cpuidle.c | 101 +- arch/sh/kernel/cpu/shmobile/pm.c | 3 +- arch/sparc/Kconfig | 23 - arch/sparc/kernel/Makefile | 3 - arch/unicore32/kernel/Makefile | 1 - arch/x86/include/asm/cpufeature.h | 1 + arch/x86/kernel/apm_32.c | 1 - arch/x86/kernel/cpu/scattered.c | 3 +- drivers/acpi/Kconfig | 13 +- drivers/acpi/Makefile | 1 + drivers/acpi/acpi_lpss.c | 292 +++++ drivers/acpi/acpi_memhotplug.c | 328 +---- drivers/acpi/acpi_pad.c | 2 +- drivers/acpi/acpi_platform.c | 40 +- drivers/acpi/acpica/Makefile | 2 + drivers/acpi/acpica/acglobal.h | 5 +- drivers/acpi/acpica/aclocal.h | 29 +- drivers/acpi/acpica/acmacros.h | 6 +- drivers/acpi/acpica/acnamesp.h | 29 +- drivers/acpi/acpica/acpredef.h | 1305 ++++++++++++++------ drivers/acpi/acpica/acutils.h | 28 +- drivers/acpi/acpica/dsutils.c | 10 +- drivers/acpi/acpica/dswexec.c | 2 +- drivers/acpi/acpica/evevent.c | 12 +- drivers/acpi/acpica/evgpe.c | 6 +- drivers/acpi/acpica/evsci.c | 4 +- drivers/acpi/acpica/evxface.c | 21 +- drivers/acpi/acpica/evxfevnt.c | 12 + drivers/acpi/acpica/exoparg2.c | 11 +- drivers/acpi/acpica/exprep.c | 4 +- drivers/acpi/acpica/exutils.c | 4 +- drivers/acpi/acpica/hwacpi.c | 20 +- drivers/acpi/acpica/nsconvert.c | 443 +++++++ drivers/acpi/acpica/nseval.c | 26 +- drivers/acpi/acpica/nspredef.c | 213 +--- drivers/acpi/acpica/nsprepkg.c | 10 +- drivers/acpi/acpica/nsrepair.c | 381 ++---- drivers/acpi/acpica/nsrepair2.c | 16 +- drivers/acpi/acpica/nsutils.c | 8 +- drivers/acpi/acpica/psargs.c | 2 +- drivers/acpi/acpica/rscalc.c | 6 + drivers/acpi/acpica/rsdump.c | 8 + drivers/acpi/acpica/rslist.c | 8 + drivers/acpi/acpica/rsxface.c | 8 +- drivers/acpi/acpica/tbfadt.c | 4 + drivers/acpi/acpica/tbxface.c | 22 +- drivers/acpi/acpica/utaddress.c | 4 +- drivers/acpi/acpica/utcache.c | 18 +- drivers/acpi/acpica/utdelete.c | 96 +- drivers/acpi/acpica/utexcep.c | 26 +- drivers/acpi/acpica/utglobal.c | 2 + drivers/acpi/acpica/utmutex.c | 9 +- drivers/acpi/acpica/utosi.c | 26 +- drivers/acpi/acpica/utpredef.c | 399 ++++++ drivers/acpi/acpica/utxface.c | 17 +- drivers/acpi/battery.c | 2 +- drivers/acpi/bus.c | 5 +- drivers/acpi/button.c | 1 + drivers/acpi/container.c | 152 +-- drivers/acpi/device_pm.c | 39 +- drivers/acpi/fan.c | 8 +- drivers/acpi/internal.h | 21 +- drivers/acpi/osl.c | 4 +- drivers/acpi/pci_link.c | 1 + drivers/acpi/pci_root.c | 4 +- drivers/acpi/power.c | 60 +- drivers/acpi/processor_idle.c | 1 - drivers/acpi/processor_thermal.c | 24 +- drivers/acpi/processor_throttling.c | 3 +- drivers/acpi/scan.c | 531 +++++--- drivers/acpi/sysfs.c | 66 + drivers/acpi/thermal.c | 16 +- drivers/acpi/video.c | 318 +++-- drivers/acpi/video_detect.c | 25 +- drivers/base/power/domain.c | 6 +- drivers/base/power/generic_ops.c | 2 +- drivers/base/power/main.c | 2 +- drivers/base/power/opp.c | 1 + drivers/base/power/runtime.c | 2 +- drivers/clk/x86/Makefile | 2 +- drivers/clk/x86/clk-lpss.c | 99 -- drivers/clk/x86/clk-lpss.h | 36 - drivers/clk/x86/clk-lpt.c | 40 +- drivers/cpufreq/Kconfig | 89 ++ drivers/cpufreq/Kconfig.arm | 148 ++- drivers/cpufreq/Kconfig.powerpc | 18 + drivers/cpufreq/Kconfig.x86 | 17 + drivers/cpufreq/Makefile | 41 +- drivers/cpufreq/acpi-cpufreq.c | 11 +- drivers/cpufreq/amd_freq_sensitivity.c | 148 +++ drivers/cpufreq/arm_big_little.c | 278 +++++ drivers/cpufreq/arm_big_little.h | 40 + drivers/cpufreq/arm_big_little_dt.c | 107 ++ .../cpufreq.c => drivers/cpufreq/at32ap-cpufreq.c | 5 +- .../cpufreq/blackfin-cpufreq.c | 79 +- drivers/cpufreq/cpufreq-cpu0.c | 32 +- drivers/cpufreq/cpufreq-nforce2.c | 11 +- drivers/cpufreq/cpufreq.c | 145 ++- drivers/cpufreq/cpufreq_conservative.c | 244 ++-- drivers/cpufreq/cpufreq_governor.c | 291 +++-- drivers/cpufreq/cpufreq_governor.h | 128 +- drivers/cpufreq/cpufreq_ondemand.c | 363 ++++-- .../cpufreq/cris-artpec3-cpufreq.c | 20 +- .../cpufreq/cris-etraxfs-cpufreq.c | 17 +- .../cpufreq.c => drivers/cpufreq/davinci-cpufreq.c | 35 +- drivers/cpufreq/dbx500-cpufreq.c | 22 +- drivers/cpufreq/e_powersaver.c | 11 +- drivers/cpufreq/elanfreq.c | 10 +- drivers/cpufreq/exynos-cpufreq.c | 9 +- drivers/cpufreq/exynos5440-cpufreq.c | 481 ++++++++ drivers/cpufreq/gx-suspmod.c | 11 +- .../cpufreq/ia64-acpi-cpufreq.c | 23 +- drivers/cpufreq/imx6q-cpufreq.c | 12 +- .../cpu.c => drivers/cpufreq/integrator-cpufreq.c | 8 +- drivers/cpufreq/intel_pstate.c | 21 +- drivers/cpufreq/kirkwood-cpufreq.c | 18 +- drivers/cpufreq/longhaul.c | 18 +- .../kernel => drivers}/cpufreq/loongson2_cpufreq.c | 11 +- drivers/cpufreq/maple-cpufreq.c | 5 +- drivers/cpufreq/omap-cpufreq.c | 34 +- drivers/cpufreq/p4-clockmod.c | 13 +- drivers/cpufreq/pcc-cpufreq.c | 5 +- drivers/cpufreq/powernow-k6.c | 12 +- drivers/cpufreq/powernow-k7.c | 10 +- drivers/cpufreq/powernow-k8.c | 19 +- .../cpufreq/ppc_cbe_cpufreq.c | 8 +- .../cpufreq/ppc_cbe_cpufreq.h | 4 +- .../cpufreq/ppc_cbe_cpufreq_pervasive.c | 2 +- .../cpufreq/ppc_cbe_cpufreq_pmi.c | 2 +- .../cpufreq/pxa2xx-cpufreq.c | 12 +- .../cpufreq/pxa3xx-cpufreq.c | 10 +- drivers/cpufreq/s3c2416-cpufreq.c | 5 +- drivers/cpufreq/s3c64xx-cpufreq.c | 7 +- drivers/cpufreq/s5pv210-cpufreq.c | 5 +- .../cpufreq/sa1100-cpufreq.c | 8 +- .../cpufreq/sa1110-cpufreq.c | 8 +- drivers/cpufreq/sc520_freq.c | 10 +- .../cpufreq.c => drivers/cpufreq/sh-cpufreq.c | 22 +- .../cpufreq/sparc-us2e-cpufreq.c | 19 +- .../cpufreq/sparc-us3-cpufreq.c | 19 +- drivers/cpufreq/spear-cpufreq.c | 7 +- drivers/cpufreq/speedstep-centrino.c | 28 +- drivers/cpufreq/speedstep-ich.c | 12 +- drivers/cpufreq/speedstep-smi.c | 5 +- .../cpu-tegra.c => drivers/cpufreq/tegra-cpufreq.c | 17 +- .../cpufreq/unicore2-cpufreq.c | 7 +- drivers/cpuidle/Kconfig | 6 - drivers/cpuidle/Makefile | 2 +- drivers/cpuidle/cpuidle-calxeda.c | 57 +- drivers/cpuidle/cpuidle-kirkwood.c | 29 +- drivers/cpuidle/cpuidle.c | 153 ++- drivers/cpuidle/driver.c | 31 +- drivers/gpu/drm/i915/intel_opregion.c | 4 +- drivers/idle/intel_idle.c | 4 - drivers/platform/x86/sony-laptop.c | 3 +- drivers/pnp/isapnp/core.c | 11 - drivers/pnp/pnpacpi/rsparser.c | 1 + drivers/pnp/pnpbios/proc.c | 5 +- include/acpi/acexcep.h | 461 ++++--- include/acpi/acoutput.h | 53 +- include/acpi/acpi_bus.h | 33 +- include/acpi/acpi_drivers.h | 1 - include/acpi/acpixf.h | 2 +- include/acpi/actbl2.h | 47 + include/acpi/actbl3.h | 55 +- include/acpi/actypes.h | 16 +- include/linux/acpi.h | 4 +- include/linux/clockchips.h | 32 +- include/linux/cpufreq.h | 21 +- include/linux/cpuidle.h | 23 +- include/linux/platform_data/clk-lpss.h | 18 + kernel/power/suspend.c | 22 +- 253 files changed, 6938 insertions(+), 4145 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-devices-lpss_ltr create mode 100644 Documentation/ABI/testing/sysfs-devices-power_resources_wakeup create mode 100644 Documentation/devicetree/bindings/cpufreq/arm_big_little_dt.txt create mode 100644 Documentation/devicetree/bindings/cpufreq/cpufreq-exynos5440.txt create mode 100644 arch/arm/mach-imx/cpuidle-imx5.c delete mode 100644 arch/arm/mach-imx/cpuidle.c create mode 100644 arch/arm/mach-pxa/include/mach/generic.h create mode 100644 arch/arm/mach-sa1100/include/mach/generic.h delete mode 100644 arch/ia64/kernel/cpufreq/Kconfig delete mode 100644 arch/ia64/kernel/cpufreq/Makefile delete mode 100644 arch/mips/kernel/cpufreq/Kconfig delete mode 100644 arch/mips/kernel/cpufreq/Makefile create mode 100644 drivers/acpi/acpi_lpss.c create mode 100644 drivers/acpi/acpica/nsconvert.c create mode 100644 drivers/acpi/acpica/utpredef.c delete mode 100644 drivers/clk/x86/clk-lpss.c delete mode 100644 drivers/clk/x86/clk-lpss.h create mode 100644 drivers/cpufreq/amd_freq_sensitivity.c create mode 100644 drivers/cpufreq/arm_big_little.c create mode 100644 drivers/cpufreq/arm_big_little.h create mode 100644 drivers/cpufreq/arm_big_little_dt.c rename arch/avr32/mach-at32ap/cpufreq.c => drivers/cpufreq/at32ap-cpufreq.c (95%) rename arch/blackfin/mach-common/cpufreq.c => drivers/cpufreq/blackfin-cpufreq.c (76%) rename arch/cris/arch-v32/mach-a3/cpufreq.c => drivers/cpufreq/cris-artpec3-cpufreq.c (89%) rename arch/cris/arch-v32/mach-fs/cpufreq.c => drivers/cpufreq/cris-etraxfs-cpufreq.c (89%) rename arch/arm/mach-davinci/cpufreq.c => drivers/cpufreq/davinci-cpufreq.c (86%) create mode 100644 drivers/cpufreq/exynos5440-cpufreq.c rename arch/ia64/kernel/cpufreq/acpi-cpufreq.c => drivers/cpufreq/ia64-acpi-cpufreq.c (94%) rename arch/arm/mach-integrator/cpu.c => drivers/cpufreq/integrator-cpufreq.c (96%) rename {arch/mips/kernel => drivers}/cpufreq/loongson2_cpufreq.c (96%) rename arch/powerpc/platforms/cell/cbe_cpufreq.c => drivers/cpufreq/ppc_cbe_cpufreq.c (96%) rename arch/powerpc/platforms/cell/cbe_cpufreq.h => drivers/cpufreq/ppc_cbe_cpufreq.h (82%) rename arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c => drivers/cpufreq/ppc_cbe_cpufreq_pervasive.c (99%) rename arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c => drivers/cpufreq/ppc_cbe_cpufreq_pmi.c (99%) rename arch/arm/mach-pxa/cpufreq-pxa2xx.c => drivers/cpufreq/pxa2xx-cpufreq.c (98%) rename arch/arm/mach-pxa/cpufreq-pxa3xx.c => drivers/cpufreq/pxa3xx-cpufreq.c (96%) rename arch/arm/mach-sa1100/cpu-sa1100.c => drivers/cpufreq/sa1100-cpufreq.c (98%) rename arch/arm/mach-sa1100/cpu-sa1110.c => drivers/cpufreq/sa1110-cpufreq.c (98%) rename arch/sh/kernel/cpufreq.c => drivers/cpufreq/sh-cpufreq.c (91%) rename arch/sparc/kernel/us2e_cpufreq.c => drivers/cpufreq/sparc-us2e-cpufreq.c (96%) rename arch/sparc/kernel/us3_cpufreq.c => drivers/cpufreq/sparc-us3-cpufreq.c (93%) rename arch/arm/mach-tegra/cpu-tegra.c => drivers/cpufreq/tegra-cpufreq.c (93%) rename arch/unicore32/kernel/cpu-ucv2.c => drivers/cpufreq/unicore2-cpufreq.c (90%) create mode 100644 include/linux/platform_data/clk-lpss.h Merging idle/next (5c99726b Merge branch 'fspin' into next) $ git merge idle/next Auto-merging include/linux/cpuidle.h Auto-merging drivers/idle/intel_idle.c Auto-merging arch/x86/include/uapi/asm/msr-index.h Merge made by the 'recursive' strategy. arch/x86/include/uapi/asm/msr-index.h | 3 + drivers/idle/intel_idle.c | 21 ++ include/linux/cpuidle.h | 2 +- tools/power/fspin/Makefile | 21 ++ tools/power/fspin/fspin.1 | 68 ++++++ tools/power/fspin/fspin.c | 443 ++++++++++++++++++++++++++++++++++ tools/power/x86/turbostat/turbostat.c | 54 ++++- 7 files changed, 610 insertions(+), 2 deletions(-) create mode 100644 tools/power/fspin/Makefile create mode 100644 tools/power/fspin/fspin.1 create mode 100644 tools/power/fspin/fspin.c 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 cpuidle/cpuidle-next (817c876 Merge branch 'pm-fixes-next' into fixes-next) $ git merge cpuidle/cpuidle-next Resolved 'drivers/base/power/qos.c' using previous resolution. Auto-merging drivers/base/power/qos.c CONFLICT (content): Merge conflict in drivers/base/power/qos.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 319a06e] 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 (de6558d Merge branch 'MAINTAINERS-update' of .git into next) $ git merge thermal/next Auto-merging include/linux/thermal.h Auto-merging drivers/thermal/thermal_core.c Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. .../devicetree/bindings/thermal/armada-thermal.txt | 22 ++ Documentation/thermal/exynos_thermal_emulation | 8 +- Documentation/thermal/sysfs-api.txt | 28 +- MAINTAINERS | 3 + drivers/thermal/Kconfig | 28 +- drivers/thermal/Makefile | 10 +- drivers/thermal/armada_thermal.c | 232 ++++++++++++++++ drivers/thermal/cpu_cooling.c | 295 +++++++++++++++------ drivers/thermal/db8500_cpufreq_cooling.c | 2 +- drivers/thermal/db8500_thermal.c | 19 +- drivers/thermal/dove_thermal.c | 7 +- drivers/thermal/exynos_thermal.c | 198 ++++++-------- drivers/thermal/fair_share.c | 15 +- drivers/thermal/kirkwood_thermal.c | 12 +- drivers/thermal/rcar_thermal.c | 34 ++- drivers/thermal/step_wise.c | 26 +- drivers/thermal/{thermal_sys.c => thermal_core.c} | 197 +++++++++++--- drivers/thermal/thermal_core.h | 27 ++ drivers/thermal/user_space.c | 15 +- include/linux/cpu_cooling.h | 25 +- include/linux/thermal.h | 15 +- 21 files changed, 858 insertions(+), 360 deletions(-) create mode 100644 Documentation/devicetree/bindings/thermal/armada-thermal.txt create mode 100644 drivers/thermal/armada_thermal.c rename drivers/thermal/{thermal_sys.c => thermal_core.c} (89%) Merging ieee1394/for-next (6fe9efb firewire: ohci: dump_stack() for PHY regs read/write failures) $ git merge ieee1394/for-next Merge made by the 'recursive' strategy. drivers/firewire/core-cdev.c | 27 ++--- drivers/firewire/core-device.c | 4 +- drivers/firewire/net.c | 7 +- drivers/firewire/ohci.c | 270 +++++++++++++++++++++++------------------ drivers/firewire/sbp2.c | 10 +- 5 files changed, 166 insertions(+), 152 deletions(-) Merging ubi/linux-next (f6161aa Linux 3.9-rc2) $ git merge ubi/linux-next Already up-to-date. Merging dlm/next (9000831 dlm: avoid unnecessary posix unlock) $ git merge dlm/next Already up-to-date. Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers) $ git merge swiotlb/linux-next Already up-to-date. Merging scsi/for-next (73b22ec Merge branch 'misc' into for-next) $ git merge scsi/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging target-updates/for-next (04b59ba tcm_vhost: Enable VIRTIO_SCSI_F_HOTPLUG) $ git merge target-updates/for-next Already up-to-date. Merging target-merge/for-next-merge (b8d26b3 iser-target: Add iSCSI Extensions for RDMA (iSER) target driver) $ 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 (0b03930 Merge branch 'for-linus' into next) $ git merge slave-dma/next Auto-merging drivers/dma/at_hdmac.c Merge made by the 'recursive' strategy. Documentation/acpi/enumeration.txt | 77 ++++ Documentation/dmatest.txt | 81 ++++ arch/arm/mach-omap2/dma.c | 4 + drivers/dma/Kconfig | 6 +- drivers/dma/Makefile | 1 + drivers/dma/acpi-dma.c | 279 ++++++++++++ drivers/dma/at_hdmac.c | 4 +- drivers/dma/coh901318.c | 4 +- drivers/dma/dmaengine.c | 17 +- drivers/dma/dmatest.c | 887 ++++++++++++++++++++++++++++++------ drivers/dma/dw_dmac.c | 203 +++++---- drivers/dma/dw_dmac_regs.h | 6 +- drivers/dma/imx-dma.c | 7 +- drivers/dma/imx-sdma.c | 4 +- drivers/dma/ioat/dma.c | 8 +- drivers/dma/ioat/dma.h | 53 ++- drivers/dma/ioat/dma_v2.h | 2 + drivers/dma/ioat/dma_v3.c | 912 ++++++++++++++++++++++++++++++++----- drivers/dma/ioat/hw.h | 88 +++- drivers/dma/ioat/pci.c | 20 + drivers/dma/ioat/registers.h | 4 + drivers/dma/ipu/ipu_idmac.c | 6 +- drivers/dma/of-dma.c | 19 +- drivers/dma/omap-dma.c | 38 +- drivers/dma/pch_dma.c | 2 +- drivers/dma/pl330.c | 10 +- drivers/dma/sirf-dma.c | 11 + drivers/dma/tegra20-apb-dma.c | 22 +- drivers/dma/timb_dma.c | 2 +- drivers/dma/txx9dmac.c | 8 +- include/linux/acpi_dma.h | 116 +++++ include/linux/dmaengine.h | 15 +- include/linux/of_dma.h | 4 +- 33 files changed, 2486 insertions(+), 434 deletions(-) create mode 100644 Documentation/dmatest.txt create mode 100644 drivers/dma/acpi-dma.c create mode 100644 include/linux/acpi_dma.h Merging dmaengine/next (41ef2d5 Linux 3.9-rc7) $ git merge dmaengine/next Already up-to-date. Merging net-next/master (fe86d71 mlx4_en: fix a build error on 32bit arches) $ git merge net-next/master Resolved 'drivers/infiniband/hw/cxgb4/qp.c' using previous resolution. Resolved 'include/linux/pci.h' using previous resolution. Resolved 'tools/Makefile' using previous resolution. Auto-merging tools/Makefile CONFLICT (content): Merge conflict in tools/Makefile Auto-merging net/socket.c Auto-merging net/sctp/associola.c Auto-merging net/netfilter/xt_hashlimit.c Auto-merging net/netfilter/x_tables.c Auto-merging net/netfilter/nf_conntrack_core.c Auto-merging net/ipv6/proc.c Auto-merging net/ipv4/udp.c Auto-merging net/ipv4/tcp_ipv4.c Auto-merging net/core/neighbour.c Auto-merging net/bluetooth/af_bluetooth.c Auto-merging kernel/audit.c Auto-merging include/uapi/linux/sctp.h Removing include/net/ipip.h Removing include/net/caif/caif_shm.h Auto-merging include/linux/pci.h CONFLICT (content): Merge conflict in include/linux/pci.h Removing include/linux/netfilter/ipset/ip_set_ahash.h Auto-merging include/linux/netdevice.h Auto-merging include/linux/mlx4/device.h Auto-merging drivers/staging/gdm72xx/netlink_k.c Auto-merging drivers/scsi/scsi_transport_iscsi.c Auto-merging drivers/scsi/csiostor/csio_hw.c Auto-merging drivers/net/wireless/ray_cs.c Auto-merging drivers/net/usb/cdc_mbim.c Auto-merging drivers/net/ppp/ppp_synctty.c Auto-merging drivers/net/ethernet/xircom/xirc2ps_cs.c Auto-merging drivers/net/ethernet/sfc/falcon.c Auto-merging drivers/net/ethernet/mellanox/mlx4/mlx4.h Auto-merging drivers/net/ethernet/mellanox/mlx4/mcg.c Auto-merging drivers/net/ethernet/mellanox/mlx4/en_netdev.c Auto-merging drivers/net/ethernet/mellanox/mlx4/en_ethtool.c Auto-merging drivers/net/ethernet/fujitsu/fmvj18x_cs.c Auto-merging drivers/net/ethernet/freescale/fec_main.c Auto-merging drivers/net/can/sja1000/peak_pcmcia.c Auto-merging drivers/net/can/sja1000/ems_pcmcia.c Removing drivers/net/caif/caif_shmcore.c Removing drivers/net/caif/caif_shm_u5500.c Auto-merging drivers/net/caif/caif_serial.c Auto-merging drivers/media/dvb-core/dvb_net.c Auto-merging drivers/infiniband/ulp/ipoib/ipoib_main.c Auto-merging drivers/infiniband/hw/mlx4/cq.c Auto-merging drivers/infiniband/hw/cxgb4/qp.c CONFLICT (content): Merge conflict in drivers/infiniband/hw/cxgb4/qp.c Auto-merging drivers/firewire/net.c Auto-merging MAINTAINERS Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 5a17719] Merge remote-tracking branch 'net-next/master' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/sysfs-class-net-mesh | 8 + Documentation/cgroups/00-INDEX | 2 + Documentation/cgroups/net_cls.txt | 34 + Documentation/devicetree/bindings/marvell.txt | 3 + .../devicetree/bindings/net/can/atmel-can.txt | 14 + Documentation/devicetree/bindings/net/cpsw.txt | 16 +- Documentation/devicetree/bindings/net/dsa/dsa.txt | 91 + .../devicetree/bindings/net/marvell-orion-mdio.txt | 4 + Documentation/networking/ieee802154.txt | 5 +- Documentation/networking/ip-sysctl.txt | 53 +- Documentation/networking/netlink_mmap.txt | 339 ++++ Documentation/networking/packet_mmap.txt | 368 +++- Documentation/networking/stmmac.txt | 45 +- MAINTAINERS | 6 +- arch/alpha/include/uapi/asm/socket.h | 2 + arch/arm/boot/dts/am33xx.dtsi | 2 +- arch/arm/net/bpf_jit_32.c | 5 +- arch/arm/plat-orion/common.c | 54 +- arch/avr32/include/uapi/asm/socket.h | 2 + arch/cris/include/uapi/asm/socket.h | 2 + arch/frv/include/uapi/asm/socket.h | 2 + arch/h8300/include/uapi/asm/socket.h | 2 + arch/ia64/include/uapi/asm/socket.h | 2 + arch/m32r/include/uapi/asm/socket.h | 2 + arch/mips/include/uapi/asm/socket.h | 2 + arch/mn10300/include/uapi/asm/socket.h | 2 + arch/parisc/include/uapi/asm/socket.h | 2 + arch/powerpc/include/uapi/asm/socket.h | 2 + arch/powerpc/net/bpf_jit_comp.c | 12 +- arch/powerpc/platforms/chrp/pegasos_eth.c | 20 + arch/powerpc/sysdev/mv64x60_dev.c | 16 +- arch/s390/include/uapi/asm/socket.h | 2 + arch/sparc/include/uapi/asm/socket.h | 2 + arch/sparc/net/bpf_jit_comp.c | 6 +- arch/x86/net/bpf_jit_comp.c | 9 +- arch/xtensa/include/uapi/asm/socket.h | 2 + drivers/atm/he.c | 2 +- drivers/connector/cn_proc.c | 25 + drivers/connector/connector.c | 12 +- drivers/dma/ioat/dca.c | 11 +- drivers/firewire/Kconfig | 6 +- drivers/firewire/net.c | 462 ++--- drivers/infiniband/hw/cxgb4/cm.c | 68 +- drivers/infiniband/hw/cxgb4/device.c | 34 +- drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 14 +- drivers/infiniband/hw/cxgb4/mem.c | 155 +- drivers/infiniband/hw/cxgb4/provider.c | 15 +- drivers/infiniband/hw/cxgb4/qp.c | 102 +- drivers/infiniband/hw/cxgb4/t4.h | 11 +- drivers/infiniband/hw/mlx4/cq.c | 2 +- drivers/infiniband/hw/nes/nes_hw.c | 2 +- drivers/infiniband/hw/nes/nes_nic.c | 14 +- drivers/infiniband/ulp/ipoib/ipoib_main.c | 4 +- drivers/isdn/capi/capidrv.c | 3 +- drivers/isdn/divert/isdn_divert.c | 8 +- drivers/isdn/hisax/fsm.c | 2 +- drivers/isdn/hisax/hfc_sx.c | 2 +- drivers/isdn/i4l/isdn_net.c | 2 +- drivers/media/dvb-core/dvb_net.c | 10 +- drivers/net/Kconfig | 1 + drivers/net/appletalk/Kconfig | 18 +- drivers/net/bonding/bond_alb.c | 4 +- drivers/net/bonding/bond_main.c | 66 +- drivers/net/caif/Kconfig | 7 - drivers/net/caif/Makefile | 4 - drivers/net/caif/caif_hsi.c | 7 +- drivers/net/caif/caif_serial.c | 4 +- drivers/net/caif/caif_shm_u5500.c | 128 -- drivers/net/caif/caif_shmcore.c | 747 -------- drivers/net/caif/caif_spi.c | 5 +- drivers/net/caif/caif_spi_slave.c | 3 +- drivers/net/can/Kconfig | 2 +- drivers/net/can/at91_can.c | 76 +- drivers/net/can/bfin_can.c | 4 +- drivers/net/can/mcp251x.c | 65 +- drivers/net/can/sja1000/ems_pci.c | 6 +- drivers/net/can/sja1000/ems_pcmcia.c | 6 +- drivers/net/can/sja1000/kvaser_pci.c | 4 +- drivers/net/can/sja1000/peak_pci.c | 2 +- drivers/net/can/sja1000/peak_pcmcia.c | 8 +- drivers/net/can/sja1000/plx_pci.c | 12 +- drivers/net/can/sja1000/sja1000.c | 126 +- drivers/net/can/sja1000/sja1000.h | 68 +- drivers/net/ethernet/3com/3c509.c | 2 + drivers/net/ethernet/3com/typhoon.c | 6 +- drivers/net/ethernet/adaptec/starfire.c | 10 +- drivers/net/ethernet/adi/bfin_mac.c | 6 +- drivers/net/ethernet/aeroflex/greth.c | 24 +- drivers/net/ethernet/alteon/acenic.c | 4 +- drivers/net/ethernet/amd/7990.c | 2 - drivers/net/ethernet/amd/a2065.c | 1 - drivers/net/ethernet/amd/am79c961a.c | 1 - drivers/net/ethernet/amd/amd8111e.c | 6 +- drivers/net/ethernet/amd/ariadne.c | 1 - drivers/net/ethernet/amd/atarilance.c | 6 +- drivers/net/ethernet/amd/au1000_eth.c | 1 - drivers/net/ethernet/amd/declance.c | 2 - drivers/net/ethernet/amd/mvme147.c | 4 +- drivers/net/ethernet/amd/ni65.c | 2 +- drivers/net/ethernet/amd/pcnet32.c | 1 - drivers/net/ethernet/amd/sun3lance.c | 7 +- drivers/net/ethernet/amd/sunlance.c | 9 +- drivers/net/ethernet/apple/macmace.c | 16 +- drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 24 +- drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 22 +- drivers/net/ethernet/atheros/atlx/atl1.c | 21 +- drivers/net/ethernet/atheros/atlx/atl2.c | 21 +- drivers/net/ethernet/atheros/atlx/atlx.c | 10 +- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 73 +- drivers/net/ethernet/broadcom/bgmac.c | 84 +- drivers/net/ethernet/broadcom/bgmac.h | 1 + drivers/net/ethernet/broadcom/bnx2.c | 19 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 58 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 357 +++- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 28 +- .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 377 +++- .../net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h | 91 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 252 ++- drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 240 ++- drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | 16 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 311 +++- drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 6 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 79 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 21 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 351 +++- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 27 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 77 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h | 2 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 126 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h | 9 +- drivers/net/ethernet/broadcom/cnic.c | 4 +- drivers/net/ethernet/broadcom/cnic_if.h | 3 + drivers/net/ethernet/broadcom/sb1250-mac.c | 5 +- drivers/net/ethernet/broadcom/tg3.c | 912 ++++++--- drivers/net/ethernet/broadcom/tg3.h | 30 +- drivers/net/ethernet/brocade/bna/bfa_ioc.c | 2 +- drivers/net/ethernet/brocade/bna/bnad.c | 17 +- drivers/net/ethernet/cadence/at91_ether.c | 80 +- drivers/net/ethernet/cadence/macb.c | 84 +- drivers/net/ethernet/cadence/macb.h | 2 + drivers/net/ethernet/calxeda/xgmac.c | 9 +- drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 13 +- drivers/net/ethernet/chelsio/cxgb/sge.c | 9 +- drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 20 +- drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 2 +- drivers/net/ethernet/chelsio/cxgb3/sge.c | 4 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 55 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 819 +++++++- drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 3 + drivers/net/ethernet/chelsio/cxgb4/sge.c | 93 +- drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 256 ++- drivers/net/ethernet/chelsio/cxgb4/t4_hw.h | 1 - drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 64 + drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 98 + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 40 +- drivers/net/ethernet/chelsio/cxgb4vf/adapter.h | 1 + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 75 +- drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 13 +- drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h | 24 + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 14 +- drivers/net/ethernet/cirrus/cs89x0.c | 74 +- drivers/net/ethernet/cirrus/ep93xx_eth.c | 13 +- drivers/net/ethernet/cisco/enic/enic_dev.c | 4 +- drivers/net/ethernet/cisco/enic/enic_dev.h | 4 +- drivers/net/ethernet/cisco/enic/enic_main.c | 6 +- drivers/net/ethernet/cisco/enic/vnic_dev.c | 3 + drivers/net/ethernet/davicom/dm9000.c | 17 +- drivers/net/ethernet/dec/tulip/xircom_cb.c | 9 +- drivers/net/ethernet/dlink/dl2k.c | 7 +- drivers/net/ethernet/emulex/benet/be.h | 7 +- drivers/net/ethernet/emulex/benet/be_cmds.c | 187 +- drivers/net/ethernet/emulex/benet/be_cmds.h | 90 +- drivers/net/ethernet/emulex/benet/be_ethtool.c | 174 +- drivers/net/ethernet/emulex/benet/be_hw.h | 9 +- drivers/net/ethernet/emulex/benet/be_main.c | 190 +- drivers/net/ethernet/emulex/benet/be_roce.c | 2 +- drivers/net/ethernet/emulex/benet/be_roce.h | 2 +- drivers/net/ethernet/faraday/ftgmac100.c | 22 +- drivers/net/ethernet/faraday/ftmac100.c | 8 +- drivers/net/ethernet/freescale/Makefile | 3 +- drivers/net/ethernet/freescale/fec.h | 10 +- .../net/ethernet/freescale/{fec.c => fec_main.c} | 207 ++- drivers/net/ethernet/freescale/fec_mpc52xx.c | 16 +- drivers/net/ethernet/freescale/fec_ptp.c | 7 +- .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 17 +- drivers/net/ethernet/freescale/gianfar.c | 176 +- drivers/net/ethernet/freescale/gianfar.h | 8 +- drivers/net/ethernet/freescale/gianfar_ethtool.c | 29 +- drivers/net/ethernet/freescale/gianfar_ptp.c | 3 + drivers/net/ethernet/freescale/gianfar_sysfs.c | 2 +- drivers/net/ethernet/freescale/ucc_geth.c | 881 ++++----- drivers/net/ethernet/freescale/ucc_geth_ethtool.c | 24 +- drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 2 - drivers/net/ethernet/i825xx/82596.c | 8 +- drivers/net/ethernet/i825xx/lib82596.c | 6 +- drivers/net/ethernet/ibm/ehea/ehea_main.c | 28 +- drivers/net/ethernet/ibm/emac/mal.c | 9 +- drivers/net/ethernet/ibm/ibmveth.c | 6 +- drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 6 +- drivers/net/ethernet/intel/e1000/e1000_main.c | 47 +- drivers/net/ethernet/intel/e1000e/80003es2lan.c | 131 +- drivers/net/ethernet/intel/e1000e/82571.c | 38 +- drivers/net/ethernet/intel/e1000e/82571.h | 2 + drivers/net/ethernet/intel/e1000e/defines.h | 27 +- drivers/net/ethernet/intel/e1000e/e1000.h | 21 +- drivers/net/ethernet/intel/e1000e/ethtool.c | 240 ++- drivers/net/ethernet/intel/e1000e/hw.h | 4 +- drivers/net/ethernet/intel/e1000e/ich8lan.c | 408 ++-- drivers/net/ethernet/intel/e1000e/ich8lan.h | 11 +- drivers/net/ethernet/intel/e1000e/mac.c | 37 +- drivers/net/ethernet/intel/e1000e/netdev.c | 343 ++-- drivers/net/ethernet/intel/e1000e/nvm.c | 2 +- drivers/net/ethernet/intel/e1000e/param.c | 62 +- drivers/net/ethernet/intel/e1000e/phy.c | 134 +- drivers/net/ethernet/intel/e1000e/ptp.c | 3 +- drivers/net/ethernet/intel/igb/e1000_82575.c | 261 ++- drivers/net/ethernet/intel/igb/e1000_82575.h | 2 + drivers/net/ethernet/intel/igb/e1000_defines.h | 50 +- drivers/net/ethernet/intel/igb/e1000_hw.h | 60 +- drivers/net/ethernet/intel/igb/e1000_i210.c | 156 +- drivers/net/ethernet/intel/igb/e1000_i210.h | 4 + drivers/net/ethernet/intel/igb/e1000_mac.c | 124 +- drivers/net/ethernet/intel/igb/e1000_mac.h | 17 +- drivers/net/ethernet/intel/igb/e1000_mbx.c | 11 +- drivers/net/ethernet/intel/igb/e1000_mbx.h | 52 +- drivers/net/ethernet/intel/igb/e1000_nvm.c | 27 +- drivers/net/ethernet/intel/igb/e1000_phy.c | 261 +-- drivers/net/ethernet/intel/igb/e1000_regs.h | 53 +- drivers/net/ethernet/intel/igb/igb.h | 133 +- drivers/net/ethernet/intel/igb/igb_ethtool.c | 354 +++- drivers/net/ethernet/intel/igb/igb_hwmon.c | 29 +- drivers/net/ethernet/intel/igb/igb_main.c | 1419 +++++++------- drivers/net/ethernet/intel/igb/igb_ptp.c | 61 +- drivers/net/ethernet/intel/igbvf/netdev.c | 18 +- drivers/net/ethernet/intel/ixgb/ixgb_main.c | 37 +- drivers/net/ethernet/intel/ixgbe/ixgbe.h | 5 + drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 110 +- drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 63 +- drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 2 + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 39 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 179 +- drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 21 +- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 25 +- drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 20 + drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 1 + drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 2 +- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 121 +- drivers/net/ethernet/intel/ixgbevf/vf.c | 7 +- drivers/net/ethernet/jme.c | 6 +- drivers/net/ethernet/marvell/Kconfig | 6 +- drivers/net/ethernet/marvell/Makefile | 2 +- drivers/net/ethernet/marvell/mv643xx_eth.c | 378 +--- drivers/net/ethernet/marvell/mvmdio.c | 142 +- drivers/net/ethernet/marvell/mvneta.c | 14 +- drivers/net/ethernet/marvell/pxa168_eth.c | 27 +- drivers/net/ethernet/marvell/sky2.c | 11 +- drivers/net/ethernet/mellanox/mlx4/Makefile | 2 +- drivers/net/ethernet/mellanox/mlx4/cmd.c | 204 +- drivers/net/ethernet/mellanox/mlx4/cq.c | 10 +- drivers/net/ethernet/mellanox/mlx4/en_clock.c | 151 ++ drivers/net/ethernet/mellanox/mlx4/en_cq.c | 10 +- drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c | 10 +- drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 30 + drivers/net/ethernet/mellanox/mlx4/en_main.c | 5 + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 235 ++- drivers/net/ethernet/mellanox/mlx4/en_resources.c | 3 + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 33 +- drivers/net/ethernet/mellanox/mlx4/en_selftest.c | 5 +- drivers/net/ethernet/mellanox/mlx4/en_tx.c | 31 +- drivers/net/ethernet/mellanox/mlx4/fw.c | 38 +- drivers/net/ethernet/mellanox/mlx4/fw.h | 1 + drivers/net/ethernet/mellanox/mlx4/main.c | 79 + drivers/net/ethernet/mellanox/mlx4/mcg.c | 51 +- drivers/net/ethernet/mellanox/mlx4/mlx4.h | 38 +- drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 26 +- drivers/net/ethernet/mellanox/mlx4/port.c | 23 +- .../net/ethernet/mellanox/mlx4/resource_tracker.c | 129 +- drivers/net/ethernet/micrel/ks8695net.c | 20 +- drivers/net/ethernet/micrel/ks8851.c | 53 +- drivers/net/ethernet/micrel/ks8851_mll.c | 32 +- drivers/net/ethernet/microchip/enc28j60.c | 4 +- drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 12 +- drivers/net/ethernet/natsemi/jazzsonic.c | 12 +- drivers/net/ethernet/natsemi/macsonic.c | 12 +- drivers/net/ethernet/natsemi/ns83820.c | 4 +- drivers/net/ethernet/natsemi/sonic.c | 1 - drivers/net/ethernet/natsemi/xtsonic.c | 12 +- drivers/net/ethernet/neterion/s2io.c | 10 +- drivers/net/ethernet/neterion/vxge/vxge-main.c | 14 +- drivers/net/ethernet/netx-eth.c | 2 - drivers/net/ethernet/nuvoton/w90p910_ether.c | 20 +- drivers/net/ethernet/nvidia/forcedeth.c | 64 +- drivers/net/ethernet/nxp/lpc_eth.c | 4 - .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 23 +- drivers/net/ethernet/pasemi/pasemi_mac.c | 5 +- drivers/net/ethernet/qlogic/Kconfig | 10 + drivers/net/ethernet/qlogic/netxen/netxen_nic.h | 5 +- .../net/ethernet/qlogic/netxen/netxen_nic_init.c | 4 +- .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 222 ++- drivers/net/ethernet/qlogic/qla3xxx.c | 1 - drivers/net/ethernet/qlogic/qlcnic/Makefile | 4 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 129 +- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 505 +++-- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 204 +- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 107 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 75 +- .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 125 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h | 6 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 63 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h | 10 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 104 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 371 +++- .../net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | 5 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h | 263 +++ .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 1954 ++++++++++++++++++++ .../net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c | 1780 ++++++++++++++++++ drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 255 ++- drivers/net/ethernet/qlogic/qlge/qlge_main.c | 34 +- drivers/net/ethernet/rdc/r6040.c | 12 +- drivers/net/ethernet/realtek/8139cp.c | 8 +- drivers/net/ethernet/realtek/8139too.c | 2 - drivers/net/ethernet/realtek/atp.c | 2 - drivers/net/ethernet/realtek/r8169.c | 286 ++- drivers/net/ethernet/renesas/Kconfig | 3 +- drivers/net/ethernet/renesas/sh_eth.c | 410 +++- drivers/net/ethernet/renesas/sh_eth.h | 220 --- drivers/net/ethernet/s6gmac.c | 16 +- drivers/net/ethernet/seeq/ether3.c | 22 +- drivers/net/ethernet/seeq/sgiseeq.c | 2 - drivers/net/ethernet/sfc/efx.c | 267 ++- drivers/net/ethernet/sfc/efx.h | 14 +- drivers/net/ethernet/sfc/enum.h | 12 +- drivers/net/ethernet/sfc/ethtool.c | 4 +- drivers/net/ethernet/sfc/falcon.c | 17 +- drivers/net/ethernet/sfc/filter.c | 249 ++- drivers/net/ethernet/sfc/mcdi_pcol.h | 1 + drivers/net/ethernet/sfc/net_driver.h | 97 +- drivers/net/ethernet/sfc/nic.c | 94 +- drivers/net/ethernet/sfc/ptp.c | 116 +- drivers/net/ethernet/sfc/rx.c | 793 ++++---- drivers/net/ethernet/sfc/siena.c | 25 +- drivers/net/ethernet/sgi/meth.c | 5 +- drivers/net/ethernet/sis/sis900.c | 41 +- drivers/net/ethernet/smsc/smc9194.c | 2 - drivers/net/ethernet/smsc/smc91x.c | 2 - drivers/net/ethernet/smsc/smsc911x.c | 2 +- drivers/net/ethernet/smsc/smsc9420.c | 4 +- drivers/net/ethernet/stmicro/stmmac/Kconfig | 19 +- drivers/net/ethernet/stmicro/stmmac/Makefile | 8 +- drivers/net/ethernet/stmicro/stmmac/chain_mode.c | 92 +- drivers/net/ethernet/stmicro/stmmac/common.h | 199 +- drivers/net/ethernet/stmicro/stmmac/descs.h | 51 +- drivers/net/ethernet/stmicro/stmmac/descs_com.h | 43 +- drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 81 +- .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 168 +- .../net/ethernet/stmicro/stmmac/dwmac1000_dma.c | 31 +- .../net/ethernet/stmicro/stmmac/dwmac100_core.c | 31 +- drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c | 30 +- drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h | 4 +- drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 151 +- drivers/net/ethernet/stmicro/stmmac/mmc.h | 3 +- drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 89 +- drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 40 +- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 73 +- .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 156 +- .../net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 148 ++ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1340 ++++++++++---- drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 2 +- drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 2 +- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 8 +- drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 211 +++ drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h | 74 + drivers/net/ethernet/sun/niu.c | 2 +- drivers/net/ethernet/sun/sunbmac.c | 4 +- drivers/net/ethernet/sun/sunhme.c | 13 +- drivers/net/ethernet/sun/sunqe.c | 5 +- drivers/net/ethernet/tehuti/tehuti.c | 17 +- drivers/net/ethernet/ti/cpsw.c | 330 +++- drivers/net/ethernet/ti/davinci_cpdma.c | 31 +- drivers/net/ethernet/ti/davinci_cpdma.h | 2 +- drivers/net/ethernet/ti/davinci_emac.c | 54 +- drivers/net/ethernet/ti/davinci_mdio.c | 1 + drivers/net/ethernet/ti/tlan.c | 5 +- drivers/net/ethernet/toshiba/ps3_gelic_net.c | 240 ++- drivers/net/ethernet/toshiba/spider_net.c | 7 +- drivers/net/ethernet/tundra/tsi108_eth.c | 21 +- drivers/net/ethernet/via/via-rhine.c | 17 +- drivers/net/ethernet/via/via-velocity.c | 15 +- drivers/net/ethernet/wiznet/w5100.c | 4 +- drivers/net/ethernet/wiznet/w5300.c | 4 +- drivers/net/ethernet/xilinx/ll_temac_main.c | 33 +- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 25 +- drivers/net/ethernet/xircom/xirc2ps_cs.c | 1 - drivers/net/fddi/defxx.c | 9 +- drivers/net/hamradio/yam.c | 2 +- drivers/net/hyperv/netvsc.c | 2 +- drivers/net/hyperv/netvsc_drv.c | 2 +- drivers/net/ieee802154/at86rf230.c | 151 +- drivers/net/ieee802154/fakehard.c | 21 - drivers/net/ieee802154/mrf24j40.c | 41 +- drivers/net/ifb.c | 3 +- drivers/net/irda/ali-ircc.c | 6 +- drivers/net/irda/au1k_ir.c | 18 +- drivers/net/irda/bfin_sir.c | 3 +- drivers/net/irda/nsc-ircc.c | 6 +- drivers/net/irda/pxaficp_ir.c | 4 +- drivers/net/irda/smsc-ircc2.c | 17 +- drivers/net/irda/via-ircc.c | 6 +- drivers/net/irda/w83977af_ir.c | 7 +- drivers/net/macvlan.c | 29 +- drivers/net/macvtap.c | 2 + drivers/net/phy/lxt.c | 2 +- drivers/net/phy/marvell.c | 127 ++ drivers/net/phy/mdio-gpio.c | 12 +- drivers/net/phy/mdio-octeon.c | 107 +- drivers/net/phy/micrel.c | 41 +- drivers/net/phy/phy.c | 66 +- drivers/net/phy/spi_ks8995.c | 8 +- drivers/net/phy/vitesse.c | 3 +- drivers/net/plip/plip.c | 2 +- drivers/net/ppp/ppp_synctty.c | 53 +- drivers/net/team/Kconfig | 12 + drivers/net/team/Makefile | 1 + drivers/net/team/team.c | 45 +- drivers/net/team/team_mode_broadcast.c | 14 +- drivers/net/team/team_mode_random.c | 71 + drivers/net/team/team_mode_roundrobin.c | 36 +- drivers/net/tun.c | 5 +- drivers/net/usb/asix_devices.c | 6 +- drivers/net/usb/ax88179_178a.c | 12 +- drivers/net/usb/cdc_ether.c | 5 +- drivers/net/usb/cdc_mbim.c | 4 +- drivers/net/usb/cdc_ncm.c | 18 +- drivers/net/usb/dm9601.c | 7 +- drivers/net/usb/mcs7830.c | 6 +- drivers/net/usb/pegasus.c | 447 ++--- drivers/net/usb/pegasus.h | 11 +- drivers/net/usb/sierra_net.c | 3 +- drivers/net/usb/usbnet.c | 45 +- drivers/net/veth.c | 3 +- drivers/net/virtio_net.c | 14 +- drivers/net/vmxnet3/vmxnet3_drv.c | 17 +- drivers/net/vmxnet3/vmxnet3_ethtool.c | 5 +- drivers/net/vxlan.c | 546 +++--- drivers/net/wireless/ath/wil6210/txrx.c | 2 - drivers/net/wireless/b43/dma.c | 9 +- drivers/net/wireless/b43legacy/dma.c | 8 +- drivers/net/wireless/iwlegacy/3945.c | 4 +- drivers/net/wireless/iwlegacy/4965-mac.c | 4 +- drivers/net/wireless/iwlegacy/common.c | 19 +- drivers/net/wireless/iwlegacy/common.h | 5 +- drivers/net/wireless/iwlwifi/pcie/tx.c | 4 +- drivers/net/wireless/p54/p54spi.c | 6 +- drivers/net/wireless/ray_cs.c | 2 +- drivers/net/wireless/ti/wl1251/spi.c | 4 +- drivers/net/xen-netback/netback.c | 316 +++- drivers/net/xen-netfront.c | 47 +- drivers/of/of_mdio.c | 64 +- drivers/pci/iov.c | 41 + drivers/ptp/ptp_clock.c | 38 +- drivers/ptp/ptp_pch.c | 29 +- drivers/s390/kvm/virtio_ccw.c | 6 +- drivers/s390/net/qeth_core.h | 4 +- drivers/s390/net/qeth_core_main.c | 8 +- drivers/s390/net/qeth_l2_main.c | 13 +- drivers/s390/net/qeth_l3_main.c | 33 +- drivers/scsi/bnx2fc/bnx2fc.h | 23 +- drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 35 +- drivers/scsi/bnx2fc/bnx2fc_hwi.c | 22 +- drivers/scsi/bnx2fc/bnx2fc_io.c | 9 +- drivers/scsi/csiostor/Makefile | 3 +- drivers/scsi/csiostor/csio_hw.c | 559 ++---- drivers/scsi/csiostor/csio_hw.h | 47 +- drivers/scsi/csiostor/csio_hw_chip.h | 175 ++ drivers/scsi/csiostor/csio_hw_t4.c | 403 ++++ drivers/scsi/csiostor/csio_hw_t5.c | 397 ++++ drivers/scsi/csiostor/csio_init.c | 48 +- drivers/scsi/csiostor/csio_init.h | 29 +- drivers/scsi/csiostor/csio_lnode.h | 2 +- drivers/scsi/csiostor/csio_rnode.c | 10 +- drivers/scsi/csiostor/csio_rnode.h | 2 +- drivers/scsi/csiostor/csio_wr.c | 60 +- drivers/scsi/fcoe/fcoe.c | 2 +- drivers/scsi/scsi_netlink.c | 4 +- drivers/scsi/scsi_transport_fc.c | 21 +- drivers/scsi/scsi_transport_iscsi.c | 70 +- drivers/staging/gdm72xx/netlink_k.c | 12 +- drivers/vhost/net.c | 74 +- drivers/vhost/vhost.c | 3 + fs/dlm/lowcomms.c | 2 +- include/linux/cn_proc.h | 4 + include/linux/filter.h | 14 + include/linux/icmpv6.h | 18 +- include/linux/if_arp.h | 12 +- include/linux/if_team.h | 25 +- include/linux/if_vlan.h | 56 +- include/linux/ktime.h | 18 + include/linux/micrel_phy.h | 1 + include/linux/mlx4/cmd.h | 6 + include/linux/mlx4/cq.h | 16 + include/linux/mlx4/device.h | 13 +- include/linux/mv643xx_eth.h | 1 - include/linux/netdev_features.h | 27 +- include/linux/netdevice.h | 79 +- include/linux/netfilter.h | 5 - include/linux/netfilter/ipset/ip_set.h | 126 +- include/linux/netfilter/ipset/ip_set_ahash.h | 1241 ------------- include/linux/netfilter/ipset/ip_set_bitmap.h | 6 + include/linux/netfilter/ipset/ip_set_timeout.h | 102 +- include/linux/netfilter/ipset/pfxlen.h | 9 + include/linux/netfilter/nfnetlink.h | 11 +- include/linux/netlink.h | 11 +- include/linux/of_net.h | 10 + include/linux/openvswitch.h | 431 +---- include/linux/pci.h | 5 + include/linux/phy.h | 10 + include/linux/platform_data/cpsw.h | 2 +- include/linux/rtnetlink.h | 9 + include/linux/sctp.h | 6 +- include/linux/sh_eth.h | 1 + include/linux/skbuff.h | 95 +- include/linux/sock_diag.h | 3 + include/linux/spi/at86rf230.h | 14 + include/linux/tcp.h | 21 +- include/linux/usb/usbnet.h | 2 + include/linux/virtio.h | 6 - include/linux/vm_sockets.h | 23 + include/net/af_unix.h | 3 +- include/net/caif/caif_dev.h | 2 +- include/net/caif/caif_device.h | 2 +- include/net/caif/caif_hsi.h | 1 - include/net/caif/caif_layer.h | 2 +- include/net/caif/caif_shm.h | 26 - include/net/caif/cfcnfg.h | 2 +- include/net/caif/cfctrl.h | 2 +- include/net/caif/cffrml.h | 2 +- include/net/caif/cfmuxl.h | 2 +- include/net/caif/cfpkt.h | 2 +- include/net/caif/cfserl.h | 2 +- include/net/caif/cfsrvl.h | 2 +- include/net/cls_cgroup.h | 4 +- include/net/dn_fib.h | 28 +- include/net/firewire.h | 25 + include/net/genetlink.h | 1 + include/net/gre.h | 51 + include/net/ieee802154_netdev.h | 5 +- include/net/if_inet6.h | 4 + include/net/inet_connection_sock.h | 5 +- include/net/inet_frag.h | 24 +- include/net/ip6_tunnel.h | 21 + include/net/ip_tunnels.h | 177 ++ include/net/ip_vs.h | 140 +- include/net/ipip.h | 87 - include/net/ipv6.h | 22 +- include/net/net_namespace.h | 2 + include/net/netfilter/nf_conntrack.h | 2 +- include/net/netfilter/nf_conntrack_core.h | 1 + include/net/netfilter/nf_conntrack_expect.h | 4 +- include/net/netfilter/nf_log.h | 14 +- include/net/netfilter/nf_queue.h | 6 + include/net/netns/ipv6.h | 1 + include/net/netns/netfilter.h | 18 + include/net/netprio_cgroup.h | 4 +- include/net/request_sock.h | 10 +- include/net/rtnetlink.h | 2 +- include/net/scm.h | 16 +- include/net/sctp/checksum.h | 2 +- include/net/sctp/constants.h | 1 - include/net/sctp/structs.h | 20 +- include/net/sctp/ulpqueue.h | 1 - include/net/secure_seq.h | 1 + include/net/sock.h | 6 +- include/net/tcp.h | 147 +- include/net/xfrm.h | 1 + include/uapi/asm-generic/socket.h | 2 + include/uapi/linux/Kbuild | 2 + include/uapi/linux/caif/caif_socket.h | 2 +- include/uapi/linux/caif/if_caif.h | 2 +- include/uapi/linux/cn_proc.h | 10 +- include/uapi/linux/filter.h | 3 +- include/uapi/linux/if_ether.h | 3 + include/uapi/linux/if_link.h | 7 +- include/uapi/linux/if_packet.h | 29 +- include/uapi/linux/ip_vs.h | 4 +- include/uapi/linux/neighbour.h | 3 + include/uapi/linux/netfilter/ipset/ip_set.h | 36 +- include/uapi/linux/netfilter/nfnetlink_queue.h | 10 +- include/uapi/linux/netfilter/xt_NFQUEUE.h | 9 + include/uapi/linux/netfilter/xt_set.h | 9 + include/uapi/linux/netfilter_ipv6/ip6t_frag.h | 4 +- include/uapi/linux/netlink.h | 34 +- include/uapi/linux/netlink_diag.h | 52 + include/uapi/linux/openvswitch.h | 456 +++++ include/uapi/linux/packet_diag.h | 5 + include/uapi/linux/pkt_sched.h | 1 + include/{net/sctp/user.h => uapi/linux/sctp.h} | 84 +- include/uapi/linux/snmp.h | 8 + include/uapi/linux/tcp.h | 26 - include/uapi/linux/vm_sockets.h | 23 +- include/uapi/linux/xfrm.h | 3 + include/xen/interface/io/netif.h | 19 + kernel/audit.c | 10 +- kernel/signal.c | 2 + net/802/garp.c | 4 + net/8021q/Kconfig | 2 +- net/8021q/vlan.c | 97 +- net/8021q/vlan.h | 58 +- net/8021q/vlan_core.c | 80 +- net/8021q/vlan_dev.c | 11 +- net/8021q/vlan_gvrp.c | 4 + net/8021q/vlan_mvrp.c | 4 + net/8021q/vlan_netlink.c | 32 +- net/Kconfig | 10 + net/atm/lec.h | 2 +- net/batman-adv/Kconfig | 14 + net/batman-adv/Makefile | 3 +- net/batman-adv/bat_iv_ogm.c | 5 + net/batman-adv/bridge_loop_avoidance.c | 2 +- net/batman-adv/debugfs.c | 18 + net/batman-adv/distributed-arp-table.c | 22 +- net/batman-adv/gateway_client.c | 2 +- net/batman-adv/hard-interface.c | 66 +- net/batman-adv/hard-interface.h | 13 +- net/batman-adv/main.c | 16 +- net/batman-adv/main.h | 15 +- net/batman-adv/network-coding.c | 1822 ++++++++++++++++++ net/batman-adv/network-coding.h | 123 ++ net/batman-adv/originator.c | 10 +- net/batman-adv/packet.h | 33 + net/batman-adv/routing.c | 50 +- net/batman-adv/send.c | 5 + net/batman-adv/soft-interface.c | 288 ++- net/batman-adv/soft-interface.h | 3 +- net/batman-adv/sysfs.c | 22 +- net/batman-adv/translation-table.c | 29 +- net/batman-adv/types.h | 136 ++ net/batman-adv/unicast.c | 6 +- net/batman-adv/vis.c | 4 +- net/bluetooth/af_bluetooth.c | 3 +- net/bluetooth/bnep/netdev.c | 2 +- net/bridge/br_device.c | 4 +- net/bridge/br_fdb.c | 30 +- net/bridge/br_if.c | 1 - net/bridge/br_mdb.c | 4 +- net/bridge/br_multicast.c | 2 +- net/bridge/br_netfilter.c | 3 +- net/bridge/br_netlink.c | 21 +- net/bridge/br_stp.c | 9 +- net/bridge/br_vlan.c | 20 +- net/bridge/netfilter/ebt_log.c | 44 +- net/bridge/netfilter/ebt_nflog.c | 5 +- net/bridge/netfilter/ebt_ulog.c | 132 +- net/bridge/netfilter/ebtable_broute.c | 4 +- net/bridge/netfilter/ebtables.c | 2 +- net/caif/caif_dev.c | 11 +- net/caif/caif_socket.c | 24 +- net/caif/caif_usb.c | 6 +- net/caif/cfcnfg.c | 21 +- net/caif/cfctrl.c | 16 +- net/caif/cfdbgl.c | 2 +- net/caif/cfdgml.c | 2 +- net/caif/cffrml.c | 6 +- net/caif/cfmuxl.c | 6 +- net/caif/cfpkt_skbuff.c | 10 +- net/caif/cfrfml.c | 6 +- net/caif/cfserl.c | 6 +- net/caif/cfsrvl.c | 15 +- net/caif/cfutill.c | 2 +- net/caif/cfveil.c | 2 +- net/caif/cfvidl.c | 2 +- net/caif/chnl_net.c | 10 +- net/can/af_can.c | 30 +- net/can/gw.c | 5 +- net/can/raw.c | 5 +- net/core/datagram.c | 4 +- net/core/dev.c | 120 +- net/core/dev_addr_lists.c | 210 ++- net/core/dst.c | 9 +- net/core/ethtool.c | 29 +- net/core/fib_rules.c | 4 +- net/core/filter.c | 5 + net/core/flow.c | 42 +- net/core/flow_dissector.c | 68 + net/core/neighbour.c | 55 +- net/core/net-procfs.c | 2 +- net/core/netpoll.c | 8 +- net/core/rtnetlink.c | 178 +- net/core/scm.c | 20 +- net/core/secure_seq.c | 4 +- net/core/skbuff.c | 93 +- net/core/sock.c | 22 +- net/core/sock_diag.c | 33 + net/core/utils.c | 5 +- net/dcb/dcbevent.c | 1 + net/dcb/dcbnl.c | 2 +- net/dccp/ipv4.c | 5 +- net/dccp/ipv6.c | 5 +- net/decnet/dn_dev.c | 4 +- net/decnet/dn_fib.c | 203 +- net/decnet/dn_route.c | 43 +- net/decnet/dn_table.c | 45 +- net/decnet/netfilter/dn_rtmsg.c | 12 +- net/dsa/dsa.c | 233 ++- net/ethernet/eth.c | 2 +- net/ieee802154/6lowpan.c | 142 +- net/ieee802154/6lowpan.h | 7 +- net/ieee802154/dgram.c | 10 + net/ieee802154/netlink.c | 8 +- net/ieee802154/nl-mac.c | 25 +- net/ipv4/Kconfig | 7 + net/ipv4/Makefile | 1 + net/ipv4/af_inet.c | 15 +- net/ipv4/arp.c | 27 +- net/ipv4/devinet.c | 83 +- net/ipv4/fib_frontend.c | 10 +- net/ipv4/gre.c | 5 - net/ipv4/icmp.c | 4 +- net/ipv4/inet_connection_sock.c | 2 +- net/ipv4/inet_diag.c | 10 +- net/ipv4/inet_fragment.c | 84 +- net/ipv4/inet_lro.c | 5 +- net/ipv4/ip_fragment.c | 31 +- net/ipv4/ip_gre.c | 1517 ++++----------- net/ipv4/ip_input.c | 4 +- net/ipv4/ip_output.c | 3 +- net/ipv4/ip_tunnel.c | 1035 +++++++++++ net/ipv4/ip_vti.c | 42 +- net/ipv4/ipcomp.c | 1 + net/ipv4/ipconfig.c | 13 +- net/ipv4/ipip.c | 748 +------- net/ipv4/ipmr.c | 12 +- net/ipv4/netfilter.c | 15 +- net/ipv4/netfilter/Kconfig | 2 +- net/ipv4/netfilter/arp_tables.c | 1 + net/ipv4/netfilter/arptable_filter.c | 4 +- net/ipv4/netfilter/ip_tables.c | 10 +- net/ipv4/netfilter/ipt_ULOG.c | 134 +- net/ipv4/netfilter/iptable_mangle.c | 9 +- net/ipv4/netfilter/iptable_nat.c | 23 +- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 1 + .../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 1 + net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 9 +- net/ipv4/netfilter/nf_nat_h323.c | 1 + net/ipv4/netfilter/nf_nat_pptp.c | 2 + net/ipv4/netfilter/nf_nat_proto_gre.c | 2 + net/ipv4/netfilter/nf_nat_snmp_basic.c | 2 + net/ipv4/ping.c | 5 +- net/ipv4/proc.c | 13 +- net/ipv4/route.c | 2 +- net/ipv4/syncookies.c | 3 +- net/ipv4/sysctl_net_ipv4.c | 18 +- net/ipv4/tcp.c | 287 +-- net/ipv4/tcp_input.c | 607 ++---- net/ipv4/tcp_ipv4.c | 123 +- net/ipv4/tcp_memcontrol.c | 3 - net/ipv4/tcp_minisocks.c | 51 +- net/ipv4/tcp_output.c | 377 ++-- net/ipv4/tcp_timer.c | 21 +- net/ipv4/tcp_westwood.c | 2 +- net/ipv4/udp.c | 132 +- net/ipv4/udp_diag.c | 10 +- net/ipv4/xfrm4_mode_tunnel.c | 8 +- net/ipv6/Kconfig | 2 + net/ipv6/Makefile | 2 +- net/ipv6/addrconf.c | 208 ++- net/ipv6/addrlabel.c | 12 +- net/ipv6/af_inet6.c | 7 +- net/ipv6/datagram.c | 20 +- net/ipv6/icmp.c | 41 +- net/ipv6/inet6_connection_sock.c | 10 +- net/ipv6/ip6_flowlabel.c | 11 +- net/ipv6/ip6_gre.c | 62 +- net/ipv6/ip6_icmp.c | 47 + net/ipv6/ip6_offload.c | 4 +- net/ipv6/ip6_output.c | 7 +- net/ipv6/ip6_tunnel.c | 16 +- net/ipv6/ip6mr.c | 10 +- net/ipv6/ndisc.c | 2 - net/ipv6/netfilter.c | 12 +- net/ipv6/netfilter/Kconfig | 2 +- net/ipv6/netfilter/ip6_tables.c | 4 +- net/ipv6/netfilter/ip6t_NPT.c | 11 +- net/ipv6/netfilter/ip6t_REJECT.c | 2 + net/ipv6/netfilter/ip6table_mangle.c | 9 +- net/ipv6/netfilter/ip6table_nat.c | 23 +- net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 8 +- net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 7 +- net/ipv6/netfilter/nf_conntrack_reasm.c | 22 +- net/ipv6/proc.c | 4 + net/ipv6/raw.c | 9 +- net/ipv6/reassembly.c | 23 +- net/ipv6/route.c | 6 +- net/ipv6/sit.c | 41 +- net/ipv6/syncookies.c | 3 +- net/ipv6/tcp_ipv6.c | 75 +- net/ipv6/udp.c | 34 +- net/ipv6/udp_offload.c | 8 +- net/ipv6/xfrm6_mode_tunnel.c | 7 +- net/irda/af_irda.c | 5 +- net/irda/ircomm/ircomm_core.c | 2 +- net/irda/irlmp.c | 2 +- net/iucv/af_iucv.c | 3 +- net/l2tp/l2tp_core.c | 2 +- net/mac80211/tx.c | 2 +- net/mac802154/mac802154.h | 3 +- net/mac802154/mac_cmd.c | 1 + net/mac802154/mib.c | 21 +- net/mac802154/tx.c | 29 +- net/mac802154/wpan.c | 4 +- net/netfilter/core.c | 30 +- net/netfilter/ipset/ip_set_bitmap_gen.h | 277 +++ net/netfilter/ipset/ip_set_bitmap_ip.c | 411 ++-- net/netfilter/ipset/ip_set_bitmap_ipmac.c | 624 +++---- net/netfilter/ipset/ip_set_bitmap_port.c | 414 ++--- net/netfilter/ipset/ip_set_core.c | 41 +- net/netfilter/ipset/ip_set_hash_gen.h | 1100 +++++++++++ net/netfilter/ipset/ip_set_hash_ip.c | 344 +--- net/netfilter/ipset/ip_set_hash_ipport.c | 362 ++-- net/netfilter/ipset/ip_set_hash_ipportip.c | 368 ++-- net/netfilter/ipset/ip_set_hash_ipportnet.c | 469 ++--- net/netfilter/ipset/ip_set_hash_net.c | 402 ++-- net/netfilter/ipset/ip_set_hash_netiface.c | 478 ++--- net/netfilter/ipset/ip_set_hash_netport.c | 456 ++--- net/netfilter/ipset/ip_set_list_set.c | 622 ++++--- net/netfilter/ipvs/ip_vs_app.c | 31 +- net/netfilter/ipvs/ip_vs_conn.c | 312 ++-- net/netfilter/ipvs/ip_vs_core.c | 88 +- net/netfilter/ipvs/ip_vs_ctl.c | 702 ++++--- net/netfilter/ipvs/ip_vs_dh.c | 86 +- net/netfilter/ipvs/ip_vs_est.c | 2 +- net/netfilter/ipvs/ip_vs_ftp.c | 4 + net/netfilter/ipvs/ip_vs_lblc.c | 115 +- net/netfilter/ipvs/ip_vs_lblcr.c | 190 +- net/netfilter/ipvs/ip_vs_lc.c | 3 +- net/netfilter/ipvs/ip_vs_nq.c | 3 +- net/netfilter/ipvs/ip_vs_pe.c | 55 +- net/netfilter/ipvs/ip_vs_pe_sip.c | 4 +- net/netfilter/ipvs/ip_vs_proto_sctp.c | 38 +- net/netfilter/ipvs/ip_vs_proto_tcp.c | 40 +- net/netfilter/ipvs/ip_vs_proto_udp.c | 33 +- net/netfilter/ipvs/ip_vs_rr.c | 64 +- net/netfilter/ipvs/ip_vs_sched.c | 63 +- net/netfilter/ipvs/ip_vs_sed.c | 5 +- net/netfilter/ipvs/ip_vs_sh.c | 86 +- net/netfilter/ipvs/ip_vs_sync.c | 56 +- net/netfilter/ipvs/ip_vs_wlc.c | 5 +- net/netfilter/ipvs/ip_vs_wrr.c | 176 +- net/netfilter/ipvs/ip_vs_xmit.c | 1050 +++++------ net/netfilter/nf_conntrack_amanda.c | 1 + net/netfilter/nf_conntrack_core.c | 56 +- net/netfilter/nf_conntrack_ecache.c | 8 +- net/netfilter/nf_conntrack_expect.c | 9 +- net/netfilter/nf_conntrack_ftp.c | 1 + net/netfilter/nf_conntrack_h323_main.c | 1 + net/netfilter/nf_conntrack_helper.c | 3 +- net/netfilter/nf_conntrack_irc.c | 1 + net/netfilter/nf_conntrack_netlink.c | 100 +- net/netfilter/nf_conntrack_pptp.c | 2 + net/netfilter/nf_conntrack_proto.c | 1 + net/netfilter/nf_conntrack_proto_dccp.c | 9 +- net/netfilter/nf_conntrack_proto_gre.c | 1 + net/netfilter/nf_conntrack_proto_sctp.c | 3 + net/netfilter/nf_conntrack_proto_tcp.c | 20 +- net/netfilter/nf_conntrack_proto_udp.c | 7 +- net/netfilter/nf_conntrack_proto_udplite.c | 8 +- net/netfilter/nf_conntrack_standalone.c | 17 +- net/netfilter/nf_conntrack_tftp.c | 2 +- net/netfilter/nf_log.c | 206 ++- net/netfilter/nf_nat_amanda.c | 1 + net/netfilter/nf_nat_core.c | 10 +- net/netfilter/nf_nat_helper.c | 1 + net/netfilter/nf_nat_proto_sctp.c | 5 +- net/netfilter/nf_queue.c | 148 +- net/netfilter/nfnetlink.c | 27 +- net/netfilter/nfnetlink_log.c | 199 +- net/netfilter/nfnetlink_queue_core.c | 439 ++++- net/netfilter/x_tables.c | 1 + net/netfilter/xt_LOG.c | 52 +- net/netfilter/xt_NFQUEUE.c | 63 +- net/netfilter/xt_TCPMSS.c | 1 + net/netfilter/xt_conntrack.c | 1 + net/netfilter/xt_hashlimit.c | 1 + net/netfilter/xt_limit.c | 1 + net/netfilter/xt_osf.c | 6 +- net/netfilter/xt_set.c | 94 +- net/netlink/Kconfig | 10 + net/netlink/Makefile | 3 + net/netlink/af_netlink.c | 899 ++++++++- net/netlink/af_netlink.h | 82 + net/netlink/diag.c | 227 +++ net/netlink/genetlink.c | 119 +- net/nfc/llcp_sock.c | 3 +- net/openvswitch/actions.c | 6 +- net/openvswitch/datapath.c | 421 +++-- net/openvswitch/datapath.h | 72 +- net/openvswitch/dp_notify.c | 82 +- net/openvswitch/flow.c | 8 +- net/openvswitch/flow.h | 21 - net/openvswitch/vport-internal_dev.c | 22 +- net/openvswitch/vport-netdev.c | 15 +- net/openvswitch/vport-netdev.h | 1 - net/openvswitch/vport.c | 58 +- net/openvswitch/vport.h | 21 +- net/packet/af_packet.c | 302 +-- net/packet/diag.c | 27 +- net/packet/internal.h | 10 +- net/phonet/pn_netlink.c | 4 +- net/sched/act_api.c | 2 +- net/sched/act_csum.c | 39 +- net/sched/cls_api.c | 14 +- net/sched/cls_flow.c | 2 +- net/sched/em_ipset.c | 2 +- net/sched/sch_api.c | 44 +- net/sched/sch_htb.c | 31 +- net/sctp/associola.c | 12 +- net/sctp/bind_addr.c | 7 - net/sctp/endpointola.c | 14 +- net/sctp/inqueue.c | 7 - net/sctp/output.c | 5 +- net/sctp/outqueue.c | 11 +- net/sctp/proc.c | 12 +- net/sctp/socket.c | 8 +- net/sctp/ssnmap.c | 23 +- net/sctp/transport.c | 1 - net/sctp/ulpqueue.c | 3 - net/socket.c | 23 +- net/tipc/Kconfig | 7 + net/tipc/Makefile | 2 + net/tipc/bcast.c | 4 +- net/tipc/bearer.c | 7 +- net/tipc/bearer.h | 16 +- net/tipc/core.c | 12 +- net/tipc/discover.c | 2 +- net/tipc/eth_media.c | 39 +- net/tipc/ib_media.c | 387 ++++ net/tipc/netlink.c | 6 +- net/unix/af_unix.c | 20 +- net/vmw_vsock/vmci_transport.c | 16 +- net/vmw_vsock/vmci_transport.h | 3 + net/wireless/util.c | 2 +- net/xfrm/xfrm_policy.c | 23 +- net/xfrm/xfrm_state.c | 1 + net/xfrm/xfrm_user.c | 17 +- security/selinux/hooks.c | 4 +- security/selinux/netlink.c | 3 +- tools/Makefile | 11 +- tools/net/Makefile | 15 + tools/net/bpf_jit_disasm.c | 199 ++ tools/testing/selftests/Makefile | 1 + tools/testing/selftests/net/.gitignore | 3 + tools/testing/selftests/net/Makefile | 19 + tools/testing/selftests/net/psock_fanout.c | 312 ++++ tools/testing/selftests/net/psock_lib.h | 127 ++ tools/testing/selftests/net/psock_tpacket.c | 824 +++++++++ tools/testing/selftests/net/run_afpackettests | 26 + tools/testing/selftests/net/run_netsocktests | 12 + tools/testing/selftests/net/socket.c | 92 + 958 files changed, 43542 insertions(+), 24352 deletions(-) create mode 100644 Documentation/cgroups/net_cls.txt create mode 100644 Documentation/devicetree/bindings/net/can/atmel-can.txt create mode 100644 Documentation/devicetree/bindings/net/dsa/dsa.txt create mode 100644 Documentation/networking/netlink_mmap.txt delete mode 100644 drivers/net/caif/caif_shm_u5500.c delete mode 100644 drivers/net/caif/caif_shmcore.c rename drivers/net/ethernet/freescale/{fec.c => fec_main.c} (92%) create mode 100644 drivers/net/ethernet/mellanox/mlx4/en_clock.c create mode 100644 drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h create mode 100644 drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c create mode 100644 drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c create mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c create mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c create mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h create mode 100644 drivers/net/team/team_mode_random.c create mode 100644 drivers/scsi/csiostor/csio_hw_chip.h create mode 100644 drivers/scsi/csiostor/csio_hw_t4.c create mode 100644 drivers/scsi/csiostor/csio_hw_t5.c delete mode 100644 include/linux/netfilter/ipset/ip_set_ahash.h create mode 100644 include/linux/vm_sockets.h delete mode 100644 include/net/caif/caif_shm.h create mode 100644 include/net/firewire.h create mode 100644 include/net/ip_tunnels.h delete mode 100644 include/net/ipip.h create mode 100644 include/net/netns/netfilter.h create mode 100644 include/uapi/linux/netlink_diag.h create mode 100644 include/uapi/linux/openvswitch.h rename include/{net/sctp/user.h => uapi/linux/sctp.h} (90%) create mode 100644 net/batman-adv/network-coding.c create mode 100644 net/batman-adv/network-coding.h create mode 100644 net/ipv4/ip_tunnel.c create mode 100644 net/ipv6/ip6_icmp.c create mode 100644 net/netfilter/ipset/ip_set_bitmap_gen.h create mode 100644 net/netfilter/ipset/ip_set_hash_gen.h create mode 100644 net/netlink/Kconfig create mode 100644 net/netlink/af_netlink.h create mode 100644 net/netlink/diag.c create mode 100644 net/tipc/ib_media.c create mode 100644 tools/net/Makefile create mode 100644 tools/net/bpf_jit_disasm.c create mode 100644 tools/testing/selftests/net/.gitignore create mode 100644 tools/testing/selftests/net/Makefile create mode 100644 tools/testing/selftests/net/psock_fanout.c create mode 100644 tools/testing/selftests/net/psock_lib.h create mode 100644 tools/testing/selftests/net/psock_tpacket.c create mode 100644 tools/testing/selftests/net/run_afpackettests create mode 100644 tools/testing/selftests/net/run_netsocktests create mode 100644 tools/testing/selftests/net/socket.c $ git am -3 ../patches/0001-drivers-net-fix-up-for-code-movement-from-rt2x00pci..patch Applying: drivers:net: fix up for code movement from rt2x00pci.c $ git reset HEAD^ Unstaged changes after reset: M drivers/net/wireless/rt2x00/rt2x00mmio.c $ git add -A . $ git commit -v -a --amend [master 69c508f] Merge remote-tracking branch 'net-next/master' Merging ipsec-next/master (05600a7 xfrm_user: constify netlink dispatch table) $ git merge ipsec-next/master Already up-to-date. Merging wireless-next/master (a8a48e6 Merge tag 'nfc-next-3.10-4' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next) $ git merge wireless-next/master Already up-to-date. Merging bluetooth/master (975aba3 Bluetooth: Fix multiple LE socket handling) $ git merge bluetooth/master Auto-merging net/bluetooth/l2cap_sock.c Merge made by the 'recursive' strategy. include/net/bluetooth/l2cap.h | 36 +++++++++-- net/bluetooth/l2cap_core.c | 145 +++++++++++++++++++++++++++--------------- net/bluetooth/l2cap_sock.c | 4 +- 3 files changed, 126 insertions(+), 59 deletions(-) Merging mtd/master (cdb6404 mtd: omap2: Use module_platform_driver()) $ git merge mtd/master Auto-merging drivers/ssb/driver_mipscore.c Removing drivers/mtd/onenand/onenand_sim.c Removing drivers/mtd/nand/rtc_from4.c Removing drivers/mtd/nand/ppchameleonevb.c Removing drivers/mtd/nand/h1910.c Auto-merging drivers/mtd/mtdcore.c Auto-merging drivers/mtd/mtdchar.c Removing drivers/mtd/maps/tqm8xxl.c Removing drivers/mtd/maps/rpxlite.c Removing drivers/mtd/maps/mbx860.c Removing drivers/mtd/maps/ixp2000.c Removing drivers/mtd/maps/h720x-flash.c Removing drivers/mtd/maps/dmv182.c Removing drivers/mtd/maps/dilnetpc.c Removing drivers/mtd/maps/dbox2-flash.c Removing drivers/mtd/devices/docprobe.c Removing drivers/mtd/devices/docecc.c Removing drivers/mtd/devices/doc2001plus.c Removing drivers/mtd/devices/doc2001.c Removing drivers/mtd/devices/doc2000.c Auto-merging arch/cris/arch-v32/drivers/Kconfig Auto-merging arch/cris/Kconfig Auto-merging arch/arm/configs/lpc32xx_defconfig Merge made by the 'recursive' strategy. Documentation/ABI/testing/sysfs-class-mtd | 6 +- .../devicetree/bindings/mtd/partition.txt | 36 +- arch/arm/configs/lpc32xx_defconfig | 1 - arch/arm/mach-pxa/Kconfig | 1 - arch/cris/Kconfig | 1 - arch/cris/arch-v32/drivers/Kconfig | 1 - drivers/bcma/driver_mips.c | 2 +- drivers/mtd/Kconfig | 13 - drivers/mtd/Makefile | 3 +- drivers/mtd/chips/Kconfig | 1 - drivers/mtd/devices/Kconfig | 64 -- drivers/mtd/devices/Makefile | 5 - drivers/mtd/devices/bcm47xxsflash.c | 13 +- drivers/mtd/devices/bcm47xxsflash.h | 59 + drivers/mtd/devices/doc2000.c | 1178 -------------------- drivers/mtd/devices/doc2001.c | 824 -------------- drivers/mtd/devices/doc2001plus.c | 1080 ------------------ drivers/mtd/devices/docecc.c | 521 --------- drivers/mtd/devices/docg3.c | 15 +- drivers/mtd/devices/docprobe.c | 325 ------ drivers/mtd/devices/elm.c | 9 +- drivers/mtd/devices/m25p80.c | 25 +- drivers/mtd/devices/mtd_dataflash.c | 4 +- drivers/mtd/maps/Kconfig | 77 -- drivers/mtd/maps/Makefile | 8 - drivers/mtd/maps/bfin-async-flash.c | 3 +- drivers/mtd/maps/ck804xrom.c | 3 +- drivers/mtd/maps/dbox2-flash.c | 123 -- drivers/mtd/maps/dc21285.c | 3 +- drivers/mtd/maps/dilnetpc.c | 496 --------- drivers/mtd/maps/dmv182.c | 146 --- drivers/mtd/maps/gpio-addr-flash.c | 3 +- drivers/mtd/maps/h720x-flash.c | 120 -- drivers/mtd/maps/impa7.c | 7 +- drivers/mtd/maps/intel_vr_nor.c | 4 +- drivers/mtd/maps/ixp2000.c | 253 ----- drivers/mtd/maps/ixp4xx.c | 2 +- drivers/mtd/maps/lantiq-flash.c | 3 +- drivers/mtd/maps/mbx860.c | 98 -- drivers/mtd/maps/pci.c | 3 +- drivers/mtd/maps/physmap.c | 17 +- drivers/mtd/maps/physmap_of.c | 16 +- drivers/mtd/maps/plat-ram.c | 2 +- drivers/mtd/maps/pxa2xx-flash.c | 4 +- drivers/mtd/maps/rbtx4939-flash.c | 5 +- drivers/mtd/maps/rpxlite.c | 64 -- drivers/mtd/maps/sa1100-flash.c | 2 +- drivers/mtd/maps/solutionengine.c | 2 +- drivers/mtd/maps/tqm8xxl.c | 249 ----- drivers/mtd/maps/tsunami_flash.c | 5 +- drivers/mtd/mtdchar.c | 52 +- drivers/mtd/mtdcore.c | 26 +- drivers/mtd/mtdcore.h | 30 +- drivers/mtd/mtdpart.c | 4 +- drivers/mtd/nand/Kconfig | 30 - drivers/mtd/nand/Makefile | 3 - drivers/mtd/nand/atmel_nand.c | 15 +- drivers/mtd/nand/bf5xx_nand.c | 16 +- drivers/mtd/nand/cafe_nand.c | 10 +- drivers/mtd/nand/davinci_nand.c | 16 +- drivers/mtd/nand/denali_dt.c | 18 +- drivers/mtd/nand/docg4.c | 13 +- drivers/mtd/nand/fsmc_nand.c | 13 +- drivers/mtd/nand/gpio.c | 8 +- drivers/mtd/nand/h1910.c | 167 --- drivers/mtd/nand/lpc32xx_mlc.c | 4 +- drivers/mtd/nand/nand_base.c | 233 ++-- drivers/mtd/nand/nand_bbt.c | 25 - drivers/mtd/nand/nand_ids.c | 242 ++-- drivers/mtd/nand/nandsim.c | 24 +- drivers/mtd/nand/nuc900_nand.c | 9 - drivers/mtd/nand/omap2.c | 9 +- drivers/mtd/nand/orion_nand.c | 13 +- drivers/mtd/nand/ppchameleonevb.c | 403 ------- drivers/mtd/nand/pxa3xx_nand.c | 2 +- drivers/mtd/nand/rtc_from4.c | 624 ----------- drivers/mtd/nand/sh_flctl.c | 16 +- drivers/mtd/nand/sm_common.c | 62 +- drivers/mtd/nand/txx9ndfmc.c | 13 +- drivers/mtd/ofpart.c | 7 +- drivers/mtd/onenand/Kconfig | 7 - drivers/mtd/onenand/Makefile | 3 - drivers/mtd/onenand/omap2.c | 14 +- drivers/mtd/onenand/onenand_sim.c | 564 ---------- drivers/ssb/driver_mipscore.c | 2 +- include/linux/mtd/mtd.h | 8 +- include/linux/mtd/nand.h | 121 +- include/linux/mtd/physmap.h | 2 +- include/linux/mtd/plat-ram.h | 4 +- include/linux/platform_data/elm.h | 2 +- 90 files changed, 602 insertions(+), 8137 deletions(-) delete mode 100644 drivers/mtd/devices/doc2000.c delete mode 100644 drivers/mtd/devices/doc2001.c delete mode 100644 drivers/mtd/devices/doc2001plus.c delete mode 100644 drivers/mtd/devices/docecc.c delete mode 100644 drivers/mtd/devices/docprobe.c delete mode 100644 drivers/mtd/maps/dbox2-flash.c delete mode 100644 drivers/mtd/maps/dilnetpc.c delete mode 100644 drivers/mtd/maps/dmv182.c delete mode 100644 drivers/mtd/maps/h720x-flash.c delete mode 100644 drivers/mtd/maps/ixp2000.c delete mode 100644 drivers/mtd/maps/mbx860.c delete mode 100644 drivers/mtd/maps/rpxlite.c delete mode 100644 drivers/mtd/maps/tqm8xxl.c delete mode 100644 drivers/mtd/nand/h1910.c delete mode 100644 drivers/mtd/nand/ppchameleonevb.c delete mode 100644 drivers/mtd/nand/rtc_from4.c delete mode 100644 drivers/mtd/onenand/onenand_sim.c Merging l2-mtd/master (98927a2 mtd: get the ECC info from the parameter page for ONFI nand) $ git merge l2-mtd/master Merge made by the 'recursive' strategy. drivers/mtd/nand/nand_base.c | 5 +++++ include/linux/mtd/nand.h | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) Merging crypto/master (3862de1 crypto: caam - fix job ring cleanup code) $ git merge crypto/master Removing include/linux/platform_data/atmel-aes.h Auto-merging drivers/crypto/caam/ctrl.c Auto-merging drivers/crypto/caam/caamalg.c Auto-merging drivers/char/hw_random/mxc-rnga.c Auto-merging crypto/testmgr.h Auto-merging crypto/gcm.c Auto-merging arch/x86/include/asm/cpufeature.h Merge made by the 'recursive' strategy. .../devicetree/bindings/crypto/fsl-imx-sahara.txt | 15 + .../devicetree/bindings/hwrng/timeriomem_rng.txt | 18 + .../devicetree/bindings/rng/brcm,bcm2835.txt | 13 + Documentation/hw_random.txt | 2 +- arch/arm/mach-at91/at91sam9g45_devices.c | 14 +- arch/x86/crypto/Makefile | 57 +- arch/x86/crypto/aesni-intel_asm.S | 117 ++ arch/x86/crypto/aesni-intel_glue.c | 80 ++ arch/x86/crypto/blowfish-avx2-asm_64.S | 449 +++++++ arch/x86/crypto/blowfish_avx2_glue.c | 585 +++++++++ arch/x86/crypto/blowfish_glue.c | 32 +- arch/x86/crypto/camellia-aesni-avx-asm_64.S | 180 ++- arch/x86/crypto/camellia-aesni-avx2-asm_64.S | 1368 ++++++++++++++++++++ arch/x86/crypto/camellia_aesni_avx2_glue.c | 586 +++++++++ arch/x86/crypto/camellia_aesni_avx_glue.c | 104 +- arch/x86/crypto/cast6-avx-x86_64-asm_64.S | 48 +- arch/x86/crypto/cast6_avx_glue.c | 91 +- arch/x86/crypto/crc32-pclmul_asm.S | 6 +- arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 10 +- arch/x86/crypto/glue_helper-asm-avx.S | 61 +- arch/x86/crypto/glue_helper-asm-avx2.S | 180 +++ arch/x86/crypto/glue_helper.c | 97 +- arch/x86/crypto/serpent-avx-x86_64-asm_64.S | 45 +- arch/x86/crypto/serpent-avx2-asm_64.S | 800 ++++++++++++ arch/x86/crypto/serpent_avx2_glue.c | 562 ++++++++ arch/x86/crypto/serpent_avx_glue.c | 145 ++- arch/x86/crypto/sha256-avx-asm.S | 496 +++++++ arch/x86/crypto/sha256-avx2-asm.S | 772 +++++++++++ arch/x86/crypto/sha256-ssse3-asm.S | 506 ++++++++ arch/x86/crypto/sha256_ssse3_glue.c | 275 ++++ arch/x86/crypto/sha512-avx-asm.S | 423 ++++++ arch/x86/crypto/sha512-avx2-asm.S | 743 +++++++++++ arch/x86/crypto/sha512-ssse3-asm.S | 421 ++++++ arch/x86/crypto/sha512_ssse3_glue.c | 282 ++++ arch/x86/crypto/twofish-avx-x86_64-asm_64.S | 48 +- arch/x86/crypto/twofish-avx2-asm_64.S | 600 +++++++++ arch/x86/crypto/twofish_avx2_glue.c | 584 +++++++++ arch/x86/crypto/twofish_avx_glue.c | 101 +- arch/x86/include/asm/cpufeature.h | 1 + arch/x86/include/asm/crypto/blowfish.h | 43 + arch/x86/include/asm/crypto/camellia.h | 19 + arch/x86/include/asm/crypto/glue_helper.h | 24 + arch/x86/include/asm/crypto/serpent-avx.h | 29 + arch/x86/include/asm/crypto/twofish.h | 18 + crypto/Kconfig | 133 +- crypto/Makefile | 1 + crypto/cmac.c | 315 +++++ crypto/crypto_user.c | 4 +- crypto/gcm.c | 116 +- crypto/sha256_generic.c | 11 +- crypto/sha512_generic.c | 13 +- crypto/tcrypt.c | 30 +- crypto/testmgr.c | 95 +- crypto/testmgr.h | 1314 ++++++++++++++++++- drivers/char/hw_random/Kconfig | 12 + drivers/char/hw_random/Makefile | 1 + drivers/char/hw_random/bcm2835-rng.c | 113 ++ drivers/char/hw_random/exynos-rng.c | 3 +- drivers/char/hw_random/mxc-rnga.c | 21 +- drivers/char/hw_random/timeriomem-rng.c | 190 ++- drivers/crypto/Kconfig | 18 +- drivers/crypto/Makefile | 1 + drivers/crypto/atmel-aes.c | 471 +++++-- drivers/crypto/atmel-sha-regs.h | 7 +- drivers/crypto/atmel-sha.c | 586 +++++++-- drivers/crypto/atmel-tdes-regs.h | 2 + drivers/crypto/atmel-tdes.c | 394 +++++- drivers/crypto/bfin_crc.c | 6 +- drivers/crypto/caam/Kconfig | 2 +- drivers/crypto/caam/caamalg.c | 6 + drivers/crypto/caam/caamhash.c | 4 +- drivers/crypto/caam/ctrl.c | 3 + drivers/crypto/caam/error.c | 10 +- drivers/crypto/caam/intern.h | 1 + drivers/crypto/caam/jr.c | 4 + drivers/crypto/caam/key_gen.c | 2 +- drivers/crypto/caam/key_gen.h | 2 +- drivers/crypto/caam/regs.h | 4 +- drivers/crypto/omap-aes.c | 15 +- drivers/crypto/omap-sham.c | 15 +- drivers/crypto/picoxcell_crypto.c | 4 +- drivers/crypto/sahara.c | 1070 +++++++++++++++ drivers/crypto/ux500/hash/hash_core.c | 6 +- include/crypto/sha.h | 5 + include/linux/platform_data/atmel-aes.h | 22 - include/linux/platform_data/crypto-atmel.h | 22 + include/linux/timeriomem-rng.h | 5 - net/xfrm/xfrm_algo.c | 13 + 88 files changed, 15378 insertions(+), 744 deletions(-) create mode 100644 Documentation/devicetree/bindings/crypto/fsl-imx-sahara.txt create mode 100644 Documentation/devicetree/bindings/hwrng/timeriomem_rng.txt create mode 100644 Documentation/devicetree/bindings/rng/brcm,bcm2835.txt create mode 100644 arch/x86/crypto/blowfish-avx2-asm_64.S create mode 100644 arch/x86/crypto/blowfish_avx2_glue.c create mode 100644 arch/x86/crypto/camellia-aesni-avx2-asm_64.S create mode 100644 arch/x86/crypto/camellia_aesni_avx2_glue.c create mode 100644 arch/x86/crypto/glue_helper-asm-avx2.S create mode 100644 arch/x86/crypto/serpent-avx2-asm_64.S create mode 100644 arch/x86/crypto/serpent_avx2_glue.c create mode 100644 arch/x86/crypto/sha256-avx-asm.S create mode 100644 arch/x86/crypto/sha256-avx2-asm.S create mode 100644 arch/x86/crypto/sha256-ssse3-asm.S create mode 100644 arch/x86/crypto/sha256_ssse3_glue.c create mode 100644 arch/x86/crypto/sha512-avx-asm.S create mode 100644 arch/x86/crypto/sha512-avx2-asm.S create mode 100644 arch/x86/crypto/sha512-ssse3-asm.S create mode 100644 arch/x86/crypto/sha512_ssse3_glue.c create mode 100644 arch/x86/crypto/twofish-avx2-asm_64.S create mode 100644 arch/x86/crypto/twofish_avx2_glue.c create mode 100644 arch/x86/include/asm/crypto/blowfish.h create mode 100644 crypto/cmac.c create mode 100644 drivers/char/hw_random/bcm2835-rng.c create mode 100644 drivers/crypto/sahara.c delete mode 100644 include/linux/platform_data/atmel-aes.h create mode 100644 include/linux/platform_data/crypto-atmel.h Merging drm/drm-next (33896bf udl: bind the framebuffer to the correct device.) $ git merge drm/drm-next Removing include/video/omap-panel-tfp410.h Removing include/video/omap-panel-picodlp.h Removing include/video/omap-panel-nokia-dsi.h Removing include/video/omap-panel-n8x0.h Removing include/video/omap-panel-generic-dpi.h Auto-merging include/drm/drmP.h Auto-merging drivers/video/omap2/omapfb/omapfb-main.c Auto-merging drivers/video/fbmem.c Auto-merging drivers/video/Kconfig Auto-merging drivers/gpu/host1x/drm/hdmi.c Auto-merging drivers/gpu/host1x/drm/drm.h Auto-merging drivers/gpu/host1x/drm/dc.c Auto-merging drivers/gpu/host1x/drm/Kconfig Auto-merging drivers/gpu/drm/tilcdc/tilcdc_panel.c Removing drivers/gpu/drm/tegra/host1x.c Removing drivers/gpu/drm/tegra/fb.c Removing drivers/gpu/drm/tegra/drm.c Removing drivers/gpu/drm/tegra/Makefile Removing drivers/gpu/drm/nouveau/nouveau_irq.h Removing drivers/gpu/drm/nouveau/nouveau_irq.c Auto-merging drivers/gpu/drm/nouveau/dispnv04/tvnv17.c Auto-merging drivers/gpu/drm/nouveau/dispnv04/tvnv04.c Auto-merging drivers/gpu/drm/nouveau/dispnv04/tvmodesnv17.c Auto-merging drivers/gpu/drm/nouveau/dispnv04/hw.h Auto-merging drivers/gpu/drm/nouveau/dispnv04/hw.c Auto-merging drivers/gpu/drm/nouveau/dispnv04/disp.c Auto-merging drivers/gpu/drm/nouveau/dispnv04/dfp.c Auto-merging drivers/gpu/drm/nouveau/dispnv04/dac.c Auto-merging drivers/gpu/drm/nouveau/dispnv04/cursor.c Auto-merging drivers/gpu/drm/nouveau/dispnv04/crtc.c Auto-merging drivers/gpu/drm/nouveau/dispnv04/arb.c Auto-merging drivers/gpu/drm/nouveau/core/include/engine/device.h Auto-merging drivers/gpu/drm/nouveau/core/engine/device/nve0.c Auto-merging drivers/gpu/drm/nouveau/core/engine/device/nvc0.c Auto-merging drivers/gpu/drm/nouveau/core/engine/device/nv50.c Auto-merging drivers/gpu/drm/nouveau/core/engine/device/nv40.c Auto-merging drivers/gpu/drm/nouveau/core/engine/device/nv30.c Auto-merging drivers/gpu/drm/nouveau/core/engine/device/nv20.c Auto-merging drivers/gpu/drm/nouveau/core/engine/device/nv10.c Auto-merging drivers/gpu/drm/nouveau/core/engine/device/nv04.c Auto-merging drivers/gpu/drm/nouveau/core/engine/device/base.c Auto-merging drivers/gpu/drm/mgag200/mgag200_mode.c Auto-merging drivers/gpu/drm/i915/intel_sdvo.c Auto-merging drivers/gpu/drm/i915/intel_dp.c Auto-merging drivers/gpu/drm/drm_modes.c Auto-merging drivers/gpu/drm/drm_fb_helper.c Auto-merging arch/arm/mach-omap2/board-omap3beagle.c Removing Documentation/devicetree/bindings/drm/exynos/g2d.txt Merge made by the 'recursive' strategy. Documentation/EDID/1600x1200.S | 44 + Documentation/EDID/HOWTO.txt | 12 +- .../devicetree/bindings/drm/exynos/g2d.txt | 22 - arch/arm/mach-omap2/board-2430sdp.c | 2 +- arch/arm/mach-omap2/board-3430sdp.c | 2 +- arch/arm/mach-omap2/board-am3517evm.c | 3 +- arch/arm/mach-omap2/board-cm-t35.c | 3 +- arch/arm/mach-omap2/board-devkit8000.c | 3 +- arch/arm/mach-omap2/board-h4.c | 2 +- arch/arm/mach-omap2/board-igep0020.c | 2 +- arch/arm/mach-omap2/board-ldp.c | 2 +- arch/arm/mach-omap2/board-omap3beagle.c | 2 +- arch/arm/mach-omap2/board-omap3evm.c | 2 +- arch/arm/mach-omap2/board-omap3stalker.c | 3 +- arch/arm/mach-omap2/board-overo.c | 3 +- arch/arm/mach-omap2/dss-common.c | 4 +- drivers/gpu/Makefile | 1 + drivers/gpu/drm/Kconfig | 4 +- drivers/gpu/drm/Makefile | 2 +- drivers/gpu/drm/drm_cache.c | 7 +- drivers/gpu/drm/drm_crtc.c | 411 ++---- drivers/gpu/drm/drm_crtc_helper.c | 3 + drivers/gpu/drm/drm_drv.c | 9 +- drivers/gpu/drm/drm_edid.c | 279 +++- drivers/gpu/drm/drm_edid_load.c | 21 +- drivers/gpu/drm/drm_fb_helper.c | 23 +- drivers/gpu/drm/drm_gem.c | 4 +- drivers/gpu/drm/drm_modes.c | 22 +- drivers/gpu/drm/drm_pci.c | 10 +- drivers/gpu/drm/drm_prime.c | 92 +- drivers/gpu/drm/drm_vm.c | 1 + drivers/gpu/drm/exynos/Kconfig | 6 +- drivers/gpu/drm/exynos/exynos_drm_connector.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_dmabuf.c | 4 +- drivers/gpu/drm/exynos/exynos_drm_drv.c | 9 +- drivers/gpu/drm/exynos/exynos_drm_drv.h | 12 +- drivers/gpu/drm/exynos/exynos_drm_fimc.c | 273 ++-- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 39 +- drivers/gpu/drm/exynos/exynos_drm_gem.c | 3 +- drivers/gpu/drm/exynos/exynos_drm_hdmi.c | 54 +- drivers/gpu/drm/exynos/exynos_drm_hdmi.h | 3 - drivers/gpu/drm/exynos/exynos_drm_ipp.c | 27 + drivers/gpu/drm/exynos/exynos_drm_rotator.c | 2 +- drivers/gpu/drm/exynos/exynos_hdmi.c | 712 ++++----- drivers/gpu/drm/exynos/exynos_mixer.c | 22 +- drivers/gpu/drm/exynos/regs-fimc.h | 7 +- drivers/gpu/drm/gma500/Kconfig | 13 +- drivers/gpu/drm/gma500/cdv_intel_crt.c | 1 + drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 1 + drivers/gpu/drm/gma500/framebuffer.c | 6 +- drivers/gpu/drm/gma500/gtt.c | 52 +- drivers/gpu/drm/gma500/gtt.h | 2 +- drivers/gpu/drm/gma500/intel_bios.c | 3 +- drivers/gpu/drm/gma500/intel_bios.h | 6 +- drivers/gpu/drm/gma500/mdfld_dsi_output.c | 7 +- drivers/gpu/drm/gma500/power.c | 17 + drivers/gpu/drm/gma500/power.h | 3 + drivers/gpu/drm/gma500/psb_drv.c | 3 + drivers/gpu/drm/gma500/psb_drv.h | 1 - drivers/gpu/drm/gma500/psb_intel_display.c | 154 +- drivers/gpu/drm/gma500/psb_intel_display.h | 3 - drivers/gpu/drm/gma500/psb_intel_drv.h | 8 - drivers/gpu/drm/gma500/psb_intel_reg.h | 1 - drivers/gpu/drm/gma500/psb_intel_sdvo.c | 33 + drivers/gpu/drm/gma500/psb_irq.c | 2 +- drivers/gpu/drm/gma500/psb_irq.h | 6 +- drivers/gpu/drm/i915/i915_debugfs.c | 433 ++---- drivers/gpu/drm/i915/i915_dma.c | 90 +- drivers/gpu/drm/i915/i915_drv.c | 206 ++- drivers/gpu/drm/i915/i915_drv.h | 94 +- drivers/gpu/drm/i915/i915_gem.c | 135 +- drivers/gpu/drm/i915/i915_gem_context.c | 7 + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 18 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 36 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 262 ++-- drivers/gpu/drm/i915/i915_gem_stolen.c | 65 + drivers/gpu/drm/i915/i915_gem_tiling.c | 33 +- drivers/gpu/drm/i915/i915_irq.c | 659 ++++++--- drivers/gpu/drm/i915/i915_reg.h | 293 +++- drivers/gpu/drm/i915/i915_suspend.c | 15 +- drivers/gpu/drm/i915/i915_sysfs.c | 27 +- drivers/gpu/drm/i915/intel_bios.c | 9 +- drivers/gpu/drm/i915/intel_bios.h | 4 +- drivers/gpu/drm/i915/intel_crt.c | 22 +- drivers/gpu/drm/i915/intel_ddi.c | 70 +- drivers/gpu/drm/i915/intel_display.c | 1543 +++++++++++--------- drivers/gpu/drm/i915/intel_dp.c | 526 ++++--- drivers/gpu/drm/i915/intel_drv.h | 155 +- drivers/gpu/drm/i915/intel_dvo.c | 13 +- drivers/gpu/drm/i915/intel_fb.c | 8 +- drivers/gpu/drm/i915/intel_hdmi.c | 166 ++- drivers/gpu/drm/i915/intel_i2c.c | 4 +- drivers/gpu/drm/i915/intel_lvds.c | 49 +- drivers/gpu/drm/i915/intel_panel.c | 49 +- drivers/gpu/drm/i915/intel_pm.c | 245 +++- drivers/gpu/drm/i915/intel_sdvo.c | 131 +- drivers/gpu/drm/i915/intel_sprite.c | 243 ++- drivers/gpu/drm/i915/intel_tv.c | 16 +- drivers/gpu/drm/mgag200/mgag200_drv.h | 6 +- drivers/gpu/drm/mgag200/mgag200_fb.c | 12 +- drivers/gpu/drm/mgag200/mgag200_main.c | 31 +- drivers/gpu/drm/mgag200/mgag200_mode.c | 7 +- drivers/gpu/drm/nouveau/Makefile | 25 +- drivers/gpu/drm/nouveau/core/core/client.c | 7 +- drivers/gpu/drm/nouveau/core/core/engine.c | 4 +- drivers/gpu/drm/nouveau/core/core/event.c | 12 +- drivers/gpu/drm/nouveau/core/core/object.c | 19 +- drivers/gpu/drm/nouveau/core/core/parent.c | 8 +- .../nouveau/core/{subdev => engine}/device/base.c | 183 ++- .../nouveau/core/{subdev => engine}/device/nv04.c | 2 +- .../nouveau/core/{subdev => engine}/device/nv10.c | 2 +- .../nouveau/core/{subdev => engine}/device/nv20.c | 2 +- .../nouveau/core/{subdev => engine}/device/nv30.c | 2 +- .../nouveau/core/{subdev => engine}/device/nv40.c | 2 +- .../nouveau/core/{subdev => engine}/device/nv50.c | 20 +- .../nouveau/core/{subdev => engine}/device/nvc0.c | 30 +- .../nouveau/core/{subdev => engine}/device/nve0.c | 2 +- drivers/gpu/drm/nouveau/core/engine/disp/dport.c | 2 +- drivers/gpu/drm/nouveau/core/engine/disp/nv50.c | 5 +- drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c | 3 +- drivers/gpu/drm/nouveau/core/engine/fifo/base.c | 7 + drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c | 18 +- drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c | 22 +- drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c | 9 +- drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c | 7 +- .../gpu/drm/nouveau/core/engine/graph/ctxnvc0.c | 51 +- .../gpu/drm/nouveau/core/engine/graph/ctxnve0.c | 13 +- .../drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc | 5 + .../drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc | 3 + drivers/gpu/drm/nouveau/core/engine/graph/nv20.c | 2 +- drivers/gpu/drm/nouveau/core/engine/graph/nv25.c | 2 +- drivers/gpu/drm/nouveau/core/engine/graph/nv2a.c | 2 +- drivers/gpu/drm/nouveau/core/engine/graph/nv30.c | 2 +- drivers/gpu/drm/nouveau/core/engine/graph/nv34.c | 2 +- drivers/gpu/drm/nouveau/core/engine/graph/nv35.c | 2 +- drivers/gpu/drm/nouveau/core/engine/graph/nv40.c | 10 + drivers/gpu/drm/nouveau/core/engine/graph/nv50.c | 10 + drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c | 31 +- drivers/gpu/drm/nouveau/core/engine/graph/nvc0.h | 3 + drivers/gpu/drm/nouveau/core/engine/graph/nve0.c | 230 ++- .../gpu/drm/nouveau/core/engine/software/nvc0.c | 29 + drivers/gpu/drm/nouveau/core/include/core/device.h | 6 +- drivers/gpu/drm/nouveau/core/include/core/parent.h | 4 +- .../core/include/{subdev => engine}/device.h | 1 - drivers/gpu/drm/nouveau/core/include/engine/fifo.h | 3 +- .../gpu/drm/nouveau/core/include/engine/graph.h | 4 + drivers/gpu/drm/nouveau/core/include/subdev/ltcg.h | 7 + drivers/gpu/drm/nouveau/core/include/subdev/mc.h | 30 +- .../gpu/drm/nouveau/core/include/subdev/therm.h | 1 + drivers/gpu/drm/nouveau/core/os.h | 1 + drivers/gpu/drm/nouveau/core/subdev/bar/nv50.c | 22 +- drivers/gpu/drm/nouveau/core/subdev/bar/nvc0.c | 14 +- drivers/gpu/drm/nouveau/core/subdev/bios/init.c | 56 +- drivers/gpu/drm/nouveau/core/subdev/fb/nvc0.c | 72 +- drivers/gpu/drm/nouveau/core/subdev/i2c/base.c | 6 +- drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.c | 20 +- drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.h | 1 - drivers/gpu/drm/nouveau/core/subdev/instmem/nv40.c | 12 +- drivers/gpu/drm/nouveau/core/subdev/ltcg/nvc0.c | 129 +- drivers/gpu/drm/nouveau/core/subdev/mc/base.c | 60 +- drivers/gpu/drm/nouveau/core/subdev/mc/nv04.c | 1 - drivers/gpu/drm/nouveau/core/subdev/mc/nv44.c | 1 - drivers/gpu/drm/nouveau/core/subdev/mc/nv50.c | 1 - drivers/gpu/drm/nouveau/core/subdev/mc/nv98.c | 1 - drivers/gpu/drm/nouveau/core/subdev/mc/nvc0.c | 1 - drivers/gpu/drm/nouveau/core/subdev/therm/nv40.c | 2 +- drivers/gpu/drm/nouveau/core/subdev/therm/nv50.c | 175 +-- drivers/gpu/drm/nouveau/core/subdev/therm/nv84.c | 221 +++ drivers/gpu/drm/nouveau/core/subdev/therm/nva3.c | 2 +- drivers/gpu/drm/nouveau/core/subdev/therm/nvd0.c | 2 +- drivers/gpu/drm/nouveau/core/subdev/therm/priv.h | 3 +- drivers/gpu/drm/nouveau/core/subdev/therm/temp.c | 14 +- drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c | 13 +- drivers/gpu/drm/nouveau/core/subdev/vm/nv04.c | 2 +- drivers/gpu/drm/nouveau/core/subdev/vm/nv41.c | 2 +- drivers/gpu/drm/nouveau/core/subdev/vm/nv44.c | 2 +- drivers/gpu/drm/nouveau/core/subdev/vm/nvc0.c | 58 +- drivers/gpu/drm/nouveau/dispnv04/Makefile | 10 + .../drm/nouveau/{nouveau_calc.c => dispnv04/arb.c} | 2 +- .../drm/nouveau/{nv04_crtc.c => dispnv04/crtc.c} | 5 +- .../nouveau/{nv04_cursor.c => dispnv04/cursor.c} | 3 +- .../gpu/drm/nouveau/{nv04_dac.c => dispnv04/dac.c} | 2 +- .../gpu/drm/nouveau/{nv04_dfp.c => dispnv04/dfp.c} | 2 +- .../nouveau/{nv04_display.c => dispnv04/disp.c} | 2 +- .../nouveau/{nv04_display.h => dispnv04/disp.h} | 0 .../drm/nouveau/{nouveau_hw.c => dispnv04/hw.c} | 2 +- .../drm/nouveau/{nouveau_hw.h => dispnv04/hw.h} | 3 +- drivers/gpu/drm/nouveau/{ => dispnv04}/nvreg.h | 0 .../{nv17_tv_modes.c => dispnv04/tvmodesnv17.c} | 4 +- .../drm/nouveau/{nv04_tv.c => dispnv04/tvnv04.c} | 2 +- .../drm/nouveau/{nv17_tv.c => dispnv04/tvnv17.c} | 4 +- .../drm/nouveau/{nv17_tv.h => dispnv04/tvnv17.h} | 0 drivers/gpu/drm/nouveau/nouveau_abi16.c | 12 +- drivers/gpu/drm/nouveau/nouveau_backlight.c | 3 + drivers/gpu/drm/nouveau/nouveau_bios.c | 2 +- drivers/gpu/drm/nouveau/nouveau_bios.h | 2 - drivers/gpu/drm/nouveau/nouveau_connector.c | 2 +- drivers/gpu/drm/nouveau/nouveau_display.c | 2 +- drivers/gpu/drm/nouveau/nouveau_drm.c | 23 +- drivers/gpu/drm/nouveau/nouveau_drm.h | 13 +- drivers/gpu/drm/nouveau/nouveau_encoder.h | 2 +- drivers/gpu/drm/nouveau/nouveau_irq.c | 76 - drivers/gpu/drm/nouveau/nouveau_irq.h | 11 - drivers/gpu/drm/nouveau/nouveau_ttm.c | 25 +- drivers/gpu/drm/nouveau/nv04_pm.c | 2 +- drivers/gpu/drm/nouveau/nv40_pm.c | 2 +- drivers/gpu/drm/nouveau/nv50_pm.c | 2 +- drivers/gpu/drm/omapdrm/omap_connector.c | 27 +- drivers/gpu/drm/omapdrm/omap_crtc.c | 21 +- drivers/gpu/drm/omapdrm/omap_drv.c | 165 ++- drivers/gpu/drm/omapdrm/omap_drv.h | 38 +- drivers/gpu/drm/omapdrm/omap_encoder.c | 24 +- drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 3 +- drivers/gpu/drm/omapdrm/omap_irq.c | 17 +- drivers/gpu/drm/omapdrm/omap_plane.c | 6 + drivers/gpu/drm/qxl/Kconfig | 10 + drivers/gpu/drm/qxl/Makefile | 9 + drivers/gpu/drm/qxl/qxl_cmd.c | 690 +++++++++ drivers/gpu/drm/qxl/qxl_debugfs.c | 141 ++ drivers/gpu/drm/qxl/qxl_dev.h | 879 +++++++++++ drivers/gpu/drm/qxl/qxl_display.c | 982 +++++++++++++ drivers/gpu/drm/qxl/qxl_draw.c | 390 +++++ drivers/gpu/drm/qxl/qxl_drv.c | 145 ++ drivers/gpu/drm/qxl/qxl_drv.h | 566 +++++++ drivers/gpu/drm/qxl/qxl_dumb.c | 93 ++ drivers/gpu/drm/qxl/qxl_fb.c | 567 +++++++ drivers/gpu/drm/qxl/qxl_fence.c | 97 ++ drivers/gpu/drm/qxl/qxl_gem.c | 149 ++ drivers/gpu/drm/qxl/qxl_image.c | 176 +++ drivers/gpu/drm/qxl/qxl_ioctl.c | 411 ++++++ drivers/gpu/drm/qxl/qxl_irq.c | 97 ++ drivers/gpu/drm/qxl/qxl_kms.c | 302 ++++ drivers/gpu/drm/qxl/qxl_object.c | 365 +++++ drivers/gpu/drm/qxl/qxl_object.h | 112 ++ drivers/gpu/drm/qxl/qxl_release.c | 307 ++++ drivers/gpu/drm/qxl/qxl_ttm.c | 581 ++++++++ drivers/gpu/drm/radeon/Makefile | 2 +- drivers/gpu/drm/radeon/atombios.h | 2 + drivers/gpu/drm/radeon/atombios_crtc.c | 3 + drivers/gpu/drm/radeon/atombios_encoders.c | 17 +- drivers/gpu/drm/radeon/evergreen.c | 1268 +++++++++++++++- drivers/gpu/drm/radeon/evergreen_hdmi.c | 169 ++- drivers/gpu/drm/radeon/evergreen_reg.h | 2 + drivers/gpu/drm/radeon/evergreend.h | 48 + drivers/gpu/drm/radeon/ni.c | 408 +++++- drivers/gpu/drm/radeon/nid.h | 21 + drivers/gpu/drm/radeon/r100.c | 77 +- drivers/gpu/drm/radeon/r500_reg.h | 2 + drivers/gpu/drm/radeon/r600.c | 404 ++++- drivers/gpu/drm/radeon/r600_audio.c | 64 +- drivers/gpu/drm/radeon/r600_hdmi.c | 150 +- drivers/gpu/drm/radeon/r600d.h | 68 +- drivers/gpu/drm/radeon/radeon.h | 78 +- drivers/gpu/drm/radeon/radeon_asic.c | 100 +- drivers/gpu/drm/radeon/radeon_asic.h | 28 +- drivers/gpu/drm/radeon/radeon_atombios.c | 105 ++ drivers/gpu/drm/radeon/radeon_cs.c | 83 +- drivers/gpu/drm/radeon/radeon_device.c | 51 +- drivers/gpu/drm/radeon/radeon_drv.c | 9 +- drivers/gpu/drm/radeon/radeon_fence.c | 22 +- drivers/gpu/drm/radeon/radeon_kms.c | 187 ++- drivers/gpu/drm/radeon/radeon_mode.h | 23 + drivers/gpu/drm/radeon/radeon_object.c | 16 +- drivers/gpu/drm/radeon/radeon_object.h | 2 +- drivers/gpu/drm/radeon/radeon_pm.c | 6 +- drivers/gpu/drm/radeon/radeon_ring.c | 27 +- drivers/gpu/drm/radeon/radeon_test.c | 72 +- drivers/gpu/drm/radeon/radeon_uvd.c | 694 +++++++++ drivers/gpu/drm/radeon/rs600.c | 52 +- drivers/gpu/drm/radeon/rs690.c | 23 + drivers/gpu/drm/radeon/rs690d.h | 3 + drivers/gpu/drm/radeon/rv515.c | 56 +- drivers/gpu/drm/radeon/rv770.c | 985 ++++++++++++- drivers/gpu/drm/radeon/rv770d.h | 43 + drivers/gpu/drm/radeon/si.c | 1061 +++++++++++++- drivers/gpu/drm/radeon/sid.h | 40 + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 2 +- drivers/gpu/drm/tegra/Makefile | 7 - drivers/gpu/drm/tegra/drm.c | 217 --- drivers/gpu/drm/tegra/fb.c | 52 - drivers/gpu/drm/tegra/host1x.c | 327 ----- drivers/gpu/drm/tilcdc/Makefile | 5 +- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 9 +- drivers/gpu/drm/tilcdc/tilcdc_panel.c | 3 +- drivers/gpu/drm/tilcdc/tilcdc_slave.c | 1 - drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 1 - drivers/gpu/drm/ttm/ttm_bo_util.c | 13 +- drivers/gpu/drm/ttm/ttm_bo_vm.c | 4 +- drivers/gpu/drm/udl/udl_fb.c | 2 +- drivers/gpu/drm/udl/udl_gem.c | 4 + drivers/gpu/host1x/Kconfig | 24 + drivers/gpu/host1x/Makefile | 20 + drivers/gpu/host1x/cdma.c | 491 +++++++ drivers/gpu/host1x/cdma.h | 100 ++ drivers/gpu/host1x/channel.c | 126 ++ drivers/gpu/host1x/channel.h | 52 + drivers/gpu/host1x/debug.c | 210 +++ drivers/gpu/host1x/debug.h | 51 + drivers/gpu/host1x/dev.c | 246 ++++ drivers/gpu/host1x/dev.h | 308 ++++ drivers/gpu/{drm/tegra => host1x/drm}/Kconfig | 20 +- drivers/gpu/{drm/tegra => host1x/drm}/dc.c | 31 +- drivers/gpu/{drm/tegra => host1x/drm}/dc.h | 0 drivers/gpu/host1x/drm/drm.c | 640 ++++++++ drivers/gpu/{drm/tegra => host1x/drm}/drm.h | 68 +- drivers/gpu/host1x/drm/fb.c | 374 +++++ drivers/gpu/host1x/drm/gem.c | 270 ++++ drivers/gpu/host1x/drm/gem.h | 59 + drivers/gpu/host1x/drm/gr2d.c | 339 +++++ drivers/gpu/{drm/tegra => host1x/drm}/hdmi.c | 5 +- drivers/gpu/{drm/tegra => host1x/drm}/hdmi.h | 0 drivers/gpu/{drm/tegra => host1x/drm}/output.c | 0 drivers/gpu/{drm/tegra => host1x/drm}/rgb.c | 0 drivers/gpu/host1x/host1x.h | 30 + drivers/gpu/host1x/host1x_bo.h | 87 ++ drivers/gpu/host1x/host1x_client.h | 35 + drivers/gpu/host1x/hw/Makefile | 6 + drivers/gpu/host1x/hw/cdma_hw.c | 326 +++++ drivers/gpu/host1x/hw/channel_hw.c | 168 +++ drivers/gpu/host1x/hw/debug_hw.c | 322 ++++ drivers/gpu/host1x/hw/host1x01.c | 42 + drivers/gpu/host1x/hw/host1x01.h | 25 + drivers/gpu/host1x/hw/host1x01_hardware.h | 143 ++ drivers/gpu/host1x/hw/hw_host1x01_channel.h | 120 ++ drivers/gpu/host1x/hw/hw_host1x01_sync.h | 243 +++ drivers/gpu/host1x/hw/hw_host1x01_uclass.h | 174 +++ drivers/gpu/host1x/hw/intr_hw.c | 143 ++ drivers/gpu/host1x/hw/syncpt_hw.c | 114 ++ drivers/gpu/host1x/intr.c | 354 +++++ drivers/gpu/host1x/intr.h | 102 ++ drivers/gpu/host1x/job.c | 603 ++++++++ drivers/gpu/host1x/job.h | 162 ++ drivers/gpu/host1x/syncpt.c | 387 +++++ drivers/gpu/host1x/syncpt.h | 165 +++ drivers/video/Kconfig | 2 + drivers/video/console/fbcon.c | 2 + drivers/video/fbmem.c | 7 + drivers/video/hdmi.c | 21 +- drivers/video/omap2/displays/panel-acx565akm.c | 59 +- drivers/video/omap2/displays/panel-generic-dpi.c | 39 +- .../omap2/displays/panel-lgphilips-lb035q02.c | 58 +- drivers/video/omap2/displays/panel-n8x0.c | 95 +- .../omap2/displays/panel-nec-nl8048hl11-01b.c | 135 +- drivers/video/omap2/displays/panel-picodlp.c | 49 +- .../video/omap2/displays/panel-sharp-ls037v7dw01.c | 126 +- drivers/video/omap2/displays/panel-taal.c | 300 +--- drivers/video/omap2/displays/panel-tfp410.c | 2 +- .../video/omap2/displays/panel-tpo-td043mtea1.c | 45 +- drivers/video/omap2/dss/apply.c | 15 +- drivers/video/omap2/dss/core.c | 5 +- drivers/video/omap2/dss/dispc.c | 176 ++- drivers/video/omap2/dss/dispc.h | 1 + drivers/video/omap2/dss/dpi.c | 316 +++- drivers/video/omap2/dss/dsi.c | 1221 ++++++++++------ drivers/video/omap2/dss/dss.c | 181 +-- drivers/video/omap2/dss/dss.h | 36 +- drivers/video/omap2/dss/dss_features.c | 8 +- drivers/video/omap2/dss/hdmi.c | 35 +- drivers/video/omap2/dss/output.c | 1 + drivers/video/omap2/dss/rfbi.c | 2 + drivers/video/omap2/dss/sdi.c | 70 +- drivers/video/omap2/dss/venc.c | 23 +- drivers/video/omap2/omapfb/omapfb-main.c | 2 +- include/drm/drmP.h | 5 +- include/drm/drm_crtc.h | 23 +- include/drm/drm_edid.h | 9 + include/drm/drm_fb_helper.h | 10 +- include/drm/ttm/ttm_bo_driver.h | 4 + include/linux/fb.h | 2 + include/linux/pm.h | 13 + include/linux/scatterlist.h | 28 +- include/trace/events/host1x.h | 253 ++++ include/uapi/drm/Kbuild | 2 + include/uapi/drm/drm.h | 6 +- include/uapi/drm/drm_mode.h | 6 +- include/uapi/drm/qxl_drm.h | 152 ++ include/uapi/drm/radeon_drm.h | 26 + include/uapi/drm/tegra_drm.h | 136 ++ include/video/omap-panel-data.h | 150 ++ include/video/omap-panel-generic-dpi.h | 37 - include/video/omap-panel-n8x0.h | 15 - include/video/omap-panel-nokia-dsi.h | 32 - include/video/omap-panel-picodlp.h | 23 - include/video/omap-panel-tfp410.h | 35 - include/video/omapdss.h | 86 +- kernel/power/console.c | 116 ++ lib/scatterlist.c | 4 +- 387 files changed, 28854 insertions(+), 7163 deletions(-) create mode 100644 Documentation/EDID/1600x1200.S delete mode 100644 Documentation/devicetree/bindings/drm/exynos/g2d.txt rename drivers/gpu/drm/nouveau/core/{subdev => engine}/device/base.c (89%) rename drivers/gpu/drm/nouveau/core/{subdev => engine}/device/nv04.c (99%) rename drivers/gpu/drm/nouveau/core/{subdev => engine}/device/nv10.c (99%) rename drivers/gpu/drm/nouveau/core/{subdev => engine}/device/nv20.c (99%) rename drivers/gpu/drm/nouveau/core/{subdev => engine}/device/nv30.c (99%) rename drivers/gpu/drm/nouveau/core/{subdev => engine}/device/nv40.c (99%) rename drivers/gpu/drm/nouveau/core/{subdev => engine}/device/nv50.c (97%) rename drivers/gpu/drm/nouveau/core/{subdev => engine}/device/nvc0.c (90%) rename drivers/gpu/drm/nouveau/core/{subdev => engine}/device/nve0.c (99%) rename drivers/gpu/drm/nouveau/core/include/{subdev => engine}/device.h (93%) create mode 100644 drivers/gpu/drm/nouveau/core/subdev/therm/nv84.c create mode 100644 drivers/gpu/drm/nouveau/dispnv04/Makefile rename drivers/gpu/drm/nouveau/{nouveau_calc.c => dispnv04/arb.c} (99%) rename drivers/gpu/drm/nouveau/{nv04_crtc.c => dispnv04/crtc.c} (99%) rename drivers/gpu/drm/nouveau/{nv04_cursor.c => dispnv04/cursor.c} (98%) rename drivers/gpu/drm/nouveau/{nv04_dac.c => dispnv04/dac.c} (99%) rename drivers/gpu/drm/nouveau/{nv04_dfp.c => dispnv04/dfp.c} (99%) rename drivers/gpu/drm/nouveau/{nv04_display.c => dispnv04/disp.c} (99%) rename drivers/gpu/drm/nouveau/{nv04_display.h => dispnv04/disp.h} (100%) rename drivers/gpu/drm/nouveau/{nouveau_hw.c => dispnv04/hw.c} (99%) rename drivers/gpu/drm/nouveau/{nouveau_hw.h => dispnv04/hw.h} (99%) rename drivers/gpu/drm/nouveau/{ => dispnv04}/nvreg.h (100%) rename drivers/gpu/drm/nouveau/{nv17_tv_modes.c => dispnv04/tvmodesnv17.c} (99%) rename drivers/gpu/drm/nouveau/{nv04_tv.c => dispnv04/tvnv04.c} (99%) rename drivers/gpu/drm/nouveau/{nv17_tv.c => dispnv04/tvnv17.c} (99%) rename drivers/gpu/drm/nouveau/{nv17_tv.h => dispnv04/tvnv17.h} (100%) delete mode 100644 drivers/gpu/drm/nouveau/nouveau_irq.c delete mode 100644 drivers/gpu/drm/nouveau/nouveau_irq.h create mode 100644 drivers/gpu/drm/qxl/Kconfig create mode 100644 drivers/gpu/drm/qxl/Makefile create mode 100644 drivers/gpu/drm/qxl/qxl_cmd.c create mode 100644 drivers/gpu/drm/qxl/qxl_debugfs.c create mode 100644 drivers/gpu/drm/qxl/qxl_dev.h create mode 100644 drivers/gpu/drm/qxl/qxl_display.c create mode 100644 drivers/gpu/drm/qxl/qxl_draw.c create mode 100644 drivers/gpu/drm/qxl/qxl_drv.c create mode 100644 drivers/gpu/drm/qxl/qxl_drv.h create mode 100644 drivers/gpu/drm/qxl/qxl_dumb.c create mode 100644 drivers/gpu/drm/qxl/qxl_fb.c create mode 100644 drivers/gpu/drm/qxl/qxl_fence.c create mode 100644 drivers/gpu/drm/qxl/qxl_gem.c create mode 100644 drivers/gpu/drm/qxl/qxl_image.c create mode 100644 drivers/gpu/drm/qxl/qxl_ioctl.c create mode 100644 drivers/gpu/drm/qxl/qxl_irq.c create mode 100644 drivers/gpu/drm/qxl/qxl_kms.c create mode 100644 drivers/gpu/drm/qxl/qxl_object.c create mode 100644 drivers/gpu/drm/qxl/qxl_object.h create mode 100644 drivers/gpu/drm/qxl/qxl_release.c create mode 100644 drivers/gpu/drm/qxl/qxl_ttm.c create mode 100644 drivers/gpu/drm/radeon/radeon_uvd.c delete mode 100644 drivers/gpu/drm/tegra/Makefile delete mode 100644 drivers/gpu/drm/tegra/drm.c delete mode 100644 drivers/gpu/drm/tegra/fb.c delete mode 100644 drivers/gpu/drm/tegra/host1x.c create mode 100644 drivers/gpu/host1x/Kconfig create mode 100644 drivers/gpu/host1x/Makefile create mode 100644 drivers/gpu/host1x/cdma.c create mode 100644 drivers/gpu/host1x/cdma.h create mode 100644 drivers/gpu/host1x/channel.c create mode 100644 drivers/gpu/host1x/channel.h create mode 100644 drivers/gpu/host1x/debug.c create mode 100644 drivers/gpu/host1x/debug.h create mode 100644 drivers/gpu/host1x/dev.c create mode 100644 drivers/gpu/host1x/dev.h rename drivers/gpu/{drm/tegra => host1x/drm}/Kconfig (53%) rename drivers/gpu/{drm/tegra => host1x/drm}/dc.c (97%) rename drivers/gpu/{drm/tegra => host1x/drm}/dc.h (100%) create mode 100644 drivers/gpu/host1x/drm/drm.c rename drivers/gpu/{drm/tegra => host1x/drm}/drm.h (77%) create mode 100644 drivers/gpu/host1x/drm/fb.c create mode 100644 drivers/gpu/host1x/drm/gem.c create mode 100644 drivers/gpu/host1x/drm/gem.h create mode 100644 drivers/gpu/host1x/drm/gr2d.c rename drivers/gpu/{drm/tegra => host1x/drm}/hdmi.c (99%) rename drivers/gpu/{drm/tegra => host1x/drm}/hdmi.h (100%) rename drivers/gpu/{drm/tegra => host1x/drm}/output.c (100%) rename drivers/gpu/{drm/tegra => host1x/drm}/rgb.c (100%) create mode 100644 drivers/gpu/host1x/host1x.h create mode 100644 drivers/gpu/host1x/host1x_bo.h create mode 100644 drivers/gpu/host1x/host1x_client.h create mode 100644 drivers/gpu/host1x/hw/Makefile create mode 100644 drivers/gpu/host1x/hw/cdma_hw.c create mode 100644 drivers/gpu/host1x/hw/channel_hw.c create mode 100644 drivers/gpu/host1x/hw/debug_hw.c create mode 100644 drivers/gpu/host1x/hw/host1x01.c create mode 100644 drivers/gpu/host1x/hw/host1x01.h create mode 100644 drivers/gpu/host1x/hw/host1x01_hardware.h create mode 100644 drivers/gpu/host1x/hw/hw_host1x01_channel.h create mode 100644 drivers/gpu/host1x/hw/hw_host1x01_sync.h create mode 100644 drivers/gpu/host1x/hw/hw_host1x01_uclass.h create mode 100644 drivers/gpu/host1x/hw/intr_hw.c create mode 100644 drivers/gpu/host1x/hw/syncpt_hw.c create mode 100644 drivers/gpu/host1x/intr.c create mode 100644 drivers/gpu/host1x/intr.h create mode 100644 drivers/gpu/host1x/job.c create mode 100644 drivers/gpu/host1x/job.h create mode 100644 drivers/gpu/host1x/syncpt.c create mode 100644 drivers/gpu/host1x/syncpt.h create mode 100644 include/trace/events/host1x.h create mode 100644 include/uapi/drm/qxl_drm.h create mode 100644 include/uapi/drm/tegra_drm.h create mode 100644 include/video/omap-panel-data.h delete mode 100644 include/video/omap-panel-generic-dpi.h delete mode 100644 include/video/omap-panel-n8x0.h delete mode 100644 include/video/omap-panel-nokia-dsi.h delete mode 100644 include/video/omap-panel-picodlp.h delete mode 100644 include/video/omap-panel-tfp410.h Merging drm-intel/drm-intel-next-queued (dce3271 drm/i915: reference count for i915_hw_contexts) $ git merge drm-intel/drm-intel-next-queued Recorded preimage for 'drivers/gpu/drm/i915/i915_reg.h' Auto-merging drivers/gpu/drm/i915/intel_pm.c Auto-merging drivers/gpu/drm/i915/intel_opregion.c Auto-merging drivers/gpu/drm/i915/intel_hdmi.c Auto-merging drivers/gpu/drm/i915/intel_dp.c Auto-merging drivers/gpu/drm/i915/intel_display.c Auto-merging drivers/gpu/drm/i915/intel_crt.c Auto-merging drivers/gpu/drm/i915/i915_reg.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_reg.h Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c Auto-merging drivers/gpu/drm/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/gpu/drm/i915/i915_reg.h'. [master c24c730] Merge remote-tracking branch 'drm-intel/drm-intel-next-queued' $ git diff -M --stat --summary HEAD^.. Documentation/DocBook/drm.tmpl | 2 + drivers/gpu/drm/Makefile | 3 +- drivers/gpu/drm/drm_rect.c | 295 ++++++++ drivers/gpu/drm/i915/i915_debugfs.c | 70 +- drivers/gpu/drm/i915/i915_dma.c | 19 +- drivers/gpu/drm/i915/i915_drv.c | 8 +- drivers/gpu/drm/i915/i915_drv.h | 129 ++-- drivers/gpu/drm/i915/i915_gem_context.c | 28 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 87 ++- drivers/gpu/drm/i915/i915_gem_stolen.c | 1 + drivers/gpu/drm/i915/i915_irq.c | 437 ++++++++++-- drivers/gpu/drm/i915/i915_reg.h | 178 ++++- drivers/gpu/drm/i915/i915_suspend.c | 10 + drivers/gpu/drm/i915/i915_sysfs.c | 71 +- drivers/gpu/drm/i915/intel_crt.c | 4 + drivers/gpu/drm/i915/intel_ddi.c | 21 +- drivers/gpu/drm/i915/intel_display.c | 1171 +++++++++++++++++++------------ drivers/gpu/drm/i915/intel_dp.c | 266 ++++++- drivers/gpu/drm/i915/intel_drv.h | 89 ++- drivers/gpu/drm/i915/intel_hdmi.c | 139 +++- drivers/gpu/drm/i915/intel_lvds.c | 231 +----- drivers/gpu/drm/i915/intel_opregion.c | 102 +-- drivers/gpu/drm/i915/intel_panel.c | 296 +++++++- drivers/gpu/drm/i915/intel_pm.c | 333 ++++++++- drivers/gpu/drm/i915/intel_sprite.c | 213 ++++-- include/drm/drm_rect.h | 160 +++++ 26 files changed, 3247 insertions(+), 1116 deletions(-) create mode 100644 drivers/gpu/drm/drm_rect.c create mode 100644 include/drm/drm_rect.h Merging sound/for-next (4ca231b ALSA: usb-audio: caiaq: fix endianness bug in snd_usb_caiaq_maschine_dispatch) $ git merge sound/for-next Auto-merging sound/soc/ux500/Kconfig Removing sound/soc/omap/omap-pcm.h Removing sound/soc/cirrus/ep93xx-pcm.h Auto-merging sound/core/info.c Removing include/sound/tegra_wm8903.h Auto-merging include/sound/pcm.h Auto-merging include/linux/mfd/arizona/registers.h Auto-merging drivers/mfd/wm5102-tables.c Auto-merging arch/arm/plat-samsung/devs.c Merge made by the 'recursive' strategy. Documentation/DocBook/writing-an-alsa-driver.tmpl | 12 +- Documentation/devicetree/bindings/sound/ak5386.txt | 19 + .../bindings/sound/nvidia,tegra30-ahub.txt | 26 +- .../devicetree/bindings/sound/ti,tas5086.txt | 32 + Documentation/sound/alsa/HD-Audio.txt | 10 +- arch/arm/mach-s3c24xx/dma-s3c2410.c | 2 - arch/arm/mach-s3c24xx/dma-s3c2412.c | 2 - arch/arm/mach-s3c24xx/dma-s3c2440.c | 2 - arch/arm/mach-s3c24xx/dma-s3c2443.c | 2 - arch/arm/plat-samsung/devs.c | 6 + drivers/mfd/wm5102-tables.c | 10 + include/linux/mfd/arizona/registers.h | 42 ++ include/linux/mfd/wm8994/pdata.h | 8 + include/linux/usb/audio-v2.h | 2 + include/sound/compress_driver.h | 4 +- include/sound/control.h | 5 +- include/sound/core.h | 26 +- include/sound/dmaengine_pcm.h | 97 ++- include/sound/emu10k1.h | 1 + include/sound/pcm.h | 31 +- include/sound/soc-dai.h | 8 - include/sound/soc-dapm.h | 1 - include/sound/soc.h | 33 +- include/sound/tas5086.h | 7 + include/sound/tegra_wm8903.h | 26 - include/uapi/sound/asound.h | 4 +- sound/aoa/soundbus/i2sbus/pcm.c | 2 +- sound/atmel/ac97c.c | 4 +- sound/core/compress_offload.c | 128 ++-- sound/core/control.c | 41 +- sound/core/device.c | 8 +- sound/core/hwdep.c | 2 +- sound/core/info.c | 41 +- sound/core/init.c | 16 +- sound/core/isadma.c | 2 +- sound/core/jack.c | 6 +- sound/core/memalloc.c | 20 +- sound/core/memory.c | 4 +- sound/core/pcm.c | 8 +- sound/core/pcm_lib.c | 54 +- sound/core/pcm_memory.c | 19 +- sound/core/pcm_misc.c | 36 +- sound/core/pcm_native.c | 13 + sound/core/rawmidi.c | 14 +- sound/core/sound.c | 7 +- sound/core/vmaster.c | 7 +- sound/drivers/Kconfig | 2 +- sound/drivers/aloop.c | 2 +- sound/drivers/mpu401/mpu401_uart.c | 6 +- sound/oss/dmabuf.c | 3 +- sound/oss/sb_common.c | 3 +- sound/oss/uart401.c | 11 +- sound/pci/ac97/ac97_codec.c | 16 +- sound/pci/ac97/ac97_pcm.c | 10 +- sound/pci/ali5451/ali5451.c | 8 +- sound/pci/asihpi/asihpi.c | 6 +- sound/pci/emu10k1/emu10k1_main.c | 39 +- sound/pci/hda/hda_auto_parser.c | 68 +- sound/pci/hda/hda_auto_parser.h | 29 +- sound/pci/hda/hda_beep.c | 39 +- sound/pci/hda/hda_beep.h | 1 + sound/pci/hda/hda_codec.c | 28 +- sound/pci/hda/hda_codec.h | 3 + sound/pci/hda/hda_generic.c | 433 +++++++++---- sound/pci/hda/hda_generic.h | 30 +- sound/pci/hda/hda_intel.c | 39 +- sound/pci/hda/hda_jack.c | 43 +- sound/pci/hda/hda_local.h | 4 + sound/pci/hda/patch_analog.c | 33 +- sound/pci/hda/patch_ca0132.c | 82 ++- sound/pci/hda/patch_cirrus.c | 19 +- sound/pci/hda/patch_conexant.c | 21 +- sound/pci/hda/patch_hdmi.c | 236 ++++--- sound/pci/hda/patch_realtek.c | 715 ++++++++++++++++++--- sound/pci/hda/patch_sigmatel.c | 39 +- sound/pci/hda/patch_via.c | 20 + sound/pci/rme9652/hdspm.c | 382 +++++++---- sound/soc/Kconfig | 4 + sound/soc/Makefile | 4 + sound/soc/atmel/atmel-pcm-dma.c | 29 +- sound/soc/atmel/atmel_ssc_dai.c | 54 +- sound/soc/au1x/ac97c.c | 9 +- sound/soc/au1x/i2sc.c | 9 +- sound/soc/au1x/psc-ac97.c | 9 +- sound/soc/au1x/psc-i2s.c | 9 +- sound/soc/blackfin/bf5xx-ac97.c | 9 +- sound/soc/blackfin/bf5xx-i2s.c | 9 +- sound/soc/blackfin/bf5xx-tdm.c | 9 +- sound/soc/blackfin/bf6xx-i2s.c | 9 +- sound/soc/cirrus/edb93xx.c | 1 - sound/soc/cirrus/ep93xx-ac97.c | 18 +- sound/soc/cirrus/ep93xx-i2s.c | 25 +- sound/soc/cirrus/ep93xx-pcm.c | 38 +- sound/soc/cirrus/ep93xx-pcm.h | 20 - sound/soc/cirrus/simone.c | 2 - sound/soc/cirrus/snappercl15.c | 1 - sound/soc/codecs/Kconfig | 10 +- sound/soc/codecs/Makefile | 4 + sound/soc/codecs/adau1373.c | 5 +- sound/soc/codecs/ak4104.c | 55 +- sound/soc/codecs/ak5386.c | 152 +++++ sound/soc/codecs/arizona.c | 497 ++++++++++++-- sound/soc/codecs/arizona.h | 31 +- sound/soc/codecs/cs4271.c | 166 +++-- sound/soc/codecs/cs42l73.c | 6 +- sound/soc/codecs/max98088.c | 32 +- sound/soc/codecs/max98090.c | 45 +- sound/soc/codecs/si476x.c | 47 +- sound/soc/codecs/tas5086.c | 591 +++++++++++++++++ sound/soc/codecs/wm0010.c | 6 +- sound/soc/codecs/wm2000.c | 4 +- sound/soc/codecs/wm2000.h | 2 + sound/soc/codecs/wm2200.c | 2 +- sound/soc/codecs/wm5102.c | 121 ++-- sound/soc/codecs/wm5102.h | 6 +- sound/soc/codecs/wm5110.c | 46 +- sound/soc/codecs/wm5110.h | 6 +- sound/soc/codecs/wm8903.c | 4 + sound/soc/codecs/wm8960.c | 10 + sound/soc/codecs/wm8994.c | 68 +- sound/soc/codecs/wm8994.h | 3 +- sound/soc/codecs/wm_adsp.c | 124 +++- sound/soc/codecs/wm_adsp.h | 5 +- sound/soc/codecs/wm_hubs.c | 9 +- sound/soc/davinci/davinci-i2s.c | 15 +- sound/soc/davinci/davinci-mcasp.c | 110 +++- sound/soc/davinci/davinci-mcasp.h | 2 +- sound/soc/davinci/davinci-pcm.c | 9 +- sound/soc/davinci/davinci-vcif.c | 11 +- sound/soc/dwc/designware_i2s.c | 9 +- sound/soc/fsl/Kconfig | 2 +- sound/soc/fsl/fsl_ssi.c | 64 +- sound/soc/fsl/fsl_ssi.h | 8 + sound/soc/fsl/imx-audmux.c | 3 +- sound/soc/fsl/imx-pcm-dma.c | 120 +--- sound/soc/fsl/imx-pcm-fiq.c | 6 +- sound/soc/fsl/imx-pcm.c | 6 +- sound/soc/fsl/imx-pcm.h | 24 +- sound/soc/fsl/imx-sgtl5000.c | 2 +- sound/soc/fsl/imx-ssi.c | 62 +- sound/soc/fsl/imx-ssi.h | 7 +- sound/soc/fsl/mpc5200_psc_ac97.c | 8 +- sound/soc/fsl/mpc5200_psc_i2s.c | 9 +- sound/soc/jz4740/jz4740-i2s.c | 9 +- sound/soc/kirkwood/kirkwood-i2s.c | 11 +- sound/soc/mid-x86/sst_platform.c | 20 +- sound/soc/mid-x86/sst_platform.h | 2 + sound/soc/mxs/Kconfig | 2 +- sound/soc/mxs/mxs-pcm.c | 176 +---- sound/soc/mxs/mxs-pcm.h | 4 +- sound/soc/mxs/mxs-saif.c | 20 +- sound/soc/nuc900/nuc900-ac97.c | 9 +- sound/soc/omap/am3517evm.c | 1 - sound/soc/omap/ams-delta.c | 1 - sound/soc/omap/mcbsp.c | 14 +- sound/soc/omap/mcbsp.h | 7 +- sound/soc/omap/n810.c | 1 - sound/soc/omap/omap-abe-twl6040.c | 1 - sound/soc/omap/omap-dmic.c | 47 +- sound/soc/omap/omap-hdmi.c | 33 +- sound/soc/omap/omap-mcbsp.c | 27 +- sound/soc/omap/omap-mcpdm.c | 118 ++-- sound/soc/omap/omap-pcm.c | 86 +-- sound/soc/omap/omap-pcm.h | 40 -- sound/soc/omap/omap-twl4030.c | 1 - sound/soc/omap/omap3pandora.c | 9 +- sound/soc/omap/osk5912.c | 1 - sound/soc/omap/rx51.c | 1 - sound/soc/pxa/mmp-pcm.c | 34 +- sound/soc/pxa/mmp-sspa.c | 9 +- sound/soc/pxa/pxa-ssp.c | 9 +- sound/soc/pxa/pxa2xx-ac97.c | 11 +- sound/soc/pxa/pxa2xx-i2s.c | 9 +- sound/soc/s6000/s6000-i2s.c | 9 +- sound/soc/samsung/Kconfig | 5 +- sound/soc/samsung/ac97.c | 14 +- sound/soc/samsung/goni_wm8994.c | 11 +- sound/soc/samsung/h1940_uda1380.c | 2 +- sound/soc/samsung/i2s.c | 16 +- sound/soc/samsung/idma.c | 11 +- sound/soc/samsung/neo1973_wm8753.c | 3 +- sound/soc/samsung/pcm.c | 11 +- .../include/plat => sound/soc/samsung}/regs-ac97.h | 0 .../include/plat => sound/soc/samsung}/regs-iis.h | 0 sound/soc/samsung/rx1950_uda1380.c | 2 +- sound/soc/samsung/s3c-i2s-v2.c | 9 +- sound/soc/samsung/s3c-i2s-v2.h | 7 +- sound/soc/samsung/s3c2412-i2s.c | 12 +- sound/soc/samsung/s3c24xx-i2s.c | 13 +- sound/soc/samsung/s3c24xx_uda134x.c | 2 +- sound/soc/samsung/spdif.c | 11 +- sound/soc/sh/fsi.c | 14 +- sound/soc/sh/hac.c | 10 +- sound/soc/sh/migor.c | 2 +- sound/soc/sh/siu_dai.c | 11 +- sound/soc/sh/ssi.c | 10 +- sound/soc/soc-compress.c | 38 +- sound/soc/soc-core.c | 213 ++++-- sound/soc/soc-dapm.c | 320 ++++----- sound/soc/soc-dmaengine-pcm.c | 150 +++-- sound/soc/soc-generic-dmaengine-pcm.c | 300 +++++++++ sound/soc/soc-io.c | 5 +- sound/soc/soc-utils.c | 25 + sound/soc/spear/spdif_in.c | 9 +- sound/soc/spear/spdif_out.c | 9 +- sound/soc/spear/spear_pcm.c | 23 +- sound/soc/tegra/Kconfig | 2 +- sound/soc/tegra/tegra20_ac97.c | 28 +- sound/soc/tegra/tegra20_ac97.h | 4 +- sound/soc/tegra/tegra20_i2s.c | 28 +- sound/soc/tegra/tegra20_i2s.h | 4 +- sound/soc/tegra/tegra20_spdif.c | 22 +- sound/soc/tegra/tegra20_spdif.h | 4 +- sound/soc/tegra/tegra30_ahub.c | 72 ++- sound/soc/tegra/tegra30_ahub.h | 24 +- sound/soc/tegra/tegra30_i2s.c | 28 +- sound/soc/tegra/tegra30_i2s.h | 4 +- sound/soc/tegra/tegra_alc5632.c | 15 +- sound/soc/tegra/tegra_asoc_utils.c | 34 +- sound/soc/tegra/tegra_asoc_utils.h | 1 + sound/soc/tegra/tegra_pcm.c | 187 +----- sound/soc/tegra/tegra_pcm.h | 7 - sound/soc/tegra/tegra_wm8753.c | 15 +- sound/soc/tegra/tegra_wm8903.c | 179 ++---- sound/soc/tegra/tegra_wm9712.c | 7 +- sound/soc/tegra/trimslice.c | 56 +- sound/soc/txx9/txx9aclc-ac97.c | 9 +- sound/soc/ux500/Kconfig | 2 +- sound/soc/ux500/ux500_msp_dai.c | 13 +- sound/soc/ux500/ux500_msp_dai.h | 5 - sound/soc/ux500/ux500_msp_i2s.h | 1 + sound/soc/ux500/ux500_pcm.c | 229 +------ sound/soc/ux500/ux500_pcm.h | 14 - sound/sound_core.c | 22 +- sound/spi/at73c213.c | 22 +- sound/usb/6fire/pcm.c | 1 - sound/usb/caiaq/audio.c | 462 ++++++------- sound/usb/caiaq/audio.h | 4 +- sound/usb/caiaq/control.c | 67 +- sound/usb/caiaq/control.h | 2 +- sound/usb/caiaq/device.c | 248 +++---- sound/usb/caiaq/device.h | 18 +- sound/usb/caiaq/input.c | 336 +++++----- sound/usb/caiaq/input.h | 6 +- sound/usb/caiaq/midi.c | 63 +- sound/usb/caiaq/midi.h | 5 +- sound/usb/card.c | 15 +- sound/usb/card.h | 9 + sound/usb/clock.c | 189 ++++-- sound/usb/clock.h | 3 +- sound/usb/endpoint.c | 32 +- sound/usb/endpoint.h | 2 +- sound/usb/format.c | 30 +- sound/usb/format.h | 2 +- sound/usb/helper.c | 10 +- sound/usb/midi.c | 25 +- sound/usb/misc/ua101.c | 3 +- sound/usb/pcm.c | 158 +++-- sound/usb/proc.c | 9 +- sound/usb/quirks-table.h | 121 +++- sound/usb/quirks.c | 60 +- sound/usb/quirks.h | 5 + sound/usb/stream.c | 23 +- sound/usb/usbaudio.h | 1 + sound/usb/usx2y/usb_stream.c | 1 - sound/usb/usx2y/usbusx2yaudio.c | 1 - sound/usb/usx2y/usx2yhwdeppcm.c | 1 - 267 files changed, 7241 insertions(+), 3721 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/ak5386.txt create mode 100644 Documentation/devicetree/bindings/sound/ti,tas5086.txt create mode 100644 include/sound/tas5086.h delete mode 100644 include/sound/tegra_wm8903.h delete mode 100644 sound/soc/cirrus/ep93xx-pcm.h create mode 100644 sound/soc/codecs/ak5386.c create mode 100644 sound/soc/codecs/tas5086.c delete mode 100644 sound/soc/omap/omap-pcm.h rename {arch/arm/plat-samsung/include/plat => sound/soc/samsung}/regs-ac97.h (100%) rename {arch/arm/plat-samsung/include/plat => sound/soc/samsung}/regs-iis.h (100%) create mode 100644 sound/soc/soc-generic-dmaengine-pcm.c Merging sound-asoc/for-next (615973d Merge remote-tracking branch 'asoc/fix/wm8994' into asoc-linus) $ git merge sound-asoc/for-next Auto-merging sound/soc/soc-dapm.c Auto-merging sound/soc/davinci/davinci-mcasp.c Auto-merging sound/soc/codecs/wm8994.c Merge made by the 'recursive' strategy. sound/soc/codecs/wm8994.c | 1 + sound/soc/davinci/davinci-mcasp.c | 5 ++++- sound/soc/soc-dapm.c | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) Merging modules/modules-next (a53a11f3 modpost: fix unwanted VMLINUX_SYMBOL_STR expansion) $ git merge modules/modules-next Auto-merging kernel/Makefile Auto-merging include/linux/kernel.h Auto-merging arch/metag/Kconfig Auto-merging Makefile Merge made by the 'recursive' strategy. Makefile | 2 +- arch/Kconfig | 6 ++ arch/blackfin/Kconfig | 5 +- arch/h8300/Kconfig | 5 +- arch/metag/Kconfig | 5 +- crypto/asymmetric_keys/x509_cert_parser.c | 55 +++++++++++++++--- drivers/mtd/chips/gen_probe.c | 8 ++- include/asm-generic/unistd.h | 12 ++-- include/asm-generic/vmlinux.lds.h | 8 +-- include/linux/export.h | 20 +++++-- include/linux/kernel.h | 7 --- include/linux/module.h | 4 +- kernel/Makefile | 2 +- kernel/kallsyms.c | 26 ++++++--- kernel/modsign_certificate.S | 13 +---- kernel/module.c | 18 ++++-- scripts/Makefile.build | 3 +- scripts/Makefile.lib | 7 --- scripts/Makefile.modpost | 8 ++- scripts/genksyms/genksyms.c | 18 +++--- scripts/link-vmlinux.sh | 5 +- scripts/mod/modpost.c | 94 ++++++++++++++++++++----------- 22 files changed, 195 insertions(+), 136 deletions(-) Merging virtio/virtio-next (c2ecd51 lguest: improve code readability in lg_cpu_start.) $ git merge virtio/virtio-next Resolved 'drivers/char/virtio_console.c' using previous resolution. Auto-merging net/9p/trans_virtio.c Auto-merging include/linux/virtio.h Auto-merging include/linux/scatterlist.h Auto-merging drivers/rpmsg/virtio_rpmsg_bus.c Auto-merging drivers/net/virtio_net.c Auto-merging drivers/net/caif/Makefile Auto-merging drivers/net/caif/Kconfig Auto-merging drivers/lguest/page_tables.c Auto-merging drivers/char/virtio_console.c CONFLICT (content): Merge conflict in drivers/char/virtio_console.c Auto-merging drivers/char/hw_random/virtio-rng.c Auto-merging drivers/Makefile Auto-merging MAINTAINERS CONFLICT (modify/delete): Documentation/virtual/virtio-spec.txt deleted in virtio/virtio-next and modified in HEAD. Version HEAD of Documentation/virtual/virtio-spec.txt left in tree. Automatic merge failed; fix conflicts and then commit the result. $ git rm -f Documentation/virtual/virtio-spec.txt Documentation/virtual/virtio-spec.txt: needs merge rm 'Documentation/virtual/virtio-spec.txt' $ git commit -v -a [master 295f455] Merge remote-tracking branch 'virtio/virtio-next' $ git diff -M --stat --summary HEAD^.. Documentation/virtual/00-INDEX | 3 - Documentation/virtual/virtio-spec.txt | 3210 ------------------------------- MAINTAINERS | 1 + arch/x86/include/asm/lguest.h | 17 +- block/blk-integrity.c | 2 +- block/blk-merge.c | 2 +- drivers/Makefile | 2 +- drivers/block/virtio_blk.c | 148 +- drivers/char/hw_random/virtio-rng.c | 2 +- drivers/char/virtio_console.c | 14 +- drivers/lguest/Kconfig | 5 +- drivers/lguest/core.c | 67 +- drivers/lguest/lg.h | 6 +- drivers/lguest/lguest_user.c | 6 +- drivers/lguest/page_tables.c | 567 +++--- drivers/lguest/x86/core.c | 7 +- drivers/net/caif/Kconfig | 14 + drivers/net/caif/Makefile | 3 + drivers/net/caif/caif_virtio.c | 790 ++++++++ drivers/net/virtio_net.c | 77 +- drivers/rpmsg/virtio_rpmsg_bus.c | 8 +- drivers/scsi/virtio_scsi.c | 487 +++-- drivers/vhost/Kconfig | 8 + drivers/vhost/Kconfig.tcm | 1 + drivers/vhost/Makefile | 2 + drivers/vhost/test.c | 4 +- drivers/vhost/vringh.c | 1007 ++++++++++ drivers/virtio/virtio_balloon.c | 6 +- drivers/virtio/virtio_ring.c | 297 ++- include/linux/scatterlist.h | 16 + include/linux/virtio.h | 20 + include/linux/virtio_caif.h | 24 + include/linux/virtio_ring.h | 57 + include/linux/vringh.h | 225 +++ include/uapi/linux/virtio_balloon.h | 4 +- include/uapi/linux/virtio_ids.h | 1 + net/9p/trans_virtio.c | 48 +- tools/lguest/lguest.txt | 2 +- tools/virtio/Makefile | 10 +- tools/virtio/asm/barrier.h | 14 + tools/virtio/linux/bug.h | 10 + tools/virtio/linux/err.h | 26 + tools/virtio/linux/export.h | 5 + tools/virtio/linux/irqreturn.h | 1 + tools/virtio/linux/kernel.h | 112 ++ tools/virtio/linux/module.h | 1 + tools/virtio/linux/printk.h | 4 + tools/virtio/linux/ratelimit.h | 4 + tools/virtio/linux/scatterlist.h | 189 ++ tools/virtio/linux/types.h | 28 + tools/virtio/linux/uaccess.h | 50 + tools/virtio/linux/uio.h | 3 + tools/virtio/linux/virtio.h | 171 +- tools/virtio/linux/virtio_config.h | 6 + tools/virtio/linux/virtio_ring.h | 1 + tools/virtio/linux/vringh.h | 1 + tools/virtio/uapi/linux/uio.h | 1 + tools/virtio/uapi/linux/virtio_config.h | 1 + tools/virtio/uapi/linux/virtio_ring.h | 4 + tools/virtio/virtio_test.c | 13 +- tools/virtio/vringh_test.c | 741 +++++++ 61 files changed, 4482 insertions(+), 4074 deletions(-) delete mode 100644 Documentation/virtual/virtio-spec.txt create mode 100644 drivers/net/caif/caif_virtio.c create mode 100644 drivers/vhost/vringh.c create mode 100644 include/linux/virtio_caif.h create mode 100644 include/linux/vringh.h create mode 100644 tools/virtio/asm/barrier.h create mode 100644 tools/virtio/linux/bug.h create mode 100644 tools/virtio/linux/err.h create mode 100644 tools/virtio/linux/export.h create mode 100644 tools/virtio/linux/irqreturn.h create mode 100644 tools/virtio/linux/kernel.h create mode 100644 tools/virtio/linux/printk.h create mode 100644 tools/virtio/linux/ratelimit.h create mode 100644 tools/virtio/linux/scatterlist.h create mode 100644 tools/virtio/linux/types.h create mode 100644 tools/virtio/linux/uaccess.h create mode 100644 tools/virtio/linux/uio.h create mode 100644 tools/virtio/linux/virtio_config.h create mode 100644 tools/virtio/linux/virtio_ring.h create mode 100644 tools/virtio/linux/vringh.h create mode 100644 tools/virtio/uapi/linux/uio.h create mode 100644 tools/virtio/uapi/linux/virtio_config.h create mode 100644 tools/virtio/uapi/linux/virtio_ring.h create mode 100644 tools/virtio/vringh_test.c Merging input/next (0c6a616 Input: trackpoint - Optimize trackpoint init to use power-on reset) $ git merge input/next Auto-merging include/linux/device.h Auto-merging drivers/usb/class/cdc-acm.c Auto-merging drivers/tty/sysrq.c Auto-merging arch/arm/mach-shmobile/board-armadillo800eva.c Merge made by the 'recursive' strategy. .../bindings/input/ps2keyb-mouse-apbps2.txt | 16 + .../bindings/input/touchscreen/auo_pixcir_ts.txt | 30 + .../bindings/input/touchscreen/sitronix-st1232.txt | 24 + .../devicetree/bindings/serio/snps-arc_ps2.txt | 16 + arch/arm/mach-shmobile/board-armadillo800eva.c | 7 +- drivers/base/devres.c | 74 + drivers/input/input-mt.c | 8 +- drivers/input/keyboard/amikbd.c | 14 +- drivers/input/keyboard/davinci_keyscan.c | 12 +- drivers/input/keyboard/imx_keypad.c | 77 +- drivers/input/keyboard/nomadik-ske-keypad.c | 12 +- drivers/input/keyboard/tegra-kbc.c | 89 +- drivers/input/misc/Kconfig | 10 + drivers/input/misc/Makefile | 1 + drivers/input/misc/ad714x-i2c.c | 2 +- drivers/input/misc/ad714x-spi.c | 2 +- drivers/input/misc/adxl34x-i2c.c | 2 +- drivers/input/misc/adxl34x-spi.c | 8 +- drivers/input/misc/ims-pcu.c | 1901 ++++++++++++++++++++ drivers/input/misc/mma8450.c | 6 +- drivers/input/misc/twl4030-pwrbutton.c | 12 +- drivers/input/mouse/alps.c | 12 +- drivers/input/mouse/amimouse.c | 14 +- drivers/input/mouse/trackpoint.c | 249 ++- drivers/input/mouse/trackpoint.h | 4 +- drivers/input/serio/Kconfig | 10 + drivers/input/serio/Makefile | 1 + drivers/input/serio/apbps2.c | 228 +++ drivers/input/serio/arc_ps2.c | 14 +- drivers/input/serio/at32psif.c | 13 +- drivers/input/serio/q40kbd.c | 13 +- drivers/input/touchscreen/ad7877.c | 10 +- drivers/input/touchscreen/ads7846.c | 4 +- drivers/input/touchscreen/atmel-wm97xx.c | 12 +- drivers/input/touchscreen/auo-pixcir-ts.c | 226 ++- drivers/input/touchscreen/edt-ft5x06.c | 3 +- drivers/input/touchscreen/eeti_ts.c | 3 +- drivers/input/touchscreen/mc13783_ts.c | 12 +- drivers/input/touchscreen/st1232.c | 77 +- drivers/input/touchscreen/wm9712.c | 28 +- drivers/input/touchscreen/wm97xx-core.c | 11 + drivers/tty/sysrq.c | 53 +- drivers/usb/class/cdc-acm.c | 13 + drivers/usb/class/cdc-acm.h | 1 + include/linux/device.h | 4 + include/linux/input/auo-pixcir-ts.h | 4 +- include/linux/input/mt.h | 1 + include/linux/platform_data/st1232_pdata.h | 13 + include/uapi/linux/input.h | 5 + 49 files changed, 2917 insertions(+), 444 deletions(-) create mode 100644 Documentation/devicetree/bindings/input/ps2keyb-mouse-apbps2.txt create mode 100644 Documentation/devicetree/bindings/input/touchscreen/auo_pixcir_ts.txt create mode 100644 Documentation/devicetree/bindings/input/touchscreen/sitronix-st1232.txt create mode 100644 Documentation/devicetree/bindings/serio/snps-arc_ps2.txt create mode 100644 drivers/input/misc/ims-pcu.c create mode 100644 drivers/input/serio/apbps2.c create mode 100644 include/linux/platform_data/st1232_pdata.h Merging input-mt/for-next (194664e Input: MT - handle semi-mt devices in core) $ git merge input-mt/for-next Merge made by the 'recursive' strategy. Merging cgroup/for-next (2a0010a cpuset: fix compile warning when CONFIG_SMP=n) $ git merge cgroup/for-next Already up-to-date. Merging block/for-next (b5bb021 Merge branch 'for-3.10/core' into for-next) $ git merge block/for-next Recorded preimage for 'include/linux/blk_types.h' Resolved 'drivers/block/drbd/drbd_proc.c' using previous resolution. Auto-merging mm/page_io.c Auto-merging mm/bounce.c Auto-merging kernel/trace/blktrace.c Auto-merging kernel/lockdep.c Auto-merging kernel/fork.c Auto-merging include/trace/events/block.h Auto-merging include/linux/sched.h Auto-merging include/linux/idr.h Auto-merging include/linux/blk_types.h CONFLICT (content): Merge conflict in include/linux/blk_types.h Auto-merging fs/gfs2/lops.c Auto-merging fs/direct-io.c Auto-merging fs/buffer.c Auto-merging fs/block_dev.c Auto-merging fs/bio.c Auto-merging drivers/scsi/libsas/sas_expander.c Auto-merging drivers/message/fusion/mptsas.c Auto-merging drivers/md/raid5.c Auto-merging drivers/md/raid10.c Auto-merging drivers/md/raid1.c Auto-merging drivers/md/md.c Auto-merging drivers/block/rbd.c Auto-merging drivers/block/pktcdvd.c Auto-merging drivers/block/drbd/drbd_receiver.c Auto-merging drivers/block/drbd/drbd_proc.c CONFLICT (content): Merge conflict in drivers/block/drbd/drbd_proc.c Auto-merging drivers/block/cciss.c Auto-merging drivers/block/aoe/aoecmd.c Auto-merging block/blk-core.c Auto-merging MAINTAINERS Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'include/linux/blk_types.h'. [master 3a16919] Merge remote-tracking branch 'block/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/sysfs-block-bcache | 156 ++ Documentation/bcache.txt | 431 +++++ Documentation/block/cfq-iosched.txt | 47 +- MAINTAINERS | 7 + block/blk-cgroup.c | 4 +- block/blk-core.c | 265 ++- block/cfq-iosched.c | 7 +- block/deadline-iosched.c | 2 +- block/elevator.c | 26 + block/partitions/efi.c | 4 +- drivers/block/aoe/aoecmd.c | 6 +- drivers/block/brd.c | 3 +- drivers/block/cciss.c | 22 +- drivers/block/drbd/drbd_actlog.c | 246 ++- drivers/block/drbd/drbd_bitmap.c | 13 +- drivers/block/drbd/drbd_int.h | 179 +- drivers/block/drbd/drbd_main.c | 251 ++- drivers/block/drbd/drbd_nl.c | 200 +- drivers/block/drbd/drbd_proc.c | 10 +- drivers/block/drbd/drbd_receiver.c | 16 +- drivers/block/drbd/drbd_req.c | 192 +- drivers/block/drbd/drbd_req.h | 8 + drivers/block/drbd/drbd_state.c | 28 +- drivers/block/drbd/drbd_strings.c | 1 + drivers/block/drbd/drbd_worker.c | 24 +- drivers/block/floppy.c | 1 - drivers/block/mg_disk.c | 2 + drivers/block/mtip32xx/mtip32xx.c | 79 +- drivers/block/mtip32xx/mtip32xx.h | 11 + drivers/block/pktcdvd.c | 102 +- drivers/block/rbd.c | 2 +- drivers/char/random.c | 1 + drivers/md/Kconfig | 2 + drivers/md/Makefile | 1 + drivers/md/bcache/Kconfig | 42 + drivers/md/bcache/Makefile | 7 + drivers/md/bcache/alloc.c | 573 ++++++ drivers/md/bcache/bcache.h | 1232 +++++++++++++ drivers/md/bcache/bset.c | 1192 ++++++++++++ drivers/md/bcache/bset.h | 379 ++++ drivers/md/bcache/btree.c | 2504 ++++++++++++++++++++++++++ drivers/md/bcache/btree.h | 405 +++++ drivers/md/bcache/closure.c | 345 ++++ drivers/md/bcache/closure.h | 672 +++++++ drivers/md/bcache/debug.c | 565 ++++++ drivers/md/bcache/debug.h | 54 + drivers/md/bcache/io.c | 390 ++++ drivers/md/bcache/journal.c | 787 ++++++++ drivers/md/bcache/journal.h | 215 +++ drivers/md/bcache/movinggc.c | 254 +++ drivers/md/bcache/request.c | 1411 +++++++++++++++ drivers/md/bcache/request.h | 62 + drivers/md/bcache/stats.c | 246 +++ drivers/md/bcache/stats.h | 58 + drivers/md/bcache/super.c | 1945 ++++++++++++++++++++ drivers/md/bcache/sysfs.c | 817 +++++++++ drivers/md/bcache/sysfs.h | 110 ++ drivers/md/bcache/trace.c | 26 + drivers/md/bcache/util.c | 377 ++++ drivers/md/bcache/util.h | 589 ++++++ drivers/md/bcache/writeback.c | 414 +++++ drivers/md/dm-crypt.c | 3 +- drivers/md/dm-raid1.c | 2 +- drivers/md/dm-stripe.c | 2 +- drivers/md/dm-verity.c | 4 +- drivers/md/faulty.c | 6 +- drivers/md/linear.c | 3 +- drivers/md/md.c | 17 +- drivers/md/raid0.c | 9 +- drivers/md/raid1.c | 133 +- drivers/md/raid10.c | 78 +- drivers/md/raid5.c | 49 +- drivers/message/fusion/mptsas.c | 6 +- drivers/s390/block/dcssblk.c | 3 +- drivers/scsi/libsas/sas_expander.c | 6 +- drivers/scsi/mpt2sas/mpt2sas_transport.c | 10 +- fs/bio-integrity.c | 144 +- fs/bio.c | 366 +++- fs/block_dev.c | 2 +- fs/btrfs/extent_io.c | 3 +- fs/btrfs/volumes.c | 2 +- fs/buffer.c | 1 - fs/direct-io.c | 8 +- fs/exofs/ore.c | 2 +- fs/exofs/ore_raid.c | 2 +- fs/fs-writeback.c | 102 +- fs/gfs2/lops.c | 2 +- fs/jfs/jfs_logmgr.c | 2 - fs/logfs/dev_bdev.c | 5 - include/linux/backing-dev.h | 16 +- include/linux/bio.h | 115 +- include/linux/blk_types.h | 5 + include/linux/blkdev.h | 29 +- include/linux/cgroup_subsys.h | 6 + include/linux/drbd.h | 5 +- include/linux/drbd_limits.h | 11 +- include/linux/idr.h | 10 +- include/linux/lru_cache.h | 1 + include/linux/rwsem.h | 10 + include/linux/sched.h | 4 + include/trace/events/bcache.h | 271 +++ include/trace/events/block.h | 12 +- include/trace/events/writeback.h | 5 - kernel/fork.c | 4 + kernel/lockdep.c | 1 + kernel/relay.c | 2 +- kernel/rwsem.c | 16 + kernel/trace/blktrace.c | 1 + lib/lru_cache.c | 56 +- mm/backing-dev.c | 259 +-- mm/bounce.c | 75 +- mm/page_io.c | 1 - 112 files changed, 18580 insertions(+), 1327 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-block-bcache create mode 100644 Documentation/bcache.txt create mode 100644 drivers/md/bcache/Kconfig create mode 100644 drivers/md/bcache/Makefile create mode 100644 drivers/md/bcache/alloc.c create mode 100644 drivers/md/bcache/bcache.h create mode 100644 drivers/md/bcache/bset.c create mode 100644 drivers/md/bcache/bset.h create mode 100644 drivers/md/bcache/btree.c create mode 100644 drivers/md/bcache/btree.h create mode 100644 drivers/md/bcache/closure.c create mode 100644 drivers/md/bcache/closure.h create mode 100644 drivers/md/bcache/debug.c create mode 100644 drivers/md/bcache/debug.h create mode 100644 drivers/md/bcache/io.c create mode 100644 drivers/md/bcache/journal.c create mode 100644 drivers/md/bcache/journal.h create mode 100644 drivers/md/bcache/movinggc.c create mode 100644 drivers/md/bcache/request.c create mode 100644 drivers/md/bcache/request.h create mode 100644 drivers/md/bcache/stats.c create mode 100644 drivers/md/bcache/stats.h create mode 100644 drivers/md/bcache/super.c create mode 100644 drivers/md/bcache/sysfs.c create mode 100644 drivers/md/bcache/sysfs.h create mode 100644 drivers/md/bcache/trace.c create mode 100644 drivers/md/bcache/util.c create mode 100644 drivers/md/bcache/util.h create mode 100644 drivers/md/bcache/writeback.c create mode 100644 include/trace/events/bcache.h Merging device-mapper/master (f8efabf This patch uses memalloc_noio_save to avoid a possible deadlock in dm-bufio. (it could happen only with large block size, at most PAGE_SIZE << MAX_ORDER (typically 8MiB).) $ git merge device-mapper/master Merge made by the 'recursive' strategy. drivers/md/dm-bufio.c | 24 +++++++++++++++++++++++- drivers/md/dm-cache-policy.h | 4 ++-- drivers/md/dm-cache-target.c | 1 + drivers/md/dm-snap.c | 1 + 4 files changed, 27 insertions(+), 3 deletions(-) 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 (e4404fa mmc: sdhci-tegra: fix MODULE_DEVICE_TABLE) $ git merge mmc/mmc-next Auto-merging drivers/mmc/core/core.c Auto-merging arch/powerpc/boot/dts/mpc5121.dtsi Auto-merging arch/avr32/configs/favr-32_defconfig Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. .../devicetree/bindings/mmc/fsl-imx-mmc.txt | 24 ++ .../devicetree/bindings/mmc/samsung-sdhci.txt | 35 +-- .../devicetree/bindings/mmc/sdhci-sirf.txt | 18 ++ Documentation/mmc/mmc-dev-attrs.txt | 1 + MAINTAINERS | 1 + arch/arm/boot/dts/tegra20-colibri-512.dtsi | 2 +- arch/arm/boot/dts/tegra20-harmony.dts | 4 +- arch/arm/boot/dts/tegra20-paz00.dts | 2 +- arch/arm/boot/dts/tegra20-seaboard.dts | 2 +- arch/arm/boot/dts/tegra20-tamonten.dtsi | 2 +- arch/arm/boot/dts/tegra20-trimslice.dts | 2 +- arch/arm/boot/dts/tegra20-ventana.dts | 2 +- arch/arm/boot/dts/tegra20-whistler.dts | 1 + arch/arm/boot/dts/tegra30-beaver.dts | 2 +- arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +- arch/arm/configs/at91sam9g45_defconfig | 1 - arch/avr32/configs/favr-32_defconfig | 1 - arch/avr32/configs/merisc_defconfig | 1 - arch/powerpc/boot/dts/mpc5121.dtsi | 2 + drivers/mmc/card/block.c | 10 +- drivers/mmc/card/queue.c | 3 - drivers/mmc/card/queue.h | 2 + drivers/mmc/core/core.c | 18 +- drivers/mmc/core/mmc.c | 5 +- drivers/mmc/core/sdio.c | 4 +- drivers/mmc/core/sdio_bus.c | 23 +- drivers/mmc/host/Kconfig | 31 +-- drivers/mmc/host/Makefile | 1 + drivers/mmc/host/android-goldfish.c | 2 +- drivers/mmc/host/atmel-mci.c | 16 +- drivers/mmc/host/davinci_mmc.c | 23 +- drivers/mmc/host/dw_mmc-exynos.c | 54 +--- drivers/mmc/host/dw_mmc.c | 153 ++++++----- drivers/mmc/host/dw_mmc.h | 3 - drivers/mmc/host/mvsdio.c | 54 ++-- drivers/mmc/host/mxcmmc.c | 296 +++++++++++++++------ drivers/mmc/host/mxs-mmc.c | 15 +- drivers/mmc/host/omap_hsmmc.c | 14 +- drivers/mmc/host/rtsx_pci_sdmmc.c | 10 + drivers/mmc/host/sdhci-acpi.c | 2 + drivers/mmc/host/sdhci-bcm2835.c | 4 +- drivers/mmc/host/sdhci-cns3xxx.c | 4 +- drivers/mmc/host/sdhci-dove.c | 4 +- drivers/mmc/host/sdhci-esdhc-imx.c | 4 +- drivers/mmc/host/sdhci-of-esdhc.c | 4 +- drivers/mmc/host/sdhci-of-hlwd.c | 4 +- drivers/mmc/host/sdhci-pci.c | 4 +- drivers/mmc/host/sdhci-pltfm.c | 7 +- drivers/mmc/host/sdhci-pltfm.h | 6 +- drivers/mmc/host/sdhci-pxav2.c | 2 +- drivers/mmc/host/sdhci-pxav3.c | 49 ++-- drivers/mmc/host/sdhci-s3c.c | 88 +----- drivers/mmc/host/sdhci-sirf.c | 193 ++++++++++++++ drivers/mmc/host/sdhci-spear.c | 4 +- drivers/mmc/host/sdhci-tegra.c | 124 ++------- drivers/mmc/host/sdhci.c | 39 ++- drivers/mmc/host/wmt-sdmmc.c | 4 +- include/linux/mmc/card.h | 1 + include/linux/mmc/host.h | 3 + 59 files changed, 835 insertions(+), 557 deletions(-) create mode 100644 Documentation/devicetree/bindings/mmc/fsl-imx-mmc.txt create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-sirf.txt create mode 100644 drivers/mmc/host/sdhci-sirf.c Merging kgdb/kgdb-next (6bedf31 kdb: Remove unhandled ssb command) $ git merge kgdb/kgdb-next Merge made by the 'recursive' strategy. Merging slab/for-next (7cccd80 slub: tid must be retrieved from the percpu area of the current processor) $ git merge slab/for-next Auto-merging mm/slub.c Auto-merging mm/slab.c Removing include/linux/kmalloc_sizes.h Merge made by the 'recursive' strategy. fs/proc/stat.c | 2 +- include/linux/kmalloc_sizes.h | 45 --- include/linux/slab.h | 231 +++++++++---- include/linux/slab_def.h | 48 +-- include/linux/slub_def.h | 136 +------- mm/slab.c | 789 ++++++++++++++++++------------------------ mm/slab.h | 43 ++- mm/slab_common.c | 165 ++++++++- mm/slub.c | 221 +++--------- 9 files changed, 765 insertions(+), 915 deletions(-) delete mode 100644 include/linux/kmalloc_sizes.h Merging uclinux/for-next (6dbe51c Linux 3.9-rc1) $ git merge uclinux/for-next Already up-to-date. Merging md/for-next (1fef8be raid5: make release_stripe lockless) $ git merge md/for-next Auto-merging drivers/md/raid5.c Auto-merging drivers/md/md.c Merge made by the 'recursive' strategy. drivers/md/md.c | 8 +- drivers/md/md.h | 8 + drivers/md/raid5.c | 458 ++++++++++++++++++++++++++++++++++++++++++++++++++--- drivers/md/raid5.h | 22 +++ 4 files changed, 469 insertions(+), 27 deletions(-) Merging mfd/master (99f4c6b mfd: si476x: Don't use 0bNNN) $ git merge mfd/master Resolved 'arch/arm/mach-ux500/cpuidle.c' using previous resolution. Resolved 'drivers/mfd/Kconfig' using previous resolution. Auto-merging include/linux/of.h Auto-merging include/linux/mfd/palmas.h Auto-merging include/linux/mfd/arizona/pdata.h Auto-merging include/linux/mfd/abx500/ab8500.h Auto-merging drivers/power/pm2301_charger.c Auto-merging drivers/power/Kconfig Auto-merging drivers/mfd/wm5102-tables.c Auto-merging drivers/mfd/Kconfig CONFLICT (content): Merge conflict in drivers/mfd/Kconfig Auto-merging arch/arm/mach-ux500/cpuidle.c CONFLICT (content): Merge conflict in arch/arm/mach-ux500/cpuidle.c Auto-merging arch/arm/mach-ux500/cpu.c Auto-merging arch/arm/mach-ux500/cpu-db8500.c Auto-merging arch/arm/mach-ux500/board-mop500.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 410b5fb] Merge remote-tracking branch 'mfd/master' $ git diff -M --stat --summary HEAD^.. .../devicetree/bindings/input/cros-ec-keyb.txt | 72 + Documentation/devicetree/bindings/mfd/as3711.txt | 73 + Documentation/devicetree/bindings/mfd/cros-ec.txt | 56 + .../devicetree/bindings/mfd/omap-usb-host.txt | 80 + .../devicetree/bindings/mfd/omap-usb-tll.txt | 17 + Documentation/devicetree/bindings/sound/wm8994.txt | 58 +- arch/arm/mach-imx/Kconfig | 2 - arch/arm/mach-s3c64xx/Kconfig | 3 - arch/arm/mach-s3c64xx/mach-crag6410-module.c | 4 +- arch/arm/mach-ux500/Makefile | 2 +- arch/arm/mach-ux500/board-mop500.c | 58 - arch/arm/mach-ux500/cpu-db8500.c | 2 - arch/arm/mach-ux500/cpu.c | 21 +- arch/arm/mach-ux500/cpuidle.c | 3 +- arch/arm/mach-ux500/devices-db8500.c | 2 + arch/arm/mach-ux500/include/mach/hardware.h | 2 - arch/arm/mach-ux500/include/mach/irqs-db8500.h | 25 - arch/arm/mach-ux500/pm.c | 167 ++ drivers/gpio/gpio-ucb1400.c | 19 +- drivers/input/keyboard/Kconfig | 12 + drivers/input/keyboard/Makefile | 1 + drivers/input/keyboard/cros_ec_keyb.c | 334 +++ drivers/input/keyboard/lpc32xx-keys.c | 11 +- drivers/input/keyboard/omap4-keypad.c | 16 +- drivers/input/keyboard/tca8418_keypad.c | 7 +- drivers/input/matrix-keymap.c | 20 + drivers/mfd/88pm860x-core.c | 12 +- drivers/mfd/Kconfig | 1620 ++++++------- drivers/mfd/Makefile | 9 +- drivers/mfd/aat2870-core.c | 20 +- drivers/mfd/ab3100-otp.c | 14 +- drivers/mfd/ab8500-core.c | 572 +++-- drivers/mfd/ab8500-debugfs.c | 2559 +++++++++++++++----- drivers/mfd/ab8500-gpadc.c | 561 ++++- drivers/mfd/ab8500-sysctrl.c | 100 +- drivers/mfd/adp5520.c | 20 +- drivers/mfd/arizona-core.c | 267 +- drivers/mfd/arizona-irq.c | 106 +- drivers/mfd/arizona-spi.c | 2 +- drivers/mfd/as3711.c | 27 +- drivers/mfd/cros_ec.c | 196 ++ drivers/mfd/cros_ec_i2c.c | 201 ++ drivers/mfd/cros_ec_spi.c | 375 +++ drivers/mfd/da903x.c | 19 +- drivers/mfd/da9052-spi.c | 4 +- drivers/mfd/da9055-core.c | 2 +- drivers/mfd/davinci_voicecodec.c | 12 +- drivers/mfd/db8500-prcmu.c | 388 +-- drivers/mfd/dbx500-prcmu-regs.h | 204 +- drivers/mfd/ezx-pcap.c | 21 +- drivers/mfd/htc-pasic3.c | 13 +- drivers/mfd/intel_msic.c | 10 +- drivers/mfd/lm3533-core.c | 8 +- drivers/mfd/max77686.c | 2 +- drivers/mfd/mc13xxx-spi.c | 6 +- drivers/mfd/omap-usb-host.c | 209 +- drivers/mfd/omap-usb-tll.c | 219 +- drivers/mfd/omap-usb.h | 5 +- drivers/mfd/palmas.c | 7 +- drivers/mfd/retu-mfd.c | 85 +- drivers/mfd/rts5249.c | 241 ++ drivers/mfd/rtsx_pcr.c | 11 +- drivers/mfd/rtsx_pcr.h | 1 + drivers/mfd/si476x-cmd.c | 1553 ++++++++++++ drivers/mfd/si476x-i2c.c | 886 +++++++ drivers/mfd/si476x-prop.c | 241 ++ drivers/mfd/sta2x11-mfd.c | 11 - drivers/mfd/stmpe-i2c.c | 1 + drivers/mfd/stmpe-spi.c | 2 +- drivers/mfd/stmpe.c | 105 +- drivers/mfd/stmpe.h | 49 + drivers/mfd/syscon.c | 80 +- drivers/mfd/tc3589x.c | 21 +- drivers/mfd/tps65090.c | 11 + drivers/mfd/twl4030-madc.c | 14 +- drivers/mfd/twl6040.c | 31 +- drivers/mfd/ucb1400_core.c | 5 + drivers/mfd/vexpress-config.c | 35 +- drivers/mfd/vexpress-sysreg.c | 4 +- drivers/mfd/wm5102-tables.c | 56 +- drivers/mfd/wm831x-spi.c | 6 +- drivers/mfd/wm8994-core.c | 88 +- drivers/power/Kconfig | 7 - drivers/power/Makefile | 3 +- drivers/power/ab8500_bmdata.c | 96 +- drivers/power/ab8500_btemp.c | 75 +- drivers/power/ab8500_charger.c | 699 ++++-- drivers/power/ab8500_fg.c | 497 +++- drivers/power/abx500_chargalg.c | 455 +++- drivers/power/pm2301_charger.c | 371 ++- drivers/power/pm2301_charger.h | 23 +- drivers/power/rx51_battery.c | 1 + include/linux/i2c/twl4030-madc.h | 2 + include/linux/input/matrix_keypad.h | 19 + include/linux/mfd/abx500.h | 21 +- include/linux/mfd/abx500/ab8500-bm.h | 60 +- include/linux/mfd/abx500/ab8500-gpadc.h | 74 +- include/linux/mfd/abx500/ab8500-sysctrl.h | 6 + include/linux/mfd/abx500/ab8500.h | 3 + include/linux/mfd/abx500/ux500_chargalg.h | 7 + include/linux/mfd/arizona/pdata.h | 7 +- include/linux/mfd/cros_ec.h | 170 ++ include/linux/mfd/cros_ec_commands.h | 1369 +++++++++++ include/linux/mfd/db8500-prcmu.h | 10 +- include/linux/mfd/dbx500-prcmu.h | 38 +- include/linux/mfd/palmas.h | 12 +- include/linux/mfd/retu.h | 8 +- include/linux/mfd/rtsx_pci.h | 36 + include/linux/mfd/si476x-core.h | 533 ++++ include/linux/mfd/si476x-platform.h | 267 ++ include/linux/mfd/si476x-reports.h | 163 ++ include/linux/mfd/stmpe.h | 3 + include/linux/mfd/syscon.h | 3 + include/linux/mfd/tps65090.h | 1 + include/linux/of.h | 5 + include/linux/platform_data/arm-ux500-pm.h | 21 + include/linux/pm2301_charger.h | 2 +- include/linux/ucb1400.h | 18 +- 118 files changed, 14332 insertions(+), 3147 deletions(-) create mode 100644 Documentation/devicetree/bindings/input/cros-ec-keyb.txt create mode 100644 Documentation/devicetree/bindings/mfd/as3711.txt create mode 100644 Documentation/devicetree/bindings/mfd/cros-ec.txt create mode 100644 Documentation/devicetree/bindings/mfd/omap-usb-host.txt create mode 100644 Documentation/devicetree/bindings/mfd/omap-usb-tll.txt create mode 100644 arch/arm/mach-ux500/pm.c create mode 100644 drivers/input/keyboard/cros_ec_keyb.c create mode 100644 drivers/mfd/cros_ec.c create mode 100644 drivers/mfd/cros_ec_i2c.c create mode 100644 drivers/mfd/cros_ec_spi.c create mode 100644 drivers/mfd/rts5249.c create mode 100644 drivers/mfd/si476x-cmd.c create mode 100644 drivers/mfd/si476x-i2c.c create mode 100644 drivers/mfd/si476x-prop.c create mode 100644 include/linux/mfd/cros_ec.h create mode 100644 include/linux/mfd/cros_ec_commands.h create mode 100644 include/linux/mfd/si476x-core.h create mode 100644 include/linux/mfd/si476x-platform.h create mode 100644 include/linux/mfd/si476x-reports.h create mode 100644 include/linux/platform_data/arm-ux500-pm.h Merging battery/master (6b17080 pm2301-charger: Fix suspend/resume) $ git merge battery/master Auto-merging include/linux/mfd/tps65090.h Auto-merging drivers/power/rx51_battery.c Auto-merging drivers/power/reset/vexpress-poweroff.c Auto-merging drivers/power/pm2301_charger.c Auto-merging drivers/power/Kconfig Auto-merging drivers/hwmon/Makefile Auto-merging drivers/hwmon/Kconfig Auto-merging arch/arm/mach-vexpress/v2m.c Merge made by the 'recursive' strategy. .../bindings/power_supply/power_supply.txt | 23 + .../devicetree/bindings/power_supply/tps65090.txt | 17 + Documentation/hwmon/ab8500 | 22 + Documentation/hwmon/abx500 | 28 ++ arch/arm/mach-vexpress/Kconfig | 3 + arch/arm/mach-vexpress/Makefile | 2 +- arch/arm/mach-vexpress/v2m.c | 5 - drivers/hwmon/Kconfig | 13 + drivers/hwmon/Makefile | 1 + drivers/hwmon/ab8500.c | 206 +++++++++ drivers/hwmon/abx500.c | 491 +++++++++++++++++++++ drivers/hwmon/abx500.h | 69 +++ drivers/power/88pm860x_charger.c | 2 - drivers/power/Kconfig | 7 + drivers/power/Makefile | 1 + drivers/power/ab8500_bmdata.c | 44 +- drivers/power/ab8500_btemp.c | 5 +- drivers/power/ab8500_fg.c | 4 +- drivers/power/charger-manager.c | 3 +- drivers/power/da9030_battery.c | 6 +- drivers/power/da9052-battery.c | 5 +- drivers/power/ds2760_battery.c | 4 +- drivers/power/ds2780_battery.c | 7 +- drivers/power/ds2782_battery.c | 23 +- drivers/power/goldfish_battery.c | 2 +- drivers/power/gpio-charger.c | 5 +- drivers/power/isp1704_charger.c | 5 +- drivers/power/lp8788-charger.c | 8 +- drivers/power/max17040_battery.c | 20 +- drivers/power/max8903_charger.c | 4 +- drivers/power/max8925_power.c | 5 +- drivers/power/max8997_charger.c | 9 +- drivers/power/max8998_charger.c | 5 +- drivers/power/pcf50633-charger.c | 7 +- drivers/power/pm2301_charger.c | 26 +- drivers/power/power_supply_core.c | 187 +++++++- drivers/power/reset/Kconfig | 7 + drivers/power/reset/Makefile | 3 +- .../power/reset/vexpress-poweroff.c | 9 +- drivers/power/rx51_battery.c | 8 +- drivers/power/s3c_adc_battery.c | 7 +- drivers/power/sbs-battery.c | 22 +- drivers/power/test_power.c | 31 +- drivers/power/tps65090-charger.c | 320 ++++++++++++++ drivers/power/twl4030_charger.c | 12 +- drivers/power/wm831x_backup.c | 10 +- include/linux/mfd/abx500.h | 6 +- include/linux/mfd/abx500/ab8500-bm.h | 1 + include/linux/mfd/tps65090.h | 5 + include/linux/power/ab8500.h | 16 + include/linux/power_supply.h | 6 + include/linux/vexpress.h | 3 - 52 files changed, 1562 insertions(+), 178 deletions(-) create mode 100644 Documentation/devicetree/bindings/power_supply/power_supply.txt create mode 100644 Documentation/devicetree/bindings/power_supply/tps65090.txt create mode 100644 Documentation/hwmon/ab8500 create mode 100644 Documentation/hwmon/abx500 create mode 100644 drivers/hwmon/ab8500.c create mode 100644 drivers/hwmon/abx500.c create mode 100644 drivers/hwmon/abx500.h rename arch/arm/mach-vexpress/reset.c => drivers/power/reset/vexpress-poweroff.c (93%) create mode 100644 drivers/power/tps65090-charger.c create mode 100644 include/linux/power/ab8500.h Merging fbdev/fbdev-next (a49f0d1 Linux 3.8-rc1) $ git merge fbdev/fbdev-next Already up-to-date. 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 (e72b753 fbdev/ps3fb: fix compile warning) $ git merge omap_dss2/for-next Merge made by the 'recursive' strategy. drivers/video/ps3fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Merging regulator/for-next (bee5465 Merge remote-tracking branch 'regulator/topic/wm8994' into v3.9-rc8) $ git merge regulator/for-next Already up-to-date. Merging security/next (b7ae9f0 Merge branch 'tpmdd-04-17-13' of git://github.com/shpedoikal/linux into my-next) $ git merge security/next Auto-merging security/selinux/hooks.c Auto-merging security/security.c Auto-merging security/capability.c Auto-merging include/linux/security.h Auto-merging fs/nfs/super.c Merge made by the 'recursive' strategy. .../devicetree/bindings/i2c/trivial-devices.txt | 2 + Documentation/security/Smack.txt | 11 + drivers/char/tpm/tpm.c | 31 ++- drivers/char/tpm/tpm.h | 3 + drivers/char/tpm/tpm_i2c_infineon.c | 180 +++++++++++---- drivers/char/tpm/tpm_i2c_stm_st33.c | 64 +++--- drivers/char/tpm/tpm_ppi.c | 14 +- fs/nfs/super.c | 3 +- include/linux/security.h | 10 +- include/uapi/linux/magic.h | 1 + kernel/seccomp.c | 2 + security/capability.c | 3 +- security/integrity/ima/ima_main.c | 14 +- security/security.c | 4 +- security/selinux/hooks.c | 39 +++- security/smack/smack.h | 5 - security/smack/smack_access.c | 2 + security/smack/smack_lsm.c | 4 +- security/smack/smackfs.c | 254 ++++++++++++++------- security/tomoyo/tomoyo.c | 5 +- 20 files changed, 450 insertions(+), 201 deletions(-) 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 (69c6612 watchdog: Fix race condition in registration code) $ git merge watchdog/master Merge made by the 'recursive' strategy. drivers/watchdog/ath79_wdt.c | 8 +++----- drivers/watchdog/davinci_wdt.c | 9 ++++----- drivers/watchdog/s3c2410_wdt.c | 7 +++---- drivers/watchdog/shwdt.c | 7 ++++--- drivers/watchdog/watchdog_dev.c | 3 ++- 5 files changed, 16 insertions(+), 18 deletions(-) Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables before creating superpage) $ git merge dwmw2-iommu/master Already up-to-date. Merging iommu/next (d4df35e2 Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'ppc/pamu' and 'core' into next) $ git merge iommu/next Auto-merging drivers/iommu/dmar.c Auto-merging drivers/iommu/amd_iommu_types.h Auto-merging drivers/iommu/amd_iommu_init.c Auto-merging drivers/iommu/amd_iommu.c Auto-merging Documentation/kernel-parameters.txt Merge made by the 'recursive' strategy. Documentation/kernel-parameters.txt | 14 ++++ arch/x86/include/asm/irq_remapping.h | 9 ++ arch/x86/kernel/early-quirks.c | 20 +++++ drivers/iommu/amd_iommu.c | 145 +++++++++++++++------------------ drivers/iommu/amd_iommu_init.c | 154 +++++++++++++++++++++++++++++++---- drivers/iommu/amd_iommu_types.h | 2 + drivers/iommu/dmar.c | 23 ++++-- drivers/iommu/exynos-iommu.c | 2 +- drivers/iommu/intel-iommu.c | 24 ++++-- drivers/iommu/intel_irq_remapping.c | 10 +++ drivers/iommu/iommu.c | 37 ++++++++- drivers/iommu/irq_remapping.c | 6 ++ drivers/iommu/irq_remapping.h | 2 + drivers/iommu/msm_iommu.c | 2 +- drivers/iommu/omap-iommu.c | 2 +- drivers/iommu/pci.h | 29 +++++++ drivers/iommu/shmobile-iommu.c | 2 +- drivers/iommu/tegra-gart.c | 2 +- drivers/iommu/tegra-smmu.c | 2 +- include/linux/iommu.h | 18 ++-- 20 files changed, 376 insertions(+), 129 deletions(-) create mode 100644 drivers/iommu/pci.h Merging vfio/next (0b43c08 vfio: Use down_reads to protect iommu disconnects) $ git merge vfio/next Auto-merging drivers/vfio/pci/vfio_pci_intrs.c Auto-merging drivers/vfio/pci/vfio_pci_config.c Auto-merging drivers/vfio/pci/vfio_pci.c Merge made by the 'recursive' strategy. drivers/vfio/pci/vfio_pci.c | 44 ++++++++- drivers/vfio/pci/vfio_pci_config.c | 172 ++++++++++++++++++++---------------- drivers/vfio/pci/vfio_pci_intrs.c | 67 +++++++++++++- drivers/vfio/pci/vfio_pci_private.h | 1 + drivers/vfio/vfio.c | 113 +++++++++++++++++------ include/linux/vfio.h | 3 + include/uapi/linux/vfio.h | 1 + 7 files changed, 294 insertions(+), 107 deletions(-) Merging osd/linux-next (861d666 exofs: don't leak io_state and pages on read error) $ 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 (071361d mm: Convert print_symbol to %pSR) $ 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 fsnotify/for-next (1ca39ab inotify: automatically restart syscalls) $ git merge fsnotify/for-next Already up-to-date. Merging edac/linux_next (de4772c edac: sb_edac.c should not require prescence of IMC_DDRIO device) $ git merge edac/linux_next Already up-to-date. Merging edac-amd/for-next (9713fae EDAC: Merge mci.mem_is_per_rank with mci.csbased) $ git merge edac-amd/for-next Already up-to-date. Merging devicetree/devicetree/next (d347bc5 Merge branch 'robherring/for-next' from git://sources.calxeda.com/kernel/linux.git) $ git merge devicetree/devicetree/next Auto-merging scripts/Makefile.lib Auto-merging drivers/of/base.c Merge made by the 'recursive' strategy. .../{drm/exynos/hdmi.txt => video/exynos_hdmi.txt} | 0 .../hdmiddc.txt => video/exynos_hdmiddc.txt} | 0 .../hdmiphy.txt => video/exynos_hdmiphy.txt} | 0 .../exynos/mixer.txt => video/exynos_mixer.txt} | 0 arch/arm/boot/dts/include/dt-bindings | 1 + drivers/of/base.c | 4 +- include/dt-bindings/gpio/gpio.h | 15 ++++ include/dt-bindings/interrupt-controller/arm-gic.h | 22 +++++ include/dt-bindings/interrupt-controller/irq.h | 19 +++++ include/linux/of_platform.h | 5 +- scripts/Makefile.lib | 17 ++-- scripts/basic/fixdep.c | 93 ++++++++++++++-------- 12 files changed, 130 insertions(+), 46 deletions(-) rename Documentation/devicetree/bindings/{drm/exynos/hdmi.txt => video/exynos_hdmi.txt} (100%) rename Documentation/devicetree/bindings/{drm/exynos/hdmiddc.txt => video/exynos_hdmiddc.txt} (100%) rename Documentation/devicetree/bindings/{drm/exynos/hdmiphy.txt => video/exynos_hdmiphy.txt} (100%) rename Documentation/devicetree/bindings/{drm/exynos/mixer.txt => video/exynos_mixer.txt} (100%) create mode 120000 arch/arm/boot/dts/include/dt-bindings create mode 100644 include/dt-bindings/gpio/gpio.h create mode 100644 include/dt-bindings/interrupt-controller/arm-gic.h create mode 100644 include/dt-bindings/interrupt-controller/irq.h Merging dt-rh/for-next (a2b9ea7 Documentation/devicetree: make semantic of initrd-end more explicit) $ git merge dt-rh/for-next Merge made by the 'recursive' strategy. Documentation/devicetree/usage-model.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) Merging spi/spi/next (00ab539 spi/s3c64xx: let device core setup the default pin configuration) $ git merge spi/spi/next Already up-to-date. Merging spi-mb/for-next (cd8d984 spi-topcliff-pch: fix to use list_for_each_entry_safe() when delete list items) $ git merge spi-mb/for-next Already up-to-date. Merging tip/auto-latest (979830a Merge branch 'x86/urgent') $ git merge tip/auto-latest Auto-merging kernel/sched/core.c Auto-merging kernel/rcutree.c Auto-merging kernel/printk.c Auto-merging kernel/events/core.c Auto-merging init/main.c Auto-merging include/trace/events/timer.h Auto-merging include/linux/sched.h Auto-merging fs/Makefile CONFLICT (modify/delete): drivers/firmware/efivars.c deleted in tip/auto-latest and modified in HEAD. Version HEAD of drivers/firmware/efivars.c left in tree. Auto-merging arch/x86/platform/efi/efi.c Auto-merging arch/ia64/Kconfig Auto-merging MAINTAINERS Auto-merging Documentation/kernel-parameters.txt Auto-merging Documentation/cpu-freq/governors.txt Automatic merge failed; fix conflicts and then commit the result. $ git rm -f drivers/firmware/efivars.c drivers/firmware/efivars.c: needs merge rm 'drivers/firmware/efivars.c' $ git commit -v -a [master 74860a1] Merge remote-tracking branch 'tip/auto-latest' $ git diff -M --stat --summary HEAD^.. Documentation/RCU/stallwarn.txt | 2 +- Documentation/cpu-freq/governors.txt | 4 +- Documentation/kernel-parameters.txt | 8 + Documentation/kernel-per-CPU-kthreads.txt | 202 +++ Documentation/timers/NO_HZ.txt | 273 ++++ MAINTAINERS | 13 +- arch/ia64/Kconfig | 1 + arch/um/include/shared/common-offsets.h | 4 +- arch/um/os-Linux/time.c | 2 +- arch/x86/Kconfig | 39 + arch/x86/kernel/cpu/perf_event_intel_uncore.c | 19 +- arch/x86/kernel/irq.c | 4 - arch/x86/platform/efi/efi.c | 19 +- drivers/firmware/Kconfig | 37 +- drivers/firmware/Makefile | 2 +- drivers/firmware/efi/Kconfig | 39 + drivers/firmware/efi/Makefile | 6 + drivers/firmware/efi/efi-pstore.c | 245 +++ drivers/firmware/efi/efi.c | 134 ++ drivers/firmware/efi/efivars.c | 618 ++++++++ drivers/firmware/efi/vars.c | 1038 ++++++++++++ drivers/firmware/efivars.c | 2118 ------------------------- drivers/firmware/google/gsmi.c | 30 +- fs/Kconfig | 1 + fs/Makefile | 1 + fs/efivarfs/Kconfig | 12 + fs/efivarfs/Makefile | 7 + fs/efivarfs/file.c | 105 ++ fs/efivarfs/inode.c | 173 ++ fs/efivarfs/internal.h | 22 + fs/efivarfs/super.c | 267 ++++ include/asm-generic/cputime_nsecs.h | 28 +- include/linux/efi.h | 134 +- include/linux/perf_event.h | 6 + include/linux/posix-timers.h | 2 + include/linux/rcupdate.h | 7 + include/linux/sched.h | 18 +- include/linux/tick.h | 25 +- include/trace/events/timer.h | 21 + init/Kconfig | 8 +- init/main.c | 1 + kernel/events/core.c | 17 +- kernel/hrtimer.c | 4 +- kernel/posix-cpu-timers.c | 76 +- kernel/printk.c | 2 +- kernel/rcutree.c | 16 +- kernel/rcutree.h | 2 +- kernel/rcutree_plugin.h | 33 +- kernel/sched/core.c | 62 +- kernel/sched/fair.c | 10 +- kernel/sched/sched.h | 15 +- kernel/softirq.c | 19 +- kernel/time/Kconfig | 81 +- kernel/time/tick-broadcast.c | 3 +- kernel/time/tick-common.c | 5 +- kernel/time/tick-sched.c | 289 +++- kernel/timer.c | 16 +- 57 files changed, 4023 insertions(+), 2322 deletions(-) create mode 100644 Documentation/kernel-per-CPU-kthreads.txt create mode 100644 Documentation/timers/NO_HZ.txt create mode 100644 drivers/firmware/efi/Kconfig create mode 100644 drivers/firmware/efi/Makefile create mode 100644 drivers/firmware/efi/efi-pstore.c create mode 100644 drivers/firmware/efi/efi.c create mode 100644 drivers/firmware/efi/efivars.c create mode 100644 drivers/firmware/efi/vars.c delete mode 100644 drivers/firmware/efivars.c create mode 100644 fs/efivarfs/Kconfig create mode 100644 fs/efivarfs/Makefile create mode 100644 fs/efivarfs/file.c create mode 100644 fs/efivarfs/inode.c create mode 100644 fs/efivarfs/internal.h create mode 100644 fs/efivarfs/super.c $ git am -3 ../patches/0001-efivars-Include-missing-linux-magic.h-inclusions.patch Applying: efivars: Include missing linux/magic.h inclusions $ git reset HEAD^ Unstaged changes after reset: M fs/efivarfs/super.c $ git add -A . $ git commit -v -a --amend [master ed4fb74] Merge remote-tracking branch 'tip/auto-latest' $ git am -3 ../patches/0001-efivars-use-of-kmalloc-etc-requires-the-inclusion-of.patch Applying: efivars: use of kmalloc etc requires the inclusion of slab.h $ git reset HEAD^ Unstaged changes after reset: M drivers/firmware/efi/efi-pstore.c M drivers/firmware/efi/efivars.c M fs/efivarfs/file.c M fs/efivarfs/inode.c M fs/efivarfs/super.c $ git add -A . $ git commit -v -a --amend [master 8fc211d] Merge remote-tracking branch 'tip/auto-latest' Merging ftrace/for-next (4c69e6e tracepoints: Prevent null probe from being added) $ git merge ftrace/for-next Already up-to-date. Merging rcu/rcu/next (a9be854 Merge commit '6d87669357936bffa1e8fea7a4e7743e76905736' into next.2013.10.22a) $ git merge rcu/rcu/next Merge made by the 'recursive' strategy. 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 kvm/linux-next (4cee4b7 kvm: KVM_CAP_IOMMU only available with device assignment) $ git merge kvm/linux-next Resolved 'arch/s390/mm/pgtable.c' using previous resolution. Resolved 'drivers/s390/kvm/virtio_ccw.c' using previous resolution. Auto-merging virt/kvm/kvm_main.c Auto-merging include/linux/kvm_host.h Auto-merging drivers/s390/kvm/virtio_ccw.c CONFLICT (content): Merge conflict in drivers/s390/kvm/virtio_ccw.c Auto-merging arch/x86/kvm/x86.c Auto-merging arch/x86/kvm/vmx.c Auto-merging arch/x86/kvm/svm.c Auto-merging arch/x86/kvm/lapic.c Auto-merging arch/x86/kernel/irq.c Auto-merging arch/x86/include/uapi/asm/msr-index.h Auto-merging arch/s390/mm/pgtable.c CONFLICT (content): Merge conflict in arch/s390/mm/pgtable.c Auto-merging arch/powerpc/sysdev/xics/icp-native.c Auto-merging arch/powerpc/kvm/e500mc.c Auto-merging arch/powerpc/kvm/e500.h Auto-merging arch/powerpc/kvm/book3s_pr.c Auto-merging arch/powerpc/kvm/book3s_hv.c Auto-merging arch/powerpc/kvm/book3s_64_mmu_hv.c Auto-merging arch/powerpc/include/asm/reg.h Auto-merging arch/arm/kvm/arm.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 0a76bcf] Merge remote-tracking branch 'kvm/linux-next' $ git diff -M --stat --summary HEAD^.. Documentation/virtual/kvm/api.txt | 126 ++ Documentation/virtual/kvm/devices/README | 1 + Documentation/virtual/kvm/devices/mpic.txt | 56 + arch/arm/kvm/arm.c | 18 +- arch/ia64/include/asm/kvm_host.h | 1 + arch/ia64/include/uapi/asm/kvm.h | 1 - arch/ia64/kvm/Kconfig | 14 +- arch/ia64/kvm/Makefile | 6 +- arch/ia64/kvm/kvm-ia64.c | 35 +- arch/ia64/kvm/lapic.h | 6 - arch/powerpc/include/asm/hvcall.h | 3 + arch/powerpc/include/asm/kvm_book3s.h | 7 +- arch/powerpc/include/asm/kvm_book3s_64.h | 13 + arch/powerpc/include/asm/kvm_book3s_asm.h | 8 +- arch/powerpc/include/asm/kvm_booke.h | 2 + arch/powerpc/include/asm/kvm_host.h | 41 +- arch/powerpc/include/asm/kvm_ppc.h | 112 +- arch/powerpc/include/asm/reg.h | 1 + arch/powerpc/include/uapi/asm/kvm.h | 82 ++ arch/powerpc/kernel/asm-offsets.c | 4 + arch/powerpc/kvm/44x.c | 12 + arch/powerpc/kvm/Kconfig | 26 +- arch/powerpc/kvm/Makefile | 12 +- arch/powerpc/kvm/book3s.c | 36 +- arch/powerpc/kvm/book3s_64_mmu_hv.c | 120 +- arch/powerpc/kvm/book3s_emulate.c | 4 +- arch/powerpc/kvm/book3s_hv.c | 92 +- arch/powerpc/kvm/book3s_hv_rm_mmu.c | 11 - arch/powerpc/kvm/book3s_hv_rm_xics.c | 406 ++++++ arch/powerpc/kvm/book3s_hv_rmhandlers.S | 228 +++- arch/powerpc/kvm/book3s_pr.c | 7 +- arch/powerpc/kvm/book3s_pr_papr.c | 21 + arch/powerpc/kvm/book3s_rtas.c | 274 +++++ arch/powerpc/kvm/book3s_xics.c | 1130 +++++++++++++++++ arch/powerpc/kvm/book3s_xics.h | 129 ++ arch/powerpc/kvm/booke.c | 158 ++- arch/powerpc/kvm/booke_interrupts.S | 42 +- arch/powerpc/kvm/e500.c | 14 + arch/powerpc/kvm/e500.h | 22 + arch/powerpc/kvm/e500_emulate.c | 19 + arch/powerpc/kvm/e500_mmu.c | 192 ++- arch/powerpc/kvm/e500mc.c | 16 + arch/powerpc/kvm/emulate.c | 2 + arch/powerpc/kvm/irq.h | 17 + arch/powerpc/kvm/mpic.c | 1843 ++++++++++++++++++++++++++++ arch/powerpc/kvm/powerpc.c | 88 +- arch/powerpc/sysdev/xics/icp-native.c | 8 + arch/s390/include/uapi/asm/Kbuild | 1 + arch/s390/include/uapi/asm/virtio-ccw.h | 21 + arch/s390/kvm/Kconfig | 1 + arch/s390/kvm/Makefile | 2 +- arch/s390/kvm/diag.c | 26 + arch/s390/kvm/gaccess.h | 429 ++----- arch/s390/kvm/intercept.c | 18 +- arch/s390/kvm/interrupt.c | 245 ++-- arch/s390/kvm/kvm-s390.c | 43 +- arch/s390/kvm/kvm-s390.h | 12 +- arch/s390/kvm/priv.c | 270 ++-- arch/x86/include/asm/entry_arch.h | 4 + arch/x86/include/asm/hardirq.h | 3 + arch/x86/include/asm/hw_irq.h | 1 + arch/x86/include/asm/irq_vectors.h | 5 + arch/x86/include/asm/kvm_host.h | 24 +- arch/x86/include/asm/vmx.h | 18 + arch/x86/include/uapi/asm/kvm.h | 1 - arch/x86/include/uapi/asm/msr-index.h | 2 + arch/x86/include/uapi/asm/vmx.h | 5 +- arch/x86/kernel/entry_64.S | 5 + arch/x86/kernel/irq.c | 22 + arch/x86/kernel/irqinit.c | 4 + arch/x86/kernel/kvmclock.c | 9 +- arch/x86/kvm/Kconfig | 14 +- arch/x86/kvm/Makefile | 5 +- arch/x86/kvm/emulate.c | 31 +- arch/x86/kvm/i8254.c | 4 +- arch/x86/kvm/lapic.c | 189 +-- arch/x86/kvm/lapic.h | 22 +- arch/x86/kvm/mmu.c | 108 +- arch/x86/kvm/mmu.h | 11 +- arch/x86/kvm/paging_tmpl.h | 2 +- arch/x86/kvm/pmu.c | 14 +- arch/x86/kvm/svm.c | 35 +- arch/x86/kvm/vmx.c | 1061 ++++++++++++---- arch/x86/kvm/x86.c | 240 ++-- drivers/s390/kvm/kvm_virtio.c | 11 +- drivers/s390/kvm/virtio_ccw.c | 20 +- include/linux/kvm_host.h | 165 ++- include/trace/events/kvm.h | 12 +- include/uapi/linux/kvm.h | 43 +- virt/kvm/Kconfig | 3 + virt/kvm/assigned-dev.c | 43 +- virt/kvm/eventfd.c | 53 +- virt/kvm/ioapic.c | 163 ++- virt/kvm/ioapic.h | 27 +- virt/kvm/irq_comm.c | 215 +--- virt/kvm/irqchip.c | 237 ++++ virt/kvm/kvm_main.c | 250 +++- 97 files changed, 7687 insertions(+), 1928 deletions(-) create mode 100644 Documentation/virtual/kvm/devices/README create mode 100644 Documentation/virtual/kvm/devices/mpic.txt create mode 100644 arch/powerpc/kvm/book3s_hv_rm_xics.c create mode 100644 arch/powerpc/kvm/book3s_rtas.c create mode 100644 arch/powerpc/kvm/book3s_xics.c create mode 100644 arch/powerpc/kvm/book3s_xics.h create mode 100644 arch/powerpc/kvm/irq.h create mode 100644 arch/powerpc/kvm/mpic.c create mode 100644 arch/s390/include/uapi/asm/virtio-ccw.h create mode 100644 virt/kvm/irqchip.c Merging kvm-arm/kvm-arm-next (b8022d7 arm: kvm: arch_timer: use symbolic constants) $ git merge kvm-arm/kvm-arm-next Auto-merging arch/arm/kvm/arm.c Merge made by the 'recursive' strategy. arch/arm/include/asm/kvm_host.h | 3 ++ arch/arm/kvm/Makefile | 2 +- arch/arm/kvm/arch_timer.c | 7 +++-- arch/arm/kvm/arm.c | 4 +++ arch/arm/kvm/perf.c | 68 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 80 insertions(+), 4 deletions(-) create mode 100644 arch/arm/kvm/perf.c Merging kvm-ppc/kvm-ppc-next (8b78645 KVM: PPC: Book3S: Facilities to save/restore XICS presentation ctrler state) $ git merge kvm-ppc/kvm-ppc-next Already up-to-date. Merging oprofile/for-next (23995bb oprofile, s390: Add support for IBM zEnterprise EC12) $ git merge oprofile/for-next Already up-to-date. Merging fw-nohz/nohz/next (74876a9 printk: Wake up klogd using irq_work) $ git merge fw-nohz/nohz/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 (6461b07 Merge branch 'stable/for-linus-3.10' into linux-next) $ git merge xen-two/linux-next Auto-merging arch/x86/xen/smp.c Auto-merging arch/x86/xen/mmu.c Auto-merging arch/x86/xen/enlighten.c Auto-merging arch/x86/xen/Kconfig Merge made by the 'recursive' strategy. arch/x86/include/asm/xen/interface.h | 11 ++- arch/x86/include/asm/xen/page.h | 3 + arch/x86/xen/Kconfig | 8 ++ arch/x86/xen/enlighten.c | 76 ++++++++++++----- arch/x86/xen/irq.c | 5 +- arch/x86/xen/mmu.c | 158 ++++++++++++++++++++++++++++++++--- arch/x86/xen/mmu.h | 2 + arch/x86/xen/p2m.c | 2 +- arch/x86/xen/setup.c | 59 ++++++++++--- arch/x86/xen/smp.c | 39 ++++++--- arch/x86/xen/xen-head.S | 10 ++- drivers/xen/balloon.c | 14 ++-- drivers/xen/cpu_hotplug.c | 4 +- drivers/xen/events.c | 9 +- drivers/xen/gntdev.c | 3 +- drivers/xen/grant-table.c | 64 +++++++++++++- drivers/xen/privcmd.c | 2 +- drivers/xen/xenbus/xenbus_client.c | 3 +- 18 files changed, 401 insertions(+), 71 deletions(-) Merging xen-arm/linux-next (9bc25a1 xen/arm: remove duplicated include from enlighten.c) $ git merge xen-arm/linux-next Auto-merging arch/arm/mach-vexpress/v2m.c Auto-merging arch/arm/Kconfig Merge made by the 'recursive' strategy. arch/arm/Kconfig | 1 + arch/arm/boot/dts/Makefile | 4 +- arch/arm/boot/dts/xenvm-4.2.dts | 13 +++++++ arch/arm/include/asm/xen/hypercall.h | 1 + arch/arm/mach-vexpress/v2m.c | 1 - arch/arm/mach-virt/virt.c | 1 + arch/arm/xen/enlighten.c | 74 ++++++++++++++++++++++++++++++++---- arch/arm/xen/hypercall.S | 1 + 8 files changed, 86 insertions(+), 10 deletions(-) Merging percpu/for-next (a1b2a55 percpu: add documentation on this_cpu operations) $ git merge percpu/for-next Already up-to-date. Merging workqueues/for-next (46aed11 Merge branch 'for-3.10' into for-next) $ git merge workqueues/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging drivers-x86/linux-next (e6e5224 ideapad-laptop: Depend on BACKLIGHT_CLASS_DEVICE instead of selecting it) $ git merge drivers-x86/linux-next Resolved 'drivers/platform/x86/chromeos_laptop.c' using previous resolution. Auto-merging drivers/platform/x86/hp-wmi.c Auto-merging drivers/platform/x86/chromeos_laptop.c CONFLICT (content): Merge conflict in drivers/platform/x86/chromeos_laptop.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 504c986] Merge remote-tracking branch 'drivers-x86/linux-next' $ git diff -M --stat --summary HEAD^.. drivers/platform/x86/hp-wmi.c | 4 ++++ 1 file changed, 4 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 (38a8179 Merge remote-tracking branch 'regmap/topic/range' 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 (df92d5f leds: leds-asic3: switch to using SIMPLE_DEV_PM_OPS) $ git merge leds/for-next Auto-merging include/linux/mmc/host.h Auto-merging drivers/leds/trigger/ledtrig-transient.c Auto-merging drivers/leds/trigger/ledtrig-timer.c Auto-merging drivers/leds/trigger/ledtrig-oneshot.c Auto-merging drivers/leds/trigger/ledtrig-heartbeat.c Auto-merging drivers/leds/trigger/ledtrig-gpio.c Auto-merging drivers/leds/trigger/ledtrig-default-on.c Auto-merging drivers/leds/trigger/ledtrig-cpu.c Auto-merging drivers/leds/trigger/ledtrig-backlight.c Merge made by the 'recursive' strategy. Documentation/leds/00-INDEX | 2 + Documentation/leds/leds-lp5521.txt | 19 - Documentation/leds/leds-lp5562.txt | 120 +++++ Documentation/leds/leds-lp55xx.txt | 46 +- drivers/leds/Kconfig | 115 +---- drivers/leds/Makefile | 11 +- drivers/leds/leds-asic3.c | 7 +- drivers/leds/leds-atmel-pwm.c | 4 +- drivers/leds/leds-bd2802.c | 14 +- drivers/leds/leds-lm355x.c | 2 + drivers/leds/leds-lm3642.c | 2 + drivers/leds/leds-lp5521.c | 22 +- drivers/leds/leds-lp5562.c | 599 ++++++++++++++++++++++++ drivers/leds/leds-lp55xx-common.c | 42 +- drivers/leds/leds-lp55xx-common.h | 4 + drivers/leds/leds-lt3593.c | 5 +- drivers/leds/leds-ns2.c | 44 +- drivers/leds/leds-pwm.c | 50 +- drivers/leds/leds-renesas-tpu.c | 3 +- drivers/leds/leds-tca6507.c | 4 +- drivers/leds/leds-wm8350.c | 5 +- drivers/leds/trigger/Kconfig | 111 +++++ drivers/leds/trigger/Makefile | 10 + drivers/leds/{ => trigger}/ledtrig-backlight.c | 2 +- drivers/leds/trigger/ledtrig-camera.c | 57 +++ drivers/leds/{ => trigger}/ledtrig-cpu.c | 2 +- drivers/leds/{ => trigger}/ledtrig-default-on.c | 2 +- drivers/leds/{ => trigger}/ledtrig-gpio.c | 2 +- drivers/leds/{ => trigger}/ledtrig-heartbeat.c | 2 +- drivers/leds/{ => trigger}/ledtrig-ide-disk.c | 0 drivers/leds/{ => trigger}/ledtrig-oneshot.c | 2 +- drivers/leds/{ => trigger}/ledtrig-timer.c | 1 - drivers/leds/{ => trigger}/ledtrig-transient.c | 2 +- include/linux/leds.h | 33 +- include/linux/mmc/host.h | 2 - include/linux/platform_data/leds-lp55xx.h | 21 +- 36 files changed, 1149 insertions(+), 220 deletions(-) create mode 100644 Documentation/leds/leds-lp5562.txt create mode 100644 drivers/leds/leds-lp5562.c create mode 100644 drivers/leds/trigger/Kconfig create mode 100644 drivers/leds/trigger/Makefile rename drivers/leds/{ => trigger}/ledtrig-backlight.c (99%) create mode 100644 drivers/leds/trigger/ledtrig-camera.c rename drivers/leds/{ => trigger}/ledtrig-cpu.c (99%) rename drivers/leds/{ => trigger}/ledtrig-default-on.c (98%) rename drivers/leds/{ => trigger}/ledtrig-gpio.c (99%) rename drivers/leds/{ => trigger}/ledtrig-heartbeat.c (99%) rename drivers/leds/{ => trigger}/ledtrig-ide-disk.c (100%) rename drivers/leds/{ => trigger}/ledtrig-oneshot.c (99%) rename drivers/leds/{ => trigger}/ledtrig-timer.c (99%) rename drivers/leds/{ => trigger}/ledtrig-transient.c (99%) Merging driver-core/driver-core-next (0d1d392 Merge 3.9-rc7 into driver-core-next) $ git merge driver-core/driver-core-next Already up-to-date. Merging tty/tty-next (45efcb2 tty/serial/sirf: fix MODULE_DEVICE_TABLE) $ git merge tty/tty-next Already up-to-date. Merging usb/usb-next (4626b8d USB: ehci-msm: USB_MSM_OTG needs USB_PHY) $ git merge usb/usb-next Already up-to-date. Merging usb-gadget/next (added5f ARM: mxs_defconfig: add CONFIG_USB_PHY) $ git merge usb-gadget/next Already up-to-date. Merging staging/staging-next (a0eeed4 staging: comedi: ni_labpc: fix legacy driver build) $ git merge staging/staging-next Already up-to-date. Merging char-misc/char-misc-next (0e27263 Tools: hv: Fix a checkpatch warning) $ git merge char-misc/char-misc-next Already up-to-date. Merging bcon/master (06c6942 blockconsole: Mark a local work struct static) $ git merge bcon/master Resolved 'drivers/block/Kconfig' using previous resolution. Auto-merging kernel/printk.c Auto-merging init/do_mounts.c Auto-merging include/linux/mount.h Auto-merging include/linux/console.h Auto-merging drivers/net/netconsole.c Auto-merging drivers/block/Makefile Auto-merging drivers/block/Kconfig CONFLICT (content): Merge conflict in drivers/block/Kconfig Auto-merging block/partitions/check.h Auto-merging block/partitions/check.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master f22b3233] Merge remote-tracking branch 'bcon/master' $ git diff -M --stat --summary HEAD^.. Documentation/block/blockconsole.txt | 94 ++++ Documentation/block/blockconsole/bcon_tail | 82 ++++ Documentation/block/blockconsole/mkblockconsole | 29 ++ block/partitions/Makefile | 1 + block/partitions/blockconsole.c | 22 + block/partitions/check.c | 3 + block/partitions/check.h | 3 + drivers/block/Kconfig | 6 + drivers/block/Makefile | 1 + drivers/block/blockconsole.c | 618 ++++++++++++++++++++++++ drivers/net/netconsole.c | 2 +- include/linux/blockconsole.h | 7 + include/linux/console.h | 1 + include/linux/mount.h | 2 +- init/do_mounts.c | 2 +- kernel/printk.c | 5 +- 16 files changed, 873 insertions(+), 5 deletions(-) create mode 100644 Documentation/block/blockconsole.txt create mode 100755 Documentation/block/blockconsole/bcon_tail create mode 100755 Documentation/block/blockconsole/mkblockconsole create mode 100644 block/partitions/blockconsole.c create mode 100644 drivers/block/blockconsole.c create mode 100644 include/linux/blockconsole.h Merging tmem/linux-next (8f0d816 Linux 3.7-rc3) $ git merge tmem/linux-next Already up-to-date. Merging writeback/writeback-for-next (ed84825 Negative (setpoint-dirty) in bdi_position_ratio()) $ git merge writeback/writeback-for-next Already up-to-date. 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 (d463f82 pinctrl: fix mutex deadlock in get_pinctrl_dev_from_of_node()) $ git merge pinctrl/for-next Merge made by the 'recursive' strategy. drivers/pinctrl/core.c | 2 +- drivers/pinctrl/spear/pinctrl-plgpio.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) Merging vhost/linux-next (6713ce9 vhost: fix error handling in RESET_OWNER ioctl) $ git merge vhost/linux-next Resolved 'drivers/vhost/net.c' using previous resolution. Resolved 'drivers/vhost/tcm_vhost.c' using previous resolution. Auto-merging drivers/vhost/vhost.c Auto-merging drivers/vhost/test.c Auto-merging drivers/vhost/tcm_vhost.h Auto-merging drivers/vhost/tcm_vhost.c CONFLICT (content): Merge conflict in drivers/vhost/tcm_vhost.c Auto-merging drivers/vhost/net.c CONFLICT (content): Merge conflict in drivers/vhost/net.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 27a8ba2] Merge remote-tracking branch 'vhost/linux-next' $ git diff -M --stat --summary HEAD^.. drivers/vhost/net.c | 258 +++++++++++++++++++++++++++++++++++++--------- drivers/vhost/tcm_vhost.c | 154 +++++++++++++++++++++++---- drivers/vhost/tcm_vhost.h | 3 + drivers/vhost/test.c | 9 +- drivers/vhost/vhost.c | 153 +++++++++------------------ drivers/vhost/vhost.h | 32 +----- 6 files changed, 403 insertions(+), 206 deletions(-) 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 (b977785 remoteproc: fix kconfig dependencies for VIRTIO) $ git merge remoteproc/for-next Resolved 'drivers/remoteproc/Kconfig' using previous resolution. Auto-merging drivers/remoteproc/ste_modem_rproc.c Auto-merging drivers/remoteproc/remoteproc_core.c Auto-merging drivers/remoteproc/Kconfig CONFLICT (content): Merge conflict in drivers/remoteproc/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master ffbf297] Merge remote-tracking branch 'remoteproc/for-next' $ git diff -M --stat --summary HEAD^.. drivers/remoteproc/Kconfig | 27 ++- drivers/remoteproc/Makefile | 1 + drivers/remoteproc/da8xx_remoteproc.c | 324 +++++++++++++++++++++++++++++ drivers/remoteproc/remoteproc_core.c | 211 ++++++++++++------- drivers/remoteproc/remoteproc_elf_loader.c | 100 ++++++--- drivers/remoteproc/remoteproc_internal.h | 15 +- drivers/remoteproc/remoteproc_virtio.c | 79 +++++-- drivers/remoteproc/ste_modem_rproc.c | 45 ++-- include/linux/remoteproc.h | 13 +- 9 files changed, 677 insertions(+), 138 deletions(-) create mode 100644 drivers/remoteproc/da8xx_remoteproc.c Merging rpmsg/for-next (397944d rpmsg: fix kconfig dependencies for VIRTIO) $ git merge rpmsg/for-next Auto-merging drivers/rpmsg/virtio_rpmsg_bus.c Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 8 +++++++ drivers/rpmsg/Kconfig | 1 + drivers/rpmsg/virtio_rpmsg_bus.c | 49 ++++++++++++++++++++++++++++------------ 3 files changed, 44 insertions(+), 14 deletions(-) Merging irqdomain/irqdomain/next (560aa53 irqdomain: document the simple domain first_irq) $ git merge irqdomain/irqdomain/next Merge made by the 'recursive' strategy. kernel/irq/irqdomain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) Merging gpio/gpio/next (753c598 gpio/em: Add Device Tree support) $ git merge gpio/gpio/next Merge made by the 'recursive' strategy. drivers/gpio/gpio-em.c | 45 ++++++++++++++++++++++++++-- drivers/gpio/gpio-omap.c | 75 +++++++++++++++++++++-------------------------- drivers/gpio/gpio-tegra.c | 11 ++++--- 3 files changed, 81 insertions(+), 50 deletions(-) Merging gpio-lw/for-next (ab6ec0f gpio/omap: ensure gpio context is initialised) $ git merge gpio-lw/for-next Auto-merging drivers/gpio/gpiolib-of.c Auto-merging drivers/gpio/gpio-pxa.c Auto-merging drivers/gpio/gpio-pca953x.c Auto-merging drivers/gpio/gpio-mvebu.c Auto-merging drivers/gpio/gpio-ich.c Auto-merging Documentation/acpi/enumeration.txt Merge made by the 'recursive' strategy. Documentation/acpi/enumeration.txt | 32 +- .../devicetree/bindings/gpio/gpio-grgpio.txt | 26 ++ .../devicetree/bindings/gpio/gpio-mcp23s08.txt | 47 ++ .../devicetree/bindings/gpio/gpio-omap.txt | 7 +- drivers/gpio/Kconfig | 13 +- drivers/gpio/Makefile | 1 + drivers/gpio/gpio-74x164.c | 8 +- drivers/gpio/gpio-adp5520.c | 4 +- drivers/gpio/gpio-em.c | 53 +-- drivers/gpio/gpio-generic.c | 62 ++- drivers/gpio/gpio-grgpio.c | 505 +++++++++++++++++++++ drivers/gpio/gpio-ich.c | 17 +- drivers/gpio/gpio-lpc32xx.c | 2 +- drivers/gpio/gpio-lynxpoint.c | 1 + drivers/gpio/gpio-max7300.c | 4 +- drivers/gpio/gpio-max7301.c | 7 +- drivers/gpio/gpio-max732x.c | 5 +- drivers/gpio/gpio-mc33880.c | 19 +- drivers/gpio/gpio-mcp23s08.c | 137 ++++-- drivers/gpio/gpio-mvebu.c | 85 +++- drivers/gpio/gpio-omap.c | 99 +++- drivers/gpio/gpio-pca953x.c | 3 +- drivers/gpio/gpio-pcf857x.c | 8 +- drivers/gpio/gpio-pxa.c | 4 +- drivers/gpio/gpio-samsung.c | 1 + drivers/gpio/gpio-sch.c | 111 +++-- drivers/gpio/gpio-stp-xway.c | 2 +- drivers/gpio/gpio-tc3589x.c | 8 +- drivers/gpio/gpio-timberdale.c | 3 +- drivers/gpio/gpio-tps65910.c | 2 +- drivers/gpio/gpio-viperboard.c | 4 - drivers/gpio/gpio-vt8500.c | 8 +- drivers/gpio/gpiolib-acpi.c | 217 ++++++++- drivers/gpio/gpiolib-of.c | 2 +- include/linux/acpi_gpio.h | 19 + include/linux/basic_mmio_gpio.h | 1 + 36 files changed, 1268 insertions(+), 259 deletions(-) create mode 100644 Documentation/devicetree/bindings/gpio/gpio-grgpio.txt create mode 100644 Documentation/devicetree/bindings/gpio/gpio-mcp23s08.txt create mode 100644 drivers/gpio/gpio-grgpio.c Merging gen-gpio/for_next (f4c5405 gpio: update gpio Chinese documentation) $ git merge gen-gpio/for_next Resolved 'arch/sh/kernel/cpu/sh2a/Makefile' using previous resolution. Auto-merging drivers/video/backlight/Kconfig Auto-merging drivers/video/Kconfig CONFLICT (modify/delete): drivers/usb/otg/Kconfig deleted in HEAD and modified in gen-gpio/for_next. Version gen-gpio/for_next of drivers/usb/otg/Kconfig left in tree. Auto-merging drivers/staging/iio/adc/Kconfig Auto-merging drivers/staging/android/Kconfig Auto-merging drivers/spi/Kconfig Auto-merging drivers/mtd/nand/Kconfig Auto-merging drivers/mtd/maps/Kconfig Auto-merging drivers/leds/Kconfig Auto-merging drivers/input/misc/Kconfig Auto-merging drivers/input/keyboard/Kconfig Auto-merging drivers/i2c/muxes/Kconfig Auto-merging drivers/gpio/gpio-lpc32xx.c Auto-merging drivers/gpio/Kconfig Auto-merging arch/xtensa/Kconfig Auto-merging arch/x86/Kconfig Auto-merging arch/sparc/Kconfig Auto-merging arch/sh/kernel/cpu/sh2a/Makefile CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/Makefile Auto-merging arch/sh/Kconfig Auto-merging arch/powerpc/platforms/Kconfig Auto-merging arch/powerpc/platforms/85xx/Kconfig Auto-merging arch/powerpc/platforms/44x/Kconfig Auto-merging arch/powerpc/platforms/40x/Kconfig Auto-merging arch/powerpc/Kconfig Auto-merging arch/openrisc/Kconfig Auto-merging arch/mips/Kconfig Auto-merging arch/microblaze/Kconfig Auto-merging arch/metag/Kconfig Auto-merging arch/m68k/Kconfig.cpu Auto-merging arch/ia64/Kconfig Auto-merging arch/hexagon/Kconfig Auto-merging arch/blackfin/Kconfig Auto-merging arch/avr32/Kconfig Auto-merging arch/arm64/Kconfig Auto-merging arch/arm/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git rm -f drivers/usb/otg/Kconfig drivers/usb/otg/Kconfig: needs merge rm 'drivers/usb/otg/Kconfig' $ git commit -v -a [master 431fef3] Merge remote-tracking branch 'gen-gpio/for_next' $ git diff -M --stat --summary HEAD^.. Documentation/gpio.txt | 10 +++++----- Documentation/zh_CN/gpio.txt | 8 ++++---- arch/alpha/Kconfig | 3 --- arch/arm/Kconfig | 3 --- arch/arm/plat-orion/Makefile | 2 +- arch/arm/plat-orion/gpio.c | 2 +- arch/arm64/Kconfig | 3 --- arch/avr32/Kconfig | 3 --- arch/blackfin/Kconfig | 5 +---- arch/hexagon/Kconfig | 3 --- arch/ia64/Kconfig | 3 --- arch/m68k/Kconfig | 3 --- arch/m68k/Kconfig.cpu | 3 +-- arch/metag/Kconfig | 3 --- arch/microblaze/Kconfig | 3 --- arch/mips/Kconfig | 10 +--------- arch/mips/loongson/common/Makefile | 2 +- arch/mips/txx9/generic/setup.c | 2 +- arch/openrisc/Kconfig | 3 --- arch/powerpc/Kconfig | 5 ----- arch/powerpc/platforms/40x/Kconfig | 1 - arch/powerpc/platforms/44x/Kconfig | 1 - arch/powerpc/platforms/85xx/Kconfig | 1 - arch/powerpc/platforms/86xx/Kconfig | 3 --- arch/powerpc/platforms/8xx/Kconfig | 1 - arch/powerpc/platforms/Kconfig | 4 ---- arch/sh/Kconfig | 3 --- arch/sh/boards/mach-sdk7786/Makefile | 2 +- arch/sh/boards/mach-x3proto/Makefile | 2 +- arch/sh/kernel/cpu/sh2a/Makefile | 2 +- arch/sh/kernel/cpu/sh3/Makefile | 2 +- arch/sh/kernel/cpu/sh4a/Makefile | 2 +- arch/sparc/Kconfig | 5 ----- arch/unicore32/Kconfig | 6 +----- arch/x86/Kconfig | 3 --- arch/xtensa/Kconfig | 3 --- arch/xtensa/configs/iss_defconfig | 1 - arch/xtensa/configs/s6105_defconfig | 1 - drivers/extcon/Kconfig | 2 +- drivers/gpio/Kconfig | 1 - drivers/gpio/gpio-lpc32xx.c | 2 +- drivers/i2c/busses/Kconfig | 4 ++-- drivers/i2c/muxes/Kconfig | 2 +- drivers/input/keyboard/Kconfig | 6 +++--- drivers/input/misc/Kconfig | 8 ++++---- drivers/input/mouse/Kconfig | 2 +- drivers/leds/Kconfig | 6 +++--- drivers/mtd/maps/Kconfig | 2 +- drivers/mtd/nand/Kconfig | 2 +- drivers/net/phy/Kconfig | 2 +- drivers/pinctrl/sh-pfc/Kconfig | 26 +++++++++++++------------- drivers/regulator/Kconfig | 2 +- drivers/spi/Kconfig | 8 ++++---- drivers/staging/android/Kconfig | 2 +- drivers/staging/iio/accel/Kconfig | 2 +- drivers/staging/iio/adc/Kconfig | 2 +- drivers/staging/iio/addac/Kconfig | 2 +- drivers/staging/iio/resolver/Kconfig | 4 ++-- drivers/staging/iio/trigger/Kconfig | 2 +- drivers/video/Kconfig | 2 +- drivers/video/backlight/Kconfig | 4 ++-- drivers/w1/masters/Kconfig | 2 +- include/linux/gpio.h | 6 +++--- 63 files changed, 73 insertions(+), 152 deletions(-) $ git am -3 ../patches/0001-gen-gpio-GPIOLIB-merge-fix-up.patch Applying: gen-gpio: GPIOLIB merge fix up $ git reset HEAD^ Unstaged changes after reset: M drivers/usb/phy/Kconfig $ git add -A . $ git commit -v -a --amend [master 2a8a281] Merge remote-tracking branch 'gen-gpio/for_next' $ git am -3 ../patches/0001-merge-fix-for-Convert-selectors-of-GENERIC_GPIO-to-G.patch Applying: merge fix for Convert selectors of GENERIC_GPIO to GPIOLIB $ git reset HEAD^ Unstaged changes after reset: M arch/powerpc/platforms/85xx/Kconfig $ git add -A . $ git commit -v -a --amend [master 62d2e5e] Merge remote-tracking branch 'gen-gpio/for_next' $ git am -3 ../patches/0001-merge-fix-2-for-Convert-selectors-of-GENERIC_GPIO-to.patch Applying: merge fix 2 for Convert selectors of GENERIC_GPIO to GPIOLIB $ git reset HEAD^ Unstaged changes after reset: M drivers/i2c/muxes/Kconfig $ git add -A . $ git commit -v -a --amend [master e1ed1ae] Merge remote-tracking branch 'gen-gpio/for_next' Merging mailbox/dbx500-prcmu-mailbox (c497eba mailbox: fix invalid use of sizeof in mailbox_msg_send()) $ git merge mailbox/dbx500-prcmu-mailbox Auto-merging drivers/remoteproc/Kconfig Auto-merging drivers/mailbox/mailbox-omap2.c Auto-merging drivers/mailbox/mailbox-omap1.c Removing arch/arm/plat-omap/mailbox.c Removing arch/arm/plat-omap/include/plat/mailbox.h Auto-merging arch/arm/mach-omap2/omap_hwmod_44xx_data.c Auto-merging arch/arm/mach-omap2/omap_hwmod_3xxx_data.c Auto-merging arch/arm/configs/omap1_defconfig Merge made by the 'recursive' strategy. .../devicetree/bindings/mailbox/dbx500-mailbox.txt | 27 + arch/arm/configs/omap1_defconfig | 3 +- arch/arm/mach-omap1/Makefile | 4 - arch/arm/mach-omap2/Makefile | 3 - arch/arm/mach-omap2/devices.c | 13 +- arch/arm/mach-omap2/omap_hwmod_2420_data.c | 12 + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 11 + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 11 + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 13 + arch/arm/plat-omap/Kconfig | 16 - arch/arm/plat-omap/Makefile | 3 - arch/arm/plat-omap/include/plat/mailbox.h | 105 ---- arch/arm/plat-omap/mailbox.c | 435 -------------- drivers/cpufreq/highbank-cpufreq.c | 2 +- drivers/mailbox/Kconfig | 41 ++ drivers/mailbox/Makefile | 5 + drivers/mailbox/mailbox-dbx500.c | 648 +++++++++++++++++++++ .../mailbox.c => drivers/mailbox/mailbox-omap1.c | 90 ++- .../mailbox.c => drivers/mailbox/mailbox-omap2.c | 330 +++++------ drivers/mailbox/mailbox.c | 552 ++++++++++++++++++ drivers/mailbox/mailbox_internal.h | 70 +++ drivers/mailbox/pl320-ipc.c | 2 +- drivers/remoteproc/Kconfig | 3 +- drivers/remoteproc/omap_remoteproc.c | 36 +- drivers/staging/tidspbridge/Kconfig | 3 +- drivers/staging/tidspbridge/core/_tiomap.h | 2 +- drivers/staging/tidspbridge/core/chnl_sm.c | 8 +- drivers/staging/tidspbridge/core/io_sm.c | 5 +- drivers/staging/tidspbridge/core/tiomap3430.c | 6 +- drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 6 +- drivers/staging/tidspbridge/core/tiomap_io.c | 9 +- .../tidspbridge/include/dspbridge/host_os.h | 2 +- include/linux/mailbox.h | 52 +- include/linux/pl320-ipc.h | 17 + include/linux/platform_data/mailbox-dbx500.h | 12 + include/linux/platform_data/mailbox-omap.h | 53 ++ 36 files changed, 1766 insertions(+), 844 deletions(-) create mode 100644 Documentation/devicetree/bindings/mailbox/dbx500-mailbox.txt delete mode 100644 arch/arm/plat-omap/include/plat/mailbox.h delete mode 100644 arch/arm/plat-omap/mailbox.c create mode 100644 drivers/mailbox/mailbox-dbx500.c rename arch/arm/mach-omap1/mailbox.c => drivers/mailbox/mailbox-omap1.c (64%) rename arch/arm/mach-omap2/mailbox.c => drivers/mailbox/mailbox-omap2.c (50%) create mode 100644 drivers/mailbox/mailbox.c create mode 100644 drivers/mailbox/mailbox_internal.h create mode 100644 include/linux/pl320-ipc.h create mode 100644 include/linux/platform_data/mailbox-dbx500.h create mode 100644 include/linux/platform_data/mailbox-omap.h Merging arm-soc/for-next (d664025 Merge branch 'next/multiplatform' into for-next) $ git merge arm-soc/for-next Auto-merging sound/soc/ux500/ux500_msp_i2s.h Auto-merging sound/soc/ux500/ux500_msp_dai.c Auto-merging sound/soc/mxs/mxs-saif.c Auto-merging include/linux/tegra-powergate.h Auto-merging include/linux/platform_data/irq-renesas-irqc.h Auto-merging include/linux/platform_data/gpio-rcar.h Auto-merging include/linux/of.h Removing include/linux/mxsfb.h Removing include/linux/irqchip/sunxi.h Auto-merging drivers/video/atmel_lcdfb.c Auto-merging drivers/video/Kconfig Auto-merging drivers/usb/host/ohci-exynos.c CONFLICT (content): Merge conflict in drivers/usb/host/ohci-exynos.c Auto-merging drivers/tty/serial/mxs-auart.c Auto-merging drivers/tty/serial/amba-pl011.c Auto-merging drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c Removing drivers/staging/ste_rmi4/board-mop500-u8500uib-rmi4.c Auto-merging drivers/staging/imx-drm/ipu-v3/ipu-common.c Auto-merging drivers/staging/iio/adc/mxs-lradc.c Auto-merging drivers/spi/spi-mxs.c Auto-merging drivers/spi/spi-davinci.c Auto-merging drivers/rtc/rtc-stmp3xxx.c Auto-merging drivers/rtc/rtc-s3c.h Auto-merging drivers/rtc/rtc-s3c.c Auto-merging drivers/pinctrl/spear/pinctrl-plgpio.c Auto-merging drivers/pinctrl/sh-pfc/Kconfig Auto-merging drivers/pinctrl/pinctrl-sirf.c Auto-merging drivers/pinctrl/pinctrl-samsung.h CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-samsung.h Auto-merging drivers/pinctrl/pinctrl-samsung.c CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-samsung.c Auto-merging drivers/pinctrl/pinctrl-nomadik.c Auto-merging drivers/pinctrl/pinctrl-exynos.c Auto-merging drivers/pinctrl/pinctrl-at91.c Auto-merging drivers/pinctrl/Makefile CONFLICT (content): Merge conflict in drivers/pinctrl/Makefile Auto-merging drivers/pinctrl/Kconfig Auto-merging drivers/of/base.c Auto-merging drivers/net/ethernet/smsc/smsc911x.c Auto-merging drivers/net/ethernet/freescale/fec_main.c Auto-merging drivers/net/ethernet/freescale/fec.h Auto-merging drivers/mtd/onenand/samsung.h Auto-merging drivers/mmc/host/sdhci-s3c.c Auto-merging drivers/mmc/host/sdhci-cns3xxx.c Auto-merging drivers/mmc/host/mxs-mmc.c Auto-merging drivers/mmc/host/davinci_mmc.c Auto-merging drivers/irqchip/irq-vt8500.c Removing drivers/irqchip/irq-sunxi.c Auto-merging drivers/irqchip/irq-s3c24xx.c Auto-merging drivers/irqchip/irq-mxs.c Auto-merging drivers/irqchip/irq-gic.c Auto-merging drivers/irqchip/irq-armada-370-xp.c Auto-merging drivers/i2c/busses/i2c-mxs.c CONFLICT (modify/delete): drivers/gpio/gpio-vt8500.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of drivers/gpio/gpio-vt8500.c left in tree. Auto-merging drivers/gpio/gpio-tegra.c Auto-merging drivers/gpio/gpio-samsung.c Auto-merging drivers/gpio/gpio-pxa.c Auto-merging drivers/gpio/gpio-pl061.c Auto-merging drivers/gpio/gpio-omap.c Auto-merging drivers/gpio/Makefile Auto-merging drivers/gpio/Kconfig Auto-merging drivers/crypto/ux500/hash/hash_core.c Auto-merging drivers/clocksource/timer-prima2.c Auto-merging drivers/clocksource/timer-marco.c Auto-merging drivers/clocksource/tegra20_timer.c CONFLICT (content): Merge conflict in drivers/clocksource/tegra20_timer.c Auto-merging drivers/clocksource/sun4i_timer.c Auto-merging drivers/clocksource/mxs_timer.c Auto-merging drivers/clocksource/exynos_mct.c Auto-merging drivers/clocksource/Makefile CONFLICT (content): Merge conflict in drivers/clocksource/Makefile Auto-merging drivers/clocksource/Kconfig Auto-merging drivers/clk/Makefile Auto-merging drivers/Makefile Auto-merging drivers/Kconfig Removing arch/arm/plat-spear/Makefile Removing arch/arm/plat-spear/Kconfig Removing arch/arm/plat-samsung/time.c Auto-merging arch/arm/plat-samsung/samsung-time.c Removing arch/arm/plat-samsung/include/plat/s5p-time.h Removing arch/arm/plat-samsung/include/plat/s3c244x.h Removing arch/arm/plat-samsung/include/plat/s3c2443.h Removing arch/arm/plat-samsung/include/plat/s3c2416.h Removing arch/arm/plat-samsung/include/plat/s3c2412.h Removing arch/arm/plat-samsung/include/plat/s3c2410.h Removing arch/arm/plat-samsung/include/plat/irq.h Auto-merging arch/arm/plat-samsung/devs.c Auto-merging arch/arm/plat-orion/gpio.c Removing arch/arm/plat-orion/addr-map.c Auto-merging arch/arm/plat-orion/Makefile CONFLICT (content): Merge conflict in arch/arm/plat-orion/Makefile Auto-merging arch/arm/plat-omap/dmtimer.c Auto-merging arch/arm/mach-zynq/platsmp.c CONFLICT (add/add): Merge conflict in arch/arm/mach-zynq/platsmp.c Auto-merging arch/arm/mach-zynq/Kconfig Auto-merging arch/arm/mach-virt/virt.c Auto-merging arch/arm/mach-vexpress/v2m.c CONFLICT (content): Merge conflict in arch/arm/mach-vexpress/v2m.c Auto-merging arch/arm/mach-vexpress/Kconfig Auto-merging arch/arm/mach-ux500/timer.c Auto-merging arch/arm/mach-ux500/irqs.h Removing arch/arm/mach-ux500/include/mach/uncompress.h Removing arch/arm/mach-ux500/include/mach/timex.h Removing arch/arm/mach-ux500/include/mach/hardware.h Removing arch/arm/mach-ux500/include/mach/debug-macro.S Auto-merging arch/arm/mach-ux500/hotplug.c Auto-merging arch/arm/mach-ux500/db8500-regs.h Auto-merging arch/arm/mach-ux500/cpuidle.c Auto-merging arch/arm/mach-ux500/board-mop500.c Auto-merging arch/arm/mach-ux500/board-mop500-regulators.h Auto-merging arch/arm/mach-ux500/board-mop500-regulators.c Auto-merging arch/arm/mach-tegra/tegra.c CONFLICT (content): Merge conflict in arch/arm/mach-tegra/tegra.c Auto-merging arch/arm/mach-tegra/platsmp.c Removing arch/arm/mach-tegra/include/mach/uncompress.h Removing arch/arm/mach-tegra/include/mach/timex.h Auto-merging arch/arm/mach-tegra/hotplug.c CONFLICT (content): Merge conflict in arch/arm/mach-tegra/hotplug.c Auto-merging arch/arm/mach-tegra/cpuidle-tegra30.c Auto-merging arch/arm/mach-tegra/cpuidle-tegra20.c Removing arch/arm/mach-tegra/board-dt-tegra30.c Removing arch/arm/mach-tegra/board-dt-tegra114.c Removing arch/arm/mach-tegra/Makefile.boot Auto-merging arch/arm/mach-tegra/Makefile Auto-merging arch/arm/mach-tegra/Kconfig Removing arch/arm/mach-spear6xx/include/mach/uncompress.h Removing arch/arm/mach-spear6xx/include/mach/timex.h Removing arch/arm/mach-spear6xx/include/mach/spear.h Removing arch/arm/mach-spear6xx/include/mach/misc_regs.h Removing arch/arm/mach-spear6xx/include/mach/hardware.h Removing arch/arm/mach-spear6xx/include/mach/generic.h Removing arch/arm/mach-spear6xx/include/mach/debug-macro.S Removing arch/arm/mach-spear6xx/Makefile.boot Removing arch/arm/mach-spear6xx/Makefile Removing arch/arm/mach-spear6xx/Kconfig Removing arch/arm/mach-spear3xx/include/mach/uncompress.h Removing arch/arm/mach-spear3xx/include/mach/timex.h Removing arch/arm/mach-spear3xx/include/mach/spear.h Removing arch/arm/mach-spear3xx/include/mach/irqs.h Removing arch/arm/mach-spear3xx/include/mach/hardware.h Removing arch/arm/mach-spear3xx/include/mach/generic.h Removing arch/arm/mach-spear3xx/include/mach/debug-macro.S Removing arch/arm/mach-spear3xx/Makefile.boot Removing arch/arm/mach-spear3xx/Makefile Removing arch/arm/mach-spear3xx/Kconfig Removing arch/arm/mach-spear13xx/include/mach/uncompress.h Removing arch/arm/mach-spear13xx/include/mach/timex.h Removing arch/arm/mach-spear13xx/include/mach/spear.h Removing arch/arm/mach-spear13xx/include/mach/irqs.h Removing arch/arm/mach-spear13xx/include/mach/hardware.h Removing arch/arm/mach-spear13xx/include/mach/dma.h Removing arch/arm/mach-spear13xx/include/mach/debug-macro.S Removing arch/arm/mach-spear13xx/Makefile Removing arch/arm/mach-spear13xx/Kconfig Auto-merging arch/arm/mach-spear/time.c Auto-merging arch/arm/mach-spear/spear6xx.c Auto-merging arch/arm/mach-spear/spear3xx.c Auto-merging arch/arm/mach-spear/spear320.c Auto-merging arch/arm/mach-spear/spear310.c Auto-merging arch/arm/mach-spear/spear300.c Auto-merging arch/arm/mach-spear/spear13xx.c CONFLICT (content): Merge conflict in arch/arm/mach-spear/spear13xx.c Auto-merging arch/arm/mach-spear/spear1340.c Auto-merging arch/arm/mach-spear/spear1310.c Auto-merging arch/arm/mach-spear/restart.c Auto-merging arch/arm/mach-spear/platsmp.c Auto-merging arch/arm/mach-spear/include/mach/misc_regs.h Auto-merging arch/arm/mach-spear/include/mach/irqs.h Auto-merging arch/arm/mach-spear/generic.h Auto-merging arch/arm/mach-shmobile/smp-sh73a0.c Auto-merging arch/arm/mach-shmobile/include/mach/common.h Removing arch/arm/mach-shmobile/hotplug.c Auto-merging arch/arm/mach-shmobile/headsmp-scu.S Auto-merging arch/arm/mach-shmobile/board-mackerel.c Auto-merging arch/arm/mach-shmobile/board-kzm9g.c Auto-merging arch/arm/mach-shmobile/board-armadillo800eva.c CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-armadillo800eva.c Auto-merging arch/arm/mach-s3c64xx/mach-crag6410-module.c Auto-merging arch/arm/mach-s3c64xx/Kconfig Auto-merging arch/arm/mach-s3c24xx/mach-rx1950.c Removing arch/arm/mach-s3c24xx/irq-s3c244x.c Removing arch/arm/mach-s3c24xx/irq-s3c2440.c Removing arch/arm/mach-s3c24xx/irq-s3c2412.c Removing arch/arm/mach-s3c24xx/include/mach/regs-sdi.h Removing arch/arm/mach-s3c24xx/include/mach/entry-macro.S Auto-merging arch/arm/mach-s3c24xx/dma-s3c2443.c CONFLICT (content): Merge conflict in arch/arm/mach-s3c24xx/dma-s3c2443.c Auto-merging arch/arm/mach-s3c24xx/dma-s3c2440.c CONFLICT (content): Merge conflict in arch/arm/mach-s3c24xx/dma-s3c2440.c Auto-merging arch/arm/mach-s3c24xx/dma-s3c2412.c CONFLICT (content): Merge conflict in arch/arm/mach-s3c24xx/dma-s3c2412.c Auto-merging arch/arm/mach-s3c24xx/dma-s3c2410.c CONFLICT (content): Merge conflict in arch/arm/mach-s3c24xx/dma-s3c2410.c Auto-merging arch/arm/mach-s3c24xx/common.c Auto-merging arch/arm/mach-s3c24xx/common-smdk.h Removing arch/arm/mach-pxa/include/mach/debug-macro.S Auto-merging arch/arm/mach-pxa/Kconfig Removing arch/arm/mach-prima2/irq.c Removing arch/arm/mach-prima2/include/mach/uncompress.h Removing arch/arm/mach-prima2/include/mach/timex.h Removing arch/arm/mach-prima2/include/mach/map.h Removing arch/arm/mach-prima2/include/mach/irqs.h Removing arch/arm/mach-prima2/include/mach/hardware.h Removing arch/arm/mach-prima2/include/mach/entry-macro.S Removing arch/arm/mach-prima2/include/mach/debug-macro.S Removing arch/arm/mach-prima2/include/mach/clkdev.h Auto-merging arch/arm/mach-orion5x/common.c Auto-merging arch/arm/mach-orion5x/board-dt.c Removing arch/arm/mach-orion5x/addr-map.c Auto-merging arch/arm/mach-omap2/timer.c Auto-merging arch/arm/mach-omap2/pm44xx.c Auto-merging arch/arm/mach-omap2/omap_hwmod.c CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod.c Auto-merging arch/arm/mach-omap2/omap-smp.c Auto-merging arch/arm/mach-omap2/omap-hotplug.c Auto-merging arch/arm/mach-omap2/id.c Auto-merging arch/arm/mach-omap2/cpuidle44xx.c Auto-merging arch/arm/mach-omap2/cpuidle34xx.c Auto-merging arch/arm/mach-omap2/common.h Removing arch/arm/mach-nomadik/include/mach/uncompress.h Removing arch/arm/mach-nomadik/include/mach/timex.h Removing arch/arm/mach-nomadik/include/mach/irqs.h Removing arch/arm/mach-nomadik/Makefile.boot Removing arch/arm/mach-mxs/system.c Auto-merging arch/arm/mach-mxs/pm.h Removing arch/arm/mach-mxs/ocotp.c Removing arch/arm/mach-mxs/mm.c Removing arch/arm/mach-mxs/include/mach/uncompress.h Removing arch/arm/mach-mxs/include/mach/timex.h Removing arch/arm/mach-mxs/include/mach/mxs.h Removing arch/arm/mach-mxs/include/mach/mx28.h Removing arch/arm/mach-mxs/include/mach/mx23.h Removing arch/arm/mach-mxs/include/mach/hardware.h Removing arch/arm/mach-mxs/include/mach/digctl.h Removing arch/arm/mach-mxs/include/mach/common.h Removing arch/arm/mach-mxs/Makefile.boot Removing arch/arm/mach-mvebu/addr-map.c Removing arch/arm/mach-mv78xx0/addr-map.c Removing arch/arm/mach-msm/include/mach/cpu.h Auto-merging arch/arm/mach-mmp/ttc_dkb.c Removing arch/arm/mach-mmp/include/mach/debug-macro.S Auto-merging arch/arm/mach-mmp/aspenite.c Removing arch/arm/mach-l7200/include/mach/debug-macro.S Removing arch/arm/mach-kirkwood/addr-map.c Removing arch/arm/mach-imx/mx6q.h Auto-merging arch/arm/mach-imx/mach-imx6q.c CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx6q.c Removing arch/arm/mach-imx/devices/platform-ahci-imx.c CONFLICT (modify/delete): arch/arm/mach-imx/cpufreq.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-imx/cpufreq.c left in tree. Removing arch/arm/mach-imx/cpu_op-mx51.h Removing arch/arm/mach-imx/cpu_op-mx51.c Removing arch/arm/mach-imx/Makefile.boot Auto-merging arch/arm/mach-imx/Makefile Auto-merging arch/arm/mach-imx/Kconfig Auto-merging arch/arm/mach-highbank/highbank.c CONFLICT (content): Merge conflict in arch/arm/mach-highbank/highbank.c Removing arch/arm/mach-h720x/include/mach/uncompress.h Removing arch/arm/mach-h720x/include/mach/isa-dma.h Removing arch/arm/mach-h720x/include/mach/irqs.h Removing arch/arm/mach-h720x/include/mach/hardware.h Removing arch/arm/mach-h720x/include/mach/h7202-regs.h Removing arch/arm/mach-h720x/include/mach/h7201-regs.h Removing arch/arm/mach-h720x/include/mach/entry-macro.S Removing arch/arm/mach-h720x/include/mach/debug-macro.S Removing arch/arm/mach-h720x/include/mach/boards.h Removing arch/arm/mach-h720x/h7202-eval.c Removing arch/arm/mach-h720x/h7201-eval.c Removing arch/arm/mach-h720x/cpu-h7202.c Removing arch/arm/mach-h720x/cpu-h7201.c Removing arch/arm/mach-h720x/common.h Removing arch/arm/mach-h720x/common.c Removing arch/arm/mach-h720x/Makefile.boot Removing arch/arm/mach-h720x/Makefile Removing arch/arm/mach-h720x/Kconfig Auto-merging arch/arm/mach-gemini/reset.c Auto-merging arch/arm/mach-gemini/irq.c Auto-merging arch/arm/mach-exynos/mach-universal_c210.c Auto-merging arch/arm/mach-exynos/mach-nuri.c Removing arch/arm/mach-exynos/include/mach/regs-mct.h Auto-merging arch/arm/mach-exynos/cpuidle.c CONFLICT (content): Merge conflict in arch/arm/mach-exynos/cpuidle.c Removing arch/arm/mach-exynos/clock-exynos5.c Removing arch/arm/mach-exynos/clock-exynos4212.c Removing arch/arm/mach-exynos/clock-exynos4210.c Removing arch/arm/mach-exynos/clock-exynos4.h Removing arch/arm/mach-exynos/clock-exynos4.c Auto-merging arch/arm/mach-exynos/Kconfig Removing arch/arm/mach-dove/addr-map.c Auto-merging arch/arm/mach-davinci/dm644x.c Auto-merging arch/arm/mach-davinci/dm365.c Auto-merging arch/arm/mach-davinci/dm355.c Auto-merging arch/arm/mach-davinci/board-dm646x-evm.c Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c Auto-merging arch/arm/mach-davinci/board-dm365-evm.c Auto-merging arch/arm/mach-davinci/board-dm355-evm.c Removing arch/arm/mach-cns3xxx/include/mach/uncompress.h Removing arch/arm/mach-cns3xxx/include/mach/timex.h Removing arch/arm/mach-cns3xxx/include/mach/irqs.h Auto-merging arch/arm/mach-cns3xxx/cns3xxx.h Removing arch/arm/mach-bcm2835/include/mach/uncompress.h Removing arch/arm/mach-bcm2835/include/mach/gpio.h Removing arch/arm/mach-bcm2835/include/mach/bcm2835_soc.h Removing arch/arm/mach-bcm2835/Makefile.boot Auto-merging arch/arm/mach-bcm/board_bcm.c Auto-merging arch/arm/mach-at91/cpuidle.c Auto-merging arch/arm/mach-at91/at91sam9x5.c Auto-merging arch/arm/mach-at91/at91sam9n12.c Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c Auto-merging arch/arm/mach-at91/at91sam9g45.c Auto-merging arch/arm/mach-at91/at91sam9260.c Auto-merging arch/arm/kernel/setup.c Auto-merging arch/arm/kernel/sched_clock.c Auto-merging arch/arm/include/debug/sirf.S Auto-merging arch/arm/include/debug/mxs.S Auto-merging arch/arm/include/debug/exynos.S Auto-merging arch/arm/include/debug/bcm2835.S Auto-merging arch/arm/configs/mxs_defconfig Auto-merging arch/arm/configs/lpc32xx_defconfig Auto-merging arch/arm/configs/kirkwood_defconfig Auto-merging arch/arm/configs/imx_v6_v7_defconfig Removing arch/arm/configs/h7202_defconfig Removing arch/arm/configs/h7201_defconfig Auto-merging arch/arm/configs/at91sam9g45_defconfig Auto-merging arch/arm/common/Makefile Auto-merging arch/arm/boot/dts/wm8850.dtsi Auto-merging arch/arm/boot/dts/wm8650.dtsi Auto-merging arch/arm/boot/dts/wm8505.dtsi Auto-merging arch/arm/boot/dts/vt8500.dtsi Removing arch/arm/boot/dts/sunxi.dtsi Removing arch/arm/boot/dts/sh73a0-reference.dtsi Auto-merging arch/arm/boot/dts/msm8960-cdp.dts Auto-merging arch/arm/boot/dts/msm8660-surf.dts Auto-merging arch/arm/boot/dts/at91sam9x5ek.dtsi Auto-merging arch/arm/boot/dts/at91sam9x5.dtsi CONFLICT (content): Merge conflict in arch/arm/boot/dts/at91sam9x5.dtsi Auto-merging arch/arm/boot/dts/at91sam9n12ek.dts Auto-merging arch/arm/boot/dts/at91sam9n12.dtsi AutoRecorded preimage for 'arch/arm/mach-tegra/hotplug.c' Recorded preimage for 'arch/arm/mach-vexpress/v2m.c' Resolved 'Documentation/kernel-parameters.txt' using previous resolution. Resolved 'arch/arm/Kconfig' using previous resolution. Resolved 'arch/arm/boot/dts/at91sam9x5.dtsi' using previous resolution. Resolved 'arch/arm/mach-exynos/cpuidle.c' using previous resolution. Resolved 'arch/arm/mach-highbank/highbank.c' using previous resolution. Resolved 'arch/arm/mach-imx/mach-imx6q.c' using previous resolution. Resolved 'arch/arm/mach-omap2/omap_hwmod.c' using previous resolution. Resolved 'arch/arm/mach-s3c24xx/dma-s3c2410.c' using previous resolution. Resolved 'arch/arm/mach-s3c24xx/dma-s3c2412.c' using previous resolution. Resolved 'arch/arm/mach-s3c24xx/dma-s3c2440.c' using previous resolution. Resolved 'arch/arm/mach-s3c24xx/dma-s3c2443.c' using previous resolution. Resolved 'arch/arm/mach-shmobile/board-armadillo800eva.c' using previous resolution. Resolved 'arch/arm/mach-spear/spear13xx.c' using previous resolution. Resolved 'arch/arm/mach-tegra/tegra.c' using previous resolution. Resolved 'arch/arm/mach-zynq/platsmp.c' using previous resolution. Resolved 'arch/arm/plat-orion/Makefile' using previous resolution. Resolved 'drivers/clocksource/Makefile' using previous resolution. Resolved 'drivers/clocksource/tegra20_timer.c' using previous resolution. Resolved 'drivers/pinctrl/Makefile' using previous resolution. Resolved 'drivers/pinctrl/pinctrl-samsung.c' using previous resolution. Resolved 'drivers/pinctrl/pinctrl-samsung.h' using previous resolution. Resolved 'drivers/usb/host/ohci-exynos.c' using previous resolution. -merging arch/arm/boot/dts/at91sam9m10g45ek.dts Auto-merging arch/arm/boot/dts/at91sam9g45.dtsi Auto-merging arch/arm/boot/dts/at91sam9g20ek_common.dtsi Auto-merging arch/arm/boot/dts/at91sam9263ek.dts Auto-merging arch/arm/boot/dts/at91sam9260.dtsi Auto-merging arch/arm/boot/dts/am33xx.dtsi Auto-merging arch/arm/boot/dts/Makefile Auto-merging arch/arm/Kconfig.debug Auto-merging arch/arm/Kconfig CONFLICT (content): Merge conflict in arch/arm/Kconfig Auto-merging Makefile Auto-merging Documentation/kernel-parameters.txt CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt Auto-merging Documentation/devicetree/bindings/watchdog/sun4i-wdt.txt Auto-merging Documentation/devicetree/bindings/usb/omap-usb.txt Auto-merging Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt Auto-merging Documentation/devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt Auto-merging Documentation/devicetree/bindings/interrupt-controller/allwinner,sun4i-ic.txt Removing Documentation/devicetree/bindings/gpio/gpio-vt8500.txt Auto-merging Documentation/devicetree/bindings/gpio/gpio-omap.txt Automatic merge failed; fix conflicts and then commit the result. $ git rm -f drivers/gpio/gpio-vt8500.c arch/arm/mach-imx/cpufreq.c arch/arm/mach-imx/cpufreq.c: needs merge drivers/gpio/gpio-vt8500.c: needs merge rm 'arch/arm/mach-imx/cpufreq.c' rm 'drivers/gpio/gpio-vt8500.c' $ git commit -v -a Recorded resolution for 'arch/arm/mach-tegra/hotplug.c'. Recorded resolution for 'arch/arm/mach-vexpress/v2m.c'. [master d1f49de] Merge remote-tracking branch 'arm-soc/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/arm/firmware.txt | 88 + .../bindings/arm/altera/socfpga-clk-manager.txt | 11 + .../devicetree/bindings/arm/bcm/bcm,kona-timer.txt | 19 + .../devicetree/bindings/arm/msm/timer.txt | 41 +- .../devicetree/bindings/arm/omap/l3-noc.txt | 1 + .../devicetree/bindings/arm/omap/timer.txt | 17 +- .../devicetree/bindings/arm/primecell.txt | 19 +- .../devicetree/bindings/arm/samsung-boards.txt | 10 + .../devicetree/bindings/arm/samsung/sysreg.txt | 7 + .../bindings/arm/tegra/nvidia,tegra20-pmc.txt | 67 +- .../devicetree/bindings/ata/pata-arasan.txt | 22 + Documentation/devicetree/bindings/bus/ti-gpmc.txt | 103 +- .../devicetree/bindings/clock/altr_socfpga.txt | 18 + .../devicetree/bindings/clock/exynos4-clock.txt | 288 +++ .../devicetree/bindings/clock/exynos5250-clock.txt | 177 ++ .../devicetree/bindings/clock/exynos5440-clock.txt | 61 + .../devicetree/bindings/clock/imx27-clock.txt | 117 + .../devicetree/bindings/clock/imx5-clock.txt | 14 +- .../devicetree/bindings/clock/imx6q-clock.txt | 3 + .../bindings/clock/nvidia,tegra114-car.txt | 303 +++ .../bindings/clock/nvidia,tegra20-car.txt | 4 +- .../devicetree/bindings/dma/fsl-mxs-dma.txt | 49 +- Documentation/devicetree/bindings/fb/mxsfb.txt | 36 +- .../devicetree/bindings/gpio/gpio-omap.txt | 8 +- .../devicetree/bindings/gpio/gpio-vt8500.txt | 24 - .../devicetree/bindings/gpio/mrvl-gpio.txt | 7 +- .../devicetree/bindings/gpu/samsung-g2d.txt | 20 + Documentation/devicetree/bindings/i2c/i2c-mxs.txt | 12 +- .../devicetree/bindings/i2c/nvidia,tegra20-i2c.txt | 60 + ...lwinner,sunxi-ic.txt => allwinner,sun4i-ic.txt} | 4 +- .../interrupt-controller/samsung,s3c24xx-irq.txt | 53 + .../devicetree/bindings/media/s5p-mfc.txt | 21 + Documentation/devicetree/bindings/misc/smc.txt | 14 + .../devicetree/bindings/mmc/davinci_mmc.txt | 33 + Documentation/devicetree/bindings/mmc/mxs-mmc.txt | 12 +- Documentation/devicetree/bindings/mtd/gpmc-nor.txt | 98 + .../devicetree/bindings/mtd/gpmc-onenand.txt | 3 + .../devicetree/bindings/mtd/gpmi-nand.txt | 17 +- Documentation/devicetree/bindings/net/gpmc-eth.txt | 97 + .../bindings/pinctrl/fsl,imx-pinctrl.txt | 6 +- .../bindings/pinctrl/fsl,imx35-pinctrl.txt | 955 +------ .../bindings/pinctrl/fsl,imx51-pinctrl.txt | 759 +----- .../bindings/pinctrl/fsl,imx53-pinctrl.txt | 1174 +-------- .../bindings/pinctrl/fsl,imx6dl-pinctrl.txt | 38 + .../bindings/pinctrl/fsl,imx6q-pinctrl.txt | 1596 +----------- .../bindings/pinctrl/fsl,imx6sl-pinctrl.txt | 39 + .../bindings/pinctrl/fsl,mxs-pinctrl.txt | 4 + .../devicetree/bindings/pinctrl/pinctrl-vt8500.txt | 57 + .../devicetree/bindings/pwm/pwm-samsung.txt | 43 + .../devicetree/bindings/reset/fsl,imx-src.txt | 49 + Documentation/devicetree/bindings/reset/reset.txt | 75 + Documentation/devicetree/bindings/serial/pl011.txt | 17 + .../bindings/sound/nvidia,tegra-audio-alc5632.txt | 8 + .../sound/nvidia,tegra-audio-trimslice.txt | 7 + .../bindings/sound/nvidia,tegra-audio-wm8753.txt | 8 + .../bindings/sound/nvidia,tegra-audio-wm8903.txt | 8 + .../bindings/sound/nvidia,tegra-audio-wm9712.txt | 8 + Documentation/devicetree/bindings/spi/mxs-spi.txt | 12 +- .../devicetree/bindings/spi/spi-davinci.txt | 51 + .../devicetree/bindings/spi/spi_pl022.txt | 36 + .../bindings/staging/imx-drm/fsl-imx-drm.txt | 3 + ...r,sunxi-timer.txt => allwinner,sun4i-timer.txt} | 4 +- .../devicetree/bindings/timer/arm,sp804.txt | 29 + .../devicetree/bindings/timer/fsl,imxgpt.txt | 18 + .../bindings/timer/samsung,exynos4210-mct.txt | 68 + .../bindings/tty/serial/fsl-mxs-auart.txt | 16 +- .../devicetree/bindings/usb/exynos-usb.txt | 50 + Documentation/devicetree/bindings/usb/omap-usb.txt | 1 + .../devicetree/bindings/video/samsung-fimd.txt | 65 + .../watchdog/{sunxi-wdt.txt => sun4i-wdt.txt} | 6 +- Documentation/kernel-parameters.txt | 6 + Makefile | 2 +- arch/arm/Kconfig | 177 +- arch/arm/Kconfig.debug | 52 +- arch/arm/Makefile | 6 +- arch/arm/arm-soc-for-next-contents.txt | 387 +++ arch/arm/boot/dts/Makefile | 36 +- arch/arm/boot/dts/am335x-bone.dts | 10 +- arch/arm/boot/dts/am335x-evm.dts | 18 +- arch/arm/boot/dts/am335x-evmsk.dts | 18 +- arch/arm/boot/dts/am33xx.dtsi | 40 +- arch/arm/boot/dts/am3517-evm.dts | 2 +- arch/arm/boot/dts/am3517_mt_ventoux.dts | 2 +- arch/arm/boot/dts/armada-370-db.dts | 123 +- arch/arm/boot/dts/armada-370-mirabox.dts | 142 +- arch/arm/boot/dts/armada-370-rd.dts | 85 +- arch/arm/boot/dts/armada-370-xp.dtsi | 296 ++- arch/arm/boot/dts/armada-370.dtsi | 282 ++- arch/arm/boot/dts/armada-xp-db.dts | 187 +- arch/arm/boot/dts/armada-xp-gp.dts | 184 +- arch/arm/boot/dts/armada-xp-mv78230.dtsi | 194 +- arch/arm/boot/dts/armada-xp-mv78260.dtsi | 238 +- arch/arm/boot/dts/armada-xp-mv78460.dtsi | 332 ++- arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 232 +- arch/arm/boot/dts/armada-xp.dtsi | 196 +- arch/arm/boot/dts/at91-ariag25.dts | 171 ++ arch/arm/boot/dts/at91rm9200.dtsi | 28 + arch/arm/boot/dts/at91sam9260.dtsi | 19 +- arch/arm/boot/dts/at91sam9263ek.dts | 2 - arch/arm/boot/dts/at91sam9g15.dtsi | 2 +- arch/arm/boot/dts/at91sam9g15ek.dts | 2 +- arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 2 - arch/arm/boot/dts/at91sam9g25.dtsi | 2 +- arch/arm/boot/dts/at91sam9g25ek.dts | 9 + arch/arm/boot/dts/at91sam9g35.dtsi | 2 +- arch/arm/boot/dts/at91sam9g35ek.dts | 9 + arch/arm/boot/dts/at91sam9g45.dtsi | 8 + arch/arm/boot/dts/at91sam9m10g45ek.dts | 2 - arch/arm/boot/dts/at91sam9n12.dtsi | 9 + arch/arm/boot/dts/at91sam9n12ek.dts | 2 - arch/arm/boot/dts/at91sam9x25.dtsi | 2 +- arch/arm/boot/dts/at91sam9x25ek.dts | 14 + arch/arm/boot/dts/at91sam9x35.dtsi | 2 +- arch/arm/boot/dts/at91sam9x35ek.dts | 9 + arch/arm/boot/dts/at91sam9x5.dtsi | 83 + arch/arm/boot/dts/at91sam9x5cm.dtsi | 20 + arch/arm/boot/dts/at91sam9x5ek.dtsi | 15 +- arch/arm/boot/dts/atlas6-evb.dts | 78 + arch/arm/boot/dts/atlas6.dtsi | 668 +++++ arch/arm/boot/dts/bcm11351.dtsi | 13 + arch/arm/boot/dts/bcm2835.dtsi | 22 + arch/arm/boot/dts/cros5250-common.dtsi | 192 +- arch/arm/boot/dts/da850-evm.dts | 110 + arch/arm/boot/dts/da850.dtsi | 109 + arch/arm/boot/dts/dbx5x0.dtsi | 7 +- arch/arm/boot/dts/dove.dtsi | 5 + arch/arm/boot/dts/exynos4.dtsi | 98 + arch/arm/boot/dts/exynos4210-origen.dts | 22 + arch/arm/boot/dts/exynos4210-smdkv310.dts | 75 +- arch/arm/boot/dts/exynos4210-trats.dts | 12 + arch/arm/boot/dts/exynos4210-universal_c210.dts | 352 +++ arch/arm/boot/dts/exynos4210.dtsi | 44 + arch/arm/boot/dts/exynos4212.dtsi | 31 + arch/arm/boot/dts/exynos4412-odroidx.dts | 111 + arch/arm/boot/dts/exynos4412-origen.dts | 453 ++++ arch/arm/boot/dts/exynos4412-smdk4412.dts | 33 + arch/arm/boot/dts/exynos4412.dtsi | 43 + arch/arm/boot/dts/exynos4x12.dtsi | 13 + arch/arm/boot/dts/exynos5250-arndale.dts | 452 ++++ arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 783 ++++++ arch/arm/boot/dts/exynos5250-smdk5250.dts | 69 +- arch/arm/boot/dts/exynos5250-snow.dts | 160 +- arch/arm/boot/dts/exynos5250.dtsi | 495 ++-- arch/arm/boot/dts/exynos5440-sd5v1.dts | 39 + arch/arm/boot/dts/exynos5440-ssdk5440.dts | 25 +- arch/arm/boot/dts/exynos5440.dtsi | 116 +- arch/arm/boot/dts/href.dtsi | 1 + arch/arm/boot/dts/hrefprev60.dts | 10 +- arch/arm/boot/dts/imx23-evk.dts | 36 +- arch/arm/boot/dts/imx23-olinuxino.dts | 1 + arch/arm/boot/dts/imx23.dtsi | 47 +- arch/arm/boot/dts/imx25-karo-tx25.dts | 2 +- arch/arm/boot/dts/imx25-pdk.dts | 2 +- arch/arm/boot/dts/imx25.dtsi | 2 +- arch/arm/boot/dts/imx27-apf27.dts | 2 +- arch/arm/boot/dts/imx27-apf27dev.dts | 60 + arch/arm/boot/dts/imx27-pdk.dts | 2 +- arch/arm/boot/dts/imx27-phytec-phycore.dts | 8 +- arch/arm/boot/dts/imx27.dtsi | 82 +- arch/arm/boot/dts/imx28-apf28dev.dts | 25 + arch/arm/boot/dts/imx28-apx4devkit.dts | 25 + arch/arm/boot/dts/imx28-cfa10049.dts | 50 +- arch/arm/boot/dts/imx28-evk.dts | 36 +- arch/arm/boot/dts/imx28-m28evk.dts | 27 + arch/arm/boot/dts/imx28.dtsi | 67 +- arch/arm/boot/dts/imx31-bug.dts | 2 +- arch/arm/boot/dts/imx31.dtsi | 18 +- arch/arm/boot/dts/imx35-pinfunc.h | 970 +++++++ arch/arm/boot/dts/imx51-apf51.dts | 2 +- arch/arm/boot/dts/imx51-apf51dev.dts | 97 + arch/arm/boot/dts/imx51-babbage.dts | 16 +- arch/arm/boot/dts/imx51-pinfunc.h | 773 ++++++ arch/arm/boot/dts/imx51.dtsi | 343 ++- arch/arm/boot/dts/imx53-ard.dts | 70 +- arch/arm/boot/dts/imx53-evk.dts | 18 +- arch/arm/boot/dts/imx53-mba53.dts | 82 +- arch/arm/boot/dts/imx53-pinfunc.h | 1189 +++++++++ arch/arm/boot/dts/imx53-qsb.dts | 22 +- arch/arm/boot/dts/imx53-smd.dts | 16 +- arch/arm/boot/dts/imx53-tqma53.dtsi | 32 +- arch/arm/boot/dts/imx53.dtsi | 256 +- arch/arm/boot/dts/imx6dl-pinfunc.h | 1085 ++++++++ arch/arm/boot/dts/imx6dl-sabreauto.dts | 31 + arch/arm/boot/dts/imx6dl-sabresd.dts | 35 + arch/arm/boot/dts/imx6dl-wandboard.dts | 44 + arch/arm/boot/dts/imx6dl.dtsi | 125 +- arch/arm/boot/dts/imx6q-arm2.dts | 8 +- arch/arm/boot/dts/imx6q-pinfunc.h | 1041 ++++++++ arch/arm/boot/dts/imx6q-sabreauto.dts | 33 +- arch/arm/boot/dts/imx6q-sabrelite.dts | 18 +- arch/arm/boot/dts/imx6q-sabresd.dts | 67 +- arch/arm/boot/dts/imx6q-sbc6x.dts | 44 + arch/arm/boot/dts/imx6q.dtsi | 280 +- arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 38 + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 87 + arch/arm/boot/dts/imx6qdl.dtsi | 41 +- arch/arm/boot/dts/imx6sl-pinfunc.h | 1077 ++++++++ arch/arm/boot/dts/integratorcp.dts | 6 +- arch/arm/boot/dts/kirkwood-6282.dtsi | 6 + arch/arm/boot/dts/kirkwood-cloudbox.dts | 89 + .../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 4 + .../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 180 ++ arch/arm/boot/dts/kirkwood-ns2mini.dts | 1 + arch/arm/boot/dts/mmp2.dtsi | 2 +- arch/arm/boot/dts/mpa1600.dts | 69 + arch/arm/boot/dts/msm8660-surf.dts | 20 +- arch/arm/boot/dts/msm8960-cdp.dts | 22 +- arch/arm/boot/dts/omap2.dtsi | 39 +- arch/arm/boot/dts/omap2420-h4.dts | 46 + arch/arm/boot/dts/omap2420.dtsi | 67 +- arch/arm/boot/dts/omap2430.dtsi | 87 +- arch/arm/boot/dts/omap3-beagle-xm.dts | 26 +- arch/arm/boot/dts/omap3-beagle.dts | 79 +- arch/arm/boot/dts/omap3-devkit8000.dts | 169 ++ arch/arm/boot/dts/omap3-evm.dts | 14 +- arch/arm/boot/dts/omap3-igep.dtsi | 122 + arch/arm/boot/dts/omap3-igep0020.dts | 56 + arch/arm/boot/dts/omap3-igep0030.dts | 44 + arch/arm/boot/dts/omap3-overo.dtsi | 31 +- arch/arm/boot/dts/omap3.dtsi | 173 +- arch/arm/boot/dts/omap3430-sdp.dts | 190 ++ arch/arm/boot/dts/omap34xx.dtsi | 28 + arch/arm/boot/dts/omap36xx.dtsi | 13 + arch/arm/boot/dts/omap4-panda-a4.dts | 5 +- arch/arm/boot/dts/omap4-panda-common.dtsi | 251 ++ arch/arm/boot/dts/omap4-panda-es.dts | 5 +- arch/arm/boot/dts/omap4-panda.dts | 201 +- arch/arm/boot/dts/omap4-sdp.dts | 74 +- arch/arm/boot/dts/omap4-var-som.dts | 2 +- arch/arm/boot/dts/omap4.dtsi | 165 +- arch/arm/boot/dts/omap443x.dtsi | 27 + arch/arm/boot/dts/omap4460.dtsi | 32 + arch/arm/boot/dts/omap5-evm.dts | 110 +- arch/arm/boot/dts/omap5.dtsi | 245 +- arch/arm/boot/dts/orion5x.dtsi | 33 + arch/arm/boot/dts/pxa168.dtsi | 2 +- arch/arm/boot/dts/pxa910.dtsi | 2 +- arch/arm/boot/dts/r8a73a4-ape6evm.dts | 52 + arch/arm/boot/dts/r8a73a4.dtsi | 94 + arch/arm/boot/dts/r8a7778-bockw.dts | 32 + arch/arm/boot/dts/r8a7778.dtsi | 35 + arch/arm/boot/dts/r8a7779-marzen-reference.dts | 47 + arch/arm/boot/dts/r8a7779.dtsi | 98 + arch/arm/boot/dts/r8a7790-lager.dts | 31 + arch/arm/boot/dts/r8a7790.dtsi | 63 + arch/arm/boot/dts/sama5d3.dtsi | 1046 ++++++++ arch/arm/boot/dts/sama5d31ek.dts | 51 + arch/arm/boot/dts/sama5d33ek.dts | 44 + arch/arm/boot/dts/sama5d34ek.dts | 61 + arch/arm/boot/dts/sama5d35ek.dts | 56 + arch/arm/boot/dts/sama5d3xcm.dtsi | 91 + arch/arm/boot/dts/sama5d3xdm.dtsi | 42 + arch/arm/boot/dts/sama5d3xmb.dtsi | 166 ++ arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 79 + arch/arm/boot/dts/sh73a0-reference.dtsi | 24 - arch/arm/boot/dts/sh73a0.dtsi | 125 + arch/arm/boot/dts/skeleton64.dtsi | 13 + arch/arm/boot/dts/snowball.dts | 4 + arch/arm/boot/dts/socfpga.dtsi | 157 ++ arch/arm/boot/dts/socfpga_cyclone5.dts | 8 + arch/arm/boot/dts/socfpga_vt.dts | 8 + arch/arm/boot/dts/spear1340.dtsi | 3 + arch/arm/boot/dts/spear13xx.dtsi | 25 +- arch/arm/boot/dts/stuib.dtsi | 2 +- arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 32 +- arch/arm/boot/dts/sun4i-a10-hackberry.dts | 6 +- arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 32 + arch/arm/boot/dts/sun4i-a10.dtsi | 253 +- arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 24 +- arch/arm/boot/dts/sun5i-a13.dtsi | 193 +- arch/arm/boot/dts/sunxi.dtsi | 82 - arch/arm/boot/dts/tegra114-dalmore.dts | 905 ++++++- arch/arm/boot/dts/tegra114-pluto.dts | 14 +- arch/arm/boot/dts/tegra114.dtsi | 252 +- arch/arm/boot/dts/tegra20-colibri-512.dtsi | 25 + arch/arm/boot/dts/tegra20-harmony.dts | 33 + arch/arm/boot/dts/tegra20-medcom-wide.dts | 7 + arch/arm/boot/dts/tegra20-paz00.dts | 23 + arch/arm/boot/dts/tegra20-plutux.dts | 3 + arch/arm/boot/dts/tegra20-seaboard.dts | 24 + arch/arm/boot/dts/tegra20-tamonten.dtsi | 19 + arch/arm/boot/dts/tegra20-tec.dts | 3 + arch/arm/boot/dts/tegra20-trimslice.dts | 36 + arch/arm/boot/dts/tegra20-ventana.dts | 35 + arch/arm/boot/dts/tegra20-whistler.dts | 26 + arch/arm/boot/dts/tegra20.dtsi | 57 +- arch/arm/boot/dts/tegra30-beaver.dts | 21 + arch/arm/boot/dts/tegra30-cardhu-a02.dts | 1 + arch/arm/boot/dts/tegra30-cardhu-a04.dts | 1 + arch/arm/boot/dts/tegra30-cardhu.dtsi | 24 + arch/arm/boot/dts/tegra30.dtsi | 7 +- arch/arm/boot/dts/tps6507x.dtsi | 47 + arch/arm/boot/dts/twl4030.dtsi | 18 +- arch/arm/boot/dts/twl6030.dtsi | 12 + arch/arm/boot/dts/versatile-ab.dts | 12 + arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts | 2 +- arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 2 +- arch/arm/boot/dts/vexpress-v2p-ca5s.dts | 2 +- arch/arm/boot/dts/vexpress-v2p-ca9.dts | 1 + arch/arm/boot/dts/vt8500.dtsi | 10 +- arch/arm/boot/dts/wm8505.dtsi | 41 +- arch/arm/boot/dts/wm8650.dtsi | 10 +- arch/arm/boot/dts/wm8850.dtsi | 10 +- arch/arm/common/Makefile | 2 + arch/arm/common/firmware.c | 18 + arch/arm/common/timer-sp.c | 140 +- arch/arm/configs/ape6evm_defconfig | 95 + arch/arm/configs/armadillo800eva_defconfig | 8 +- arch/arm/configs/at91_dt_defconfig | 2 +- arch/arm/configs/at91sam9260_defconfig | 2 +- arch/arm/configs/at91sam9g20_defconfig | 2 +- arch/arm/configs/at91sam9g45_defconfig | 2 +- arch/arm/configs/bcm2835_defconfig | 11 +- arch/arm/configs/bockw_defconfig | 94 + arch/arm/configs/cns3420vb_defconfig | 3 + arch/arm/configs/da8xx_omapl_defconfig | 1 + arch/arm/configs/davinci_all_defconfig | 1 + arch/arm/configs/dove_defconfig | 2 + arch/arm/configs/h7201_defconfig | 27 - arch/arm/configs/h7202_defconfig | 47 - arch/arm/configs/imx_v4_v5_defconfig | 1 + arch/arm/configs/imx_v6_v7_defconfig | 1 + arch/arm/configs/kirkwood_defconfig | 55 +- arch/arm/configs/kzm9g_defconfig | 2 - arch/arm/configs/lpc32xx_defconfig | 20 +- arch/arm/configs/mackerel_defconfig | 4 + arch/arm/configs/marzen_defconfig | 8 + arch/arm/configs/msm_defconfig | 155 +- arch/arm/configs/multi_v7_defconfig | 23 + arch/arm/configs/mvebu_defconfig | 9 + arch/arm/configs/mxs_defconfig | 7 +- arch/arm/configs/nhk8815_defconfig | 42 +- arch/arm/configs/omap2plus_defconfig | 1 + arch/arm/configs/sama5_defconfig | 181 ++ arch/arm/configs/spear3xx_defconfig | 2 + arch/arm/configs/spear6xx_defconfig | 1 + arch/arm/configs/tegra_defconfig | 18 +- arch/arm/configs/u8500_defconfig | 4 +- arch/arm/include/asm/arch_timer.h | 13 +- arch/arm/include/asm/firmware.h | 66 + arch/arm/include/asm/hardware/timer-sp.h | 16 +- arch/arm/include/asm/irq.h | 5 + arch/arm/include/asm/mach/irq.h | 36 - arch/arm/include/asm/sched_clock.h | 2 + .../mach/debug-macro.S => include/debug/bcm2835.S} | 3 +- .../mach/debug-macro.S => include/debug/cns3xxx.S} | 0 .../mach/debug-macro.S => include/debug/exynos.S} | 12 +- arch/arm/include/debug/mvebu.S | 2 +- .../mach/debug-macro.S => include/debug/mxs.S} | 9 +- .../mach/debug-macro.S => include/debug/nomadik.S} | 0 arch/arm/include/debug/pxa.S | 33 + .../plat/debug-macro.S => include/debug/samsung.S} | 0 .../include/mach/uart.h => include/debug/sirf.S} | 29 +- arch/arm/include/debug/ux500.S | 48 + arch/arm/kernel/arch_timer.c | 29 +- arch/arm/kernel/devtree.c | 7 + arch/arm/kernel/irq.c | 6 +- arch/arm/kernel/sched_clock.c | 15 +- arch/arm/kernel/setup.c | 13 +- arch/arm/kernel/time.c | 7 +- arch/arm/mach-at91/Kconfig | 453 +--- arch/arm/mach-at91/Kconfig.non_dt | 399 +++ arch/arm/mach-at91/Makefile | 11 +- arch/arm/mach-at91/at91_rstc.h | 2 +- arch/arm/mach-at91/at91_shdwc.h | 2 +- arch/arm/mach-at91/at91rm9200.c | 3 +- arch/arm/mach-at91/at91sam9260.c | 2 +- arch/arm/mach-at91/at91sam9261.c | 4 +- arch/arm/mach-at91/at91sam9261_devices.c | 6 +- arch/arm/mach-at91/at91sam9263.c | 3 +- arch/arm/mach-at91/at91sam9263_devices.c | 2 +- arch/arm/mach-at91/at91sam9g45.c | 4 +- arch/arm/mach-at91/at91sam9g45_devices.c | 6 +- arch/arm/mach-at91/at91sam9n12.c | 2 +- arch/arm/mach-at91/at91sam9rl.c | 3 +- arch/arm/mach-at91/at91sam9rl_devices.c | 2 +- arch/arm/mach-at91/at91sam9x5.c | 2 +- arch/arm/mach-at91/at91x40_time.c | 2 +- .../{board-rm9200-dt.c => board-dt-rm9200.c} | 0 arch/arm/mach-at91/{board-dt.c => board-dt-sam9.c} | 0 arch/arm/mach-at91/board-dt-sama5.c | 86 + arch/arm/mach-at91/clock.c | 109 +- arch/arm/mach-at91/clock.h | 2 + arch/arm/mach-at91/cpuidle.c | 2 + arch/arm/mach-at91/gpio.c | 3 +- arch/arm/mach-at91/include/mach/at91_dbgu.h | 3 - arch/arm/mach-at91/include/mach/at91_matrix.h | 2 +- arch/arm/mach-at91/include/mach/at91_pmc.h | 18 +- arch/arm/mach-at91/include/mach/at91_st.h | 2 +- arch/arm/mach-at91/include/mach/cpu.h | 29 +- arch/arm/mach-at91/include/mach/sama5d3.h | 73 + arch/arm/mach-at91/pm.c | 2 + arch/arm/mach-at91/pm.h | 30 +- arch/arm/mach-at91/sama5d3.c | 377 +++ arch/arm/mach-at91/setup.c | 57 +- arch/arm/mach-at91/soc.h | 7 +- arch/arm/mach-bcm/Makefile | 4 +- arch/arm/mach-bcm/bcm_kona_smc.c | 118 + arch/arm/mach-bcm/bcm_kona_smc.h | 80 + arch/arm/mach-bcm/bcm_kona_smc_asm.S | 41 + arch/arm/mach-bcm/board_bcm.c | 23 + arch/arm/mach-bcm2835/Kconfig | 15 + arch/arm/mach-bcm2835/Makefile.boot | 1 - arch/arm/mach-bcm2835/bcm2835.c | 6 +- arch/arm/mach-bcm2835/include/mach/bcm2835_soc.h | 29 - arch/arm/mach-bcm2835/include/mach/gpio.h | 1 - arch/arm/mach-bcm2835/include/mach/uncompress.h | 44 - arch/arm/mach-cns3xxx/Kconfig | 12 + arch/arm/mach-cns3xxx/Makefile | 8 +- arch/arm/mach-cns3xxx/cns3420vb.c | 6 +- arch/arm/mach-cns3xxx/{include/mach => }/cns3xxx.h | 34 +- arch/arm/mach-cns3xxx/core.c | 131 +- arch/arm/mach-cns3xxx/devices.c | 5 +- arch/arm/mach-cns3xxx/include/mach/irqs.h | 24 - arch/arm/mach-cns3xxx/include/mach/timex.h | 12 - arch/arm/mach-cns3xxx/include/mach/uncompress.h | 53 - arch/arm/mach-cns3xxx/pcie.c | 2 +- arch/arm/mach-cns3xxx/pm.c | 4 +- arch/arm/mach-cns3xxx/{include/mach => }/pm.h | 0 arch/arm/mach-davinci/board-da830-evm.c | 7 +- arch/arm/mach-davinci/board-da850-evm.c | 19 +- arch/arm/mach-davinci/board-dm355-evm.c | 1 - arch/arm/mach-davinci/board-dm365-evm.c | 1 - arch/arm/mach-davinci/board-dm644x-evm.c | 26 +- arch/arm/mach-davinci/board-dm646x-evm.c | 7 +- arch/arm/mach-davinci/board-neuros-osd2.c | 16 +- arch/arm/mach-davinci/board-omapl138-hawk.c | 7 +- arch/arm/mach-davinci/board-tnetv107x-evm.c | 1 - arch/arm/mach-davinci/clock.c | 21 +- arch/arm/mach-davinci/clock.h | 2 + arch/arm/mach-davinci/da830.c | 2 +- arch/arm/mach-davinci/da850.c | 50 +- arch/arm/mach-davinci/da8xx-dt.c | 11 +- arch/arm/mach-davinci/devices-da8xx.c | 92 +- arch/arm/mach-davinci/devices-tnetv107x.c | 4 +- arch/arm/mach-davinci/devices.c | 8 +- arch/arm/mach-davinci/dm355.c | 4 +- arch/arm/mach-davinci/dm365.c | 4 +- arch/arm/mach-davinci/dm644x.c | 2 +- arch/arm/mach-davinci/include/mach/da8xx.h | 5 + arch/arm/mach-davinci/include/mach/debug-macro.S | 2 - arch/arm/mach-davinci/pm.c | 1 + arch/arm/mach-davinci/sram.c | 4 +- arch/arm/mach-davinci/tnetv107x.c | 4 +- arch/arm/mach-davinci/usb.c | 3 +- arch/arm/mach-dove/Makefile | 2 +- arch/arm/mach-dove/addr-map.c | 125 - arch/arm/mach-dove/board-dt.c | 2 +- arch/arm/mach-dove/common.c | 39 +- arch/arm/mach-dove/common.h | 2 +- arch/arm/mach-dove/include/mach/dove.h | 5 + arch/arm/mach-exynos/Kconfig | 36 +- arch/arm/mach-exynos/Makefile | 12 +- arch/arm/mach-exynos/clock-exynos4.c | 1601 ------------ arch/arm/mach-exynos/clock-exynos4.h | 35 - arch/arm/mach-exynos/clock-exynos4210.c | 187 -- arch/arm/mach-exynos/clock-exynos4212.c | 201 -- arch/arm/mach-exynos/clock-exynos5.c | 1645 ------------ arch/arm/mach-exynos/common.c | 207 +- arch/arm/mach-exynos/common.h | 15 +- arch/arm/mach-exynos/cpuidle.c | 58 +- arch/arm/mach-exynos/dev-ohci.c | 2 +- arch/arm/mach-exynos/dev-uart.c | 1 + arch/arm/mach-exynos/exynos-smc.S | 22 + arch/arm/mach-exynos/firmware.c | 70 + arch/arm/mach-exynos/include/mach/irqs.h | 24 +- arch/arm/mach-exynos/include/mach/map.h | 5 +- arch/arm/mach-exynos/include/mach/pm-core.h | 9 +- arch/arm/mach-exynos/include/mach/regs-mct.h | 53 - arch/arm/mach-exynos/mach-armlex4210.c | 4 +- arch/arm/mach-exynos/mach-exynos4-dt.c | 123 +- arch/arm/mach-exynos/mach-exynos5-dt.c | 141 +- arch/arm/mach-exynos/mach-nuri.c | 6 +- arch/arm/mach-exynos/mach-origen.c | 8 +- arch/arm/mach-exynos/mach-smdk4x12.c | 6 +- arch/arm/mach-exynos/mach-smdkv310.c | 10 +- arch/arm/mach-exynos/mach-universal_c210.c | 9 +- arch/arm/mach-exynos/platsmp.c | 40 +- arch/arm/mach-exynos/setup-sdhci-gpio.c | 2 +- arch/arm/mach-exynos/smc.h | 31 + arch/arm/mach-gemini/Makefile | 2 +- arch/arm/mach-gemini/board-nas4220b.c | 1 + arch/arm/mach-gemini/board-rut1xx.c | 2 + arch/arm/mach-gemini/board-wbd111.c | 1 + arch/arm/mach-gemini/board-wbd222.c | 1 + arch/arm/mach-gemini/common.h | 2 + arch/arm/mach-gemini/gpio.c | 19 +- arch/arm/mach-gemini/include/mach/hardware.h | 2 +- arch/arm/mach-gemini/irq.c | 4 +- arch/arm/mach-gemini/mm.c | 22 +- .../mach-gemini/{include/mach/system.h => reset.c} | 2 +- arch/arm/mach-h720x/Kconfig | 40 - arch/arm/mach-h720x/Makefile | 16 - arch/arm/mach-h720x/Makefile.boot | 2 - arch/arm/mach-h720x/common.c | 268 -- arch/arm/mach-h720x/common.h | 30 - arch/arm/mach-h720x/cpu-h7201.c | 57 - arch/arm/mach-h720x/cpu-h7202.c | 225 -- arch/arm/mach-h720x/h7201-eval.c | 38 - arch/arm/mach-h720x/h7202-eval.c | 81 - arch/arm/mach-h720x/include/mach/boards.h | 53 - arch/arm/mach-h720x/include/mach/debug-macro.S | 40 - arch/arm/mach-h720x/include/mach/entry-macro.S | 57 - arch/arm/mach-h720x/include/mach/h7201-regs.h | 67 - arch/arm/mach-h720x/include/mach/h7202-regs.h | 155 -- arch/arm/mach-h720x/include/mach/hardware.h | 190 -- arch/arm/mach-h720x/include/mach/irqs.h | 116 - arch/arm/mach-h720x/include/mach/isa-dma.h | 19 - arch/arm/mach-h720x/include/mach/uncompress.h | 36 - arch/arm/mach-highbank/Kconfig | 1 + arch/arm/mach-highbank/highbank.c | 24 +- arch/arm/mach-highbank/platsmp.c | 7 - arch/arm/mach-imx/Kconfig | 33 +- arch/arm/mach-imx/Makefile | 4 +- arch/arm/mach-imx/Makefile.boot | 35 - arch/arm/mach-imx/anatop.c | 103 + arch/arm/mach-imx/avic.c | 6 +- arch/arm/mach-imx/clk-busy.c | 2 +- arch/arm/mach-imx/clk-gate2.c | 1 + arch/arm/mach-imx/clk-imx27.c | 13 +- arch/arm/mach-imx/clk-imx51-imx53.c | 84 +- arch/arm/mach-imx/clk-imx6q.c | 126 +- arch/arm/mach-imx/clk-pllv1.c | 2 +- arch/arm/mach-imx/clk-pllv2.c | 2 +- arch/arm/mach-imx/clk.c | 1 + arch/arm/mach-imx/clk.h | 17 + arch/arm/mach-imx/common.h | 13 +- arch/arm/mach-imx/cpu-imx5.c | 1 + arch/arm/mach-imx/cpu.c | 1 + arch/arm/mach-imx/cpu_op-mx51.c | 31 - arch/arm/mach-imx/cpu_op-mx51.h | 14 - arch/arm/mach-imx/cpufreq.c | 202 -- arch/arm/mach-imx/devices/Kconfig | 4 - arch/arm/mach-imx/devices/Makefile | 1 - arch/arm/mach-imx/devices/devices-common.h | 10 - arch/arm/mach-imx/devices/platform-ahci-imx.c | 157 -- arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 4 +- arch/arm/mach-imx/gpc.c | 24 +- arch/arm/mach-imx/hardware.h | 1 - arch/arm/mach-imx/imx27-dt.c | 22 +- arch/arm/mach-imx/imx51-dt.c | 3 + arch/arm/mach-imx/iomux-imx31.c | 2 +- arch/arm/mach-imx/irq-common.c | 19 - arch/arm/mach-imx/mach-cpuimx27.c | 4 +- arch/arm/mach-imx/mach-cpuimx51sd.c | 5 - arch/arm/mach-imx/mach-imx6q.c | 78 +- arch/arm/mach-imx/mach-mx51_babbage.c | 4 - arch/arm/mach-imx/mm-imx1.c | 2 + arch/arm/mach-imx/mm-imx3.c | 2 +- arch/arm/mach-imx/mm-imx5.c | 2 + arch/arm/mach-imx/mx6q.h | 31 - arch/arm/mach-imx/mxc.h | 11 + arch/arm/mach-imx/platsmp.c | 16 +- arch/arm/mach-imx/pm-imx6q.c | 4 +- arch/arm/mach-imx/src.c | 70 +- arch/arm/mach-imx/tzic.c | 2 +- arch/arm/mach-integrator/integrator_cp.c | 34 - arch/arm/mach-kirkwood/Kconfig | 334 +-- arch/arm/mach-kirkwood/Makefile | 44 +- arch/arm/mach-kirkwood/addr-map.c | 91 - arch/arm/mach-kirkwood/board-dt.c | 20 +- arch/arm/mach-kirkwood/board-guruplug.c | 6 - arch/arm/mach-kirkwood/board-ns2.c | 3 +- arch/arm/mach-kirkwood/board-readynas.c | 28 + arch/arm/mach-kirkwood/common.c | 38 +- arch/arm/mach-kirkwood/common.h | 14 +- arch/arm/mach-kirkwood/include/mach/kirkwood.h | 7 +- arch/arm/mach-kirkwood/pcie.c | 1 - arch/arm/mach-l7200/include/mach/debug-macro.S | 38 - arch/arm/mach-mmp/aspenite.c | 7 + arch/arm/mach-mmp/avengers_lite.c | 7 + arch/arm/mach-mmp/brownstone.c | 7 + arch/arm/mach-mmp/clock-mmp2.c | 2 +- arch/arm/mach-mmp/clock-pxa168.c | 2 +- arch/arm/mach-mmp/clock-pxa910.c | 2 +- arch/arm/mach-mmp/flint.c | 7 + arch/arm/mach-mmp/gplugd.c | 7 + arch/arm/mach-mmp/include/mach/debug-macro.S | 30 - arch/arm/mach-mmp/jasper.c | 8 + arch/arm/mach-mmp/mmp-dt.c | 4 +- arch/arm/mach-mmp/mmp2-dt.c | 2 +- arch/arm/mach-mmp/mmp2.c | 2 +- arch/arm/mach-mmp/pxa168.c | 2 +- arch/arm/mach-mmp/pxa910.c | 2 +- arch/arm/mach-mmp/tavorevb.c | 7 + arch/arm/mach-mmp/teton_bga.c | 7 + arch/arm/mach-mmp/ttc_dkb.c | 7 + arch/arm/mach-msm/Kconfig | 7 +- arch/arm/mach-msm/board-halibut.c | 1 + arch/arm/mach-msm/board-msm7x30.c | 1 + arch/arm/mach-msm/board-qsd8x50.c | 1 + arch/arm/mach-msm/board-trout.c | 1 + arch/arm/mach-msm/devices-msm7x00.c | 31 + arch/arm/mach-msm/devices-msm7x30.c | 31 + arch/arm/mach-msm/devices-qsd8x50.c | 31 + arch/arm/mach-msm/devices.h | 4 + arch/arm/mach-msm/dma.c | 26 + arch/arm/mach-msm/include/mach/cpu.h | 54 - arch/arm/mach-msm/include/mach/dma.h | 26 - arch/arm/mach-msm/include/mach/uncompress.h | 2 +- arch/arm/mach-msm/platsmp.c | 8 - arch/arm/mach-msm/timer.c | 110 +- arch/arm/mach-mv78xx0/Makefile | 2 +- arch/arm/mach-mv78xx0/addr-map.c | 93 - arch/arm/mach-mv78xx0/common.c | 10 +- arch/arm/mach-mv78xx0/include/mach/mv78xx0.h | 9 +- arch/arm/mach-mv78xx0/pcie.c | 21 +- arch/arm/mach-mvebu/Kconfig | 2 + arch/arm/mach-mvebu/Makefile | 2 +- arch/arm/mach-mvebu/addr-map.c | 137 - arch/arm/mach-mvebu/armada-370-xp.c | 27 +- arch/arm/mach-mvebu/armada-370-xp.h | 8 +- arch/arm/mach-mvebu/platsmp.c | 2 + arch/arm/mach-mxs/Kconfig | 24 +- arch/arm/mach-mxs/Makefile | 6 +- arch/arm/mach-mxs/Makefile.boot | 1 - arch/arm/mach-mxs/include/mach/common.h | 29 - arch/arm/mach-mxs/include/mach/digctl.h | 22 - arch/arm/mach-mxs/include/mach/hardware.h | 23 - arch/arm/mach-mxs/include/mach/mx23.h | 169 -- arch/arm/mach-mxs/include/mach/mx28.h | 225 -- arch/arm/mach-mxs/include/mach/mxs.h | 117 - arch/arm/mach-mxs/include/mach/timex.h | 21 - arch/arm/mach-mxs/include/mach/uncompress.h | 76 - arch/arm/mach-mxs/mach-mxs.c | 346 ++- arch/arm/mach-mxs/mm.c | 52 - arch/arm/mach-mxs/ocotp.c | 93 - arch/arm/mach-mxs/pm.c | 4 +- .../include/mach/timex.h => mach-mxs/pm.h} | 9 +- arch/arm/mach-mxs/system.c | 139 - arch/arm/mach-nomadik/Kconfig | 25 +- arch/arm/mach-nomadik/Makefile.boot | 4 - arch/arm/mach-nomadik/cpu-8815.c | 1 - arch/arm/mach-nomadik/include/mach/irqs.h | 79 - arch/arm/mach-nomadik/include/mach/timex.h | 6 - arch/arm/mach-nomadik/include/mach/uncompress.h | 60 - arch/arm/mach-omap1/Kconfig | 6 - arch/arm/mach-omap1/dma.h | 41 - arch/arm/mach-omap1/include/mach/usb.h | 2 +- arch/arm/mach-omap1/usb.c | 6 +- arch/arm/mach-omap2/Kconfig | 12 +- arch/arm/mach-omap2/Makefile | 3 - arch/arm/mach-omap2/board-2430sdp.c | 45 +- arch/arm/mach-omap2/board-3430sdp.c | 74 +- arch/arm/mach-omap2/board-3630sdp.c | 21 +- arch/arm/mach-omap2/board-4430sdp.c | 6 + arch/arm/mach-omap2/board-am3517crane.c | 24 +- arch/arm/mach-omap2/board-am3517evm.c | 91 +- arch/arm/mach-omap2/board-cm-t35.c | 80 +- arch/arm/mach-omap2/board-cm-t3517.c | 22 +- arch/arm/mach-omap2/board-devkit8000.c | 35 +- arch/arm/mach-omap2/board-generic.c | 3 +- arch/arm/mach-omap2/board-h4.c | 2 +- arch/arm/mach-omap2/board-igep0020.c | 32 +- arch/arm/mach-omap2/board-ldp.c | 61 +- arch/arm/mach-omap2/board-omap3beagle.c | 32 +- arch/arm/mach-omap2/board-omap3evm.c | 95 +- arch/arm/mach-omap2/board-omap3pandora.c | 28 +- arch/arm/mach-omap2/board-omap3stalker.c | 28 +- arch/arm/mach-omap2/board-omap3touchbook.c | 17 +- arch/arm/mach-omap2/board-omap4panda.c | 55 +- arch/arm/mach-omap2/board-overo.c | 74 +- arch/arm/mach-omap2/board-rx51-peripherals.c | 4 + arch/arm/mach-omap2/board-rx51-video.c | 26 +- arch/arm/mach-omap2/board-zoom-display.c | 94 +- arch/arm/mach-omap2/board-zoom-peripherals.c | 53 +- arch/arm/mach-omap2/board-zoom.c | 16 +- arch/arm/mach-omap2/cclock2420_data.c | 283 +-- arch/arm/mach-omap2/cclock2430_data.c | 313 ++- arch/arm/mach-omap2/cclock33xx_data.c | 181 +- arch/arm/mach-omap2/cclock3xxx_data.c | 687 ++--- arch/arm/mach-omap2/cclock44xx_data.c | 517 ++-- arch/arm/mach-omap2/clock.c | 17 +- arch/arm/mach-omap2/clock.h | 20 +- arch/arm/mach-omap2/common.h | 11 +- arch/arm/mach-omap2/cpuidle34xx.c | 3 - arch/arm/mach-omap2/cpuidle44xx.c | 8 +- arch/arm/mach-omap2/devices.c | 149 +- arch/arm/mach-omap2/dma.h | 70 - arch/arm/mach-omap2/dpll3xxx.c | 30 +- arch/arm/mach-omap2/dsp.c | 4 +- arch/arm/mach-omap2/dss-common.c | 54 +- arch/arm/mach-omap2/gpmc-nand.c | 42 +- arch/arm/mach-omap2/gpmc-onenand.c | 118 +- arch/arm/mach-omap2/gpmc-smc91x.c | 30 +- arch/arm/mach-omap2/gpmc.c | 544 ++-- arch/arm/mach-omap2/gpmc.h | 43 +- arch/arm/mach-omap2/id.c | 107 +- arch/arm/mach-omap2/io.c | 43 +- arch/arm/mach-omap2/omap-hotplug.c | 3 - arch/arm/mach-omap2/omap-smp.c | 76 +- arch/arm/mach-omap2/omap4-common.c | 26 +- arch/arm/mach-omap2/omap4-sar-layout.h | 28 +- arch/arm/mach-omap2/omap54xx.h | 1 + arch/arm/mach-omap2/omap_device.c | 4 +- arch/arm/mach-omap2/omap_hwmod.c | 52 +- arch/arm/mach-omap2/omap_hwmod.h | 6 +- arch/arm/mach-omap2/omap_hwmod_2420_data.c | 2 + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 2 + .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 36 + arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 81 + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 107 +- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 172 +- arch/arm/mach-omap2/omap_hwmod_common_data.h | 4 + arch/arm/mach-omap2/pm24xx.c | 11 +- arch/arm/mach-omap2/pm34xx.c | 9 +- arch/arm/mach-omap2/pm44xx.c | 20 +- arch/arm/mach-omap2/pmu.c | 14 +- arch/arm/mach-omap2/powerdomain.c | 18 +- arch/arm/mach-omap2/prm44xx.c | 6 +- arch/arm/mach-omap2/soc.h | 2 + arch/arm/mach-omap2/timer.c | 137 +- arch/arm/mach-omap2/usb-host.c | 160 +- arch/arm/mach-omap2/usb-tusb6010.c | 62 +- arch/arm/mach-omap2/usb.h | 9 + arch/arm/mach-orion5x/Makefile | 2 +- arch/arm/mach-orion5x/addr-map.c | 155 -- arch/arm/mach-orion5x/board-dt.c | 2 +- arch/arm/mach-orion5x/common.c | 50 +- arch/arm/mach-orion5x/common.h | 13 +- arch/arm/mach-orion5x/d2net-setup.c | 4 +- arch/arm/mach-orion5x/db88f5281-setup.c | 13 +- arch/arm/mach-orion5x/dns323-setup.c | 3 +- arch/arm/mach-orion5x/edmini_v2-setup.c | 4 +- arch/arm/mach-orion5x/include/mach/orion5x.h | 6 +- arch/arm/mach-orion5x/kurobox_pro-setup.c | 8 +- arch/arm/mach-orion5x/ls-chl-setup.c | 4 +- arch/arm/mach-orion5x/ls_hgl-setup.c | 4 +- arch/arm/mach-orion5x/lsmini-setup.c | 4 +- arch/arm/mach-orion5x/mss2-setup.c | 3 +- arch/arm/mach-orion5x/mv2120-setup.c | 3 +- arch/arm/mach-orion5x/net2big-setup.c | 4 +- arch/arm/mach-orion5x/pci.c | 14 +- arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 4 +- arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 4 +- arch/arm/mach-orion5x/rd88f5182-setup.c | 7 +- arch/arm/mach-orion5x/terastation_pro2-setup.c | 4 +- arch/arm/mach-orion5x/ts209-setup.c | 4 +- arch/arm/mach-orion5x/ts409-setup.c | 4 +- arch/arm/mach-orion5x/wnr854t-setup.c | 4 +- arch/arm/mach-orion5x/wrt350n-v2-setup.c | 4 +- arch/arm/mach-prima2/Kconfig | 23 +- arch/arm/mach-prima2/Makefile | 5 +- arch/arm/mach-prima2/common.c | 37 +- arch/arm/mach-prima2/common.h | 4 +- arch/arm/mach-prima2/include/mach/clkdev.h | 15 - arch/arm/mach-prima2/include/mach/debug-macro.S | 29 - arch/arm/mach-prima2/include/mach/entry-macro.S | 22 - arch/arm/mach-prima2/include/mach/hardware.h | 15 - arch/arm/mach-prima2/include/mach/irqs.h | 17 - arch/arm/mach-prima2/include/mach/map.h | 18 - arch/arm/mach-prima2/include/mach/timex.h | 14 - arch/arm/mach-prima2/include/mach/uncompress.h | 41 - arch/arm/mach-prima2/irq.c | 129 - arch/arm/mach-prima2/lluart.c | 14 +- arch/arm/mach-prima2/platsmp.c | 9 - arch/arm/mach-pxa/Kconfig | 2 + arch/arm/mach-pxa/devices.c | 29 +- arch/arm/mach-pxa/devices.h | 6 +- arch/arm/mach-pxa/include/mach/debug-macro.S | 23 - arch/arm/mach-pxa/pxa25x.c | 11 +- arch/arm/mach-pxa/pxa27x.c | 7 +- arch/arm/mach-pxa/pxa3xx.c | 23 +- arch/arm/mach-pxa/pxa930.c | 17 +- arch/arm/mach-realview/Kconfig | 8 + arch/arm/mach-s3c24xx/Kconfig | 29 +- arch/arm/mach-s3c24xx/Makefile | 8 +- arch/arm/mach-s3c24xx/bast-irq.c | 2 - arch/arm/mach-s3c24xx/clock-s3c2410.c | 1 - arch/arm/mach-s3c24xx/clock-s3c2412.c | 1 - arch/arm/mach-s3c24xx/clock-s3c2416.c | 1 - arch/arm/mach-s3c24xx/clock-s3c2443.c | 1 - arch/arm/mach-s3c24xx/common-smdk.c | 3 +- .../include/plat => mach-s3c24xx}/common-smdk.h | 3 +- arch/arm/mach-s3c24xx/common.c | 7 +- arch/arm/mach-s3c24xx/common.h | 94 +- arch/arm/mach-s3c24xx/dma-s3c2410.c | 1 - arch/arm/mach-s3c24xx/dma-s3c2412.c | 1 - arch/arm/mach-s3c24xx/dma-s3c2440.c | 1 - arch/arm/mach-s3c24xx/dma-s3c2443.c | 1 - arch/arm/mach-s3c24xx/include/mach/debug-macro.S | 2 +- arch/arm/mach-s3c24xx/include/mach/dma.h | 1 - arch/arm/mach-s3c24xx/include/mach/entry-macro.S | 70 - arch/arm/mach-s3c24xx/include/mach/irqs.h | 58 +- arch/arm/mach-s3c24xx/include/mach/regs-sdi.h | 127 - arch/arm/mach-s3c24xx/irq-pm.c | 7 +- arch/arm/mach-s3c24xx/irq-s3c2412.c | 215 -- arch/arm/mach-s3c24xx/irq-s3c2440.c | 128 - arch/arm/mach-s3c24xx/irq-s3c244x.c | 142 -- arch/arm/mach-s3c24xx/mach-amlm5900.c | 7 +- arch/arm/mach-s3c24xx/mach-anubis.c | 6 +- arch/arm/mach-s3c24xx/mach-at2440evb.c | 6 +- arch/arm/mach-s3c24xx/mach-bast.c | 6 +- arch/arm/mach-s3c24xx/mach-gta02.c | 6 +- arch/arm/mach-s3c24xx/mach-h1940.c | 12 +- arch/arm/mach-s3c24xx/mach-jive.c | 8 +- arch/arm/mach-s3c24xx/mach-mini2440.c | 6 +- arch/arm/mach-s3c24xx/mach-n30.c | 11 +- arch/arm/mach-s3c24xx/mach-nexcoder.c | 8 +- arch/arm/mach-s3c24xx/mach-osiris.c | 6 +- arch/arm/mach-s3c24xx/mach-otom.c | 7 +- arch/arm/mach-s3c24xx/mach-qt2410.c | 8 +- arch/arm/mach-s3c24xx/mach-rx1950.c | 6 +- arch/arm/mach-s3c24xx/mach-rx3715.c | 11 +- arch/arm/mach-s3c24xx/mach-smdk2410.c | 9 +- arch/arm/mach-s3c24xx/mach-smdk2413.c | 19 +- arch/arm/mach-s3c24xx/mach-smdk2416.c | 8 +- arch/arm/mach-s3c24xx/mach-smdk2440.c | 11 +- arch/arm/mach-s3c24xx/mach-smdk2443.c | 9 +- arch/arm/mach-s3c24xx/mach-tct_hammer.c | 6 +- arch/arm/mach-s3c24xx/mach-vr1000.c | 6 +- arch/arm/mach-s3c24xx/mach-vstms.c | 9 +- arch/arm/mach-s3c24xx/pm-s3c2412.c | 9 +- arch/arm/mach-s3c24xx/regs-dsc.h | 203 +- arch/arm/mach-s3c24xx/s3c2410.c | 1 - arch/arm/mach-s3c24xx/s3c2412.c | 1 - arch/arm/mach-s3c24xx/s3c2416.c | 1 - arch/arm/mach-s3c24xx/s3c2440.c | 1 - arch/arm/mach-s3c24xx/s3c2442.c | 1 - arch/arm/mach-s3c24xx/s3c2443.c | 1 - arch/arm/mach-s3c24xx/s3c244x.c | 2 - arch/arm/mach-s3c64xx/Kconfig | 2 + arch/arm/mach-s3c64xx/Makefile | 1 - arch/arm/mach-s3c64xx/dma.c | 1 + arch/arm/mach-s3c64xx/include/mach/debug-macro.S | 2 +- arch/arm/mach-s3c64xx/include/mach/dma.h | 1 - arch/arm/mach-s3c64xx/mach-anw6410.c | 4 +- arch/arm/mach-s3c64xx/mach-crag6410-module.c | 1 + arch/arm/mach-s3c64xx/mach-crag6410.c | 4 +- arch/arm/mach-s3c64xx/mach-hmt.c | 4 +- arch/arm/mach-s3c64xx/mach-mini6410.c | 4 +- arch/arm/mach-s3c64xx/mach-ncp.c | 4 +- arch/arm/mach-s3c64xx/mach-real6410.c | 4 +- arch/arm/mach-s3c64xx/mach-smartq.c | 2 + arch/arm/mach-s3c64xx/mach-smartq5.c | 3 +- arch/arm/mach-s3c64xx/mach-smartq7.c | 3 +- arch/arm/mach-s3c64xx/mach-smdk6400.c | 4 +- arch/arm/mach-s3c64xx/mach-smdk6410.c | 4 +- arch/arm/mach-s5p64x0/Kconfig | 4 +- arch/arm/mach-s5p64x0/include/mach/debug-macro.S | 2 +- arch/arm/mach-s5p64x0/mach-smdk6440.c | 6 +- arch/arm/mach-s5p64x0/mach-smdk6450.c | 6 +- arch/arm/mach-s5pc100/Kconfig | 1 + arch/arm/mach-s5pc100/common.h | 9 - arch/arm/mach-s5pc100/include/mach/debug-macro.S | 2 +- arch/arm/mach-s5pc100/mach-smdkc100.c | 4 +- arch/arm/mach-s5pc100/setup-sdhci-gpio.c | 1 - arch/arm/mach-s5pv210/Kconfig | 2 +- arch/arm/mach-s5pv210/common.h | 9 - arch/arm/mach-s5pv210/include/mach/debug-macro.S | 2 +- arch/arm/mach-s5pv210/mach-aquila.c | 6 +- arch/arm/mach-s5pv210/mach-goni.c | 6 +- arch/arm/mach-s5pv210/mach-smdkc110.c | 6 +- arch/arm/mach-s5pv210/mach-smdkv210.c | 6 +- arch/arm/mach-s5pv210/mach-torbreck.c | 6 +- arch/arm/mach-s5pv210/setup-sdhci-gpio.c | 1 - arch/arm/mach-shmobile/Kconfig | 77 +- arch/arm/mach-shmobile/Makefile | 15 +- arch/arm/mach-shmobile/board-ag5evm.c | 172 +- arch/arm/mach-shmobile/board-ap4evb.c | 91 +- arch/arm/mach-shmobile/board-ape6evm.c | 94 + arch/arm/mach-shmobile/board-armadillo800eva.c | 333 ++- arch/arm/mach-shmobile/board-bockw.c | 81 + arch/arm/mach-shmobile/board-bonito.c | 52 +- arch/arm/mach-shmobile/board-kota2.c | 208 +- arch/arm/mach-shmobile/board-kzm9d.c | 1 - arch/arm/mach-shmobile/board-kzm9g-reference.c | 107 + arch/arm/mach-shmobile/board-kzm9g.c | 244 +- arch/arm/mach-shmobile/board-lager.c | 46 + arch/arm/mach-shmobile/board-mackerel.c | 187 +- arch/arm/mach-shmobile/board-marzen-reference.c | 75 + arch/arm/mach-shmobile/board-marzen.c | 119 +- arch/arm/mach-shmobile/clock-r8a73a4.c | 115 + arch/arm/mach-shmobile/clock-r8a7740.c | 127 +- arch/arm/mach-shmobile/clock-r8a7778.c | 107 + arch/arm/mach-shmobile/clock-r8a7779.c | 221 +- arch/arm/mach-shmobile/clock-r8a7790.c | 93 + arch/arm/mach-shmobile/clock-sh7372.c | 50 +- arch/arm/mach-shmobile/clock-sh73a0.c | 122 +- arch/arm/mach-shmobile/clock.c | 13 + .../{headsmp-sh73a0.S => headsmp-scu.S} | 15 +- arch/arm/mach-shmobile/hotplug.c | 68 - arch/arm/mach-shmobile/include/mach/clock.h | 39 + arch/arm/mach-shmobile/include/mach/common.h | 64 +- arch/arm/mach-shmobile/include/mach/irqs.h | 5 + arch/arm/mach-shmobile/include/mach/r8a73a4.h | 8 + arch/arm/mach-shmobile/include/mach/r8a7740.h | 83 +- arch/arm/mach-shmobile/include/mach/r8a7778.h | 32 + arch/arm/mach-shmobile/include/mach/r8a7779.h | 336 +-- arch/arm/mach-shmobile/include/mach/r8a7790.h | 9 + arch/arm/mach-shmobile/include/mach/sh7372.h | 41 +- arch/arm/mach-shmobile/include/mach/sh73a0.h | 378 +-- arch/arm/mach-shmobile/intc-r8a7740.c | 641 +---- arch/arm/mach-shmobile/intc-r8a7779.c | 78 +- arch/arm/mach-shmobile/intc-sh73a0.c | 125 - arch/arm/mach-shmobile/setup-emev2.c | 5 +- arch/arm/mach-shmobile/setup-r8a73a4.c | 202 ++ arch/arm/mach-shmobile/setup-r8a7740.c | 193 +- arch/arm/mach-shmobile/setup-r8a7778.c | 244 ++ arch/arm/mach-shmobile/setup-r8a7779.c | 185 +- arch/arm/mach-shmobile/setup-r8a7790.c | 150 ++ arch/arm/mach-shmobile/setup-sh7372.c | 1 - arch/arm/mach-shmobile/setup-sh73a0.c | 163 +- arch/arm/mach-shmobile/smp-emev2.c | 93 +- arch/arm/mach-shmobile/smp-r8a7779.c | 136 +- arch/arm/mach-shmobile/smp-sh73a0.c | 43 +- arch/arm/mach-shmobile/timer.c | 7 +- arch/arm/mach-socfpga/core.h | 11 + arch/arm/mach-socfpga/platsmp.c | 15 - arch/arm/mach-socfpga/socfpga.c | 16 +- arch/arm/mach-spear/Kconfig | 105 + arch/arm/mach-spear/Makefile | 26 + .../{mach-spear13xx => mach-spear}/Makefile.boot | 0 .../include/mach => mach-spear}/generic.h | 33 +- arch/arm/{mach-spear13xx => mach-spear}/headsmp.S | 0 arch/arm/{mach-spear13xx => mach-spear}/hotplug.c | 0 .../plat => mach-spear/include/mach}/debug-macro.S | 0 .../include/mach/irqs.h | 22 +- .../include/mach/misc_regs.h | 2 +- arch/arm/mach-spear/include/mach/spear.h | 93 + .../plat => mach-spear/include/mach}/timex.h | 0 .../plat => mach-spear/include/mach}/uncompress.h | 0 arch/arm/{plat-spear => mach-spear}/pl080.c | 0 .../include/plat => mach-spear}/pl080.h | 0 arch/arm/{mach-spear13xx => mach-spear}/platsmp.c | 10 +- arch/arm/{plat-spear => mach-spear}/restart.c | 5 +- .../arm/{mach-spear13xx => mach-spear}/spear1310.c | 34 +- .../arm/{mach-spear13xx => mach-spear}/spear1340.c | 35 +- .../arm/{mach-spear13xx => mach-spear}/spear13xx.c | 63 +- arch/arm/{mach-spear3xx => mach-spear}/spear300.c | 4 +- arch/arm/{mach-spear3xx => mach-spear}/spear310.c | 4 +- arch/arm/{mach-spear3xx => mach-spear}/spear320.c | 7 +- arch/arm/{mach-spear3xx => mach-spear}/spear3xx.c | 17 +- arch/arm/{mach-spear6xx => mach-spear}/spear6xx.c | 25 +- arch/arm/{plat-spear => mach-spear}/time.c | 2 +- arch/arm/mach-spear13xx/Kconfig | 20 - arch/arm/mach-spear13xx/Makefile | 10 - arch/arm/mach-spear13xx/include/mach/debug-macro.S | 14 - arch/arm/mach-spear13xx/include/mach/dma.h | 128 - arch/arm/mach-spear13xx/include/mach/hardware.h | 1 - arch/arm/mach-spear13xx/include/mach/irqs.h | 20 - arch/arm/mach-spear13xx/include/mach/spear.h | 54 - arch/arm/mach-spear13xx/include/mach/timex.h | 19 - arch/arm/mach-spear13xx/include/mach/uncompress.h | 19 - arch/arm/mach-spear3xx/Kconfig | 26 - arch/arm/mach-spear3xx/Makefile | 15 - arch/arm/mach-spear3xx/Makefile.boot | 3 - arch/arm/mach-spear3xx/include/mach/debug-macro.S | 14 - arch/arm/mach-spear3xx/include/mach/generic.h | 36 - arch/arm/mach-spear3xx/include/mach/hardware.h | 1 - arch/arm/mach-spear3xx/include/mach/irqs.h | 19 - arch/arm/mach-spear3xx/include/mach/spear.h | 60 - arch/arm/mach-spear3xx/include/mach/timex.h | 19 - arch/arm/mach-spear3xx/include/mach/uncompress.h | 19 - arch/arm/mach-spear6xx/Kconfig | 10 - arch/arm/mach-spear6xx/Makefile | 6 - arch/arm/mach-spear6xx/Makefile.boot | 3 - arch/arm/mach-spear6xx/include/mach/debug-macro.S | 14 - arch/arm/mach-spear6xx/include/mach/generic.h | 23 - arch/arm/mach-spear6xx/include/mach/hardware.h | 1 - arch/arm/mach-spear6xx/include/mach/misc_regs.h | 22 - arch/arm/mach-spear6xx/include/mach/spear.h | 46 - arch/arm/mach-spear6xx/include/mach/timex.h | 19 - arch/arm/mach-spear6xx/include/mach/uncompress.h | 19 - arch/arm/mach-sunxi/Kconfig | 5 +- arch/arm/mach-sunxi/sunxi.c | 74 +- arch/arm/mach-tegra/Kconfig | 29 +- arch/arm/mach-tegra/Makefile | 7 +- arch/arm/mach-tegra/Makefile.boot | 3 - arch/arm/mach-tegra/board-dt-tegra114.c | 46 - arch/arm/mach-tegra/board-dt-tegra30.c | 60 - arch/arm/mach-tegra/board-harmony-pcie.c | 7 +- arch/arm/mach-tegra/board.h | 5 +- arch/arm/mach-tegra/common.c | 33 +- arch/arm/mach-tegra/cpuidle-tegra20.c | 6 +- arch/arm/mach-tegra/cpuidle-tegra30.c | 10 +- arch/arm/mach-tegra/fuse.c | 4 + arch/arm/mach-tegra/fuse.h | 7 + arch/arm/mach-tegra/headsmp.S | 3 - arch/arm/mach-tegra/hotplug.c | 23 +- arch/arm/mach-tegra/include/mach/timex.h | 26 - arch/arm/mach-tegra/include/mach/uncompress.h | 175 -- arch/arm/mach-tegra/irq.c | 96 +- arch/arm/mach-tegra/irq.h | 6 + arch/arm/mach-tegra/pcie.c | 3 +- arch/arm/mach-tegra/platsmp.c | 127 +- arch/arm/mach-tegra/pm.c | 162 +- arch/arm/mach-tegra/pm.h | 17 +- arch/arm/mach-tegra/pmc.c | 310 ++- arch/arm/mach-tegra/pmc.h | 18 + arch/arm/mach-tegra/powergate.c | 7 +- arch/arm/mach-tegra/reset-handler.S | 49 +- arch/arm/mach-tegra/sleep-tegra20.S | 2 +- arch/arm/mach-tegra/sleep-tegra30.S | 4 +- arch/arm/mach-tegra/sleep.h | 12 +- .../arm/mach-tegra/{board-dt-tegra20.c => tegra.c} | 48 +- arch/arm/mach-tegra/tegra114_speedo.c | 104 + arch/arm/mach-u300/include/mach/u300-regs.h | 2 +- arch/arm/mach-ux500/Kconfig | 16 + arch/arm/mach-ux500/Makefile | 2 + arch/arm/mach-ux500/board-mop500-audio.c | 7 +- arch/arm/mach-ux500/board-mop500-pins.c | 36 +- arch/arm/mach-ux500/board-mop500-regulators.c | 14 + arch/arm/mach-ux500/board-mop500-regulators.h | 1 + arch/arm/mach-ux500/board-mop500-sdi.c | 55 +- arch/arm/mach-ux500/board-mop500-u8500uib.c | 9 +- arch/arm/mach-ux500/board-mop500-uib.c | 1 - arch/arm/mach-ux500/board-mop500.c | 53 +- arch/arm/mach-ux500/board-mop500.h | 4 +- arch/arm/mach-ux500/cache-l2x0.c | 6 +- arch/arm/mach-ux500/cpu-db8500.c | 11 +- arch/arm/mach-ux500/cpu.c | 14 +- arch/arm/mach-ux500/cpuidle.c | 2 + .../mach-ux500/{include/mach => }/db8500-regs.h | 28 + arch/arm/mach-ux500/devices-common.c | 3 +- arch/arm/mach-ux500/devices-db8500.c | 6 +- arch/arm/mach-ux500/devices-db8500.h | 3 +- arch/arm/mach-ux500/devices.c | 5 +- arch/arm/mach-ux500/{include/mach => }/devices.h | 0 arch/arm/mach-ux500/hotplug.c | 2 +- arch/arm/mach-ux500/id.c | 4 +- arch/arm/mach-ux500/include/mach/debug-macro.S | 39 - arch/arm/mach-ux500/include/mach/hardware.h | 45 - arch/arm/mach-ux500/include/mach/timex.h | 6 - arch/arm/mach-ux500/include/mach/uncompress.h | 57 - .../{include/mach => }/irqs-board-mop500.h | 0 .../mach-ux500/{include/mach => }/irqs-db8500.h | 0 arch/arm/mach-ux500/{include/mach => }/irqs.h | 6 +- arch/arm/mach-ux500/platsmp.c | 12 +- arch/arm/mach-ux500/pm.c | 2 +- arch/arm/mach-ux500/{include/mach => }/setup.h | 0 arch/arm/mach-ux500/timer.c | 6 +- arch/arm/mach-ux500/usb.c | 2 +- arch/arm/mach-versatile/core.c | 26 +- arch/arm/mach-versatile/versatile_dt.c | 1 - arch/arm/mach-vexpress/Kconfig | 2 + arch/arm/mach-vexpress/v2m.c | 25 +- arch/arm/mach-virt/platsmp.c | 8 - arch/arm/mach-virt/virt.c | 9 - arch/arm/mach-vt8500/Kconfig | 1 + arch/arm/mach-vt8500/Makefile | 2 +- arch/arm/mach-vt8500/common.h | 6 - arch/arm/mach-vt8500/vt8500.c | 14 +- arch/arm/mach-zynq/Kconfig | 2 + arch/arm/mach-zynq/platsmp.c | 16 - arch/arm/plat-omap/dmtimer.c | 241 +- arch/arm/plat-omap/include/plat/dmtimer.h | 1 + arch/arm/plat-orion/Makefile | 2 - arch/arm/plat-orion/addr-map.c | 178 -- arch/arm/plat-orion/gpio.c | 59 + arch/arm/plat-orion/pcie.c | 10 +- arch/arm/plat-samsung/Kconfig | 24 +- arch/arm/plat-samsung/Makefile | 3 +- arch/arm/plat-samsung/devs.c | 47 +- arch/arm/plat-samsung/dma-ops.c | 10 +- arch/arm/plat-samsung/include/plat/cpu.h | 15 +- arch/arm/plat-samsung/include/plat/dma-ops.h | 1 - arch/arm/plat-samsung/include/plat/dma-pl330.h | 1 - arch/arm/plat-samsung/include/plat/irq.h | 116 - arch/arm/plat-samsung/include/plat/map-s5p.h | 1 + arch/arm/plat-samsung/include/plat/rtc-core.h | 2 +- arch/arm/plat-samsung/include/plat/s3c2410.h | 31 - arch/arm/plat-samsung/include/plat/s3c2412.h | 32 - arch/arm/plat-samsung/include/plat/s3c2416.h | 37 - arch/arm/plat-samsung/include/plat/s3c2443.h | 36 - arch/arm/plat-samsung/include/plat/s3c244x.h | 42 - arch/arm/plat-samsung/include/plat/s5p-time.h | 40 - arch/arm/plat-samsung/include/plat/samsung-time.h | 53 + arch/arm/plat-samsung/include/plat/sdhci.h | 60 +- arch/arm/plat-samsung/irq-vic-timer.c | 4 +- arch/arm/plat-samsung/pm.c | 1 + arch/arm/plat-samsung/s5p-dev-mfc.c | 42 +- arch/arm/plat-samsung/s5p-irq-gpioint.c | 3 +- arch/arm/plat-samsung/s5p-irq.c | 1 + arch/arm/plat-samsung/s5p-sleep.S | 9 + .../plat-samsung/{s5p-time.c => samsung-time.c} | 138 +- arch/arm/plat-samsung/setup-mipiphy.c | 3 + arch/arm/plat-samsung/time.c | 287 --- arch/arm/plat-spear/Kconfig | 47 - arch/arm/plat-spear/Makefile | 9 - arch/arm/plat-versatile/platsmp.c | 8 - arch/arm64/include/asm/arch_timer.h | 5 + arch/arm64/kernel/time.c | 6 +- arch/avr32/mach-at32ap/at32ap700x.c | 6 +- arch/sh/kernel/cpu/sh2a/pinmux-sh7203.c | 13 +- arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c | 13 +- arch/sh/kernel/cpu/sh2a/pinmux-sh7269.c | 13 +- arch/sh/kernel/cpu/sh3/pinmux-sh7720.c | 14 +- arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c | 14 +- arch/sh/kernel/cpu/sh4a/pinmux-sh7723.c | 14 +- arch/sh/kernel/cpu/sh4a/pinmux-sh7724.c | 13 +- arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c | 13 +- arch/sh/kernel/cpu/sh4a/pinmux-sh7785.c | 14 +- arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c | 14 +- arch/sh/kernel/cpu/sh4a/pinmux-shx3.c | 17 +- drivers/Kconfig | 2 + drivers/Makefile | 3 + drivers/ata/pata_arasan_cf.c | 37 +- drivers/bus/Kconfig | 7 + drivers/bus/Makefile | 1 + drivers/bus/mvebu-mbus.c | 870 +++++++ drivers/clk/Makefile | 1 + drivers/clk/mmp/clk-mmp2.c | 2 +- drivers/clk/mmp/clk-pxa168.c | 2 +- drivers/clk/mmp/clk-pxa910.c | 2 +- drivers/clk/mxs/clk-imx23.c | 42 +- drivers/clk/mxs/clk-imx28.c | 42 +- drivers/clk/samsung/Makefile | 8 + drivers/clk/samsung/clk-exynos4.c | 1082 ++++++++ drivers/clk/samsung/clk-exynos5250.c | 522 ++++ drivers/clk/samsung/clk-exynos5440.c | 138 + drivers/clk/samsung/clk-pll.c | 419 +++ drivers/clk/samsung/clk-pll.h | 41 + drivers/clk/samsung/clk.c | 320 +++ drivers/clk/samsung/clk.h | 287 +++ drivers/clk/socfpga/clk.c | 163 +- drivers/clk/spear/spear1310_clock.c | 64 +- drivers/clk/spear/spear1340_clock.c | 63 +- drivers/clk/spear/spear3xx_clock.c | 60 +- drivers/clk/spear/spear6xx_clock.c | 31 +- drivers/clk/tegra/Makefile | 1 + drivers/clk/tegra/clk-periph-gate.c | 11 +- drivers/clk/tegra/clk-periph.c | 14 +- drivers/clk/tegra/clk-pll.c | 1194 ++++++++- drivers/clk/tegra/clk-tegra114.c | 2085 +++++++++++++++ drivers/clk/tegra/clk-tegra20.c | 220 +- drivers/clk/tegra/clk-tegra30.c | 279 +- drivers/clk/tegra/clk.c | 14 +- drivers/clk/tegra/clk.h | 98 +- drivers/clk/ux500/clk-prcc.c | 1 - drivers/clk/ux500/u8500_clk.c | 145 +- drivers/clocksource/Kconfig | 17 +- drivers/clocksource/Makefile | 9 +- drivers/clocksource/arm_arch_timer.c | 33 +- drivers/clocksource/clksrc-dbx500-prcmu.c | 3 - drivers/clocksource/em_sti.c | 13 +- .../mct.c => drivers/clocksource/exynos_mct.c | 221 +- .../timer.c => drivers/clocksource/mxs_timer.c | 36 +- drivers/clocksource/nomadik-mtu.c | 4 +- drivers/clocksource/samsung_pwm_timer.c | 494 ++++ drivers/clocksource/sh_cmt.c | 189 +- drivers/clocksource/sh_mtu2.c | 2 +- drivers/clocksource/sh_tmu.c | 2 +- .../clocksource/{sunxi_timer.c => sun4i_timer.c} | 94 +- drivers/clocksource/tegra20_timer.c | 4 +- .../clocksource}/timer-marco.c | 25 +- .../clocksource}/timer-prima2.c | 42 +- drivers/crypto/ux500/cryp/cryp.c | 2 - drivers/crypto/ux500/cryp/cryp_core.c | 1 - drivers/crypto/ux500/hash/hash_core.c | 1 - drivers/dma/mxs-dma.c | 109 +- drivers/gpio/Kconfig | 12 +- drivers/gpio/Makefile | 2 +- drivers/gpio/gpio-msm-v1.c | 220 +- drivers/gpio/gpio-msm-v2.c | 3 +- drivers/gpio/gpio-mxc.c | 2 +- drivers/gpio/gpio-omap.c | 3 +- drivers/gpio/gpio-pl061.c | 2 +- drivers/gpio/gpio-pxa.c | 154 +- drivers/gpio/gpio-rcar.c | 396 +++ drivers/gpio/gpio-samsung.c | 9 +- drivers/gpio/gpio-tegra.c | 24 +- drivers/gpio/gpio-vt8500.c | 353 --- drivers/i2c/busses/i2c-mxs.c | 40 +- drivers/irqchip/Kconfig | 8 + drivers/irqchip/Makefile | 9 +- drivers/irqchip/exynos-combiner.c | 158 +- .../irqchip}/irq-armada-370-xp.c | 106 +- drivers/irqchip/irq-gic.c | 36 +- .../mach-mxs/icoll.c => drivers/irqchip/irq-mxs.c | 24 +- drivers/irqchip/irq-renesas-intc-irqpin.c | 547 ++++ drivers/irqchip/irq-renesas-irqc.c | 307 +++ .../irq.c => drivers/irqchip/irq-s3c24xx.c | 700 ++++- drivers/irqchip/irq-sirfsoc.c | 126 + drivers/irqchip/irq-sun4i.c | 149 ++ drivers/irqchip/irq-sunxi.c | 151 -- drivers/irqchip/irq-vic.c | 3 +- .../irq.c => drivers/irqchip/irq-vt8500.c | 6 + drivers/mmc/host/davinci_mmc.c | 88 +- drivers/mmc/host/mmci.c | 9 + drivers/mmc/host/msm_sdcc.c | 1 - drivers/mmc/host/mxs-mmc.c | 48 +- drivers/mmc/host/s3cmci.c | 83 +- drivers/mmc/host/sdhci-cns3xxx.c | 1 - .../mmc/host/sdhci-s3c-regs.h | 0 drivers/mmc/host/sdhci-s3c.c | 5 +- drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 51 +- drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 3 +- drivers/mtd/onenand/samsung.c | 4 +- .../mtd/onenand/samsung.h | 2 - drivers/net/ethernet/freescale/fec.h | 1 + drivers/net/ethernet/freescale/fec_main.c | 18 +- drivers/net/ethernet/smsc/smsc911x.c | 29 +- drivers/of/base.c | 111 +- drivers/pinctrl/Kconfig | 13 +- drivers/pinctrl/Makefile | 2 + drivers/pinctrl/pinctrl-at91.c | 3 +- drivers/pinctrl/pinctrl-bcm2835.c | 19 +- drivers/pinctrl/pinctrl-exynos.c | 111 +- drivers/pinctrl/pinctrl-imx.c | 126 +- drivers/pinctrl/pinctrl-imx.h | 29 +- drivers/pinctrl/pinctrl-imx35.c | 2088 ++++++--------- drivers/pinctrl/pinctrl-imx51.c | 1532 ++++------- drivers/pinctrl/pinctrl-imx53.c | 1597 ++---------- drivers/pinctrl/pinctrl-imx6dl.c | 497 ++++ drivers/pinctrl/pinctrl-imx6q.c | 2301 ++--------------- drivers/pinctrl/pinctrl-imx6sl.c | 403 +++ drivers/pinctrl/pinctrl-nomadik.c | 2 +- drivers/pinctrl/pinctrl-samsung.c | 2 + drivers/pinctrl/pinctrl-samsung.h | 1 + drivers/pinctrl/pinctrl-sirf.c | 14 +- drivers/pinctrl/sh-pfc/Kconfig | 6 + drivers/pinctrl/sh-pfc/Makefile | 1 + drivers/pinctrl/sh-pfc/core.c | 302 +-- drivers/pinctrl/sh-pfc/core.h | 55 +- drivers/pinctrl/sh-pfc/gpio.c | 372 ++- drivers/pinctrl/sh-pfc/pfc-r8a73a4.c | 2587 +++++++++++++++++++ drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 694 ++++- drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 1695 ++++++++++--- drivers/pinctrl/sh-pfc/pfc-sh7203.c | 488 ++-- drivers/pinctrl/sh-pfc/pfc-sh7264.c | 460 ++-- drivers/pinctrl/sh-pfc/pfc-sh7269.c | 624 ++--- drivers/pinctrl/sh-pfc/pfc-sh7372.c | 323 ++- drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 2664 ++++++++++++++------ drivers/pinctrl/sh-pfc/pfc-sh7720.c | 333 +-- drivers/pinctrl/sh-pfc/pfc-sh7722.c | 480 ++-- drivers/pinctrl/sh-pfc/pfc-sh7723.c | 642 ++--- drivers/pinctrl/sh-pfc/pfc-sh7724.c | 638 ++--- drivers/pinctrl/sh-pfc/pfc-sh7734.c | 55 +- drivers/pinctrl/sh-pfc/pfc-sh7757.c | 620 ++--- drivers/pinctrl/sh-pfc/pfc-sh7785.c | 354 +-- drivers/pinctrl/sh-pfc/pfc-sh7786.c | 296 +-- drivers/pinctrl/sh-pfc/pfc-shx3.c | 148 +- drivers/pinctrl/sh-pfc/pinctrl.c | 491 ++-- drivers/pinctrl/sh-pfc/sh_pfc.h | 135 +- drivers/pinctrl/spear/pinctrl-plgpio.c | 2 +- drivers/pinctrl/vt8500/Kconfig | 52 + drivers/pinctrl/vt8500/Makefile | 8 + drivers/pinctrl/vt8500/pinctrl-vt8500.c | 501 ++++ drivers/pinctrl/vt8500/pinctrl-wm8505.c | 532 ++++ drivers/pinctrl/vt8500/pinctrl-wm8650.c | 370 +++ drivers/pinctrl/vt8500/pinctrl-wm8750.c | 409 +++ drivers/pinctrl/vt8500/pinctrl-wm8850.c | 388 +++ drivers/pinctrl/vt8500/pinctrl-wmt.c | 632 +++++ drivers/pinctrl/vt8500/pinctrl-wmt.h | 79 + drivers/reset/Kconfig | 13 + drivers/reset/Makefile | 1 + drivers/reset/core.c | 297 +++ drivers/rtc/rtc-s3c.c | 3 +- .../plat/regs-rtc.h => drivers/rtc/rtc-s3c.h | 3 +- drivers/rtc/rtc-stmp3xxx.c | 6 +- drivers/spi/spi-davinci.c | 4 +- drivers/spi/spi-mxs.c | 60 +- drivers/spi/spi-pl022.c | 43 +- drivers/staging/iio/adc/mxs-lradc.c | 3 - drivers/staging/imx-drm/ipu-v3/ipu-common.c | 14 +- drivers/staging/ste_rmi4/Makefile | 1 - .../staging/ste_rmi4/board-mop500-u8500uib-rmi4.c | 31 - drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 31 +- drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h | 1 - drivers/tty/serial/amba-pl011.c | 64 +- drivers/tty/serial/mxs-auart.c | 52 +- drivers/usb/host/ohci-exynos.c | 2 +- drivers/video/Kconfig | 2 + drivers/video/atmel_lcdfb.c | 120 +- drivers/video/mxsfb.c | 260 +- include/clocksource/arm_arch_timer.h | 6 - include/clocksource/samsung_pwm.h | 36 + include/linux/clk/mxs.h | 16 + include/linux/clk/tegra.h | 1 + include/linux/gpio-pxa.h | 1 + include/linux/irqchip/arm-gic.h | 1 - include/linux/irqchip/chained_irq.h | 52 + include/linux/irqchip/mxs.h | 14 + include/linux/irqchip/sunxi.h | 27 - include/linux/mbus.h | 27 +- include/linux/mxsfb.h | 52 - include/linux/of.h | 14 + include/linux/pata_arasan_cf_data.h | 2 - .../linux/platform_data/asoc-ux500-msp.h | 0 include/linux/platform_data/clk-ux500.h | 3 +- .../{sunxi_timer.h => platform_data/gpio-rcar.h} | 22 +- .../linux/platform_data/irq-renesas-intc-irqpin.h | 29 + .../linux/platform_data/irq-renesas-irqc.h | 17 +- include/linux/platform_data/mmc-davinci.h | 3 - include/linux/platform_data/mmc-sdhci-s3c.h | 56 + .../{usb-exynos.h => usb-ohci-exynos.h} | 0 include/linux/reset-controller.h | 51 + include/linux/reset.h | 17 + include/linux/spi/mxs-spi.h | 4 +- .../powergate.h => include/linux/tegra-powergate.h | 5 - include/video/atmel_lcdc.h | 4 +- sound/soc/mxs/mxs-saif.c | 5 +- sound/soc/ux500/mop500_ab8500.c | 2 - sound/soc/ux500/ux500_msp_dai.c | 4 +- sound/soc/ux500/ux500_msp_i2s.c | 4 +- sound/soc/ux500/ux500_msp_i2s.h | 2 - 1297 files changed, 66115 insertions(+), 39778 deletions(-) create mode 100644 Documentation/arm/firmware.txt create mode 100644 Documentation/devicetree/bindings/arm/altera/socfpga-clk-manager.txt create mode 100644 Documentation/devicetree/bindings/arm/bcm/bcm,kona-timer.txt create mode 100644 Documentation/devicetree/bindings/arm/samsung/sysreg.txt create mode 100644 Documentation/devicetree/bindings/clock/altr_socfpga.txt create mode 100644 Documentation/devicetree/bindings/clock/exynos4-clock.txt create mode 100644 Documentation/devicetree/bindings/clock/exynos5250-clock.txt create mode 100644 Documentation/devicetree/bindings/clock/exynos5440-clock.txt create mode 100644 Documentation/devicetree/bindings/clock/imx27-clock.txt create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra114-car.txt delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-vt8500.txt create mode 100644 Documentation/devicetree/bindings/gpu/samsung-g2d.txt create mode 100644 Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.txt rename Documentation/devicetree/bindings/interrupt-controller/{allwinner,sunxi-ic.txt => allwinner,sun4i-ic.txt} (94%) create mode 100644 Documentation/devicetree/bindings/interrupt-controller/samsung,s3c24xx-irq.txt create mode 100644 Documentation/devicetree/bindings/misc/smc.txt create mode 100644 Documentation/devicetree/bindings/mmc/davinci_mmc.txt create mode 100644 Documentation/devicetree/bindings/mtd/gpmc-nor.txt create mode 100644 Documentation/devicetree/bindings/net/gpmc-eth.txt create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx6dl-pinctrl.txt create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx6sl-pinctrl.txt create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-vt8500.txt create mode 100644 Documentation/devicetree/bindings/pwm/pwm-samsung.txt create mode 100644 Documentation/devicetree/bindings/reset/fsl,imx-src.txt create mode 100644 Documentation/devicetree/bindings/reset/reset.txt create mode 100644 Documentation/devicetree/bindings/serial/pl011.txt create mode 100644 Documentation/devicetree/bindings/spi/spi-davinci.txt rename Documentation/devicetree/bindings/timer/{allwinner,sunxi-timer.txt => allwinner,sun4i-timer.txt} (78%) create mode 100644 Documentation/devicetree/bindings/timer/arm,sp804.txt create mode 100644 Documentation/devicetree/bindings/timer/fsl,imxgpt.txt create mode 100644 Documentation/devicetree/bindings/timer/samsung,exynos4210-mct.txt create mode 100644 Documentation/devicetree/bindings/usb/exynos-usb.txt create mode 100644 Documentation/devicetree/bindings/video/samsung-fimd.txt rename Documentation/devicetree/bindings/watchdog/{sunxi-wdt.txt => sun4i-wdt.txt} (57%) create mode 100644 arch/arm/arm-soc-for-next-contents.txt create mode 100644 arch/arm/boot/dts/at91-ariag25.dts create mode 100644 arch/arm/boot/dts/atlas6-evb.dts create mode 100644 arch/arm/boot/dts/atlas6.dtsi create mode 100644 arch/arm/boot/dts/exynos4210-universal_c210.dts create mode 100644 arch/arm/boot/dts/exynos4412-odroidx.dts create mode 100644 arch/arm/boot/dts/exynos4412-origen.dts create mode 100644 arch/arm/boot/dts/exynos5250-arndale.dts create mode 100644 arch/arm/boot/dts/exynos5250-pinctrl.dtsi create mode 100644 arch/arm/boot/dts/exynos5440-sd5v1.dts create mode 100644 arch/arm/boot/dts/imx27-apf27dev.dts create mode 100644 arch/arm/boot/dts/imx35-pinfunc.h create mode 100644 arch/arm/boot/dts/imx51-apf51dev.dts create mode 100644 arch/arm/boot/dts/imx51-pinfunc.h create mode 100644 arch/arm/boot/dts/imx53-pinfunc.h create mode 100644 arch/arm/boot/dts/imx6dl-pinfunc.h create mode 100644 arch/arm/boot/dts/imx6dl-sabreauto.dts create mode 100644 arch/arm/boot/dts/imx6dl-sabresd.dts create mode 100644 arch/arm/boot/dts/imx6dl-wandboard.dts create mode 100644 arch/arm/boot/dts/imx6q-pinfunc.h create mode 100644 arch/arm/boot/dts/imx6q-sbc6x.dts create mode 100644 arch/arm/boot/dts/imx6qdl-sabreauto.dtsi create mode 100644 arch/arm/boot/dts/imx6qdl-sabresd.dtsi create mode 100644 arch/arm/boot/dts/imx6sl-pinfunc.h create mode 100644 arch/arm/boot/dts/kirkwood-cloudbox.dts create mode 100644 arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts create mode 100644 arch/arm/boot/dts/mpa1600.dts create mode 100644 arch/arm/boot/dts/omap3-devkit8000.dts create mode 100644 arch/arm/boot/dts/omap3-igep.dtsi create mode 100644 arch/arm/boot/dts/omap3-igep0020.dts create mode 100644 arch/arm/boot/dts/omap3-igep0030.dts create mode 100644 arch/arm/boot/dts/omap3430-sdp.dts create mode 100644 arch/arm/boot/dts/omap34xx.dtsi create mode 100644 arch/arm/boot/dts/omap4-panda-common.dtsi create mode 100644 arch/arm/boot/dts/omap443x.dtsi create mode 100644 arch/arm/boot/dts/omap4460.dtsi create mode 100644 arch/arm/boot/dts/r8a73a4-ape6evm.dts create mode 100644 arch/arm/boot/dts/r8a73a4.dtsi create mode 100644 arch/arm/boot/dts/r8a7778-bockw.dts create mode 100644 arch/arm/boot/dts/r8a7778.dtsi create mode 100644 arch/arm/boot/dts/r8a7779-marzen-reference.dts create mode 100644 arch/arm/boot/dts/r8a7779.dtsi create mode 100644 arch/arm/boot/dts/r8a7790-lager.dts create mode 100644 arch/arm/boot/dts/r8a7790.dtsi create mode 100644 arch/arm/boot/dts/sama5d3.dtsi create mode 100644 arch/arm/boot/dts/sama5d31ek.dts create mode 100644 arch/arm/boot/dts/sama5d33ek.dts create mode 100644 arch/arm/boot/dts/sama5d34ek.dts create mode 100644 arch/arm/boot/dts/sama5d35ek.dts create mode 100644 arch/arm/boot/dts/sama5d3xcm.dtsi create mode 100644 arch/arm/boot/dts/sama5d3xdm.dtsi create mode 100644 arch/arm/boot/dts/sama5d3xmb.dtsi create mode 100644 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts delete mode 100644 arch/arm/boot/dts/sh73a0-reference.dtsi create mode 100644 arch/arm/boot/dts/skeleton64.dtsi create mode 100644 arch/arm/boot/dts/sun4i-a10-mini-xplus.dts delete mode 100644 arch/arm/boot/dts/sunxi.dtsi create mode 100644 arch/arm/boot/dts/tps6507x.dtsi create mode 100644 arch/arm/common/firmware.c create mode 100644 arch/arm/configs/ape6evm_defconfig create mode 100644 arch/arm/configs/bockw_defconfig delete mode 100644 arch/arm/configs/h7201_defconfig delete mode 100644 arch/arm/configs/h7202_defconfig create mode 100644 arch/arm/configs/sama5_defconfig create mode 100644 arch/arm/include/asm/firmware.h rename arch/arm/{mach-bcm2835/include/mach/debug-macro.S => include/debug/bcm2835.S} (86%) rename arch/arm/{mach-cns3xxx/include/mach/debug-macro.S => include/debug/cns3xxx.S} (100%) rename arch/arm/{mach-exynos/include/mach/debug-macro.S => include/debug/exynos.S} (84%) rename arch/arm/{mach-mxs/include/mach/debug-macro.S => include/debug/mxs.S} (77%) rename arch/arm/{mach-nomadik/include/mach/debug-macro.S => include/debug/nomadik.S} (100%) create mode 100644 arch/arm/include/debug/pxa.S rename arch/arm/{plat-samsung/include/plat/debug-macro.S => include/debug/samsung.S} (100%) rename arch/arm/{mach-prima2/include/mach/uart.h => include/debug/sirf.S} (55%) create mode 100644 arch/arm/include/debug/ux500.S create mode 100644 arch/arm/mach-at91/Kconfig.non_dt rename arch/arm/mach-at91/{board-rm9200-dt.c => board-dt-rm9200.c} (100%) rename arch/arm/mach-at91/{board-dt.c => board-dt-sam9.c} (100%) create mode 100644 arch/arm/mach-at91/board-dt-sama5.c create mode 100644 arch/arm/mach-at91/include/mach/sama5d3.h create mode 100644 arch/arm/mach-at91/sama5d3.c create mode 100644 arch/arm/mach-bcm/bcm_kona_smc.c create mode 100644 arch/arm/mach-bcm/bcm_kona_smc.h create mode 100644 arch/arm/mach-bcm/bcm_kona_smc_asm.S create mode 100644 arch/arm/mach-bcm2835/Kconfig delete mode 100644 arch/arm/mach-bcm2835/Makefile.boot delete mode 100644 arch/arm/mach-bcm2835/include/mach/bcm2835_soc.h delete mode 100644 arch/arm/mach-bcm2835/include/mach/gpio.h delete mode 100644 arch/arm/mach-bcm2835/include/mach/uncompress.h rename arch/arm/mach-cns3xxx/{include/mach => }/cns3xxx.h (94%) delete mode 100644 arch/arm/mach-cns3xxx/include/mach/irqs.h delete mode 100644 arch/arm/mach-cns3xxx/include/mach/timex.h delete mode 100644 arch/arm/mach-cns3xxx/include/mach/uncompress.h rename arch/arm/mach-cns3xxx/{include/mach => }/pm.h (100%) delete mode 100644 arch/arm/mach-dove/addr-map.c delete mode 100644 arch/arm/mach-exynos/clock-exynos4.c delete mode 100644 arch/arm/mach-exynos/clock-exynos4.h delete mode 100644 arch/arm/mach-exynos/clock-exynos4210.c delete mode 100644 arch/arm/mach-exynos/clock-exynos4212.c delete mode 100644 arch/arm/mach-exynos/clock-exynos5.c create mode 100644 arch/arm/mach-exynos/exynos-smc.S create mode 100644 arch/arm/mach-exynos/firmware.c delete mode 100644 arch/arm/mach-exynos/include/mach/regs-mct.h create mode 100644 arch/arm/mach-exynos/smc.h rename arch/arm/mach-gemini/{include/mach/system.h => reset.c} (91%) delete mode 100644 arch/arm/mach-h720x/Kconfig delete mode 100644 arch/arm/mach-h720x/Makefile delete mode 100644 arch/arm/mach-h720x/Makefile.boot delete mode 100644 arch/arm/mach-h720x/common.c delete mode 100644 arch/arm/mach-h720x/common.h delete mode 100644 arch/arm/mach-h720x/cpu-h7201.c delete mode 100644 arch/arm/mach-h720x/cpu-h7202.c delete mode 100644 arch/arm/mach-h720x/h7201-eval.c delete mode 100644 arch/arm/mach-h720x/h7202-eval.c delete mode 100644 arch/arm/mach-h720x/include/mach/boards.h delete mode 100644 arch/arm/mach-h720x/include/mach/debug-macro.S delete mode 100644 arch/arm/mach-h720x/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-h720x/include/mach/h7201-regs.h delete mode 100644 arch/arm/mach-h720x/include/mach/h7202-regs.h delete mode 100644 arch/arm/mach-h720x/include/mach/hardware.h delete mode 100644 arch/arm/mach-h720x/include/mach/irqs.h delete mode 100644 arch/arm/mach-h720x/include/mach/isa-dma.h delete mode 100644 arch/arm/mach-h720x/include/mach/uncompress.h delete mode 100644 arch/arm/mach-imx/Makefile.boot create mode 100644 arch/arm/mach-imx/anatop.c delete mode 100644 arch/arm/mach-imx/cpu_op-mx51.c delete mode 100644 arch/arm/mach-imx/cpu_op-mx51.h delete mode 100644 arch/arm/mach-imx/cpufreq.c delete mode 100644 arch/arm/mach-imx/devices/platform-ahci-imx.c delete mode 100644 arch/arm/mach-imx/mx6q.h delete mode 100644 arch/arm/mach-kirkwood/addr-map.c create mode 100644 arch/arm/mach-kirkwood/board-readynas.c delete mode 100644 arch/arm/mach-l7200/include/mach/debug-macro.S delete mode 100644 arch/arm/mach-mmp/include/mach/debug-macro.S delete mode 100644 arch/arm/mach-msm/include/mach/cpu.h delete mode 100644 arch/arm/mach-mv78xx0/addr-map.c delete mode 100644 arch/arm/mach-mvebu/addr-map.c delete mode 100644 arch/arm/mach-mxs/Makefile.boot delete mode 100644 arch/arm/mach-mxs/include/mach/common.h delete mode 100644 arch/arm/mach-mxs/include/mach/digctl.h delete mode 100644 arch/arm/mach-mxs/include/mach/hardware.h delete mode 100644 arch/arm/mach-mxs/include/mach/mx23.h delete mode 100644 arch/arm/mach-mxs/include/mach/mx28.h delete mode 100644 arch/arm/mach-mxs/include/mach/mxs.h delete mode 100644 arch/arm/mach-mxs/include/mach/timex.h delete mode 100644 arch/arm/mach-mxs/include/mach/uncompress.h delete mode 100644 arch/arm/mach-mxs/mm.c delete mode 100644 arch/arm/mach-mxs/ocotp.c rename arch/arm/{mach-h720x/include/mach/timex.h => mach-mxs/pm.h} (52%) delete mode 100644 arch/arm/mach-mxs/system.c delete mode 100644 arch/arm/mach-nomadik/Makefile.boot delete mode 100644 arch/arm/mach-nomadik/include/mach/irqs.h delete mode 100644 arch/arm/mach-nomadik/include/mach/timex.h delete mode 100644 arch/arm/mach-nomadik/include/mach/uncompress.h delete mode 100644 arch/arm/mach-orion5x/addr-map.c delete mode 100644 arch/arm/mach-prima2/include/mach/clkdev.h delete mode 100644 arch/arm/mach-prima2/include/mach/debug-macro.S delete mode 100644 arch/arm/mach-prima2/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-prima2/include/mach/hardware.h delete mode 100644 arch/arm/mach-prima2/include/mach/irqs.h delete mode 100644 arch/arm/mach-prima2/include/mach/map.h delete mode 100644 arch/arm/mach-prima2/include/mach/timex.h delete mode 100644 arch/arm/mach-prima2/include/mach/uncompress.h delete mode 100644 arch/arm/mach-prima2/irq.c delete mode 100644 arch/arm/mach-pxa/include/mach/debug-macro.S rename arch/arm/{plat-samsung/include/plat => mach-s3c24xx}/common-smdk.h (86%) delete mode 100644 arch/arm/mach-s3c24xx/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-s3c24xx/include/mach/regs-sdi.h delete mode 100644 arch/arm/mach-s3c24xx/irq-s3c2412.c delete mode 100644 arch/arm/mach-s3c24xx/irq-s3c2440.c delete mode 100644 arch/arm/mach-s3c24xx/irq-s3c244x.c create mode 100644 arch/arm/mach-shmobile/board-ape6evm.c create mode 100644 arch/arm/mach-shmobile/board-bockw.c create mode 100644 arch/arm/mach-shmobile/board-kzm9g-reference.c create mode 100644 arch/arm/mach-shmobile/board-lager.c create mode 100644 arch/arm/mach-shmobile/board-marzen-reference.c create mode 100644 arch/arm/mach-shmobile/clock-r8a73a4.c create mode 100644 arch/arm/mach-shmobile/clock-r8a7778.c create mode 100644 arch/arm/mach-shmobile/clock-r8a7790.c rename arch/arm/mach-shmobile/{headsmp-sh73a0.S => headsmp-scu.S} (85%) delete mode 100644 arch/arm/mach-shmobile/hotplug.c create mode 100644 arch/arm/mach-shmobile/include/mach/clock.h create mode 100644 arch/arm/mach-shmobile/include/mach/r8a73a4.h create mode 100644 arch/arm/mach-shmobile/include/mach/r8a7778.h create mode 100644 arch/arm/mach-shmobile/include/mach/r8a7790.h create mode 100644 arch/arm/mach-shmobile/setup-r8a73a4.c create mode 100644 arch/arm/mach-shmobile/setup-r8a7778.c create mode 100644 arch/arm/mach-shmobile/setup-r8a7790.c create mode 100644 arch/arm/mach-spear/Kconfig create mode 100644 arch/arm/mach-spear/Makefile rename arch/arm/{mach-spear13xx => mach-spear}/Makefile.boot (100%) rename arch/arm/{mach-spear13xx/include/mach => mach-spear}/generic.h (51%) rename arch/arm/{mach-spear13xx => mach-spear}/headsmp.S (100%) rename arch/arm/{mach-spear13xx => mach-spear}/hotplug.c (100%) rename arch/arm/{plat-spear/include/plat => mach-spear/include/mach}/debug-macro.S (100%) rename arch/arm/{mach-spear6xx => mach-spear}/include/mach/irqs.h (51%) rename arch/arm/{mach-spear3xx => mach-spear}/include/mach/misc_regs.h (90%) create mode 100644 arch/arm/mach-spear/include/mach/spear.h rename arch/arm/{plat-spear/include/plat => mach-spear/include/mach}/timex.h (100%) rename arch/arm/{plat-spear/include/plat => mach-spear/include/mach}/uncompress.h (100%) rename arch/arm/{plat-spear => mach-spear}/pl080.c (100%) rename arch/arm/{plat-spear/include/plat => mach-spear}/pl080.h (100%) rename arch/arm/{mach-spear13xx => mach-spear}/platsmp.c (92%) rename arch/arm/{plat-spear => mach-spear}/restart.c (90%) rename arch/arm/{mach-spear13xx => mach-spear}/spear1310.c (59%) rename arch/arm/{mach-spear13xx => mach-spear}/spear1340.c (82%) rename arch/arm/{mach-spear13xx => mach-spear}/spear13xx.c (69%) rename arch/arm/{mach-spear3xx => mach-spear}/spear300.c (98%) rename arch/arm/{mach-spear3xx => mach-spear}/spear310.c (98%) rename arch/arm/{mach-spear3xx => mach-spear}/spear320.c (97%) rename arch/arm/{mach-spear3xx => mach-spear}/spear3xx.c (88%) rename arch/arm/{mach-spear6xx => mach-spear}/spear6xx.c (93%) rename arch/arm/{plat-spear => mach-spear}/time.c (99%) delete mode 100644 arch/arm/mach-spear13xx/Kconfig delete mode 100644 arch/arm/mach-spear13xx/Makefile delete mode 100644 arch/arm/mach-spear13xx/include/mach/debug-macro.S delete mode 100644 arch/arm/mach-spear13xx/include/mach/dma.h delete mode 100644 arch/arm/mach-spear13xx/include/mach/hardware.h delete mode 100644 arch/arm/mach-spear13xx/include/mach/irqs.h delete mode 100644 arch/arm/mach-spear13xx/include/mach/spear.h delete mode 100644 arch/arm/mach-spear13xx/include/mach/timex.h delete mode 100644 arch/arm/mach-spear13xx/include/mach/uncompress.h delete mode 100644 arch/arm/mach-spear3xx/Kconfig delete mode 100644 arch/arm/mach-spear3xx/Makefile delete mode 100644 arch/arm/mach-spear3xx/Makefile.boot delete mode 100644 arch/arm/mach-spear3xx/include/mach/debug-macro.S delete mode 100644 arch/arm/mach-spear3xx/include/mach/generic.h delete mode 100644 arch/arm/mach-spear3xx/include/mach/hardware.h delete mode 100644 arch/arm/mach-spear3xx/include/mach/irqs.h delete mode 100644 arch/arm/mach-spear3xx/include/mach/spear.h delete mode 100644 arch/arm/mach-spear3xx/include/mach/timex.h delete mode 100644 arch/arm/mach-spear3xx/include/mach/uncompress.h delete mode 100644 arch/arm/mach-spear6xx/Kconfig delete mode 100644 arch/arm/mach-spear6xx/Makefile delete mode 100644 arch/arm/mach-spear6xx/Makefile.boot delete mode 100644 arch/arm/mach-spear6xx/include/mach/debug-macro.S delete mode 100644 arch/arm/mach-spear6xx/include/mach/generic.h delete mode 100644 arch/arm/mach-spear6xx/include/mach/hardware.h delete mode 100644 arch/arm/mach-spear6xx/include/mach/misc_regs.h delete mode 100644 arch/arm/mach-spear6xx/include/mach/spear.h delete mode 100644 arch/arm/mach-spear6xx/include/mach/timex.h delete mode 100644 arch/arm/mach-spear6xx/include/mach/uncompress.h delete mode 100644 arch/arm/mach-tegra/Makefile.boot delete mode 100644 arch/arm/mach-tegra/board-dt-tegra114.c delete mode 100644 arch/arm/mach-tegra/board-dt-tegra30.c delete mode 100644 arch/arm/mach-tegra/include/mach/timex.h delete mode 100644 arch/arm/mach-tegra/include/mach/uncompress.h rename arch/arm/mach-tegra/{board-dt-tegra20.c => tegra.c} (74%) create mode 100644 arch/arm/mach-tegra/tegra114_speedo.c rename arch/arm/mach-ux500/{include/mach => }/db8500-regs.h (88%) rename arch/arm/mach-ux500/{include/mach => }/devices.h (100%) delete mode 100644 arch/arm/mach-ux500/include/mach/debug-macro.S delete mode 100644 arch/arm/mach-ux500/include/mach/hardware.h delete mode 100644 arch/arm/mach-ux500/include/mach/timex.h delete mode 100644 arch/arm/mach-ux500/include/mach/uncompress.h rename arch/arm/mach-ux500/{include/mach => }/irqs-board-mop500.h (100%) rename arch/arm/mach-ux500/{include/mach => }/irqs-db8500.h (100%) rename arch/arm/mach-ux500/{include/mach => }/irqs.h (93%) rename arch/arm/mach-ux500/{include/mach => }/setup.h (100%) delete mode 100644 arch/arm/plat-orion/addr-map.c delete mode 100644 arch/arm/plat-samsung/include/plat/irq.h delete mode 100644 arch/arm/plat-samsung/include/plat/s3c2410.h delete mode 100644 arch/arm/plat-samsung/include/plat/s3c2412.h delete mode 100644 arch/arm/plat-samsung/include/plat/s3c2416.h delete mode 100644 arch/arm/plat-samsung/include/plat/s3c2443.h delete mode 100644 arch/arm/plat-samsung/include/plat/s3c244x.h delete mode 100644 arch/arm/plat-samsung/include/plat/s5p-time.h create mode 100644 arch/arm/plat-samsung/include/plat/samsung-time.h rename arch/arm/plat-samsung/{s5p-time.c => samsung-time.c} (68%) delete mode 100644 arch/arm/plat-samsung/time.c delete mode 100644 arch/arm/plat-spear/Kconfig delete mode 100644 arch/arm/plat-spear/Makefile create mode 100644 drivers/bus/mvebu-mbus.c create mode 100644 drivers/clk/samsung/Makefile create mode 100644 drivers/clk/samsung/clk-exynos4.c create mode 100644 drivers/clk/samsung/clk-exynos5250.c create mode 100644 drivers/clk/samsung/clk-exynos5440.c create mode 100644 drivers/clk/samsung/clk-pll.c create mode 100644 drivers/clk/samsung/clk-pll.h create mode 100644 drivers/clk/samsung/clk.c create mode 100644 drivers/clk/samsung/clk.h create mode 100644 drivers/clk/tegra/clk-tegra114.c rename arch/arm/mach-exynos/mct.c => drivers/clocksource/exynos_mct.c (64%) rename arch/arm/mach-mxs/timer.c => drivers/clocksource/mxs_timer.c (91%) create mode 100644 drivers/clocksource/samsung_pwm_timer.c rename drivers/clocksource/{sunxi_timer.c => sun4i_timer.c} (50%) rename {arch/arm/mach-prima2 => drivers/clocksource}/timer-marco.c (94%) rename {arch/arm/mach-prima2 => drivers/clocksource}/timer-prima2.c (90%) create mode 100644 drivers/gpio/gpio-rcar.c delete mode 100644 drivers/gpio/gpio-vt8500.c rename {arch/arm/mach-mvebu => drivers/irqchip}/irq-armada-370-xp.c (91%) rename arch/arm/mach-mxs/icoll.c => drivers/irqchip/irq-mxs.c (89%) create mode 100644 drivers/irqchip/irq-renesas-intc-irqpin.c create mode 100644 drivers/irqchip/irq-renesas-irqc.c rename arch/arm/mach-s3c24xx/irq.c => drivers/irqchip/irq-s3c24xx.c (52%) create mode 100644 drivers/irqchip/irq-sirfsoc.c create mode 100644 drivers/irqchip/irq-sun4i.c delete mode 100644 drivers/irqchip/irq-sunxi.c rename arch/arm/mach-vt8500/irq.c => drivers/irqchip/irq-vt8500.c (97%) rename arch/arm/plat-samsung/include/plat/regs-sdhci.h => drivers/mmc/host/sdhci-s3c-regs.h (100%) rename arch/arm/plat-samsung/include/plat/regs-onenand.h => drivers/mtd/onenand/samsung.h (98%) create mode 100644 drivers/pinctrl/pinctrl-imx6dl.c create mode 100644 drivers/pinctrl/pinctrl-imx6sl.c create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a73a4.c create mode 100644 drivers/pinctrl/vt8500/Kconfig create mode 100644 drivers/pinctrl/vt8500/Makefile create mode 100644 drivers/pinctrl/vt8500/pinctrl-vt8500.c create mode 100644 drivers/pinctrl/vt8500/pinctrl-wm8505.c create mode 100644 drivers/pinctrl/vt8500/pinctrl-wm8650.c create mode 100644 drivers/pinctrl/vt8500/pinctrl-wm8750.c create mode 100644 drivers/pinctrl/vt8500/pinctrl-wm8850.c create mode 100644 drivers/pinctrl/vt8500/pinctrl-wmt.c create mode 100644 drivers/pinctrl/vt8500/pinctrl-wmt.h create mode 100644 drivers/reset/Kconfig create mode 100644 drivers/reset/Makefile create mode 100644 drivers/reset/core.c rename arch/arm/plat-samsung/include/plat/regs-rtc.h => drivers/rtc/rtc-s3c.h (97%) delete mode 100644 drivers/staging/ste_rmi4/board-mop500-u8500uib-rmi4.c create mode 100644 include/clocksource/samsung_pwm.h create mode 100644 include/linux/clk/mxs.h create mode 100644 include/linux/irqchip/chained_irq.h create mode 100644 include/linux/irqchip/mxs.h delete mode 100644 include/linux/irqchip/sunxi.h delete mode 100644 include/linux/mxsfb.h rename arch/arm/mach-ux500/include/mach/msp.h => include/linux/platform_data/asoc-ux500-msp.h (100%) rename include/linux/{sunxi_timer.h => platform_data/gpio-rcar.h} (63%) create mode 100644 include/linux/platform_data/irq-renesas-intc-irqpin.h rename arch/arm/mach-bcm2835/include/mach/timex.h => include/linux/platform_data/irq-renesas-irqc.h (76%) create mode 100644 include/linux/platform_data/mmc-sdhci-s3c.h rename include/linux/platform_data/{usb-exynos.h => usb-ohci-exynos.h} (100%) create mode 100644 include/linux/reset-controller.h create mode 100644 include/linux/reset.h rename arch/arm/mach-tegra/include/mach/powergate.h => include/linux/tegra-powergate.h (92%) Merging bcm2835/for-next (31880c3 Linux 3.9-rc6) $ git merge bcm2835/for-next Already up-to-date. Merging cortex/for-next (4477ca4 ARM: ARMv7-M: Allow the building of new kernel port) $ git merge cortex/for-next Auto-merging arch/arm/mm/Makefile Auto-merging arch/arm/mm/Kconfig Auto-merging arch/arm/kernel/setup.c Auto-merging arch/arm/kernel/entry-header.S Auto-merging arch/arm/kernel/entry-common.S Auto-merging arch/arm/include/asm/glue-cache.h Auto-merging arch/arm/Makefile Auto-merging arch/arm/Kconfig Merge made by the 'recursive' strategy. arch/arm/Kconfig | 4 +- arch/arm/Kconfig-nommu | 2 +- arch/arm/Makefile | 1 + arch/arm/include/asm/assembler.h | 17 +++- arch/arm/include/asm/cputype.h | 12 ++- arch/arm/include/asm/glue-cache.h | 27 +++++++ arch/arm/include/asm/glue-df.h | 8 ++ arch/arm/include/asm/glue-proc.h | 9 +++ arch/arm/include/asm/irqflags.h | 22 ++++-- arch/arm/include/asm/ptrace.h | 4 + arch/arm/include/asm/system_info.h | 1 + arch/arm/include/asm/v7m.h | 44 +++++++++++ arch/arm/include/uapi/asm/ptrace.h | 35 +++++++-- arch/arm/kernel/Makefile | 8 +- arch/arm/kernel/entry-common.S | 4 + arch/arm/kernel/entry-header.S | 124 +++++++++++++++++++++++++++++ arch/arm/kernel/entry-v7m.S | 143 +++++++++++++++++++++++++++++++++ arch/arm/kernel/head-nommu.S | 10 ++- arch/arm/kernel/setup.c | 17 +++- arch/arm/kernel/traps.c | 8 ++ arch/arm/mm/Kconfig | 21 ++++- arch/arm/mm/Makefile | 2 + arch/arm/mm/cache-nop.S | 50 ++++++++++++ arch/arm/mm/nommu.c | 7 ++ arch/arm/mm/proc-v7m.S | 157 +++++++++++++++++++++++++++++++++++++ 25 files changed, 711 insertions(+), 26 deletions(-) create mode 100644 arch/arm/include/asm/v7m.h create mode 100644 arch/arm/kernel/entry-v7m.S create mode 100644 arch/arm/mm/cache-nop.S create mode 100644 arch/arm/mm/proc-v7m.S Merging ep93xx/ep93xx-for-next (7ec4429 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 imx-mxs/for-next (3795b56 Merge branches 'mxs/dt-3.11' and 'imx/dt-3.11' into for-next) $ git merge imx-mxs/for-next Merge made by the 'recursive' strategy. arch/arm/boot/dts/imx28.dtsi | 33 +++++++++++++++++++++++++++++++++ arch/arm/boot/dts/imx51.dtsi | 23 +++++++++++++++++++++++ arch/arm/boot/dts/imx53-qsb.dts | 8 ++++++++ arch/arm/boot/dts/imx53.dtsi | 31 +++++++++++++++++++++++++++++++ 4 files changed, 95 insertions(+) Merging ixp4xx/next (19f949f Linux 3.8) $ git merge ixp4xx/next Already up-to-date. Merging msm/for-next (1df357a Merge branch 'msm-defconfig' into for-next) $ git merge msm/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging renesas/next (cda9c03 Merge branch 'heads/soc-sh73a0' into next) $ git merge renesas/next Resolved 'arch/arm/mach-shmobile/board-armadillo800eva.c' using previous resolution. Resolved 'arch/arm/mach-shmobile/board-bockw.c' using previous resolution. Resolved 'arch/arm/mach-shmobile/setup-r8a7740.c' using previous resolution. Resolved 'drivers/pinctrl/sh-pfc/Kconfig' using previous resolution. Auto-merging drivers/pinctrl/sh-pfc/Kconfig CONFLICT (content): Merge conflict in drivers/pinctrl/sh-pfc/Kconfig Auto-merging arch/arm/mach-shmobile/setup-sh73a0.c Auto-merging arch/arm/mach-shmobile/setup-sh7372.c Auto-merging arch/arm/mach-shmobile/setup-r8a7740.c CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-r8a7740.c Auto-merging arch/arm/mach-shmobile/board-mackerel.c Auto-merging arch/arm/mach-shmobile/board-lager.c Auto-merging arch/arm/mach-shmobile/board-kzm9g.c Auto-merging arch/arm/mach-shmobile/board-kzm9d.c Auto-merging arch/arm/mach-shmobile/board-bockw.c CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-bockw.c Auto-merging arch/arm/mach-shmobile/board-armadillo800eva.c CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-armadillo800eva.c Auto-merging arch/arm/mach-shmobile/Kconfig Auto-merging arch/arm/boot/dts/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master e850aee] Merge remote-tracking branch 'renesas/next' $ git diff -M --stat --summary HEAD^.. .../interrupt-controller/renesas,intc-irqpin.txt | 13 + .../devicetree/bindings/timer/renesas,timer.txt | 45 + arch/arm/boot/dts/Makefile | 1 + .../boot/dts/r8a7740-armadillo800eva-reference.dts | 45 + arch/arm/boot/dts/r8a7740.dtsi | 117 + arch/arm/boot/dts/r8a7779.dtsi | 17 + arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 86 + arch/arm/boot/dts/sh73a0.dtsi | 11 + arch/arm/configs/armadillo800eva_defconfig | 2 +- arch/arm/configs/bockw_defconfig | 16 +- arch/arm/configs/kzm9g_defconfig | 3 + arch/arm/mach-shmobile/Kconfig | 17 + arch/arm/mach-shmobile/Makefile | 3 +- arch/arm/mach-shmobile/board-ap4evb.c | 132 +- arch/arm/mach-shmobile/board-ape6evm.c | 15 + .../board-armadillo800eva-reference.c | 213 ++ arch/arm/mach-shmobile/board-armadillo800eva.c | 117 +- arch/arm/mach-shmobile/board-bockw.c | 80 +- arch/arm/mach-shmobile/board-bonito.c | 47 +- arch/arm/mach-shmobile/board-kzm9d.c | 2 +- arch/arm/mach-shmobile/board-kzm9g-reference.c | 1 - arch/arm/mach-shmobile/board-kzm9g.c | 196 +- arch/arm/mach-shmobile/board-lager.c | 15 + arch/arm/mach-shmobile/board-mackerel.c | 171 +- arch/arm/mach-shmobile/board-marzen.c | 12 +- arch/arm/mach-shmobile/clock-r8a73a4.c | 375 ++- arch/arm/mach-shmobile/clock-r8a7740.c | 8 +- arch/arm/mach-shmobile/clock-r8a7778.c | 156 +- arch/arm/mach-shmobile/clock-r8a7779.c | 4 +- arch/arm/mach-shmobile/clock-r8a7790.c | 227 +- arch/arm/mach-shmobile/clock-sh73a0.c | 98 +- arch/arm/mach-shmobile/cpuidle-r8a7740.c | 62 + arch/arm/mach-shmobile/include/mach/clock.h | 8 +- arch/arm/mach-shmobile/include/mach/irqs.h | 5 + arch/arm/mach-shmobile/include/mach/r8a7740.h | 495 +-- arch/arm/mach-shmobile/include/mach/r8a7778.h | 3 + arch/arm/mach-shmobile/include/mach/sh7372.h | 391 --- arch/arm/mach-shmobile/intc-r8a7740.c | 24 +- arch/arm/mach-shmobile/pm-r8a7740.c | 165 +- arch/arm/mach-shmobile/setup-r8a7740.c | 77 +- arch/arm/mach-shmobile/setup-r8a7778.c | 99 +- arch/arm/mach-shmobile/setup-r8a7779.c | 19 +- arch/arm/mach-shmobile/setup-r8a7790.c | 35 +- arch/arm/mach-shmobile/setup-sh7372.c | 24 +- arch/arm/mach-shmobile/setup-sh73a0.c | 62 +- arch/arm/mach-shmobile/sleep-r8a7740.S | 57 + drivers/clocksource/sh_cmt.c | 108 +- drivers/clocksource/sh_tmu.c | 96 +- drivers/gpio/gpio-rcar.c | 2 +- drivers/irqchip/irq-renesas-intc-irqpin.c | 4 + drivers/irqchip/irq-renesas-irqc.c | 8 + drivers/pinctrl/sh-pfc/Kconfig | 13 +- drivers/pinctrl/sh-pfc/Makefile | 2 + drivers/pinctrl/sh-pfc/core.c | 22 +- drivers/pinctrl/sh-pfc/core.h | 4 + drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 1873 +++++++---- drivers/pinctrl/sh-pfc/pfc-r8a7778.c | 2516 ++++++++++++++ drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 443 ++- drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 3502 ++++++++++++++++++++ drivers/pinctrl/sh-pfc/pfc-sh7372.c | 1652 ++++++--- drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 134 + drivers/pinctrl/sh-pfc/sh_pfc.h | 4 +- include/linux/platform_data/gpio-rcar.h | 2 + 63 files changed, 11586 insertions(+), 2570 deletions(-) create mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,intc-irqpin.txt create mode 100644 Documentation/devicetree/bindings/timer/renesas,timer.txt create mode 100644 arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts create mode 100644 arch/arm/mach-shmobile/board-armadillo800eva-reference.c create mode 100644 arch/arm/mach-shmobile/cpuidle-r8a7740.c create mode 100644 arch/arm/mach-shmobile/sleep-r8a7740.S create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a7778.c create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a7790.c Merging samsung/for-next (e0f8f91 Merge branch 'next/late-exynos' into for-next) $ git merge samsung/for-next Resolved 'arch/arm/mach-exynos/cpuidle.c' using previous resolution. Auto-merging arch/arm/mach-exynos/cpuidle.c CONFLICT (content): Merge conflict in arch/arm/mach-exynos/cpuidle.c Auto-merging arch/arm/mach-exynos/Kconfig Auto-merging arch/arm/boot/dts/exynos5250.dtsi Auto-merging arch/arm/boot/dts/exynos4412-origen.dts Auto-merging arch/arm/boot/dts/exynos4210.dtsi Auto-merging arch/arm/boot/dts/exynos4.dtsi Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master a15f51f] Merge remote-tracking branch 'samsung/for-next' $ git diff -M --stat --summary HEAD^.. .../devicetree/bindings/media/s5p-mfc.txt | 5 ++ .../devicetree/bindings/usb/exynos-usb.txt | 34 +++++++++ arch/arm/boot/dts/exynos4.dtsi | 2 + arch/arm/boot/dts/exynos4210-origen.dts | 4 + arch/arm/boot/dts/exynos4210.dtsi | 3 + arch/arm/boot/dts/exynos4412-origen.dts | 62 +++++++++++++++ arch/arm/boot/dts/exynos4412-smdk4412.dts | 87 ++++++++++++++++++++++ arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 56 -------------- arch/arm/boot/dts/exynos5250.dtsi | 45 +++++++++++ arch/arm/mach-exynos/Kconfig | 1 + arch/arm/mach-exynos/mach-exynos5-dt.c | 28 +++++++ 11 files changed, 271 insertions(+), 56 deletions(-) Merging tegra/for-next (c0c1cb1 Merge branch 'for-3.10/defconfig' into for-next) $ git merge tegra/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging dma-mapping/dma-mapping-next (a937536 Linux 3.9-rc3) $ git merge dma-mapping/dma-mapping-next Already up-to-date. Merging pwm/for-next (affb923 pwm: lpc32xx: Don't change PWM_ENABLE bit in lpc32xx_pwm_config) $ git merge pwm/for-next Merge made by the 'recursive' strategy. .../devicetree/bindings/pwm/pwm-tiecap.txt | 12 ++++++++-- .../devicetree/bindings/pwm/pwm-tiehrpwm.txt | 12 ++++++++-- drivers/pwm/Kconfig | 8 +++---- drivers/pwm/pwm-ab8500.c | 10 ++++---- drivers/pwm/pwm-atmel-tcb.c | 1 + drivers/pwm/pwm-imx.c | 6 +---- drivers/pwm/pwm-lpc32xx.c | 27 ++++++++++++++++++---- drivers/pwm/pwm-mxs.c | 4 +--- drivers/pwm/pwm-puv3.c | 1 - drivers/pwm/pwm-pxa.c | 23 ++++-------------- drivers/pwm/pwm-samsung.c | 20 ++++++++-------- drivers/pwm/pwm-spear.c | 11 ++++----- drivers/pwm/pwm-tegra.c | 2 +- drivers/pwm/pwm-tiecap.c | 6 +++-- drivers/pwm/pwm-tiehrpwm.c | 6 +++-- drivers/pwm/pwm-tipwmss.c | 2 ++ drivers/pwm/pwm-tipwmss.h | 2 +- drivers/pwm/pwm-twl-led.c | 4 +++- drivers/pwm/pwm-twl.c | 6 +++-- drivers/video/backlight/pwm_bl.c | 7 ++---- 20 files changed, 91 insertions(+), 79 deletions(-) Merging dma-buf/for-next (5320c97 dma-buf: double unlock in debugfs code) $ git merge dma-buf/for-next Merge made by the 'recursive' strategy. Documentation/dma-buf-sharing.txt | 13 ++- drivers/base/dma-buf.c | 169 +++++++++++++++++++++++++++++++++++++- include/linux/dma-buf.h | 16 +++- 3 files changed, 189 insertions(+), 9 deletions(-) Merging userns/for-next (78008c4 proc: Restrict mounting the proc filesystem) $ git merge userns/for-next Auto-merging fs/proc/root.c Merge made by the 'recursive' strategy. fs/proc/root.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Merging ktest/for-next (df5f7c6 ktest: Reset grub menu cache with different machines) $ git merge ktest/for-next Already up-to-date. Merging signal/for-next (99e621f syscalls.h: slightly reduce the jungles of macros) $ git merge signal/for-next Resolved 'arch/mips/kernel/linux32.c' using previous resolution. Resolved 'arch/tile/Kconfig' using previous resolution. Resolved 'arch/tile/kernel/compat.c' using previous resolution. Resolved 'fs/compat.c' using previous resolution. Resolved 'fs/read_write.c' using previous resolution. Resolved 'fs/read_write.h' using previous resolution. Resolved 'fs/splice.c' using previous resolution. Resolved 'include/asm-generic/unistd.h' using previous resolution. Auto-merging mm/nommu.c Auto-merging kernel/sys.c Auto-merging kernel/fork.c Auto-merging kernel/exit.c Auto-merging include/linux/mm.h Auto-merging include/linux/compat.h Auto-merging include/asm-generic/unistd.h CONFLICT (content): Merge conflict in include/asm-generic/unistd.h Auto-merging fs/splice.c CONFLICT (content): Merge conflict in fs/splice.c Auto-merging fs/read_write.h CONFLICT (content): Merge conflict in fs/read_write.h Auto-merging fs/read_write.c CONFLICT (content): Merge conflict in fs/read_write.c Auto-merging fs/compat.c CONFLICT (content): Merge conflict in fs/compat.c Auto-merging fs/aio.c Removing arch/x86/ia32/ipc32.c Auto-merging arch/tile/kernel/compat.c CONFLICT (content): Merge conflict in arch/tile/kernel/compat.c Auto-merging arch/tile/Kconfig CONFLICT (content): Merge conflict in arch/tile/Kconfig Auto-merging arch/sparc/Kconfig Auto-merging arch/s390/kernel/syscalls.S Auto-merging arch/s390/kernel/compat_wrapper.S Auto-merging arch/s390/Kconfig Removing arch/powerpc/include/uapi/asm/linkage.h Auto-merging arch/powerpc/include/asm/unistd.h Auto-merging arch/powerpc/include/asm/systbl.h Auto-merging arch/powerpc/Kconfig Auto-merging arch/mips/kernel/linux32.c CONFLICT (content): Merge conflict in arch/mips/kernel/linux32.c Auto-merging arch/mips/Kconfig Auto-merging arch/alpha/Kconfig Auto-merging arch/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master daab495] Merge remote-tracking branch 'signal/for-next' $ git diff -M --stat --summary HEAD^.. arch/Kconfig | 3 - arch/alpha/Kconfig | 1 - arch/alpha/include/asm/linkage.h | 4 +- arch/alpha/include/asm/unistd.h | 12 --- arch/arm/include/asm/unistd.h | 8 -- arch/arm64/kernel/sys32.S | 7 -- arch/avr32/include/asm/unistd.h | 8 -- arch/blackfin/include/asm/unistd.h | 8 -- arch/cris/include/asm/unistd.h | 8 -- arch/frv/include/asm/unistd.h | 10 -- arch/h8300/include/asm/linkage.h | 2 - arch/h8300/include/asm/unistd.h | 7 -- arch/ia64/include/asm/linkage.h | 4 + arch/ia64/include/asm/unistd.h | 10 -- arch/m32r/include/asm/unistd.h | 10 -- arch/m68k/include/asm/unistd.h | 8 -- arch/microblaze/include/asm/unistd.h | 8 -- arch/mips/Kconfig | 1 - arch/mips/include/asm/linkage.h | 3 + arch/mips/include/asm/unistd.h | 8 -- arch/mips/kernel/linux32.c | 119 ---------------------- arch/mips/kernel/scall64-n32.S | 8 +- arch/mips/kernel/scall64-o32.S | 6 +- arch/mn10300/include/asm/unistd.h | 10 -- arch/parisc/include/asm/unistd.h | 8 -- arch/parisc/kernel/sys_parisc32.c | 41 -------- arch/parisc/kernel/syscall_table.S | 8 +- arch/powerpc/Kconfig | 1 - arch/powerpc/include/asm/linkage.h | 13 +++ arch/powerpc/include/asm/systbl.h | 10 +- arch/powerpc/include/asm/unistd.h | 6 -- arch/powerpc/include/uapi/asm/linkage.h | 6 -- arch/powerpc/kernel/sys_ppc32.c | 109 -------------------- arch/s390/Kconfig | 1 - arch/s390/include/asm/unistd.h | 8 -- arch/s390/kernel/compat_linux.c | 86 +--------------- arch/s390/kernel/compat_linux.h | 5 - arch/s390/kernel/compat_wrapper.S | 64 ------------ arch/s390/kernel/sys_s390.c | 14 +-- arch/s390/kernel/syscalls.S | 18 ++-- arch/sh/include/asm/unistd.h | 8 -- arch/sparc/Kconfig | 1 - arch/sparc/include/asm/unistd.h | 8 -- arch/sparc/kernel/sys32.S | 4 - arch/sparc/kernel/sys_sparc32.c | 75 +------------- arch/sparc/kernel/sys_sparc_64.c | 6 +- arch/sparc/kernel/systbls_64.S | 8 +- arch/tile/Kconfig | 1 - arch/tile/kernel/compat.c | 6 -- arch/x86/ia32/Makefile | 3 - arch/x86/ia32/ipc32.c | 54 ---------- arch/x86/ia32/sys_ia32.c | 37 ------- arch/x86/include/asm/sys_ia32.h | 12 --- arch/x86/include/asm/syscalls.h | 4 +- arch/x86/include/asm/unistd.h | 8 -- arch/x86/kernel/tls.c | 14 +-- arch/x86/syscalls/syscall_32.tbl | 10 +- arch/x86/um/tls_32.c | 5 +- arch/xtensa/include/asm/unistd.h | 8 -- fs/aio.c | 2 - fs/compat.c | 121 ---------------------- fs/dcookies.c | 15 ++- fs/eventpoll.c | 47 +++++++++ fs/notify/fanotify/fanotify_user.c | 17 +--- fs/open.c | 52 ++-------- fs/read_write.c | 68 +++++++++---- fs/read_write.h | 2 - fs/signalfd.c | 31 ++++++ fs/splice.c | 22 ++++ fs/sync.c | 26 +---- include/asm-generic/unistd.h | 12 --- include/linux/compat.h | 51 +++------- include/linux/linkage.h | 21 ++++ include/linux/mm.h | 3 - include/linux/syscalls.h | 156 +++++++++------------------- ipc/compat.c | 174 ++++++++++++++++++-------------- ipc/sem.c | 123 +++++++++++++--------- ipc/syscall.c | 6 +- kernel/compat.c | 19 ---- kernel/exit.c | 5 - kernel/fork.c | 5 +- kernel/sys.c | 14 +++ kernel/sys_ni.c | 3 +- kernel/uid16.c | 55 ++-------- mm/fadvise.c | 18 +--- mm/nommu.c | 3 +- mm/readahead.c | 9 +- 87 files changed, 539 insertions(+), 1484 deletions(-) create mode 100644 arch/powerpc/include/asm/linkage.h delete mode 100644 arch/powerpc/include/uapi/asm/linkage.h delete mode 100644 arch/x86/ia32/ipc32.c $ git am -3 ../patches/0001-cond_syscall-and-SYSCALL_ALIAS-merge-fixup.patch Applying: cond_syscall and SYSCALL_ALIAS merge fixup $ git reset HEAD^ Unstaged changes after reset: M include/linux/linkage.h $ git add -A . $ git commit -v -a --amend [master 3b9a2ae] Merge remote-tracking branch 'signal/for-next' Merging clk/clk-next (1e43525 clk: add clk_ignore_unused option to keep boot clocks on) $ git merge clk/clk-next Already up-to-date. Merging random/dev (b980955 random: fix locking dependency with the tasklist_lock) $ git merge random/dev Already up-to-date. Merging lzo-update/lzo-update (42b775a lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) $ git merge lzo-update/lzo-update Merge made by the 'recursive' strategy. lib/lzo/lzo1x_decompress_safe.c | 4 ++++ lib/lzo/lzodefs.h | 6 ++++++ 2 files changed, 10 insertions(+) Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6) Merging akpm-current/current (0fbd067 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) $ git merge akpm-current/current Already up-to-date. $ git clone -s -l -n -q . ../rebase-tmp $ cd ../rebase-tmp $ git checkout -b akpm remotes/origin/akpm/master Switched to a new branch 'akpm' $ git rebase --onto master remotes/origin/akpm/master-base First, rewinding head to replay your work on top of it... Applying: revert "ipc: don't allocate a copy larger than max" Applying: drivers/char/random.c: fix priming of last_data Applying: sound/soc/codecs/si476x.c: don't use 0bNNN Applying: x86: make 'mem=' option to work for efi platform Applying: kernel/auditfilter.c: tree and watch will memory leak when failure occurs Applying: kernel/audit_tree.c: tree will leak memory when failure occurs in audit_trim_trees() Using index info to reconstruct a base tree... M kernel/audit_tree.c Falling back to patching base and 3-way merge... Auto-merging kernel/audit_tree.c Applying: drm/fb-helper: don't sleep for screen unblank when an oops is in progress Applying: drivers/video: implement a simple framebuffer driver Applying: drivers-video-implement-a-simple-framebuffer-driver-fix Applying: cyber2000fb: avoid palette corruption at higher clocks Applying: inotify: invalid mask should return a error number but not set it Applying: inotify-invalid-mask-should-return-a-error-number-but-not-set-it-fix Applying: posix_cpu_timer: consolidate expiry time type Applying: posix_cpu_timers: consolidate timer list cleanups Applying: posix_cpu_timers: consolidate expired timers check Applying: selftests: add basic posix timers selftests Applying: posix-timers: correctly get dying task time sample in posix_cpu_timer_schedule() Applying: posix_timers: Fix racy timer delta caching on task exit Applying: ipvs: change type of netns_ipvs->sysctl_sync_qlen_max Applying: lockdep: introduce lock_acquire_exclusive/shared helper macros Applying: lglock: update lockdep annotations to report recursive local locks Applying: block: restore /proc/partitions to not display non-partitionable removable devices Applying: fs/block_dev.c: no need to check inode->i_bdev in bd_forget() Applying: fs/dcache.c: add cond_resched() to shrink_dcache_parent() Applying: watchdog: trigger all-cpu backtrace when locked up and going to panic Applying: vm: adjust ifdef for TINY_RCU Applying: mm: frontswap: lazy initialization to allow tmem backends to build/run as modules Applying: frontswap: make frontswap_init use a pointer for the ops Applying: mm: frontswap: cleanup code Applying: frontswap: get rid of swap_lock dependency Applying: mm: cleancache: lazy initialization to allow tmem backends to build/run as modules Applying: cleancache: Make cleancache_init use a pointer for the ops Applying: mm: cleancache: clean up cleancache_enabled Applying: xen: tmem: enable Xen tmem shim to be built/loaded as a module Applying: xen-tmem-enable-xen-tmem-shim-to-be-built-loaded-as-a-module-fix Applying: zcache/tmem: Better error checking on frontswap_register_ops return value. Applying: staging: zcache: enable ramster to be built/loaded as a module Applying: staging-zcache-enable-ramster-to-be-built-loaded-as-a-module-fix Applying: staging: zcache: enable zcache to be built/loaded as a module Applying: mm/SPARC: use common help functions to free reserved pages Applying: clear_refs: sanitize accepted commands declaration Applying: clear_refs-sanitize-accepted-commands-declaration-fix Applying: clear_refs: introduce private struct for mm_walk Applying: pagemap: introduce pagemap_entry_t without pmshift bits Applying: pagemap: introduce the /proc/PID/pagemap2 file Applying: mm: soft-dirty bits for user memory changes tracking Applying: mem-soft-dirty: Reshuffle CONFIG_ options to be more Arch-friendly Applying: selftest: add simple test for soft-dirty bit Applying: mm: remove free_area_cache Applying: include/linux/mmzone.h: cleanups Applying: include-linux-mmzoneh-cleanups-fix Applying: mm: memmap_init_zone() performance improvement Applying: drop_caches: add some documentation and info message Applying: drivers/usb/gadget/amd5536udc.c: avoid calling dma_pool_create() with NULL dev Applying: mm/dmapool.c: fix null dev in dma_pool_create() Applying: memcg: debugging facility to access dangling memcgs Applying: memcg-debugging-facility-to-access-dangling-memcgs-fix Applying: mm: add vm event counters for balloon pages compaction Applying: kernel/range.c: subtract_range: fix the broken phrase issued by printk Applying: smp: Give WARN()ing when calling smp_call_function_many()/single() in serving irq Applying: x86: don't show trace beyond show_stack(NULL, NULL) Applying: sparc32: make show_stack() acquire %fp if @_ksp is not specified Applying: dump_stack: consolidate dump_stack() implementations and unify their behaviors Applying: dmi: morph dmi_dump_ids() into dmi_format_ids() which formats into a buffer Applying: dump_stack: implement arch-specific hardware description in task dumps Applying: dump_stack: unify debug information printed by show_regs() Applying: arc, print-fatal-signals: reduce duplicated information Applying: kthread: implement probe_kthread_data() Applying: workqueue: include workqueue info when printing debug dump of a worker task Applying: writeback: set worker desc to identify writeback workers in task dumps Applying: kernel/smp.c: use '|=' for csd_lock Applying: kernel/smp.c: remove 'priv' of call_single_data Applying: include/linux/fs.h: disable preempt when acquire i_size_seqcount write lock Applying: kernel/smp.c: cleanups Applying: kmsg: honor dmesg_restrict sysctl on /dev/kmsg Applying: drivers/leds/leds-ot200.c: fix error caused by shifted mask Applying: lib/string_helpers: introduce generic string_unescape Applying: lib-string_helpers-introduce-generic-string_unescape-fix Applying: staging: speakup: remove custom string_unescape_any_inplace Applying: dynamic_debug: reuse generic string_unescape function Applying: binfmt_misc: reuse string_unescape_inplace() Applying: kernel/compat.c: make do_sysinfo() static Applying: kernel/timer.c: convert compat_sys_sysinfo to COMPAT_SYSCALL_DEFINE Applying: kernel/timer.c: move some non timer related syscalls to kernel/sys.c Applying: kernel-timerc-ove-some-non-timer-related-syscalls-to-kernel-sysc-checkpatch-fixes Applying: epoll: trim epitem by one cache line Applying: epoll-trim-epitem-by-one-cache-line-on-x86_64-fix Applying: epoll: comment + BUILD_BUG_ON to prevent epitem bloat Applying: epoll: use RCU to protect wakeup_source in epitem Applying: epoll: fix suspicious RCU usage in ep_poll_callback Applying: epoll: lock ep->mtx in ep_free to silence lockdep Applying: epoll: cleanup: hoist out f_op->poll calls Applying: epoll: cleanup: use RCU_INIT_POINTER when nulling Applying: fs: make binfmt support for #! scripts modular and removable Applying: binfmt_elf: PIE: make PF_RANDOMIZE check comment more accurate Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting Applying: dmi_scan: refactor dmi_scan_machine(), {smbios,dmi}_present() Applying: dmi_scan: proper buf type in dmi_present() Applying: i2o: check copy_from_user() size parameter Applying: drivers/rtc/rtc-v3020.c: use gpio_request_array() Applying: drivers/rtc/rtc-pxa.c: fix set time sync time issue Applying: drivers-rtc-rtc-pxac-fix-set-time-sync-time-issue-fix Applying: drivers/rtc/rtc-pxa.c: use devm_* APIs Applying: nilfs2: fix issue with flush kernel thread after remount in RO mode because of driver's internal error or metadata corruption Applying: nilfs2-fix-issue-with-flush-kernel-thread-after-remount-in-ro-mode-because-of-drivers-internal-error-or-metadata-corruption-fix Applying: nilfs2: fix using of PageLocked() in nilfs_clear_dirty_page() Applying: nilfs2: remove unneeded test in nilfs_writepage() Applying: hfs: add error checking for hfs_find_init() Applying: hfsplus: fix warnings in fs/hfsplus/bfind.c Applying: hfsplus-fix-warnings-in-fs-hfsplus-bfindc-in-function-hfs_find_1st_rec_by_cnid-fix Applying: hfs/hfsplus: convert dprint to hfs_dbg Applying: hfs/hfsplus: convert printks to pr_ Applying: hfsplus: add error propagation to __hfsplus_ext_write_extent() Applying: hfsplus: remove duplicated message prefix in hfsplus_block_free() Applying: fat: additions to support fat_fallocate Applying: fat-additions-to-support-fat_fallocate-fix Applying: ptrace: add ability to retrieve signals without removing from a queue (v4) Applying: selftest: add a test case for PTRACE_PEEKSIGINFO Applying: usermodehelper: export call_usermodehelper_exec() and call_usermodehelper_setup() Applying: usermodehelper-export-_exec-and-_setup-functions-fix Applying: kmod: split call to call_usermodehelper_fns() Applying: KEYS: split call to call_usermodehelper_fns() Applying: coredump: remove trailling whitespace Applying: usermodehelper: split remaining calls to call_usermodehelper_fns() Applying: kmod: remove call_usermodehelper_fns() Applying: coredump: only SIGKILL should interrupt the coredumping task Applying: coredump: ensure that SIGKILL always kills the dumping thread Applying: coredump: sanitize the setting of signal->group_exit_code Applying: coredump: introduce dump_interrupted() Applying: coredump: factor out the setting of PF_DUMPCORE Applying: coredump: change wait_for_dump_helpers() to use wait_event_interruptible() Applying: fs, proc: truncate /proc/pid/comm writes to first TASK_COMM_LEN bytes Applying: set_task_comm: kill the pointless memset() + wmb() Applying: exec: do not abuse ->cred_guard_mutex in threadgroup_lock() Applying: kexec: fix wrong types of some local variables Applying: kexec: Use min() and min_t() to simplify logic Applying: kexec-use-min_t-to-simplify-logic-fix Applying: ipc: clamp with min() Applying: ipc: separate msg allocation from userspace copy Applying: ipc: tighten msg copy loops Applying: ipc: set EFAULT as default error in load_msg() Applying: ipc: remove msg handling from queue scan Applying: ipc: implement MSG_COPY as a new receive mode Applying: ipc: simplify msg list search Applying: ipc: refactor msg list search into separate function Applying: ipc: find_msg can be static Applying: ipc/msgutil.c: use linux/uaccess.h Applying: ipc: remove bogus lock comment for ipc_checkid Applying: ipc: introduce obtaining a lockless ipc object Applying: ipc-introduce-obtaining-a-lockless-ipc-object-fix Applying: ipc: introduce lockless pre_down ipcctl Applying: ipc,sem: do not hold ipc lock more than necessary Applying: ipc,sem: prevent releasing RCU read lock twice in semctl_main Applying: ipcsem-do-not-hold-ipc-lock-more-than-necessary-fix-checkpatch-fixes Applying: ipc,sem: open code and rename sem_lock Applying: ipcsem-open-code-and-rename-sem_lock-fix Applying: ipc,sem: have only one list in struct sem_queue Applying: ipc,sem: fine grained locking for semtimedop Applying: fix for sem_lock Applying: ipc, sem: prevent possible deadlock Applying: ipc,sem: fix locking in semctl_main Applying: ipc,sem: untangle RCU locking with find_alloc_undo Applying: ipc, sem: do not call sem_lock when bogus sma Applying: ipc: make refcounter atomic Applying: ipc,sem: fix lockdep false positive Applying: ipc/msg.c: use list_for_each_entry_[safe] for list traversing Applying: ipc: sysv shared memory limited to 8TiB Applying: ipc-sysv-shared-memory-limited-to-8tib-fix Applying: ipc/sem.c: alternatives to preempt_disable() Applying: mwave: fix info leak in mwave_ioctl() Applying: rapidio: make enumeration/discovery configurable Applying: rapidio: add enumeration/discovery start from user space Applying: rapidio: documentation update for enumeration changes Applying: rbtree_test: add extra rbtree integrity check Applying: rbtree_test: add __init/__exit annotations Applying: kernel/pid.c: improve flow of a loop inside alloc_pidmap. Applying: kernel-pidc-improve-flow-of-a-loop-inside-alloc_pidmap-fix Applying: pid_namespace.c/.h: simplify defines Applying: pid_namespacec-h-simplify-defines-fix Applying: nbd: increase default and max request sizes Applying: aoe: replace kmalloc and then memcpy with kmemdup Applying: drivers/net: rename random32() to prandom_u32() Applying: drivers-net-rename-random32-to-prandom_u32-fix Applying: brcm80211: fix the misaligned indentation Applying: remove unused random32() and srandom32() Applying: random: fix accounting race condition with lockless irq entropy_count update Applying: pps: hide more configuration symbols behind CONFIG_PPS Applying: pps: pps_kc_hardpps_lock can be static Applying: semaphore: use unlikely() for down's timeout Applying: semaphore: use `bool' type for semaphore_waiter's up Applying: drivers/memstick/host/r592.c: make r592_pm_ops static Applying: kernel/relay.c: remove unused function argument actor Applying: kernel/relay.c: move FIX_SIZE macro into relay.c Applying: relay: use macro PAGE_ALIGN instead of FIX_SIZE Applying: relay: fix timer madness Applying: mm: remove old aio use_mm() comment Applying: aio: remove dead code from aio.h Applying: gadget: remove only user of aio retry Applying: gadget-remove-only-user-of-aio-retry-checkpatch-fixes Applying: aio: remove retry-based AIO Applying: aio-remove-retry-based-aio-checkpatch-fixes Applying: char: add aio_{read,write} to /dev/{null,zero} Applying: aio: kill return value of aio_complete() Applying: aio: add kiocb_cancel() Applying: aio: move private stuff out of aio.h Applying: aio: dprintk() -> pr_debug() Applying: aio: do fget() after aio_get_req() Applying: aio: make aio_put_req() lockless Applying: aio-make-aio_put_req-lockless-checkpatch-fixes Applying: aio: refcounting cleanup Applying: aio-refcounting-cleanup-checkpatch-fixes Applying: wait: add wait_event_hrtimeout() Applying: aio: make aio_read_evt() more efficient, convert to hrtimers Applying: aio-make-aio_read_evt-more-efficient-convert-to-hrtimers-checkpatch-fixes Applying: aio: use flush_dcache_page() Applying: aio: use cancellation list lazily Applying: aio: change reqs_active to include unreaped completions Applying: aio: kill batch allocation Applying: aio: kill struct aio_ring_info Applying: aio: give shared kioctx fields their own cachelines Applying: aio: reqs_active -> reqs_available Applying: aio: percpu reqs_available Applying: generic dynamic per cpu refcounting Applying: generic-dynamic-per-cpu-refcounting-checkpatch-fixes Applying: generic-dynamic-per-cpu-refcounting-fix Applying: aio: percpu ioctx refcount Applying: aio: use xchg() instead of completion_lock Applying: aio: don't include aio.h in sched.h Applying: aio-dont-include-aioh-in-schedh-fix Applying: aio: kill ki_key Applying: aio: kill ki_retry Applying: aio-kill-ki_retry-fix Applying: aio-kill-ki_retry-checkpatch-fixes Applying: block: prep work for batch completion Applying: block-prep-work-for-batch-completion-checkpatch-fixes Applying: block-prep-work-for-batch-completion-checkpatch merge fixes Applying: block-prep-work-for-batch-completion-fix-2 Applying: block-prep-work-for-batch-completion-fix-3 Applying: block-prep-work-for-batch-completion-fix-3-fix Applying: block-prep-work-for-batch-completion-fix-4 Applying: block-prep-work-for-batch-completion-fix-99 Applying: block, aio: batch completion for bios/kiocbs Applying: block-aio-batch-completion-for-bios-kiocbs-checkpatch-fixes Applying: block-aio-batch-completion-for-bios-kiocbs-fix Applying: virtio-blk: convert to batch completion Applying: mtip32xx: convert to batch completion Applying: aio: fix kioctx not being freed after cancellation at exit time Applying: Kconfig: consolidate CONFIG_DEBUG_STRICT_USER_COPY_CHECKS Applying: kconfig-consolidate-config_debug_strict_user_copy_checks-fix Applying: kconfig menu: move Virtualization drivers near other virtualization options Applying: init/Kconfig: re-order CONFIG_EXPERT options to fix menuconfig display Applying: UAPI: remove empty Kbuild files Applying: kernel/sys.c: make prctl(PR_SET_MM) generally available Applying: notifier-error-inject: fix module names in Kconfig Applying: decompressor: add LZ4 decompressor module Applying: lib: add support for LZ4-compressed kernel Applying: arm: add support for LZ4-compressed kernel Applying: x86: add support for LZ4-compressed kernel Applying: lib: add lz4 compressor module Applying: lib-add-lz4-compressor-module-fix Applying: crypto: add lz4 Cryptographic API Applying: crypto-add-lz4-cryptographic-api-fix Applying: lib/decompress.c: fix initconst Applying: seccomp: add generic code for jitted seccomp filters. Applying: ARM: net: bpf_jit: make code generation less dependent on struct sk_filter. Applying: ARM: net: bpf_jit: add support for jitted seccomp filters. Applying: bpf: add comments explaining the schedule_work() operation Applying: kgdb/sysrq: fix inconstistent help message of sysrq key Applying: power/sysrq: fix inconstistent help message of sysrq key Applying: ARM/etm/sysrq: fix inconstistent help message of sysrq key Applying: powerpc/xmon/sysrq: fix inconstistent help message of sysrq key Applying: sparc/sysrq: fix inconstistent help message of sysrq key Applying: ethernet/emac/sysrq: fix inconstistent help message of sysrq key Applying: Documentation/sysrq: fix inconstistent help message of sysrq key $ cd ../next $ git fetch -f ../rebase-tmp akpm:akpm/master From ../rebase-tmp + 8255302...843d8e2 akpm -> akpm/master (forced update) $ rm -rf ../rebase-tmp Merging akpm/master (843d8e2 Documentation/sysrq: fix inconstistent help message of sysrq key) $ git merge --no-ff akpm/master Auto-merging lib/usercopy.c Removing include/scsi/Kbuild Removing arch/sparc/lib/usercopy.c Merge made by the 'recursive' strategy. Documentation/cgroups/memory.txt | 16 + .../bindings/video/simple-framebuffer.txt | 25 + Documentation/filesystems/proc.txt | 9 +- Documentation/rapidio/rapidio.txt | 137 +- Documentation/rapidio/sysfs.txt | 17 + Documentation/sysctl/vm.txt | 33 +- Documentation/sysrq.txt | 20 +- Documentation/vm/pagemap.txt | 5 + Documentation/vm/soft-dirty.txt | 36 + arch/Kconfig | 17 + arch/alpha/kernel/process.c | 1 + arch/alpha/kernel/traps.c | 7 - arch/arc/kernel/stacktrace.c | 7 - arch/arc/kernel/troubleshoot.c | 3 +- arch/arm/Kconfig | 2 + arch/arm/boot/compressed/.gitignore | 1 + arch/arm/boot/compressed/Makefile | 6 +- arch/arm/boot/compressed/decompress.c | 4 + arch/arm/boot/compressed/piggy.lz4.S | 6 + arch/arm/kernel/etm.c | 2 +- arch/arm/kernel/process.c | 8 +- arch/arm/kernel/traps.c | 7 - arch/arm/mm/mmap.c | 2 - arch/arm/net/bpf_jit_32.c | 91 +- arch/arm64/kernel/process.c | 7 +- arch/arm64/kernel/traps.c | 7 - arch/arm64/mm/mmap.c | 2 - arch/avr32/kernel/process.c | 13 +- arch/blackfin/kernel/dumpstack.c | 1 + arch/blackfin/kernel/trace.c | 2 + arch/c6x/kernel/traps.c | 10 +- arch/cris/arch-v10/kernel/process.c | 3 + arch/cris/arch-v32/kernel/process.c | 3 + arch/cris/kernel/traps.c | 7 - arch/frv/kernel/traps.c | 14 +- arch/h8300/kernel/process.c | 2 + arch/h8300/kernel/traps.c | 7 - arch/hexagon/kernel/traps.c | 8 - arch/hexagon/kernel/vm_events.c | 2 + arch/ia64/kernel/process.c | 12 +- arch/ia64/kernel/setup.c | 1 + arch/m32r/kernel/process.c | 2 + arch/m32r/kernel/traps.c | 9 - arch/m68k/kernel/traps.c | 12 - arch/metag/kernel/process.c | 2 + arch/metag/kernel/traps.c | 6 - arch/microblaze/kernel/process.c | 2 + arch/microblaze/kernel/traps.c | 6 - arch/mips/kernel/traps.c | 15 +- arch/mips/mm/mmap.c | 2 - arch/mn10300/kernel/process.c | 1 + arch/mn10300/kernel/traps.c | 11 - arch/openrisc/kernel/process.c | 1 + arch/openrisc/kernel/traps.c | 11 - arch/parisc/Kconfig | 1 + arch/parisc/Kconfig.debug | 14 - arch/parisc/kernel/traps.c | 10 +- arch/powerpc/kernel/process.c | 14 +- arch/powerpc/mm/mmap_64.c | 2 - arch/powerpc/net/bpf_jit_comp.c | 4 + arch/powerpc/xmon/xmon.c | 2 +- arch/s390/Kconfig | 1 + arch/s390/Kconfig.debug | 14 - arch/s390/hypfs/inode.c | 1 + arch/s390/kernel/dumpstack.c | 26 +- arch/s390/lib/Makefile | 1 - arch/s390/mm/mmap.c | 4 - arch/s390/net/bpf_jit_comp.c | 4 + arch/score/kernel/traps.c | 12 +- arch/sh/kernel/dumpstack.c | 6 - arch/sh/kernel/process_32.c | 6 +- arch/sh/kernel/process_64.c | 1 + arch/sparc/kernel/leon_smp.c | 15 +- arch/sparc/kernel/process_32.c | 23 +- arch/sparc/kernel/process_64.c | 6 +- arch/sparc/kernel/sys_sparc_64.c | 2 - arch/sparc/kernel/traps_64.c | 7 - arch/sparc/lib/Makefile | 1 - arch/sparc/lib/usercopy.c | 9 - arch/sparc/mm/init_32.c | 37 +- arch/sparc/mm/init_64.c | 28 +- arch/sparc/net/bpf_jit_comp.c | 4 + arch/tile/Kconfig | 8 +- arch/tile/include/asm/uaccess.h | 7 +- arch/tile/kernel/process.c | 3 +- arch/tile/lib/uaccess.c | 8 - arch/tile/mm/mmap.c | 2 - arch/um/kernel/sysrq.c | 12 - arch/um/sys-ppc/sysrq.c | 2 + arch/unicore32/kernel/process.c | 6 +- arch/unicore32/kernel/traps.c | 6 - arch/x86/Kconfig | 3 + arch/x86/Kconfig.debug | 14 - arch/x86/boot/compressed/Makefile | 6 +- arch/x86/boot/compressed/misc.c | 4 + arch/x86/ia32/ia32_aout.c | 3 - arch/x86/include/asm/bug.h | 3 - arch/x86/include/asm/e820.h | 2 + arch/x86/include/asm/pgtable.h | 24 +- arch/x86/include/asm/pgtable_types.h | 12 + arch/x86/kernel/dumpstack.c | 28 +- arch/x86/kernel/dumpstack_32.c | 4 +- arch/x86/kernel/dumpstack_64.c | 6 +- arch/x86/kernel/e820.c | 72 +- arch/x86/kernel/process.c | 24 - arch/x86/kernel/process_32.c | 2 - arch/x86/kernel/process_64.c | 1 - arch/x86/kernel/setup.c | 1 + arch/x86/lib/usercopy_32.c | 6 - arch/x86/mm/mmap.c | 2 - arch/x86/net/bpf_jit_comp.c | 4 + arch/x86/platform/efi/efi.c | 15 +- arch/xtensa/kernel/traps.c | 10 +- block/blk-core.c | 35 +- block/blk-flush.c | 5 +- block/blk-lib.c | 3 +- block/blk.h | 3 +- block/genhd.c | 2 +- block/scsi_ioctl.c | 1 + crypto/Kconfig | 16 + crypto/Makefile | 2 + crypto/lz4.c | 106 ++ crypto/lz4hc.c | 106 ++ drivers/Kconfig | 4 +- drivers/block/aoe/aoechr.c | 3 +- drivers/block/blockconsole.c | 5 +- drivers/block/drbd/drbd_bitmap.c | 3 +- drivers/block/drbd/drbd_worker.c | 9 +- drivers/block/drbd/drbd_wrappers.h | 9 +- drivers/block/floppy.c | 3 +- drivers/block/mtip32xx/mtip32xx.c | 86 +- drivers/block/mtip32xx/mtip32xx.h | 8 +- drivers/block/nbd.c | 2 + drivers/block/pktcdvd.c | 9 +- drivers/block/swim3.c | 2 +- drivers/block/virtio_blk.c | 31 +- drivers/block/xen-blkback/blkback.c | 3 +- drivers/char/mem.c | 36 + drivers/char/mwave/tp3780i.c | 1 + drivers/char/random.c | 54 +- drivers/firmware/dmi_scan.c | 137 +- drivers/gpu/drm/drm_fb_helper.c | 8 + drivers/infiniband/hw/ipath/ipath_file_ops.c | 1 + drivers/infiniband/hw/qib/qib_file_ops.c | 2 +- drivers/leds/leds-ot200.c | 14 +- drivers/md/bcache/alloc.c | 3 +- drivers/md/bcache/btree.c | 3 +- drivers/md/bcache/debug.c | 3 +- drivers/md/bcache/io.c | 6 +- drivers/md/bcache/journal.c | 9 +- drivers/md/bcache/movinggc.c | 3 +- drivers/md/bcache/request.c | 9 +- drivers/md/bcache/request.h | 3 +- drivers/md/bcache/super.c | 11 +- drivers/md/bcache/writeback.c | 8 +- drivers/md/dm-bufio.c | 9 +- drivers/md/dm-cache-target.c | 3 +- drivers/md/dm-crypt.c | 3 +- drivers/md/dm-io.c | 2 +- drivers/md/dm-snap.c | 3 +- drivers/md/dm-thin.c | 3 +- drivers/md/dm-verity.c | 3 +- drivers/md/dm.c | 8 +- drivers/md/faulty.c | 3 +- drivers/md/md.c | 9 +- drivers/md/multipath.c | 3 +- drivers/md/raid1.c | 12 +- drivers/md/raid10.c | 18 +- drivers/md/raid5.c | 15 +- drivers/memstick/host/r592.c | 8 +- drivers/message/i2o/i2o_config.c | 10 + drivers/net/ethernet/broadcom/cnic.c | 4 +- drivers/net/ethernet/ibm/emac/debug.c | 2 +- drivers/net/hamradio/baycom_epp.c | 2 +- drivers/net/hamradio/hdlcdrv.c | 2 +- drivers/net/hamradio/yam.c | 2 +- drivers/net/team/team_mode_random.c | 2 +- drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 2 +- drivers/net/wireless/mwifiex/cfg80211.c | 4 +- drivers/pps/Kconfig | 6 +- drivers/pps/kc.c | 6 +- drivers/rapidio/Kconfig | 28 + drivers/rapidio/Makefile | 3 +- drivers/rapidio/rio-driver.c | 8 + drivers/rapidio/rio-scan.c | 195 +-- drivers/rapidio/rio-sysfs.c | 45 + drivers/rapidio/rio.c | 234 ++- drivers/rapidio/rio.h | 12 +- drivers/rtc/rtc-pxa.c | 99 +- drivers/rtc/rtc-v3020.c | 37 +- drivers/scsi/sg.c | 1 + drivers/staging/android/logger.c | 1 + drivers/staging/speakup/kobjects.c | 6 +- drivers/staging/speakup/speakup.h | 1 - drivers/staging/speakup/varhandlers.c | 46 - drivers/staging/zcache/Kconfig | 6 +- drivers/staging/zcache/ramster.h | 6 +- drivers/staging/zcache/ramster/debug.c | 2 +- drivers/staging/zcache/ramster/nodemanager.c | 9 +- drivers/staging/zcache/ramster/ramster.c | 29 +- drivers/staging/zcache/ramster/ramster.h | 2 +- .../staging/zcache/ramster/ramster_nodemanager.h | 2 + drivers/staging/zcache/tmem.c | 6 +- drivers/staging/zcache/tmem.h | 8 +- drivers/staging/zcache/zcache-main.c | 64 +- drivers/staging/zcache/zcache.h | 2 +- drivers/target/target_core_iblock.c | 6 +- drivers/target/target_core_pscsi.c | 3 +- drivers/usb/gadget/amd5536udc.c | 4 +- drivers/usb/gadget/inode.c | 42 +- drivers/video/Kconfig | 17 + drivers/video/Makefile | 1 + drivers/video/cyber2000fb.c | 3 + drivers/video/simplefb.c | 234 +++ drivers/xen/Kconfig | 4 +- drivers/xen/tmem.c | 55 +- drivers/xen/xen-selfballoon.c | 13 +- fs/9p/vfs_addr.c | 1 + fs/Kconfig.binfmt | 14 + fs/Makefile | 5 +- fs/afs/write.c | 1 + fs/aio.c | 1820 ++++++++------------ fs/binfmt_aout.c | 3 - fs/binfmt_elf.c | 29 +- fs/binfmt_elf_fdpic.c | 2 - fs/binfmt_misc.c | 24 +- fs/bio-integrity.c | 3 +- fs/bio.c | 64 +- fs/block_dev.c | 9 +- fs/btrfs/check-integrity.c | 14 +- fs/btrfs/compression.c | 6 +- fs/btrfs/disk-io.c | 6 +- fs/btrfs/extent_io.c | 12 +- fs/btrfs/file.c | 1 + fs/btrfs/inode.c | 14 +- fs/btrfs/raid56.c | 9 +- fs/btrfs/scrub.c | 18 +- fs/btrfs/volumes.c | 5 +- fs/buffer.c | 3 +- fs/ceph/file.c | 1 + fs/compat.c | 1 + fs/coredump.c | 84 +- fs/dcache.c | 4 +- fs/direct-io.c | 22 +- fs/drop_caches.c | 2 + fs/ecryptfs/file.c | 1 + fs/eventpoll.c | 128 +- fs/exec.c | 13 +- fs/ext2/inode.c | 1 + fs/ext3/inode.c | 1 + fs/ext4/file.c | 1 + fs/ext4/indirect.c | 1 + fs/ext4/inode.c | 1 + fs/ext4/page-io.c | 4 +- fs/f2fs/data.c | 3 +- fs/f2fs/segment.c | 3 +- fs/fat/file.c | 108 +- fs/fat/inode.c | 55 + fs/fs-writeback.c | 1 + fs/fuse/cuse.c | 1 + fs/fuse/dev.c | 1 + fs/fuse/file.c | 1 + fs/gfs2/aops.c | 1 + fs/gfs2/file.c | 1 + fs/gfs2/lops.c | 3 +- fs/gfs2/ops_fstype.c | 3 +- fs/hfs/bfind.c | 10 +- fs/hfs/bitmap.c | 4 +- fs/hfs/bnode.c | 39 +- fs/hfs/brec.c | 19 +- fs/hfs/btree.c | 31 +- fs/hfs/catalog.c | 24 +- fs/hfs/dir.c | 20 +- fs/hfs/extent.c | 68 +- fs/hfs/hfs_fs.h | 22 +- fs/hfs/inode.c | 16 +- fs/hfs/mdb.c | 23 +- fs/hfs/super.c | 47 +- fs/hfsplus/attributes.c | 26 +- fs/hfsplus/bfind.c | 14 +- fs/hfsplus/bitmap.c | 13 +- fs/hfsplus/bnode.c | 36 +- fs/hfsplus/brec.c | 14 +- fs/hfsplus/btree.c | 29 +- fs/hfsplus/catalog.c | 11 +- fs/hfsplus/dir.c | 14 +- fs/hfsplus/extents.c | 53 +- fs/hfsplus/hfsplus_fs.h | 20 +- fs/hfsplus/inode.c | 5 +- fs/hfsplus/options.c | 22 +- fs/hfsplus/super.c | 56 +- fs/hfsplus/wrapper.c | 11 +- fs/hfsplus/xattr.c | 41 +- fs/jfs/inode.c | 1 + fs/jfs/jfs_logmgr.c | 4 +- fs/jfs/jfs_metapage.c | 6 +- fs/logfs/dev_bdev.c | 8 +- fs/mpage.c | 2 +- fs/nfs/blocklayout/blocklayout.c | 17 +- fs/nilfs2/inode.c | 19 +- fs/nilfs2/mdt.c | 19 +- fs/nilfs2/page.c | 70 +- fs/nilfs2/page.h | 3 +- fs/nilfs2/segbuf.c | 3 +- fs/notify/inotify/inotify_user.c | 6 +- fs/ntfs/file.c | 1 + fs/ntfs/inode.c | 1 + fs/ocfs2/aops.h | 2 + fs/ocfs2/cluster/heartbeat.c | 4 +- fs/ocfs2/dlmglue.c | 2 +- fs/ocfs2/inode.h | 2 + fs/pipe.c | 1 + fs/proc/base.c | 7 +- fs/proc/internal.h | 1 + fs/proc/task_mmu.c | 128 +- fs/read_write.c | 35 +- fs/reiserfs/inode.c | 1 + fs/ubifs/file.c | 1 + fs/udf/inode.c | 1 + fs/xfs/xfs_aops.c | 4 +- fs/xfs/xfs_buf.c | 3 +- fs/xfs/xfs_file.c | 1 + include/Kbuild | 3 - include/asm-generic/pgtable.h | 22 + include/linux/aio.h | 199 +-- include/linux/balloon_compaction.h | 7 + include/linux/batch_complete.h | 23 + include/linux/bio.h | 38 +- include/linux/blk_types.h | 4 +- include/linux/blkdev.h | 12 +- include/linux/cgroup.h | 1 + include/linux/cleancache.h | 4 +- include/linux/decompress/unlz4.h | 10 + include/linux/dmi.h | 2 + include/linux/errno.h | 1 - include/linux/frontswap.h | 36 +- include/linux/fs.h | 4 +- include/linux/hardirq.h | 5 + include/linux/ipc_namespace.h | 2 +- include/linux/kernel.h | 2 - include/linux/kmod.h | 17 +- include/linux/kthread.h | 1 + include/linux/lockdep.h | 92 +- include/linux/lz4.h | 87 + include/linux/mm_types.h | 3 - include/linux/mmzone.h | 20 +- include/linux/pagemap.h | 2 +- include/linux/percpu-refcount.h | 114 ++ include/linux/pid_namespace.h | 5 +- include/linux/posix-timers.h | 16 +- include/linux/printk.h | 15 + include/linux/random.h | 7 - include/linux/relay.h | 3 - include/linux/rio.h | 17 + include/linux/rio_drv.h | 1 + include/linux/rtc-pxa.h | 18 + include/linux/sched.h | 23 +- include/linux/seccomp.h | 18 + include/linux/smp.h | 1 - include/linux/string_helpers.h | 58 + include/linux/swap.h | 9 +- include/linux/vm_event_item.h | 7 +- include/linux/wait.h | 86 + include/linux/workqueue.h | 5 + include/linux/writeback.h | 1 + include/net/ip_vs.h | 8 +- include/scsi/Kbuild | 1 - include/uapi/linux/ptrace.h | 12 + include/xen/tmem.h | 8 + init/Kconfig | 114 +- init/do_mounts_initrd.c | 8 +- ipc/msg.c | 127 +- ipc/msgutil.c | 110 +- ipc/sem.c | 724 +++++--- ipc/shm.c | 2 +- ipc/util.c | 122 +- ipc/util.h | 19 +- kernel/audit_tree.c | 1 + kernel/auditfilter.c | 4 + kernel/compat.c | 65 - kernel/debug/debug_core.c | 2 +- kernel/fork.c | 5 +- kernel/kexec.c | 30 +- kernel/kmod.c | 98 +- kernel/kthread.c | 19 + kernel/lglock.c | 12 +- kernel/panic.c | 6 - kernel/pid.c | 11 +- kernel/pid_namespace.c | 2 - kernel/posix-cpu-timers.c | 395 ++--- kernel/power/poweroff.c | 2 +- kernel/printk.c | 154 +- kernel/ptrace.c | 81 + kernel/range.c | 3 +- kernel/relay.c | 28 +- kernel/sched/core.c | 1 + kernel/seccomp.c | 33 +- kernel/semaphore.c | 8 +- kernel/signal.c | 9 +- kernel/smp.c | 102 +- kernel/softirq.c | 6 +- kernel/sys.c | 221 ++- kernel/timer.c | 143 +- kernel/watchdog.c | 10 +- kernel/workqueue.c | 79 + kernel/workqueue_internal.h | 12 +- lib/Kconfig | 13 + lib/Kconfig.debug | 25 +- lib/Makefile | 11 +- lib/decompress.c | 7 +- lib/decompress_unlz4.c | 187 ++ lib/dump_stack.c | 11 +- lib/dynamic_debug.c | 48 +- lib/lz4/Makefile | 3 + lib/lz4/lz4_compress.c | 443 +++++ lib/lz4/lz4_decompress.c | 326 ++++ lib/lz4/lz4defs.h | 156 ++ lib/lz4/lz4hc_compress.c | 539 ++++++ lib/percpu-refcount.c | 251 +++ lib/rbtree_test.c | 9 +- lib/string_helpers.c | 133 ++ lib/test-string_helpers.c | 103 ++ {arch/s390/lib => lib}/usercopy.c | 3 +- mm/Kconfig | 12 + mm/balloon_compaction.c | 2 + mm/bounce.c | 12 +- mm/cleancache.c | 265 ++- mm/dmapool.c | 5 +- mm/frontswap.c | 156 +- mm/huge_memory.c | 2 +- mm/memcontrol.c | 192 ++- mm/migrate.c | 1 + mm/mmap.c | 28 - mm/mmu_context.c | 3 - mm/mremap.c | 2 +- mm/nommu.c | 4 - mm/page_alloc.c | 5 +- mm/page_io.c | 9 +- mm/shmem.c | 1 + mm/swap.c | 1 + mm/swapfile.c | 17 +- mm/util.c | 1 - mm/vmstat.c | 9 +- net/netfilter/ipvs/ip_vs_ctl.c | 4 +- scripts/Makefile.lib | 5 + security/keys/internal.h | 2 + security/keys/keyctl.c | 1 + security/keys/request_key.c | 13 +- sound/core/pcm_native.c | 2 +- sound/soc/codecs/si476x.c | 6 +- tools/testing/selftests/Makefile | 11 +- tools/testing/selftests/ptrace/Makefile | 10 + tools/testing/selftests/ptrace/peeksiginfo.c | 214 +++ tools/testing/selftests/soft-dirty/Makefile | 10 + tools/testing/selftests/soft-dirty/soft-dirty.c | 114 ++ tools/testing/selftests/timers/Makefile | 8 + tools/testing/selftests/timers/posix_timers.c | 221 +++ usr/Kconfig | 9 + 458 files changed, 9818 insertions(+), 4498 deletions(-) create mode 100644 Documentation/devicetree/bindings/video/simple-framebuffer.txt create mode 100644 Documentation/vm/soft-dirty.txt create mode 100644 arch/arm/boot/compressed/piggy.lz4.S delete mode 100644 arch/sparc/lib/usercopy.c create mode 100644 crypto/lz4.c create mode 100644 crypto/lz4hc.c create mode 100644 drivers/video/simplefb.c create mode 100644 include/linux/batch_complete.h create mode 100644 include/linux/decompress/unlz4.h create mode 100644 include/linux/lz4.h create mode 100644 include/linux/percpu-refcount.h create mode 100644 include/linux/rtc-pxa.h delete mode 100644 include/scsi/Kbuild create mode 100644 lib/decompress_unlz4.c create mode 100644 lib/lz4/Makefile create mode 100644 lib/lz4/lz4_compress.c create mode 100644 lib/lz4/lz4_decompress.c create mode 100644 lib/lz4/lz4defs.h create mode 100644 lib/lz4/lz4hc_compress.c create mode 100644 lib/percpu-refcount.c create mode 100644 lib/test-string_helpers.c rename {arch/s390/lib => lib}/usercopy.c (73%) create mode 100644 tools/testing/selftests/ptrace/Makefile create mode 100644 tools/testing/selftests/ptrace/peeksiginfo.c create mode 100644 tools/testing/selftests/soft-dirty/Makefile create mode 100644 tools/testing/selftests/soft-dirty/soft-dirty.c create mode 100644 tools/testing/selftests/timers/Makefile create mode 100644 tools/testing/selftests/timers/posix_timers.c