$ date Friday 21 March 09:41:11 EST 2014 $ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at 887843961c4b mm: fix bad rss-counter if remap_file_pages raced migration Merging origin/master (3fb725c48b93 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus) $ git merge origin/master Updating 887843961c4b..3fb725c48b93 Fast-forward arch/mips/Kconfig | 12 ++++++------ arch/mips/bcm47xx/nvram.c | 2 +- arch/mips/cavium-octeon/octeon-irq.c | 22 ++++++++++++---------- arch/mips/include/asm/asmmacro.h | 11 +++++++++++ arch/mips/include/asm/ftrace.h | 20 ++++++++++---------- sound/core/compress_offload.c | 2 +- sound/pci/oxygen/xonar_dg.c | 30 ++++++++++++++++++++++++------ 7 files changed, 65 insertions(+), 34 deletions(-) Merging fixes/master (b0031f227e47 Merge tag 's2mps11-build' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator) $ git merge fixes/master Already up-to-date. Merging kbuild-current/rc-fixes (38dbfb59d117 Linus 3.14-rc1) $ git merge kbuild-current/rc-fixes Already up-to-date. Merging arc-current/for-curr (7e22e91102c6 Linux 3.13-rc8) $ git merge arc-current/for-curr Already up-to-date. Merging arm-current/fixes (95c52fe06335 ARM: 8007/1: Remove extraneous kcmp syscall ignore) $ git merge arm-current/fixes Merge made by the 'recursive' strategy. arch/arm/include/asm/unistd.h | 1 - 1 file changed, 1 deletion(-) Merging m68k-current/for-linus (7247f55381d5 m68k: Wire up sched_setattr and sched_getattr) $ git merge m68k-current/for-linus Already up-to-date. Merging metag-fixes/fixes (0414855fdc4a Linux 3.14-rc5) $ git merge metag-fixes/fixes Already up-to-date. Merging powerpc-merge/merge (a5b2cf5b1af4 powerpc: Align p_dyn, p_rela and p_st symbols) $ git merge powerpc-merge/merge Already up-to-date. Merging sparc/master (151b628f1045 sparc64:tsb.c:use array size macro rather than number) $ git merge sparc/master Merge made by the 'recursive' strategy. arch/sparc/kernel/syscalls.S | 4 ++-- arch/sparc/mm/tsb.c | 2 +- drivers/tty/serial/sunhv.c | 22 ++++++++++------------ drivers/tty/serial/sunsab.c | 14 +++++--------- drivers/tty/serial/sunsu.c | 14 +++++--------- drivers/tty/serial/sunzilog.c | 14 +++++--------- 6 files changed, 28 insertions(+), 42 deletions(-) Merging net/master (b74d3feccc3f Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch) $ git merge net/master Merge made by the 'recursive' strategy. Documentation/networking/netlink_mmap.txt | 4 +- MAINTAINERS | 1 + drivers/isdn/capi/Kconfig | 18 ++-- drivers/net/ethernet/atheros/alx/main.c | 14 +-- drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 4 +- drivers/net/ethernet/broadcom/cnic.c | 111 +++++++++++---------- drivers/net/ethernet/broadcom/cnic.h | 2 +- drivers/net/ethernet/broadcom/cnic_defs.h | 2 +- drivers/net/ethernet/broadcom/cnic_if.h | 16 ++- drivers/net/ethernet/ti/cpsw.c | 4 - drivers/net/ethernet/via/via-rhine.c | 8 +- drivers/net/phy/phy_device.c | 3 +- drivers/net/usb/cdc_ncm.c | 48 +++++---- drivers/net/vxlan.c | 3 + drivers/net/wireless/ath/ath9k/hw.c | 3 +- drivers/net/wireless/ath/ath9k/xmit.c | 4 +- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 4 +- drivers/net/wireless/rt2x00/rt2800lib.c | 6 +- drivers/scsi/bnx2fc/bnx2fc_io.c | 16 +-- drivers/scsi/bnx2fc/bnx2fc_tgt.c | 38 +++---- drivers/scsi/bnx2i/bnx2i_hwi.c | 52 +++++----- drivers/scsi/bnx2i/bnx2i_iscsi.c | 23 +++-- include/linux/security.h | 10 +- include/linux/usb/cdc_ncm.h | 1 + include/net/tcp.h | 11 +- net/core/rtnetlink.c | 10 +- net/ipv4/ipmr.c | 13 ++- net/ipv6/ip6_output.c | 14 ++- net/ipv6/ip6mr.c | 13 ++- net/key/af_key.c | 19 ++-- net/openvswitch/datapath.c | 9 +- net/openvswitch/flow.c | 3 +- net/xfrm/xfrm_user.c | 6 +- security/capability.c | 3 +- security/security.c | 6 +- security/selinux/hooks.c | 13 +-- security/selinux/include/security.h | 2 +- security/selinux/include/xfrm.h | 3 +- security/selinux/selinuxfs.c | 28 ++++-- security/selinux/ss/services.c | 6 +- security/selinux/xfrm.c | 14 +-- 41 files changed, 305 insertions(+), 263 deletions(-) Merging ipsec/master (3e3d35402140 ATHEROS-ATL1E: Convert iounmap to pci_iounmap) $ git merge ipsec/master Already up-to-date. Merging sound-current/for-linus (749d32237bf3 ALSA: compress: Pass through return value of open ops callback) $ git merge sound-current/for-linus Already up-to-date. Merging pci-current/for-linus (707d4eefbdb3 Revert "[PATCH] Insert GART region into resource map") $ git merge pci-current/for-linus Already up-to-date. Merging wireless/master (584221918925 Revert "rt2x00: rt2800lib: Update BBP register initialization for RT53xx") $ git merge wireless/master Already up-to-date. Merging driver-core.current/driver-core-linus (0414855fdc4a Linux 3.14-rc5) $ git merge driver-core.current/driver-core-linus Already up-to-date. Merging tty.current/tty-linus (0414855fdc4a Linux 3.14-rc5) $ git merge tty.current/tty-linus Already up-to-date. Merging usb.current/usb-linus (fa389e220254 Linux 3.14-rc6) $ git merge usb.current/usb-linus Already up-to-date. Merging staging.current/staging-linus (dcb99fd9b08c Linux 3.14-rc7) $ git merge staging.current/staging-linus Already up-to-date. Merging char-misc.current/char-misc-linus (0414855fdc4a Linux 3.14-rc5) $ git merge char-misc.current/char-misc-linus Already up-to-date. Merging input-current/for-linus (70b0052425ff Input: da9052_onkey - use correct register bit for key status) $ git merge input-current/for-linus Merge made by the 'recursive' strategy. drivers/input/keyboard/adp5588-keys.c | 12 +++++++++++- drivers/input/misc/da9052_onkey.c | 29 ++++++++++++++++------------- 2 files changed, 27 insertions(+), 14 deletions(-) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) $ git merge md-current/for-linus Already up-to-date. Merging crypto-current/master (ee97dc7db4cb crypto: s390 - fix des and des3_ede ctr concurrency issue) $ git merge crypto-current/master Already up-to-date. Merging ide/master (5b40dd30bbfa ide: Fix SC1200 dependencies) $ git merge ide/master Merge made by the 'recursive' strategy. drivers/ide/Kconfig | 5 ++++- drivers/ide/ide-probe.c | 8 +++++--- 2 files changed, 9 insertions(+), 4 deletions(-) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) $ git merge dwmw2/master Already up-to-date. Merging devicetree-current/devicetree/merge (1f42e5dd5065 of: Add self test for of_match_node()) $ git merge devicetree-current/devicetree/merge Already up-to-date. Merging rr-fixes/fixes (7122c3e9154b scripts/link-vmlinux.sh: only filter kernel symbols for arm) $ git merge rr-fixes/fixes Already up-to-date. Merging mfd-fixes/master (73beb63d290f mfd: rtsx_pcr: Disable interrupts before cancelling delayed works) $ git merge mfd-fixes/master Already up-to-date. Merging vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-linus) $ git merge vfio-fixes/for-linus Already up-to-date. Merging drm-intel-fixes/for-linux-next-fixes (24bd9bf54d45 drm/i915: Fix PSR programming) $ git merge drm-intel-fixes/for-linux-next-fixes Merge made by the 'recursive' strategy. drivers/gpu/drm/i915/intel_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu) $ git merge asm-generic/master Already up-to-date. Merging arc/for-next (fef289567354 ARC: [clockevent] simplify timer ISR) $ git merge arc/for-next Merge made by the 'recursive' strategy. arch/arc/boot/.gitignore | 1 + arch/arc/include/asm/linkage.h | 14 ----------- arch/arc/kernel/ctx_sw_asm.S | 2 +- arch/arc/kernel/entry.S | 52 ++++++++++++++++++++-------------------- arch/arc/kernel/time.c | 37 +++++++++++++--------------- arch/arc/lib/memcmp.S | 6 ++--- arch/arc/lib/memcpy-700.S | 6 ++--- arch/arc/lib/memset.S | 10 ++++---- arch/arc/lib/strchr-700.S | 6 ++--- arch/arc/lib/strcmp.S | 6 ++--- arch/arc/lib/strcpy-700.S | 6 ++--- arch/arc/lib/strlen.S | 6 ++--- arch/arc/mm/init.c | 27 +++++++++++++++++++++ arch/arc/mm/tlbex.S | 10 ++++---- arch/arc/plat-arcfpga/Kconfig | 1 - arch/arc/plat-arcfpga/platform.c | 6 ++--- 16 files changed, 101 insertions(+), 95 deletions(-) Merging arm/for-next (54740e1ee0fe Merge branch 'devel-stable' into for-next) $ git merge arm/for-next Removing arch/arm/include/asm/system.h Auto-merging arch/arm/Kconfig Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/arm/pmu.txt | 10 +- arch/Kconfig | 6 +- arch/arm/Kconfig | 5 +- arch/arm/common/Makefile | 1 + arch/arm/common/scoop.c | 2 - arch/arm/include/asm/assembler.h | 8 +- arch/arm/include/asm/atomic.h | 44 +- arch/arm/include/asm/cmpxchg.h | 6 + arch/arm/include/asm/cputype.h | 1 + arch/arm/include/asm/floppy.h | 2 +- arch/arm/include/asm/futex.h | 9 +- arch/arm/include/asm/hw_breakpoint.h | 1 + arch/arm/include/asm/hwcap.h | 3 +- arch/arm/include/asm/jump_label.h | 1 - arch/arm/include/asm/kprobes.h | 17 +- arch/arm/include/asm/pgtable-2level.h | 1 + arch/arm/include/asm/pgtable.h | 7 +- arch/arm/include/asm/pmu.h | 2 + arch/arm/include/asm/probes.h | 43 + arch/arm/include/asm/ptrace.h | 14 +- arch/arm/include/asm/sync_bitops.h | 1 - arch/arm/include/asm/system.h | 7 - arch/arm/include/asm/thread_info.h | 5 +- arch/arm/include/asm/uaccess.h | 2 +- arch/arm/include/asm/uprobes.h | 45 + arch/arm/include/uapi/asm/hwcap.h | 9 + arch/arm/kernel/Makefile | 7 +- arch/arm/kernel/bios32.c | 37 +- arch/arm/kernel/hw_breakpoint.c | 3 +- arch/arm/kernel/kprobes-arm.c | 806 ++--------------- arch/arm/kernel/kprobes-common.c | 469 +--------- arch/arm/kernel/kprobes-test-arm.c | 1 + arch/arm/kernel/kprobes-test.c | 12 +- arch/arm/kernel/kprobes-thumb.c | 1145 ++++--------------------- arch/arm/kernel/kprobes.c | 25 +- arch/arm/kernel/kprobes.h | 400 +-------- arch/arm/kernel/perf_event.c | 27 +- arch/arm/kernel/perf_event_cpu.c | 113 ++- arch/arm/kernel/perf_event_v7.c | 717 ++++++++++++++++ arch/arm/kernel/probes-arm.c | 734 ++++++++++++++++ arch/arm/kernel/probes-arm.h | 73 ++ arch/arm/kernel/probes-thumb.c | 882 +++++++++++++++++++ arch/arm/kernel/probes-thumb.h | 97 +++ arch/arm/kernel/probes.c | 455 ++++++++++ arch/arm/kernel/probes.h | 407 +++++++++ arch/arm/kernel/process.c | 9 +- arch/arm/kernel/setup.c | 16 + arch/arm/kernel/signal.c | 4 + arch/arm/kernel/unwind.c | 137 ++- arch/arm/kernel/uprobes-arm.c | 234 +++++ arch/arm/kernel/uprobes.c | 210 +++++ arch/arm/kernel/uprobes.h | 35 + arch/arm/lib/bitops.h | 5 + arch/arm/lib/copy_template.S | 36 +- arch/arm/lib/csumpartialcopygeneric.S | 96 +-- arch/arm/lib/io-readsl.S | 12 +- arch/arm/lib/io-writesl.S | 12 +- arch/arm/lib/memmove.S | 36 +- arch/arm/lib/uaccess.S | 192 ++--- arch/arm/mach-cns3xxx/core.c | 2 +- arch/arm/mach-ebsa110/core.c | 2 +- arch/arm/mach-footbridge/dc21285-timer.c | 6 +- arch/arm/mach-footbridge/dc21285.c | 10 +- arch/arm/mach-footbridge/isa-timer.c | 2 +- arch/arm/mach-gemini/idle.c | 2 +- arch/arm/mach-integrator/integrator_ap.c | 2 +- arch/arm/mach-ixp4xx/common.c | 2 +- arch/arm/mach-ixp4xx/dsmg600-setup.c | 3 +- arch/arm/mach-ixp4xx/fsg-setup.c | 6 +- arch/arm/mach-ixp4xx/nas100d-setup.c | 3 +- arch/arm/mach-ixp4xx/nslu2-setup.c | 6 +- arch/arm/mach-ks8695/time.c | 2 +- arch/arm/mach-lpc32xx/timer.c | 2 +- arch/arm/mach-mmp/time.c | 2 +- arch/arm/mach-netx/time.c | 2 +- arch/arm/mach-omap1/dma.c | 191 ++--- arch/arm/mach-omap2/am35xx-emac.c | 1 - arch/arm/mach-omap2/dma.c | 183 ++-- arch/arm/mach-rpc/dma.c | 2 +- arch/arm/mach-rpc/time.c | 1 - arch/arm/mach-sa1100/collie.c | 33 + arch/arm/mach-sa1100/h3100.c | 7 - arch/arm/mach-sa1100/h3600.c | 7 - arch/arm/mach-sa1100/h3xxx.c | 58 +- arch/arm/mach-sa1100/include/mach/collie.h | 2 +- arch/arm/mach-sa1100/include/mach/h3xxx.h | 11 - arch/arm/mach-sa1100/time.c | 2 +- arch/arm/mach-spear/time.c | 2 +- arch/arm/mach-u300/timer.c | 2 +- arch/arm/mach-vexpress/Makefile | 3 + arch/arm/mach-w90x900/time.c | 2 +- arch/arm/mm/Kconfig | 3 +- arch/arm/mm/cache-feroceon-l2.c | 4 +- arch/arm/mm/dma-mapping.c | 3 - arch/arm/mm/mmu.c | 10 + arch/arm/mm/proc-macros.S | 19 +- arch/arm/mm/proc-v7-2level.S | 7 - arch/arm/mm/proc-v7.S | 11 + arch/arm/plat-iop/time.c | 2 +- arch/arm/plat-omap/dma.c | 17 +- drivers/amba/bus.c | 4 +- drivers/dma/omap-dma.c | 659 ++++++++++++-- drivers/mmc/host/mmci.h | 9 +- drivers/scsi/arm/acornscsi.c | 2 +- drivers/scsi/arm/cumana_1.c | 2 +- drivers/scsi/arm/cumana_2.c | 2 +- drivers/scsi/arm/powertec.c | 2 +- drivers/usb/gadget/lpc32xx_udc.c | 1 - include/linux/memblock.h | 2 + include/linux/omap-dma.h | 25 +- include/linux/uprobes.h | 1 + kernel/events/uprobes.c | 9 + kernel/trace/Kconfig | 1 + mm/memblock.c | 5 + 114 files changed, 5718 insertions(+), 3339 deletions(-) create mode 100644 arch/arm/include/asm/probes.h delete mode 100644 arch/arm/include/asm/system.h create mode 100644 arch/arm/include/asm/uprobes.h create mode 100644 arch/arm/kernel/probes-arm.c create mode 100644 arch/arm/kernel/probes-arm.h create mode 100644 arch/arm/kernel/probes-thumb.c create mode 100644 arch/arm/kernel/probes-thumb.h create mode 100644 arch/arm/kernel/probes.c create mode 100644 arch/arm/kernel/probes.h create mode 100644 arch/arm/kernel/uprobes-arm.c create mode 100644 arch/arm/kernel/uprobes.c create mode 100644 arch/arm/kernel/uprobes.h Merging arm-kvm-cpuresume/arm-kvm-cpuresume (91a3f6af430d arm: kernel: sleep: restore HYP mode configuration in cpu_resume) $ git merge arm-kvm-cpuresume/arm-kvm-cpuresume Auto-merging arch/arm/include/asm/assembler.h Merge made by the 'recursive' strategy. arch/arm/include/asm/assembler.h | 2 +- arch/arm/kernel/sleep.S | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) Merging arm-perf/for-next/perf (6d0abeca3242 Linux 3.14-rc3) $ git merge arm-perf/for-next/perf Already up-to-date. Merging arm-soc/for-next (0a3ce8b9f611 arm-soc list new merges) $ git merge arm-soc/for-next Auto-merging include/linux/irqchip/irq-crossbar.h Auto-merging drivers/thermal/Kconfig Auto-merging drivers/clocksource/qcom-timer.c Removing arch/arm/plat-samsung/include/plat/regs-serial.h Removing arch/arm/plat-omap/include/plat/timex.h Auto-merging arch/arm/mm/cache-feroceon-l2.c Auto-merging arch/arm/mm/Kconfig Removing arch/arm/mach-w90x900/include/mach/timex.h Removing arch/arm/mach-virt/virt.c Removing arch/arm/mach-virt/Makefile Removing arch/arm/mach-virt/Kconfig Removing arch/arm/mach-ux500/irqs.h Removing arch/arm/mach-ux500/irqs-db8500.h Removing arch/arm/mach-ux500/irqs-board-mop500.h Removing arch/arm/mach-ux500/board-mop500-pins.c Removing arch/arm/mach-spear/include/mach/timex.h Removing arch/arm/mach-shmobile/include/mach/timex.h Removing arch/arm/mach-shmobile/board-kzm9d-reference.c Auto-merging arch/arm/mach-sa1100/time.c Removing arch/arm/mach-sa1100/include/mach/timex.h Removing arch/arm/mach-s5pv210/include/mach/timex.h Removing arch/arm/mach-s5pc100/include/mach/timex.h Removing arch/arm/mach-s5pc100/include/mach/tick.h Removing arch/arm/mach-s5p64x0/include/mach/timex.h Removing arch/arm/mach-s3c64xx/include/mach/timex.h Removing arch/arm/mach-s3c64xx/include/mach/tick.h Removing arch/arm/mach-s3c24xx/include/mach/timex.h Removing arch/arm/mach-s3c24xx/include/mach/tick.h Auto-merging arch/arm/mach-s3c24xx/include/mach/rtc-core.h Auto-merging arch/arm/mach-rpc/time.c Removing arch/arm/mach-rpc/include/mach/timex.h Auto-merging arch/arm/mach-rockchip/headsmp.S Auto-merging arch/arm/mach-rockchip/core.h Removing arch/arm/mach-realview/include/mach/timex.h Auto-merging arch/arm/mach-qcom/scm-boot.h Auto-merging arch/arm/mach-qcom/board.c Removing arch/arm/mach-pxa/include/mach/timex.h Removing arch/arm/mach-orion5x/include/mach/timex.h Removing arch/arm/mach-omap2/include/mach/timex.h Removing arch/arm/mach-omap1/include/mach/timex.h Auto-merging arch/arm/mach-netx/time.c Removing arch/arm/mach-netx/include/mach/timex.h Auto-merging arch/arm/mach-mvebu/dove.c Auto-merging arch/arm/mach-mvebu/board-v7.c Removing arch/arm/mach-mv78xx0/include/mach/timex.h Removing arch/arm/mach-msm/platsmp.c Removing arch/arm/mach-msm/include/mach/timex.h Removing arch/arm/mach-msm/hotplug.c Removing arch/arm/mach-msm/headsmp.S Auto-merging arch/arm/mach-mmp/time.c Removing arch/arm/mach-ks8695/include/mach/timex.h Removing arch/arm/mach-kirkwood/include/mach/timex.h Removing arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c Removing arch/arm/mach-ixp4xx/include/mach/timex.h Auto-merging arch/arm/mach-ixp4xx/common.c Removing arch/arm/mach-iop33x/include/mach/timex.h Removing arch/arm/mach-iop32x/include/mach/timex.h Removing arch/arm/mach-iop13xx/include/mach/timex.h Auto-merging arch/arm/mach-integrator/integrator_ap.c Removing arch/arm/mach-integrator/include/mach/timex.h Removing arch/arm/mach-integrator/include/mach/hardware.h Auto-merging arch/arm/mach-integrator/impd1.h Auto-merging arch/arm/mach-integrator/hardware.h Removing arch/arm/mach-imx/pm-imx6q.c Removing arch/arm/mach-imx/devices/platform-mxc_pwm.c Removing arch/arm/mach-gemini/include/mach/timex.h Removing arch/arm/mach-footbridge/include/mach/timex.h Removing arch/arm/mach-exynos/include/mach/uncompress.h Removing arch/arm/mach-exynos/include/mach/timex.h Removing arch/arm/mach-ep93xx/include/mach/timex.h Removing arch/arm/mach-efm32/include/mach/timex.h Removing arch/arm/mach-efm32/include/mach/entry-macro.S Removing arch/arm/mach-ebsa110/include/mach/timex.h Removing arch/arm/mach-dove/include/mach/timex.h Removing arch/arm/mach-davinci/tnetv107x.c Removing arch/arm/mach-davinci/include/mach/tnetv107x.h Removing arch/arm/mach-davinci/include/mach/timex.h Removing arch/arm/mach-davinci/devices-tnetv107x.c Removing arch/arm/mach-davinci/board-tnetv107x-evm.c Auto-merging arch/arm/mach-cns3xxx/core.c Removing arch/arm/mach-clps711x/include/mach/timex.h Removing arch/arm/mach-bcm2835/Makefile Removing arch/arm/mach-bcm2835/Kconfig Removing arch/arm/mach-at91/include/mach/timex.h Auto-merging arch/arm/include/asm/hardware/cache-feroceon-l2.h Auto-mergingResolved 'arch/arm/boot/dts/keystone-clocks.dtsi' using previous resolution. arch/arm/configs/mvebu_v7_defconfig Removing arch/arm/configs/kzm9d_defconfig Removing arch/arm/configs/da8xx_omapl_defconfig Removing arch/arm/boot/dts/r8a7791-koelsch-reference.dts Auto-merging arch/arm/boot/dts/keystone-clocks.dtsi CONFLICT (content): Merge conflict in arch/arm/boot/dts/keystone-clocks.dtsi Removing arch/arm/boot/dts/imx53-evk.dts Auto-merging arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi Removing arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts Auto-merging arch/arm/boot/dts/bcm21664-garnet.dts Auto-merging arch/arm/Kconfig Auto-merging MAINTAINERS Auto-merging Documentation/devicetree/bindings/iio/adc/at91_adc.txt Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master d22dd204266e] Merge remote-tracking branch 'arm-soc/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/arm/Marvell/README | 12 +- .../devicetree/bindings/arm/armada-375.txt | 9 + .../devicetree/bindings/arm/armada-38x.txt | 10 + .../devicetree/bindings/arm/bcm/bcm21664.txt | 15 + .../devicetree/bindings/arm/bcm/kona-resetmgr.txt | 14 + Documentation/devicetree/bindings/arm/bcm4708.txt | 8 + Documentation/devicetree/bindings/arm/cpus.txt | 25 +- Documentation/devicetree/bindings/arm/gic.txt | 6 + .../devicetree/bindings/arm/keystone/keystone.txt | 10 + .../devicetree/bindings/arm/mrvl/feroceon.txt | 16 + .../devicetree/bindings/arm/msm/qcom,kpss-acc.txt | 30 + .../devicetree/bindings/arm/msm/qcom,saw2.txt | 35 + .../bindings/arm/mvebu-system-controller.txt | 3 +- .../devicetree/bindings/arm/omap/crossbar.txt | 27 + Documentation/devicetree/bindings/arm/omap/dmm.txt | 22 + .../devicetree/bindings/arm/omap/omap.txt | 6 + .../devicetree/bindings/arm/rockchip/pmu.txt | 16 + .../devicetree/bindings/arm/rockchip/smp-sram.txt | 30 + .../devicetree/bindings/arm/samsung/pmu.txt | 15 + Documentation/devicetree/bindings/bus/imx-weim.txt | 28 +- .../devicetree/bindings/clock/arm-integrator.txt | 34 + .../devicetree/bindings/clock/exynos4-clock.txt | 259 +---- .../devicetree/bindings/clock/exynos5250-clock.txt | 163 +-- .../devicetree/bindings/clock/exynos5420-clock.txt | 184 +--- .../devicetree/bindings/clock/exynos5440-clock.txt | 45 +- .../devicetree/bindings/i2c/trivial-devices.txt | 1 + .../{arm/atmel-adc.txt => iio/adc/at91_adc.txt} | 33 +- .../interrupt-controller/cirrus,clps711x-intc.txt | 41 + .../devicetree/bindings/mmc/socfpga-dw-mshc.txt | 23 + .../devicetree/bindings/net/socfpga-dwmac.txt | 35 + .../bindings/power_supply/qnap-poweroff.txt | 5 +- .../devicetree/bindings/reset/sirf,rstc.txt | 42 + .../devicetree/bindings/reset/st,sti-powerdown.txt | 47 + .../devicetree/bindings/reset/st,sti-softreset.txt | 46 + .../devicetree/bindings/serial/atmel-usart.txt | 3 + .../devicetree/bindings/usb/atmel-usb.txt | 4 +- .../devicetree/bindings/usb/ehci-omap.txt | 2 +- .../devicetree/bindings/usb/ohci-omap3.txt | 2 +- .../devicetree/bindings/vendor-prefixes.txt | 7 + .../devicetree/bindings/watchdog/marvel.txt | 11 +- MAINTAINERS | 36 +- arch/arm/Kconfig | 33 +- arch/arm/Kconfig.debug | 29 +- arch/arm/Makefile | 3 +- arch/arm/arm-soc-for-next-contents.txt | 255 +++++ arch/arm/boot/dts/Makefile | 137 ++- arch/arm/boot/dts/am335x-evm.dts | 60 +- arch/arm/boot/dts/am335x-evmsk.dts | 56 ++ arch/arm/boot/dts/am33xx.dtsi | 17 +- arch/arm/boot/dts/am3517-craneboard.dts | 174 ++++ arch/arm/boot/dts/am4372.dtsi | 46 + arch/arm/boot/dts/am437x-gp-evm.dts | 127 +++ arch/arm/boot/dts/am43x-epos-evm.dts | 183 ++++ arch/arm/boot/dts/armada-370-db.dts | 56 ++ arch/arm/boot/dts/armada-370-mirabox.dts | 7 +- arch/arm/boot/dts/armada-370-rd.dts | 6 +- arch/arm/boot/dts/armada-370-xp.dtsi | 8 +- arch/arm/boot/dts/armada-370.dtsi | 33 + arch/arm/boot/dts/armada-375-db.dts | 130 +++ arch/arm/boot/dts/armada-375.dtsi | 464 +++++++++ arch/arm/boot/dts/armada-380.dtsi | 117 +++ arch/arm/boot/dts/armada-385-db.dts | 122 +++ arch/arm/boot/dts/armada-385-rd.dts | 94 ++ arch/arm/boot/dts/armada-385.dtsi | 149 +++ arch/arm/boot/dts/armada-38x.dtsi | 376 +++++++ arch/arm/boot/dts/armada-xp-axpwifiap.dts | 6 +- arch/arm/boot/dts/armada-xp-db.dts | 13 +- arch/arm/boot/dts/armada-xp-gp.dts | 22 +- arch/arm/boot/dts/armada-xp-matrix.dts | 7 +- arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 12 +- arch/arm/boot/dts/armada-xp.dtsi | 6 + arch/arm/boot/dts/at91-ariag25.dts | 1 - arch/arm/boot/dts/at91-cosino.dtsi | 1 - arch/arm/boot/dts/at91-cosino_mega2560.dts | 1 - arch/arm/boot/dts/at91sam9260.dtsi | 11 +- arch/arm/boot/dts/at91sam9261.dtsi | 735 ++++++++++++++ arch/arm/boot/dts/at91sam9261ek.dts | 211 ++++ arch/arm/boot/dts/at91sam9g45.dtsi | 12 +- arch/arm/boot/dts/at91sam9n12.dtsi | 1 + arch/arm/boot/dts/at91sam9rl.dtsi | 802 +++++++++++++++ arch/arm/boot/dts/at91sam9rlek.dts | 157 +++ arch/arm/boot/dts/at91sam9x5.dtsi | 14 +- arch/arm/boot/dts/atlas6.dtsi | 3 +- arch/arm/boot/dts/bcm11351.dtsi | 192 +++- .../dts/{bcm11351-brt.dts => bcm21664-garnet.dts} | 12 +- arch/arm/boot/dts/bcm21664.dtsi | 292 ++++++ arch/arm/boot/dts/bcm28155-ap.dts | 51 +- arch/arm/boot/dts/bcm2835.dtsi | 92 +- arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 35 + arch/arm/boot/dts/bcm4708.dtsi | 34 + arch/arm/boot/dts/bcm5301x.dtsi | 95 ++ arch/arm/boot/dts/bcm59056.dtsi | 74 ++ arch/arm/boot/dts/dove.dtsi | 22 +- arch/arm/boot/dts/dra7.dtsi | 151 +++ arch/arm/boot/dts/efm32gg-dk3750.dts | 2 +- arch/arm/boot/dts/efm32gg.dtsi | 4 +- arch/arm/boot/dts/exynos4.dtsi | 73 +- arch/arm/boot/dts/exynos4210.dtsi | 9 +- arch/arm/boot/dts/exynos4412-odroidx.dts | 2 +- arch/arm/boot/dts/exynos4412-origen.dts | 4 +- arch/arm/boot/dts/exynos4x12.dtsi | 34 +- arch/arm/boot/dts/exynos5.dtsi | 7 - arch/arm/boot/dts/exynos5250-arndale.dts | 5 + arch/arm/boot/dts/exynos5250-smdk5250.dts | 146 +++ arch/arm/boot/dts/exynos5250-snow.dts | 4 + arch/arm/boot/dts/exynos5250.dtsi | 118 ++- arch/arm/boot/dts/exynos5420-arndale-octa.dts | 298 ++++++ arch/arm/boot/dts/exynos5420-smdk5420.dts | 253 +++++ arch/arm/boot/dts/exynos5420.dtsi | 159 ++- arch/arm/boot/dts/exynos5440.dtsi | 33 +- arch/arm/boot/dts/imx23-evk.dts | 8 +- arch/arm/boot/dts/imx23-olinuxino.dts | 5 +- arch/arm/boot/dts/imx23-stmp378x_devb.dts | 5 +- arch/arm/boot/dts/imx23.dtsi | 8 +- arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi | 73 ++ .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 174 ++++ arch/arm/boot/dts/imx25-pinfunc.h | 494 ++++++++++ arch/arm/boot/dts/imx25.dtsi | 18 +- arch/arm/boot/dts/imx27-apf27.dts | 38 + arch/arm/boot/dts/imx27-apf27dev.dts | 149 ++- arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts | 77 +- arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts | 44 - arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi | 103 ++ arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 178 +++- ...ycore-som.dts => imx27-phytec-phycore-som.dtsi} | 133 ++- arch/arm/boot/dts/imx27-pinfunc.h | 526 ++++++++++ arch/arm/boot/dts/imx27.dtsi | 207 ++-- arch/arm/boot/dts/imx28-apf28dev.dts | 29 +- arch/arm/boot/dts/imx28-apx4devkit.dts | 5 +- arch/arm/boot/dts/imx28-cfa10036.dts | 2 + arch/arm/boot/dts/imx28-cfa10037.dts | 7 +- arch/arm/boot/dts/imx28-cfa10049.dts | 31 +- arch/arm/boot/dts/imx28-cfa10057.dts | 7 +- arch/arm/boot/dts/imx28-cfa10058.dts | 7 +- arch/arm/boot/dts/imx28-duckbill.dts | 121 +++ arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts | 71 ++ arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts | 50 + arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi | 326 ++++++ arch/arm/boot/dts/imx28-evk.dts | 24 +- arch/arm/boot/dts/imx28-m28cu3.dts | 17 +- arch/arm/boot/dts/imx28-m28evk.dts | 20 +- arch/arm/boot/dts/imx28-sps1.dts | 7 +- arch/arm/boot/dts/imx28-tx28.dts | 24 +- arch/arm/boot/dts/imx28.dtsi | 65 +- arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi | 81 ++ .../boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts | 143 +++ arch/arm/boot/dts/imx35.dtsi | 359 +++++++ arch/arm/boot/dts/imx50-evk.dts | 119 +++ arch/arm/boot/dts/imx50-pinfunc.h | 923 +++++++++++++++++ arch/arm/boot/dts/imx50.dtsi | 478 +++++++++ arch/arm/boot/dts/imx51-apf51.dts | 40 +- arch/arm/boot/dts/imx51-apf51dev.dts | 102 +- arch/arm/boot/dts/imx51-babbage.dts | 255 ++++- arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi | 93 ++ .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 175 ++++ arch/arm/boot/dts/imx51.dtsi | 459 ++------- arch/arm/boot/dts/imx53-ard.dts | 33 +- arch/arm/boot/dts/imx53-evk.dts | 126 --- arch/arm/boot/dts/imx53-m53evk.dts | 232 ++++- arch/arm/boot/dts/imx53-mba53.dts | 39 +- arch/arm/boot/dts/imx53-qsb-common.dtsi | 336 +++++++ arch/arm/boot/dts/imx53-qsb.dts | 210 +--- arch/arm/boot/dts/imx53-qsrb.dts | 158 +++ arch/arm/boot/dts/imx53-smd.dts | 119 ++- arch/arm/boot/dts/imx53-tqma53.dtsi | 175 +++- arch/arm/boot/dts/imx53-tx53-x03x.dts | 315 ++++++ arch/arm/boot/dts/imx53-tx53-x13x.dts | 243 +++++ arch/arm/boot/dts/imx53-tx53.dtsi | 510 +++++++++- arch/arm/boot/dts/imx53-voipac-bsb.dts | 159 +++ arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi | 277 ++++++ arch/arm/boot/dts/imx53.dtsi | 663 ++----------- arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts | 23 + arch/arm/boot/dts/imx6dl-gw51xx.dts | 19 + arch/arm/boot/dts/imx6dl-gw52xx.dts | 19 + arch/arm/boot/dts/imx6dl-gw53xx.dts | 19 + arch/arm/boot/dts/imx6dl-gw54xx.dts | 19 + arch/arm/boot/dts/imx6dl-nitrogen6x.dts | 21 + arch/arm/boot/dts/imx6dl-pinfunc.h | 2 + arch/arm/boot/dts/imx6dl-sabrelite.dts | 20 + arch/arm/boot/dts/imx6dl.dtsi | 29 +- arch/arm/boot/dts/imx6q-arm2.dts | 140 ++- arch/arm/boot/dts/imx6q-cm-fx6.dts | 107 ++ arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts | 23 + arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 372 +++++++ arch/arm/boot/dts/imx6q-gk802.dts | 171 ++++ arch/arm/boot/dts/imx6q-gw51xx.dts | 19 + arch/arm/boot/dts/imx6q-gw52xx.dts | 23 + arch/arm/boot/dts/imx6q-gw53xx.dts | 23 + arch/arm/boot/dts/imx6q-gw5400-a.dts | 546 +++++++++++ arch/arm/boot/dts/imx6q-gw54xx.dts | 23 + arch/arm/boot/dts/imx6q-nitrogen6x.dts | 25 + arch/arm/boot/dts/imx6q-phytec-pbab01.dts | 16 + arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi | 167 +++- arch/arm/boot/dts/imx6q-pinfunc.h | 2 + arch/arm/boot/dts/imx6q-sabrelite.dts | 178 +--- arch/arm/boot/dts/imx6q-sbc6x.dts | 58 +- arch/arm/boot/dts/imx6q-udoo.dts | 54 +- arch/arm/boot/dts/imx6q.dtsi | 23 +- arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi | 199 ++++ arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 374 +++++++ arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 490 ++++++++++ arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 553 +++++++++++ arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 580 +++++++++++ arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 422 ++++++++ arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 378 ++++++- arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 423 ++++++++ arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 277 +++++- arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 131 ++- arch/arm/boot/dts/imx6qdl.dtsi | 938 +++--------------- arch/arm/boot/dts/imx6sl-evk.dts | 427 +++++++- arch/arm/boot/dts/imx6sl.dtsi | 385 +++----- arch/arm/boot/dts/integratorap.dts | 35 + arch/arm/boot/dts/integratorcp.dts | 102 +- arch/arm/boot/dts/k2e-clocks.dtsi | 78 ++ arch/arm/boot/dts/k2e-evm.dts | 60 ++ arch/arm/boot/dts/k2e.dtsi | 80 ++ arch/arm/boot/dts/k2hk-clocks.dtsi | 426 ++++++++ arch/arm/boot/dts/k2hk-evm.dts | 83 +- arch/arm/boot/dts/k2hk.dtsi | 46 + arch/arm/boot/dts/k2l-clocks.dtsi | 267 +++++ arch/arm/boot/dts/k2l-evm.dts | 37 + arch/arm/boot/dts/k2l.dtsi | 55 ++ arch/arm/boot/dts/keystone-clocks.dtsi | 427 +------- arch/arm/boot/dts/keystone.dtsi | 102 +- arch/arm/boot/dts/kirkwood-b3.dts | 204 ++++ arch/arm/boot/dts/kirkwood-ds109.dts | 41 + arch/arm/boot/dts/kirkwood-ds110jv10.dts | 41 + arch/arm/boot/dts/kirkwood-ds111.dts | 44 + arch/arm/boot/dts/kirkwood-ds112.dts | 48 + arch/arm/boot/dts/kirkwood-ds209.dts | 44 + arch/arm/boot/dts/kirkwood-ds210.dts | 46 + arch/arm/boot/dts/kirkwood-ds212.dts | 47 + arch/arm/boot/dts/kirkwood-ds212j.dts | 41 + arch/arm/boot/dts/kirkwood-ds409.dts | 48 + arch/arm/boot/dts/kirkwood-ds409slim.dts | 40 + arch/arm/boot/dts/kirkwood-ds411.dts | 52 + arch/arm/boot/dts/kirkwood-ds411j.dts | 48 + arch/arm/boot/dts/kirkwood-ds411slim.dts | 48 + arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 62 ++ arch/arm/boot/dts/kirkwood-rd88f6192.dts | 112 +++ arch/arm/boot/dts/kirkwood-rd88f6281-a0.dts | 26 + arch/arm/boot/dts/kirkwood-rd88f6281-a1.dts | 31 + arch/arm/boot/dts/kirkwood-rd88f6281.dtsi | 152 +++ arch/arm/boot/dts/kirkwood-rs212.dts | 48 + arch/arm/boot/dts/kirkwood-rs409.dts | 44 + arch/arm/boot/dts/kirkwood-rs411.dts | 44 + arch/arm/boot/dts/kirkwood-synology.dtsi | 871 +++++++++++++++++ arch/arm/boot/dts/kirkwood-t5325.dts | 208 ++++ arch/arm/boot/dts/kirkwood-ts419-6281.dts | 20 + arch/arm/boot/dts/kirkwood-ts419-6282.dts | 32 + arch/arm/boot/dts/kirkwood-ts419.dtsi | 75 ++ arch/arm/boot/dts/kirkwood.dtsi | 24 +- arch/arm/boot/dts/marco.dtsi | 3 +- arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi | 58 ++ arch/arm/boot/dts/omap2420.dtsi | 2 + arch/arm/boot/dts/omap2430.dtsi | 5 + arch/arm/boot/dts/omap3-beagle-xm.dts | 4 + arch/arm/boot/dts/omap3-beagle.dts | 4 + arch/arm/boot/dts/omap3-cm-t3517.dts | 136 +++ arch/arm/boot/dts/omap3-cm-t3530.dts | 48 + arch/arm/boot/dts/omap3-cm-t3730.dts | 57 +- arch/arm/boot/dts/omap3-cm-t3x.dtsi | 110 +++ arch/arm/boot/dts/omap3-cm-t3x30.dtsi | 74 +- arch/arm/boot/dts/omap3-devkit8000.dts | 16 +- arch/arm/boot/dts/omap3-gta04.dts | 51 +- arch/arm/boot/dts/omap3-igep.dtsi | 1 + arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 459 +++++++++ arch/arm/boot/dts/omap3-lilly-dbb056.dts | 170 ++++ arch/arm/boot/dts/omap3-n900.dts | 90 ++ arch/arm/boot/dts/omap3-overo-alto35-common.dtsi | 77 ++ arch/arm/boot/dts/omap3-overo-alto35.dts | 22 + arch/arm/boot/dts/omap3-overo-base.dtsi | 221 +++++ .../boot/dts/omap3-overo-chestnut43-common.dtsi | 69 ++ arch/arm/boot/dts/omap3-overo-chestnut43.dts | 38 + .../boot/dts/omap3-overo-common-peripherals.dtsi | 94 ++ arch/arm/boot/dts/omap3-overo-gallop43-common.dtsi | 57 ++ arch/arm/boot/dts/omap3-overo-gallop43.dts | 38 + arch/arm/boot/dts/omap3-overo-palo43-common.dtsi | 53 + arch/arm/boot/dts/omap3-overo-palo43.dts | 38 + arch/arm/boot/dts/omap3-overo-storm-alto35.dts | 21 + arch/arm/boot/dts/omap3-overo-storm-chestnut43.dts | 38 + arch/arm/boot/dts/omap3-overo-storm-gallop43.dts | 38 + arch/arm/boot/dts/omap3-overo-storm-palo43.dts | 38 + arch/arm/boot/dts/omap3-overo-storm-summit.dts | 30 + arch/arm/boot/dts/omap3-overo-storm-tobi.dts | 2 +- arch/arm/boot/dts/omap3-overo-storm.dtsi | 35 + arch/arm/boot/dts/omap3-overo-summit-common.dtsi | 31 + arch/arm/boot/dts/omap3-overo-summit.dts | 30 + arch/arm/boot/dts/omap3-overo-tobi-common.dtsi | 51 +- arch/arm/boot/dts/omap3-overo-tobi.dts | 2 +- arch/arm/boot/dts/omap3-overo.dtsi | 98 +- arch/arm/boot/dts/omap3-sb-t35.dtsi | 29 +- arch/arm/boot/dts/omap3-sbc-t3517.dts | 43 + arch/arm/boot/dts/omap3-sbc-t3530.dts | 36 + arch/arm/boot/dts/omap3-sbc-t3730.dts | 23 +- arch/arm/boot/dts/omap3.dtsi | 29 +- arch/arm/boot/dts/omap3430-sdp.dts | 7 +- arch/arm/boot/dts/omap3430es1-clocks.dtsi | 10 +- .../boot/dts/omap36xx-omap3430es2plus-clocks.dtsi | 10 +- arch/arm/boot/dts/omap36xx.dtsi | 20 + arch/arm/boot/dts/omap4-duovero-parlor.dts | 146 +++ arch/arm/boot/dts/omap4-duovero.dtsi | 252 +++++ arch/arm/boot/dts/omap4-panda-common.dtsi | 31 +- arch/arm/boot/dts/omap4-sdp.dts | 33 +- arch/arm/boot/dts/omap4.dtsi | 66 +- arch/arm/boot/dts/omap443x.dtsi | 26 + arch/arm/boot/dts/omap4460.dtsi | 37 + arch/arm/boot/dts/omap5-uevm.dts | 8 +- arch/arm/boot/dts/omap5.dtsi | 45 +- arch/arm/boot/dts/prima2.dtsi | 3 +- arch/arm/boot/dts/qcom-msm8660-surf.dts | 59 +- arch/arm/boot/dts/qcom-msm8660.dtsi | 87 ++ arch/arm/boot/dts/qcom-msm8960-cdp.dts | 66 +- arch/arm/boot/dts/qcom-msm8960.dtsi | 135 +++ arch/arm/boot/dts/qcom-msm8974.dtsi | 81 ++ arch/arm/boot/dts/r7s72100-genmai-reference.dts | 13 +- arch/arm/boot/dts/r7s72100.dtsi | 147 +++ arch/arm/boot/dts/r8a7778-bockw-reference.dts | 4 +- arch/arm/boot/dts/r8a7778.dtsi | 40 - arch/arm/boot/dts/r8a7790-lager.dts | 153 ++- arch/arm/boot/dts/r8a7790.dtsi | 192 +++- arch/arm/boot/dts/r8a7791-koelsch-reference.dts | 115 --- arch/arm/boot/dts/r8a7791-koelsch.dts | 274 +++++- arch/arm/boot/dts/r8a7791.dtsi | 323 +++++- arch/arm/boot/dts/rk3066a.dtsi | 13 + arch/arm/boot/dts/rk3188.dtsi | 13 + arch/arm/boot/dts/rk3xxx.dtsi | 10 + arch/arm/boot/dts/sama5d3.dtsi | 28 +- arch/arm/boot/dts/sama5d36.dtsi | 2 +- arch/arm/boot/dts/sama5d3xdm.dtsi | 6 +- arch/arm/boot/dts/socfpga.dtsi | 87 +- arch/arm/boot/dts/socfpga_arria5.dtsi | 11 + arch/arm/boot/dts/socfpga_arria5_socdk.dts | 24 + arch/arm/boot/dts/socfpga_cyclone5.dtsi | 11 + arch/arm/boot/dts/socfpga_cyclone5_socdk.dts | 17 + arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 22 +- arch/arm/boot/dts/socfpga_vt.dts | 19 + arch/arm/boot/dts/ste-dbx5x0.dtsi | 12 +- arch/arm/boot/dts/ste-href-ab8500.dtsi | 428 ++++++++ arch/arm/boot/dts/ste-href-ab8505.dtsi | 240 +++++ arch/arm/boot/dts/ste-hrefprev60.dtsi | 1 + arch/arm/boot/dts/ste-hrefv60plus.dtsi | 1 + arch/arm/boot/dts/ste-snowball.dts | 1 + arch/arm/boot/dts/ste-u300.dts | 2 +- arch/arm/boot/dts/stih415-clock.dtsi | 14 + arch/arm/boot/dts/stih415-pinctrl.dtsi | 204 ++++ arch/arm/boot/dts/stih415.dtsi | 70 ++ arch/arm/boot/dts/stih416-clock.dtsi | 14 + arch/arm/boot/dts/stih416-pinctrl.dtsi | 197 ++++ arch/arm/boot/dts/stih416.dtsi | 67 ++ arch/arm/boot/dts/stih41x-b2000.dtsi | 22 + arch/arm/boot/dts/stih41x-b2020.dtsi | 13 + arch/arm/boot/dts/sun4i-a10-a1000.dts | 55 +- arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 40 + arch/arm/boot/dts/sun4i-a10-hackberry.dts | 56 +- arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 69 ++ arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 31 + arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 111 +++ arch/arm/boot/dts/sun4i-a10-pcduino.dts | 79 ++ arch/arm/boot/dts/sun4i-a10.dtsi | 211 +++- arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 27 + arch/arm/boot/dts/sun5i-a10s.dtsi | 158 ++- arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 27 + arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 27 + arch/arm/boot/dts/sun5i-a13.dtsi | 159 ++- arch/arm/boot/dts/sun6i-a31-colombus.dts | 18 + arch/arm/boot/dts/sun6i-a31.dtsi | 188 +++- arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 53 +- arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 61 ++ arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 68 +- arch/arm/boot/dts/sun7i-a20.dtsi | 302 +++++- arch/arm/boot/dts/sunxi-common-regulators.dtsi | 75 ++ arch/arm/boot/dts/tps65910.dtsi | 5 + arch/arm/boot/dts/twl4030.dtsi | 7 + arch/arm/boot/dts/vf610-cosmic.dts | 29 +- arch/arm/boot/dts/vf610-twr.dts | 158 ++- arch/arm/boot/dts/vf610.dtsi | 273 ++---- arch/arm/boot/dts/zynq-7000.dtsi | 1 + arch/arm/common/timer-sp.c | 8 +- arch/arm/configs/ape6evm_defconfig | 2 + arch/arm/configs/armadillo800eva_defconfig | 2 + arch/arm/configs/at91_dt_defconfig | 3 + arch/arm/configs/at91sam9260_9g20_defconfig | 9 +- arch/arm/configs/at91sam9rl_defconfig | 10 +- arch/arm/configs/bcm2835_defconfig | 1 + arch/arm/configs/bcm_defconfig | 7 + arch/arm/configs/bockw_defconfig | 2 + arch/arm/configs/clps711x_defconfig | 3 +- arch/arm/configs/da8xx_omapl_defconfig | 139 --- arch/arm/configs/davinci_all_defconfig | 20 + arch/arm/configs/dove_defconfig | 3 +- arch/arm/configs/exynos_defconfig | 2 +- arch/arm/configs/genmai_defconfig | 8 +- arch/arm/configs/imx_v4_v5_defconfig | 1 + arch/arm/configs/imx_v6_v7_defconfig | 7 + arch/arm/configs/keystone_defconfig | 15 + arch/arm/configs/koelsch_defconfig | 21 +- arch/arm/configs/kzm9d_defconfig | 89 -- arch/arm/configs/kzm9g_defconfig | 2 + arch/arm/configs/lager_defconfig | 21 + arch/arm/configs/mackerel_defconfig | 2 + arch/arm/configs/marzen_defconfig | 2 + arch/arm/configs/multi_v5_defconfig | 190 ++++ arch/arm/configs/multi_v7_defconfig | 19 + arch/arm/configs/mvebu_v5_defconfig | 181 ++++ .../{mvebu_defconfig => mvebu_v7_defconfig} | 9 + arch/arm/configs/omap2plus_defconfig | 1 + arch/arm/configs/shmobile_defconfig | 129 +++ arch/arm/configs/socfpga_defconfig | 6 + arch/arm/configs/sunxi_defconfig | 3 + .../asm/hardware}/cache-feroceon-l2.h | 4 +- arch/arm/include/asm/smp.h | 9 + arch/arm/include/asm/timex.h | 6 - arch/arm/include/debug/samsung.S | 2 +- arch/arm/kernel/devtree.c | 40 + arch/arm/mach-at91/Kconfig | 2 - arch/arm/mach-at91/at91rm9200.c | 1 + arch/arm/mach-at91/at91rm9200_devices.c | 11 +- arch/arm/mach-at91/at91rm9200_time.c | 1 + arch/arm/mach-at91/at91sam9260.c | 1 + arch/arm/mach-at91/at91sam9260_devices.c | 8 + arch/arm/mach-at91/at91sam9261.c | 26 +- arch/arm/mach-at91/at91sam9261_devices.c | 5 + arch/arm/mach-at91/at91sam9263.c | 2 + arch/arm/mach-at91/at91sam9263_devices.c | 5 + arch/arm/mach-at91/at91sam926x_time.c | 1 + arch/arm/mach-at91/at91sam9g45.c | 2 + arch/arm/mach-at91/at91sam9g45_devices.c | 6 + arch/arm/mach-at91/at91sam9n12.c | 1 + arch/arm/mach-at91/at91sam9rl.c | 25 +- arch/arm/mach-at91/at91sam9rl_devices.c | 6 + arch/arm/mach-at91/at91sam9x5.c | 1 + arch/arm/mach-at91/at91x40.c | 2 +- arch/arm/mach-at91/at91x40_time.c | 1 + arch/arm/mach-at91/board-dt-sam9.c | 11 +- arch/arm/mach-at91/board-gsia18s.c | 1 + arch/arm/mach-at91/board-pcontrol-g20.c | 1 + arch/arm/mach-at91/board-stamp9g20.c | 1 + arch/arm/mach-at91/include/mach/at91x40.h | 2 + arch/arm/mach-at91/include/mach/timex.h | 37 - arch/arm/mach-at91/pm.c | 1 + arch/arm/mach-bcm/Kconfig | 48 +- arch/arm/mach-bcm/Makefile | 8 +- arch/arm/mach-bcm/bcm_5301x.c | 61 ++ arch/arm/mach-bcm/board_bcm21664.c | 78 ++ arch/arm/mach-bcm/board_bcm281xx.c | 83 +- .../bcm2835.c => mach-bcm/board_bcm2835.c} | 0 arch/arm/mach-bcm/kona.c | 64 +- arch/arm/mach-bcm/kona.h | 7 +- arch/arm/mach-bcm2835/Kconfig | 15 - arch/arm/mach-bcm2835/Makefile | 1 - arch/arm/mach-berlin/Kconfig | 4 - arch/arm/mach-clps711x/Kconfig | 14 - arch/arm/mach-clps711x/board-autcpu12.c | 4 +- arch/arm/mach-clps711x/board-cdb89712.c | 2 - arch/arm/mach-clps711x/board-clep7312.c | 2 - arch/arm/mach-clps711x/board-edb7211.c | 2 - arch/arm/mach-clps711x/board-p720t.c | 2 - arch/arm/mach-clps711x/common.c | 201 +--- arch/arm/mach-clps711x/common.h | 5 +- arch/arm/mach-clps711x/include/mach/clps711x.h | 16 - arch/arm/mach-clps711x/include/mach/hardware.h | 17 - arch/arm/mach-clps711x/include/mach/timex.h | 2 - arch/arm/mach-cns3xxx/Kconfig | 3 - arch/arm/mach-cns3xxx/cns3420vb.c | 1 - arch/arm/mach-cns3xxx/core.c | 33 +- arch/arm/mach-cns3xxx/pcie.c | 105 +- arch/arm/mach-davinci/Kconfig | 12 - arch/arm/mach-davinci/Makefile | 2 - arch/arm/mach-davinci/Makefile.boot | 20 +- arch/arm/mach-davinci/aemif.c | 107 +- arch/arm/mach-davinci/board-da830-evm.c | 3 + arch/arm/mach-davinci/board-da850-evm.c | 3 + arch/arm/mach-davinci/board-dm644x-evm.c | 5 + arch/arm/mach-davinci/board-dm646x-evm.c | 3 + arch/arm/mach-davinci/board-mityomapl138.c | 4 + arch/arm/mach-davinci/board-tnetv107x-evm.c | 287 ------ arch/arm/mach-davinci/davinci.h | 2 + arch/arm/mach-davinci/devices-tnetv107x.c | 434 -------- arch/arm/mach-davinci/devices.c | 17 +- arch/arm/mach-davinci/dm355.c | 8 +- arch/arm/mach-davinci/dm365.c | 8 +- arch/arm/mach-davinci/dm644x.c | 8 +- arch/arm/mach-davinci/dm646x.c | 8 +- arch/arm/mach-davinci/include/mach/cputype.h | 8 - arch/arm/mach-davinci/include/mach/irqs.h | 97 -- arch/arm/mach-davinci/include/mach/mux.h | 269 ----- arch/arm/mach-davinci/include/mach/psc.h | 47 - arch/arm/mach-davinci/include/mach/serial.h | 8 - arch/arm/mach-davinci/include/mach/timex.h | 22 - arch/arm/mach-davinci/include/mach/tnetv107x.h | 61 -- arch/arm/mach-davinci/include/mach/uncompress.h | 6 - arch/arm/mach-davinci/tnetv107x.c | 766 --------------- arch/arm/mach-dove/Kconfig | 12 - arch/arm/mach-dove/Makefile | 1 - arch/arm/mach-dove/include/mach/bridge-regs.h | 1 + arch/arm/mach-dove/include/mach/timex.h | 9 - arch/arm/mach-ebsa110/include/mach/timex.h | 19 - arch/arm/mach-efm32/include/mach/entry-macro.S | 4 - arch/arm/mach-efm32/include/mach/timex.h | 3 - arch/arm/mach-ep93xx/core.c | 2 +- arch/arm/mach-ep93xx/include/mach/timex.h | 5 - arch/arm/mach-exynos/common.c | 2 +- arch/arm/mach-exynos/include/mach/timex.h | 29 - arch/arm/mach-exynos/include/mach/uncompress.h | 48 - arch/arm/mach-exynos/pm_domains.c | 2 - arch/arm/mach-footbridge/include/mach/timex.h | 18 - arch/arm/mach-gemini/include/mach/timex.h | 13 - arch/arm/mach-highbank/Kconfig | 7 - arch/arm/mach-hisi/Kconfig | 4 - arch/arm/mach-imx/Kconfig | 57 +- arch/arm/mach-imx/Makefile | 9 +- arch/arm/mach-imx/clk-imx21.c | 1 - arch/arm/mach-imx/clk-imx25.c | 8 - arch/arm/mach-imx/clk-imx27.c | 1 - arch/arm/mach-imx/clk-imx51-imx53.c | 2 - arch/arm/mach-imx/clk-imx6q.c | 7 +- arch/arm/mach-imx/clk-imx6sl.c | 159 ++- arch/arm/mach-imx/clk-vf610.c | 36 +- arch/arm/mach-imx/common.h | 17 +- arch/arm/mach-imx/cpuidle-imx6q.c | 4 +- arch/arm/mach-imx/cpuidle-imx6sl.c | 57 ++ arch/arm/mach-imx/cpuidle.h | 5 + arch/arm/mach-imx/devices-imx25.h | 4 - arch/arm/mach-imx/devices-imx51.h | 4 - arch/arm/mach-imx/devices/Kconfig | 3 - arch/arm/mach-imx/devices/Makefile | 1 - arch/arm/mach-imx/devices/devices-common.h | 9 - arch/arm/mach-imx/devices/platform-mxc_pwm.c | 69 -- arch/arm/mach-imx/hardware.h | 4 +- arch/arm/mach-imx/headsmp.S | 40 - arch/arm/mach-imx/mach-imx6q.c | 98 +- arch/arm/mach-imx/mach-imx6sl.c | 6 +- arch/arm/mach-imx/pm-imx6.c | 552 +++++++++++ arch/arm/mach-imx/pm-imx6q.c | 241 ----- arch/arm/mach-imx/suspend-imx6.S | 361 +++++++ arch/arm/mach-imx/time.c | 12 + arch/arm/mach-integrator/Kconfig | 3 + arch/arm/mach-integrator/core.c | 4 +- .../{include/mach/platform.h => hardware.h} | 110 +-- arch/arm/mach-integrator/impd1.c | 85 +- .../arm/mach-integrator/{include/mach => }/impd1.h | 4 - arch/arm/mach-integrator/include/mach/hardware.h | 45 - arch/arm/mach-integrator/include/mach/timex.h | 26 - arch/arm/mach-integrator/integrator_ap.c | 25 +- arch/arm/mach-integrator/integrator_cp.c | 23 +- arch/arm/mach-integrator/leds.c | 4 +- arch/arm/mach-integrator/lm.c | 2 +- arch/arm/mach-integrator/{include/mach => }/lm.h | 0 arch/arm/mach-integrator/pci_v3.c | 4 +- arch/arm/mach-iop13xx/include/mach/timex.h | 1 - arch/arm/mach-iop32x/include/mach/timex.h | 6 - arch/arm/mach-iop33x/include/mach/timex.h | 6 - arch/arm/mach-ixp4xx/common-pci.c | 9 - arch/arm/mach-ixp4xx/common.c | 26 +- arch/arm/mach-ixp4xx/include/mach/timex.h | 16 - arch/arm/mach-keystone/Kconfig | 4 - arch/arm/mach-keystone/keystone.c | 3 + arch/arm/mach-kirkwood/Kconfig | 7 - arch/arm/mach-kirkwood/Makefile | 4 +- arch/arm/mach-kirkwood/board-dt.c | 113 ++- arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c | 50 - arch/arm/mach-kirkwood/common.c | 3 +- arch/arm/mach-kirkwood/common.h | 13 - arch/arm/mach-kirkwood/include/mach/bridge-regs.h | 3 + arch/arm/mach-kirkwood/include/mach/timex.h | 10 - arch/arm/mach-kirkwood/pm.c | 9 +- arch/arm/mach-kirkwood/pm.h | 26 + arch/arm/mach-ks8695/include/mach/timex.h | 21 - arch/arm/mach-mmp/aspenite.c | 4 +- arch/arm/mach-mmp/devices.c | 14 +- arch/arm/mach-mmp/time.c | 12 +- arch/arm/mach-mmp/ttc_dkb.c | 18 +- arch/arm/mach-moxart/Kconfig | 5 - arch/arm/mach-msm/Kconfig | 54 +- arch/arm/mach-msm/Makefile | 8 - arch/arm/mach-msm/common.h | 3 - arch/arm/mach-msm/headsmp.S | 39 - arch/arm/mach-msm/hotplug.c | 74 -- arch/arm/mach-msm/include/mach/timex.h | 21 - arch/arm/mach-msm/platsmp.c | 161 --- arch/arm/mach-mv78xx0/common.c | 2 +- arch/arm/mach-mv78xx0/include/mach/bridge-regs.h | 1 + arch/arm/mach-mv78xx0/include/mach/timex.h | 9 - arch/arm/mach-mvebu/Kconfig | 87 +- arch/arm/mach-mvebu/Makefile | 5 +- arch/arm/mach-mvebu/board-t5325.c | 41 + .../arm/mach-mvebu/{armada-370-xp.c => board-v7.c} | 58 +- arch/arm/mach-mvebu/board.h | 22 + .../{mach-dove/board-dt.c => mach-mvebu/dove.c} | 20 +- arch/arm/mach-mvebu/kirkwood-pm.c | 76 ++ arch/arm/mach-mvebu/kirkwood-pm.h | 26 + arch/arm/mach-mvebu/kirkwood.c | 199 ++++ arch/arm/mach-mvebu/kirkwood.h | 22 + arch/arm/mach-mvebu/mvebu-soc-id.c | 1 + arch/arm/mach-mvebu/system-controller.c | 23 +- arch/arm/mach-mxs/Kconfig | 4 - arch/arm/mach-mxs/mach-mxs.c | 33 + arch/arm/mach-netx/include/mach/timex.h | 20 - arch/arm/mach-netx/time.c | 11 +- arch/arm/mach-nomadik/Kconfig | 5 - arch/arm/mach-nspire/Kconfig | 5 - arch/arm/mach-omap1/include/mach/timex.h | 5 - arch/arm/mach-omap2/Kconfig | 25 +- arch/arm/mach-omap2/Makefile | 1 + arch/arm/mach-omap2/board-generic.c | 3 +- arch/arm/mach-omap2/clkt_dpll.c | 6 +- arch/arm/mach-omap2/clockdomains3xxx_data.c | 2 +- arch/arm/mach-omap2/cminst44xx.c | 18 +- arch/arm/mach-omap2/devices.c | 3 + arch/arm/mach-omap2/dpll3xxx.c | 2 +- arch/arm/mach-omap2/gpmc-nand.c | 31 +- arch/arm/mach-omap2/id.c | 16 +- arch/arm/mach-omap2/include/mach/timex.h | 5 - arch/arm/mach-omap2/io.c | 1 + arch/arm/mach-omap2/irq.c | 8 + arch/arm/mach-omap2/mux.h | 3 - arch/arm/mach-omap2/omap-wakeupgen.c | 4 +- arch/arm/mach-omap2/omap4-common.c | 4 + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 12 +- arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 1 + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 3 +- arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 83 ++ arch/arm/mach-omap2/pdata-quirks.c | 117 ++- arch/arm/mach-omap2/pm.h | 2 +- arch/arm/mach-omap2/prminst44xx.c | 3 + arch/arm/mach-omap2/soc.h | 3 +- arch/arm/mach-omap2/timer.c | 3 +- arch/arm/mach-orion5x/include/mach/bridge-regs.h | 1 + arch/arm/mach-orion5x/include/mach/timex.h | 11 - arch/arm/mach-picoxcell/Kconfig | 5 - arch/arm/mach-prima2/Kconfig | 7 +- arch/arm/mach-prima2/common.c | 11 +- arch/arm/mach-prima2/common.h | 1 - arch/arm/mach-prima2/l2x0.c | 9 +- arch/arm/mach-prima2/platsmp.c | 6 +- arch/arm/mach-prima2/rstc.c | 99 +- arch/arm/mach-prima2/rtciobrg.c | 2 +- arch/arm/mach-pxa/corgi.c | 40 + arch/arm/mach-pxa/include/mach/timex.h | 34 - arch/arm/mach-qcom/Kconfig | 33 + arch/arm/mach-qcom/Makefile | 5 + .../arm/{mach-msm/board-dt.c => mach-qcom/board.c} | 23 +- arch/arm/mach-qcom/platsmp.c | 378 +++++++ arch/arm/{mach-msm => mach-qcom}/scm-boot.c | 0 arch/arm/{mach-msm => mach-qcom}/scm-boot.h | 8 +- arch/arm/{mach-msm => mach-qcom}/scm.c | 0 arch/arm/{mach-msm => mach-qcom}/scm.h | 0 arch/arm/mach-realview/include/mach/timex.h | 23 - arch/arm/mach-rockchip/Kconfig | 4 +- arch/arm/mach-rockchip/Makefile | 1 + .../include/mach/timex.h => mach-rockchip/core.h} | 20 +- .../mach/timex.h => mach-rockchip/headsmp.S} | 27 +- arch/arm/mach-rockchip/platsmp.c | 184 ++++ arch/arm/mach-rockchip/rockchip.c | 2 + arch/arm/mach-rpc/include/mach/timex.h | 17 - arch/arm/mach-rpc/time.c | 15 +- arch/arm/mach-s3c24xx/Kconfig | 2 - arch/arm/mach-s3c24xx/clock-s3c2410.c | 3 +- arch/arm/mach-s3c24xx/clock-s3c2412.c | 3 +- arch/arm/mach-s3c24xx/clock-s3c2440.c | 2 +- arch/arm/mach-s3c24xx/common.c | 5 +- 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/mach-s3c24xx/include/mach/debug-macro.S | 2 +- .../plat => mach-s3c24xx/include/mach}/rtc-core.h | 13 +- arch/arm/mach-s3c24xx/include/mach/tick.h | 15 - arch/arm/mach-s3c24xx/include/mach/timex.h | 24 - arch/arm/mach-s3c24xx/mach-amlm5900.c | 2 +- arch/arm/mach-s3c24xx/mach-anubis.c | 2 +- arch/arm/mach-s3c24xx/mach-at2440evb.c | 2 +- arch/arm/mach-s3c24xx/mach-bast.c | 2 +- arch/arm/mach-s3c24xx/mach-gta02.c | 2 +- arch/arm/mach-s3c24xx/mach-h1940.c | 2 +- arch/arm/mach-s3c24xx/mach-jive.c | 2 +- arch/arm/mach-s3c24xx/mach-mini2440.c | 2 +- arch/arm/mach-s3c24xx/mach-n30.c | 2 +- arch/arm/mach-s3c24xx/mach-nexcoder.c | 2 +- arch/arm/mach-s3c24xx/mach-osiris.c | 2 +- arch/arm/mach-s3c24xx/mach-otom.c | 2 +- arch/arm/mach-s3c24xx/mach-qt2410.c | 2 +- arch/arm/mach-s3c24xx/mach-rx1950.c | 2 +- arch/arm/mach-s3c24xx/mach-rx3715.c | 2 +- arch/arm/mach-s3c24xx/mach-s3c2416-dt.c | 2 +- arch/arm/mach-s3c24xx/mach-smdk2410.c | 2 +- arch/arm/mach-s3c24xx/mach-smdk2413.c | 2 +- arch/arm/mach-s3c24xx/mach-smdk2416.c | 2 +- arch/arm/mach-s3c24xx/mach-smdk2440.c | 2 +- arch/arm/mach-s3c24xx/mach-smdk2443.c | 2 +- arch/arm/mach-s3c24xx/mach-tct_hammer.c | 2 +- arch/arm/mach-s3c24xx/mach-vr1000.c | 2 +- arch/arm/mach-s3c24xx/mach-vstms.c | 2 +- arch/arm/mach-s3c24xx/pm.c | 2 +- arch/arm/mach-s3c24xx/s3c2410.c | 2 +- arch/arm/mach-s3c24xx/s3c2412.c | 2 +- arch/arm/mach-s3c24xx/s3c2416.c | 2 +- arch/arm/mach-s3c24xx/s3c2443.c | 2 +- arch/arm/mach-s3c24xx/s3c244x.c | 2 +- arch/arm/mach-s3c24xx/sleep-s3c2410.S | 2 +- arch/arm/mach-s3c24xx/sleep.S | 2 +- arch/arm/mach-s3c64xx/common.c | 2 +- arch/arm/mach-s3c64xx/include/mach/debug-macro.S | 2 +- arch/arm/mach-s3c64xx/include/mach/tick.h | 31 - arch/arm/mach-s3c64xx/include/mach/timex.h | 24 - arch/arm/mach-s3c64xx/irq-pm.c | 2 +- arch/arm/mach-s3c64xx/mach-anw6410.c | 2 +- arch/arm/mach-s3c64xx/mach-crag6410-module.c | 2 +- arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +- arch/arm/mach-s3c64xx/mach-hmt.c | 2 +- arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +- arch/arm/mach-s3c64xx/mach-ncp.c | 2 +- arch/arm/mach-s3c64xx/mach-real6410.c | 2 +- arch/arm/mach-s3c64xx/mach-smartq.c | 2 +- arch/arm/mach-s3c64xx/mach-smdk6400.c | 3 +- arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +- arch/arm/mach-s3c64xx/s3c6400.c | 2 +- arch/arm/mach-s3c64xx/s3c6410.c | 2 +- arch/arm/mach-s5p64x0/common.c | 2 +- arch/arm/mach-s5p64x0/include/mach/debug-macro.S | 3 +- arch/arm/mach-s5p64x0/include/mach/timex.h | 27 - arch/arm/mach-s5p64x0/irq-pm.c | 2 +- arch/arm/mach-s5p64x0/mach-smdk6440.c | 2 +- arch/arm/mach-s5p64x0/mach-smdk6450.c | 2 +- arch/arm/mach-s5pc100/common.c | 2 +- arch/arm/mach-s5pc100/include/mach/debug-macro.S | 2 +- arch/arm/mach-s5pc100/include/mach/tick.h | 31 - arch/arm/mach-s5pc100/include/mach/timex.h | 24 - arch/arm/mach-s5pc100/mach-smdkc100.c | 2 +- arch/arm/mach-s5pv210/common.c | 2 +- arch/arm/mach-s5pv210/include/mach/debug-macro.S | 2 +- arch/arm/mach-s5pv210/include/mach/timex.h | 29 - arch/arm/mach-s5pv210/mach-aquila.c | 2 +- arch/arm/mach-s5pv210/mach-goni.c | 2 +- arch/arm/mach-s5pv210/mach-smdkc110.c | 2 +- arch/arm/mach-s5pv210/mach-smdkv210.c | 2 +- arch/arm/mach-s5pv210/mach-torbreck.c | 2 +- arch/arm/mach-sa1100/include/mach/timex.h | 12 - arch/arm/mach-sa1100/time.c | 8 +- arch/arm/mach-shmobile/Kconfig | 26 +- arch/arm/mach-shmobile/Makefile | 4 +- arch/arm/mach-shmobile/board-armadillo800eva.c | 2 + arch/arm/mach-shmobile/board-bockw.c | 45 +- arch/arm/mach-shmobile/board-genmai.c | 75 +- arch/arm/mach-shmobile/board-koelsch-reference.c | 106 +- arch/arm/mach-shmobile/board-koelsch.c | 305 +++++- arch/arm/mach-shmobile/board-kzm9d-reference.c | 48 - arch/arm/mach-shmobile/board-lager-reference.c | 109 ++- arch/arm/mach-shmobile/board-lager.c | 492 +++++++++- arch/arm/mach-shmobile/clock-r7s72100.c | 36 +- arch/arm/mach-shmobile/clock-r8a7778.c | 4 + arch/arm/mach-shmobile/clock-r8a7779.c | 27 +- arch/arm/mach-shmobile/clock-r8a7790.c | 196 ++-- arch/arm/mach-shmobile/clock-r8a7791.c | 153 ++- arch/arm/mach-shmobile/include/mach/common.h | 1 - arch/arm/mach-shmobile/include/mach/head-kzm9g.txt | 410 ++++++++ arch/arm/mach-shmobile/include/mach/pm-rcar.h | 15 + arch/arm/mach-shmobile/include/mach/r8a7779.h | 13 +- arch/arm/mach-shmobile/include/mach/r8a7790.h | 26 + arch/arm/mach-shmobile/include/mach/timex.h | 6 - arch/arm/mach-shmobile/include/mach/zboot.h | 3 + arch/arm/mach-shmobile/include/mach/zboot_macros.h | 43 + arch/arm/mach-shmobile/platsmp-apmu.c | 3 +- arch/arm/mach-shmobile/pm-r8a7779.c | 131 +-- arch/arm/mach-shmobile/pm-r8a7790.c | 45 + arch/arm/mach-shmobile/pm-rcar.c | 141 +++ arch/arm/mach-shmobile/setup-emev2.c | 2 +- arch/arm/mach-shmobile/setup-r8a7790.c | 90 ++ arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 +- arch/arm/mach-shmobile/smp-r8a7779.c | 17 +- arch/arm/mach-shmobile/smp-r8a7790.c | 17 + arch/arm/mach-socfpga/Kconfig | 7 - arch/arm/mach-spear/Kconfig | 10 - arch/arm/mach-spear/include/mach/timex.h | 19 - arch/arm/mach-sti/Kconfig | 7 +- arch/arm/mach-sunxi/Kconfig | 5 - arch/arm/mach-sunxi/sunxi.c | 4 +- arch/arm/mach-tegra/Kconfig | 8 - arch/arm/mach-u300/Kconfig | 6 - arch/arm/mach-ux500/Kconfig | 10 - arch/arm/mach-ux500/Makefile | 1 - arch/arm/mach-ux500/board-mop500-audio.c | 1 - arch/arm/mach-ux500/board-mop500-pins.c | 291 ------ arch/arm/mach-ux500/board-mop500.h | 73 -- arch/arm/mach-ux500/cpu-db8500.c | 17 - arch/arm/mach-ux500/cpu.c | 10 - arch/arm/mach-ux500/irqs-board-mop500.h | 55 -- arch/arm/mach-ux500/irqs-db8500.h | 125 --- arch/arm/mach-ux500/irqs.h | 49 - arch/arm/mach-versatile/core.c | 2 +- arch/arm/mach-vexpress/Kconfig | 5 - arch/arm/mach-virt/Kconfig | 10 - arch/arm/mach-virt/Makefile | 5 - arch/arm/mach-virt/virt.c | 41 - arch/arm/mach-vt8500/Kconfig | 4 - arch/arm/mach-w90x900/include/mach/timex.h | 25 - arch/arm/mach-zynq/Kconfig | 7 - arch/arm/mm/Kconfig | 2 +- arch/arm/mm/cache-feroceon-l2.c | 45 +- arch/arm/plat-omap/Kconfig | 3 - arch/arm/plat-omap/include/plat/timex.h | 33 - arch/arm/plat-orion/common.c | 10 +- arch/arm/plat-samsung/clock.c | 2 +- arch/arm/plat-samsung/cpu.c | 7 - arch/arm/plat-samsung/devs.c | 12 +- arch/arm/plat-samsung/include/plat/cpu.h | 1 - arch/arm/plat-samsung/include/plat/regs-serial.h | 1 - arch/arm/plat-samsung/include/plat/uncompress.h | 2 +- arch/arm/plat-samsung/init.c | 3 +- arch/arm/plat-samsung/pm-gpio.c | 5 +- arch/arm/plat-samsung/pm.c | 3 +- arch/arm/plat-samsung/s5p-irq-pm.c | 13 - drivers/bus/arm-cci.c | 24 +- drivers/bus/imx-weim.c | 58 ++ drivers/bus/mvebu-mbus.c | 3 +- drivers/char/hw_random/Kconfig | 6 +- drivers/clk/Kconfig | 1 + drivers/clk/Makefile | 1 + drivers/clk/bcm/Kconfig | 9 + drivers/clk/bcm/Makefile | 3 + drivers/clk/bcm/clk-bcm281xx.c | 416 ++++++++ drivers/clk/bcm/clk-kona-setup.c | 769 +++++++++++++++ drivers/clk/bcm/clk-kona.c | 1033 ++++++++++++++++++++ drivers/clk/bcm/clk-kona.h | 410 ++++++++ drivers/clk/ti/clk-44xx.c | 1 - drivers/clk/ti/clk-54xx.c | 1 - drivers/clk/ti/clk-7xx.c | 1 - drivers/clk/versatile/clk-icst.c | 21 +- drivers/clk/versatile/clk-icst.h | 1 + drivers/clk/versatile/clk-impd1.c | 12 +- drivers/clk/versatile/clk-integrator.c | 83 +- drivers/clk/versatile/clk-realview.c | 4 +- drivers/clocksource/Kconfig | 3 + drivers/clocksource/Makefile | 1 + drivers/clocksource/exynos_mct.c | 2 - .../timer.c => drivers/clocksource/qcom-timer.c | 29 +- drivers/clocksource/timer-marco.c | 13 +- drivers/clocksource/timer-prima2.c | 16 +- drivers/cpufreq/Kconfig.arm | 2 +- drivers/cpuidle/Kconfig.arm | 2 +- drivers/gpio/Kconfig | 2 +- drivers/gpu/drm/msm/Kconfig | 2 +- drivers/input/misc/ixp4xx-beeper.c | 2 +- drivers/irqchip/Kconfig | 16 + drivers/irqchip/Makefile | 2 + drivers/irqchip/exynos-combiner.c | 3 +- drivers/irqchip/irq-clps711x.c | 243 +++++ drivers/irqchip/irq-crossbar.c | 208 ++++ drivers/irqchip/irq-gic.c | 86 +- drivers/irqchip/irq-mmp.c | 2 +- drivers/irqchip/irq-vic.c | 60 +- drivers/leds/Kconfig | 4 +- drivers/mfd/ab8500-core.c | 27 +- drivers/mfd/db8500-prcmu.c | 34 +- drivers/mtd/nand/davinci_nand.c | 22 - drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 183 ++++ drivers/phy/Kconfig | 2 +- drivers/power/reset/Kconfig | 2 +- drivers/power/reset/qnap-poweroff.c | 49 +- drivers/reset/Kconfig | 2 + drivers/reset/Makefile | 1 + drivers/reset/sti/Kconfig | 15 + drivers/reset/sti/Makefile | 4 + drivers/reset/sti/reset-stih415.c | 112 +++ drivers/reset/sti/reset-stih416.c | 143 +++ drivers/reset/sti/reset-syscfg.c | 186 ++++ drivers/reset/sti/reset-syscfg.h | 69 ++ drivers/rtc/rtc-at91sam9.c | 2 +- drivers/rtc/rtc-isl12057.c | 5 +- drivers/rtc/rtc-mv.c | 12 + drivers/rtc/rtc-pxa.c | 1 - drivers/sh/clk/cpg.c | 38 + drivers/sh/intc/Kconfig | 2 +- drivers/thermal/Kconfig | 2 +- drivers/tty/serial/Kconfig | 2 +- drivers/tty/serial/atmel_serial.c | 49 +- drivers/watchdog/Kconfig | 2 +- drivers/watchdog/orion_wdt.c | 381 ++++++-- include/asm-generic/vmlinux.lds.h | 10 + include/dt-bindings/clock/bcm281xx.h | 65 ++ include/dt-bindings/clock/r8a7790-clock.h | 4 +- include/dt-bindings/pinctrl/am43xx.h | 1 + .../dt-bindings/reset-controller/stih415-resets.h | 26 + .../dt-bindings/reset-controller/stih416-resets.h | 50 + include/linux/irqchip/arm-gic.h | 7 +- include/linux/irqchip/arm-vic.h | 6 +- .../linux/irqchip/irq-crossbar.h | 12 +- include/linux/mfd/abx500/ab8500.h | 2 - include/linux/mfd/dbx500-prcmu.h | 2 - include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 18 + include/linux/platform_data/atmel.h | 1 + include/linux/platform_data/clk-integrator.h | 1 - include/linux/platform_data/mtd-davinci-aemif.h | 5 +- include/linux/sh_clk.h | 19 +- sound/soc/kirkwood/Kconfig | 2 +- 897 files changed, 45116 insertions(+), 12074 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/armada-375.txt create mode 100644 Documentation/devicetree/bindings/arm/armada-38x.txt create mode 100644 Documentation/devicetree/bindings/arm/bcm/bcm21664.txt create mode 100644 Documentation/devicetree/bindings/arm/bcm/kona-resetmgr.txt create mode 100644 Documentation/devicetree/bindings/arm/bcm4708.txt create mode 100644 Documentation/devicetree/bindings/arm/mrvl/feroceon.txt create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,kpss-acc.txt create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,saw2.txt create mode 100644 Documentation/devicetree/bindings/arm/omap/crossbar.txt create mode 100644 Documentation/devicetree/bindings/arm/omap/dmm.txt create mode 100644 Documentation/devicetree/bindings/arm/rockchip/pmu.txt create mode 100644 Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt create mode 100644 Documentation/devicetree/bindings/arm/samsung/pmu.txt create mode 100644 Documentation/devicetree/bindings/clock/arm-integrator.txt rename Documentation/devicetree/bindings/{arm/atmel-adc.txt => iio/adc/at91_adc.txt} (73%) create mode 100644 Documentation/devicetree/bindings/interrupt-controller/cirrus,clps711x-intc.txt create mode 100644 Documentation/devicetree/bindings/mmc/socfpga-dw-mshc.txt create mode 100644 Documentation/devicetree/bindings/net/socfpga-dwmac.txt create mode 100644 Documentation/devicetree/bindings/reset/sirf,rstc.txt create mode 100644 Documentation/devicetree/bindings/reset/st,sti-powerdown.txt create mode 100644 Documentation/devicetree/bindings/reset/st,sti-softreset.txt create mode 100644 arch/arm/arm-soc-for-next-contents.txt create mode 100644 arch/arm/boot/dts/am3517-craneboard.dts create mode 100644 arch/arm/boot/dts/am437x-gp-evm.dts create mode 100644 arch/arm/boot/dts/armada-375-db.dts create mode 100644 arch/arm/boot/dts/armada-375.dtsi create mode 100644 arch/arm/boot/dts/armada-380.dtsi create mode 100644 arch/arm/boot/dts/armada-385-db.dts create mode 100644 arch/arm/boot/dts/armada-385-rd.dts create mode 100644 arch/arm/boot/dts/armada-385.dtsi create mode 100644 arch/arm/boot/dts/armada-38x.dtsi create mode 100644 arch/arm/boot/dts/at91sam9261.dtsi create mode 100644 arch/arm/boot/dts/at91sam9261ek.dts create mode 100644 arch/arm/boot/dts/at91sam9rl.dtsi create mode 100644 arch/arm/boot/dts/at91sam9rlek.dts rename arch/arm/boot/dts/{bcm11351-brt.dts => bcm21664-garnet.dts} (79%) create mode 100644 arch/arm/boot/dts/bcm21664.dtsi create mode 100644 arch/arm/boot/dts/bcm4708-netgear-r6250.dts create mode 100644 arch/arm/boot/dts/bcm4708.dtsi create mode 100644 arch/arm/boot/dts/bcm5301x.dtsi create mode 100644 arch/arm/boot/dts/bcm59056.dtsi create mode 100644 arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi create mode 100644 arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts create mode 100644 arch/arm/boot/dts/imx25-pinfunc.h delete mode 100644 arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts create mode 100644 arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi rename arch/arm/boot/dts/{imx27-phytec-phycore-som.dts => imx27-phytec-phycore-som.dtsi} (52%) create mode 100644 arch/arm/boot/dts/imx27-pinfunc.h create mode 100644 arch/arm/boot/dts/imx28-duckbill.dts create mode 100644 arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts create mode 100644 arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts create mode 100644 arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi create mode 100644 arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi create mode 100644 arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts create mode 100644 arch/arm/boot/dts/imx35.dtsi create mode 100644 arch/arm/boot/dts/imx50-evk.dts create mode 100644 arch/arm/boot/dts/imx50-pinfunc.h create mode 100644 arch/arm/boot/dts/imx50.dtsi create mode 100644 arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi create mode 100644 arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts delete mode 100644 arch/arm/boot/dts/imx53-evk.dts create mode 100644 arch/arm/boot/dts/imx53-qsb-common.dtsi create mode 100644 arch/arm/boot/dts/imx53-qsrb.dts create mode 100644 arch/arm/boot/dts/imx53-tx53-x03x.dts create mode 100644 arch/arm/boot/dts/imx53-tx53-x13x.dts create mode 100644 arch/arm/boot/dts/imx53-voipac-bsb.dts create mode 100644 arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi create mode 100644 arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts create mode 100644 arch/arm/boot/dts/imx6dl-gw51xx.dts create mode 100644 arch/arm/boot/dts/imx6dl-gw52xx.dts create mode 100644 arch/arm/boot/dts/imx6dl-gw53xx.dts create mode 100644 arch/arm/boot/dts/imx6dl-gw54xx.dts create mode 100644 arch/arm/boot/dts/imx6dl-nitrogen6x.dts create mode 100644 arch/arm/boot/dts/imx6dl-sabrelite.dts create mode 100644 arch/arm/boot/dts/imx6q-cm-fx6.dts create mode 100644 arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts create mode 100644 arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts create mode 100644 arch/arm/boot/dts/imx6q-gk802.dts create mode 100644 arch/arm/boot/dts/imx6q-gw51xx.dts create mode 100644 arch/arm/boot/dts/imx6q-gw52xx.dts create mode 100644 arch/arm/boot/dts/imx6q-gw53xx.dts create mode 100644 arch/arm/boot/dts/imx6q-gw5400-a.dts create mode 100644 arch/arm/boot/dts/imx6q-gw54xx.dts create mode 100644 arch/arm/boot/dts/imx6q-nitrogen6x.dts create mode 100644 arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi create mode 100644 arch/arm/boot/dts/imx6qdl-gw51xx.dtsi create mode 100644 arch/arm/boot/dts/imx6qdl-gw52xx.dtsi create mode 100644 arch/arm/boot/dts/imx6qdl-gw53xx.dtsi create mode 100644 arch/arm/boot/dts/imx6qdl-gw54xx.dtsi create mode 100644 arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi create mode 100644 arch/arm/boot/dts/imx6qdl-sabrelite.dtsi create mode 100644 arch/arm/boot/dts/k2e-clocks.dtsi create mode 100644 arch/arm/boot/dts/k2e-evm.dts create mode 100644 arch/arm/boot/dts/k2e.dtsi create mode 100644 arch/arm/boot/dts/k2hk-clocks.dtsi create mode 100644 arch/arm/boot/dts/k2hk.dtsi create mode 100644 arch/arm/boot/dts/k2l-clocks.dtsi create mode 100644 arch/arm/boot/dts/k2l-evm.dts create mode 100644 arch/arm/boot/dts/k2l.dtsi create mode 100644 arch/arm/boot/dts/kirkwood-b3.dts create mode 100644 arch/arm/boot/dts/kirkwood-ds109.dts create mode 100644 arch/arm/boot/dts/kirkwood-ds110jv10.dts create mode 100644 arch/arm/boot/dts/kirkwood-ds111.dts create mode 100644 arch/arm/boot/dts/kirkwood-ds112.dts create mode 100644 arch/arm/boot/dts/kirkwood-ds209.dts create mode 100644 arch/arm/boot/dts/kirkwood-ds210.dts create mode 100644 arch/arm/boot/dts/kirkwood-ds212.dts create mode 100644 arch/arm/boot/dts/kirkwood-ds212j.dts create mode 100644 arch/arm/boot/dts/kirkwood-ds409.dts create mode 100644 arch/arm/boot/dts/kirkwood-ds409slim.dts create mode 100644 arch/arm/boot/dts/kirkwood-ds411.dts create mode 100644 arch/arm/boot/dts/kirkwood-ds411j.dts create mode 100644 arch/arm/boot/dts/kirkwood-ds411slim.dts create mode 100644 arch/arm/boot/dts/kirkwood-rd88f6192.dts create mode 100644 arch/arm/boot/dts/kirkwood-rd88f6281-a0.dts create mode 100644 arch/arm/boot/dts/kirkwood-rd88f6281-a1.dts create mode 100644 arch/arm/boot/dts/kirkwood-rd88f6281.dtsi create mode 100644 arch/arm/boot/dts/kirkwood-rs212.dts create mode 100644 arch/arm/boot/dts/kirkwood-rs409.dts create mode 100644 arch/arm/boot/dts/kirkwood-rs411.dts create mode 100644 arch/arm/boot/dts/kirkwood-synology.dtsi create mode 100644 arch/arm/boot/dts/kirkwood-t5325.dts create mode 100644 arch/arm/boot/dts/kirkwood-ts419-6281.dts create mode 100644 arch/arm/boot/dts/kirkwood-ts419-6282.dts create mode 100644 arch/arm/boot/dts/kirkwood-ts419.dtsi create mode 100644 arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi create mode 100644 arch/arm/boot/dts/omap3-cm-t3517.dts create mode 100644 arch/arm/boot/dts/omap3-cm-t3530.dts create mode 100644 arch/arm/boot/dts/omap3-cm-t3x.dtsi create mode 100644 arch/arm/boot/dts/omap3-lilly-a83x.dtsi create mode 100644 arch/arm/boot/dts/omap3-lilly-dbb056.dts create mode 100644 arch/arm/boot/dts/omap3-overo-alto35-common.dtsi create mode 100644 arch/arm/boot/dts/omap3-overo-alto35.dts create mode 100644 arch/arm/boot/dts/omap3-overo-base.dtsi create mode 100644 arch/arm/boot/dts/omap3-overo-chestnut43-common.dtsi create mode 100644 arch/arm/boot/dts/omap3-overo-chestnut43.dts create mode 100644 arch/arm/boot/dts/omap3-overo-common-peripherals.dtsi create mode 100644 arch/arm/boot/dts/omap3-overo-gallop43-common.dtsi create mode 100644 arch/arm/boot/dts/omap3-overo-gallop43.dts create mode 100644 arch/arm/boot/dts/omap3-overo-palo43-common.dtsi create mode 100644 arch/arm/boot/dts/omap3-overo-palo43.dts create mode 100644 arch/arm/boot/dts/omap3-overo-storm-alto35.dts create mode 100644 arch/arm/boot/dts/omap3-overo-storm-chestnut43.dts create mode 100644 arch/arm/boot/dts/omap3-overo-storm-gallop43.dts create mode 100644 arch/arm/boot/dts/omap3-overo-storm-palo43.dts create mode 100644 arch/arm/boot/dts/omap3-overo-storm-summit.dts create mode 100644 arch/arm/boot/dts/omap3-overo-storm.dtsi create mode 100644 arch/arm/boot/dts/omap3-overo-summit-common.dtsi create mode 100644 arch/arm/boot/dts/omap3-overo-summit.dts create mode 100644 arch/arm/boot/dts/omap3-sbc-t3517.dts create mode 100644 arch/arm/boot/dts/omap3-sbc-t3530.dts create mode 100644 arch/arm/boot/dts/omap4-duovero-parlor.dts create mode 100644 arch/arm/boot/dts/omap4-duovero.dtsi create mode 100644 arch/arm/boot/dts/qcom-msm8660.dtsi create mode 100644 arch/arm/boot/dts/qcom-msm8960.dtsi delete mode 100644 arch/arm/boot/dts/r8a7791-koelsch-reference.dts create mode 100644 arch/arm/boot/dts/ste-href-ab8500.dtsi create mode 100644 arch/arm/boot/dts/ste-href-ab8505.dtsi create mode 100644 arch/arm/boot/dts/sun4i-a10-inet97fv2.dts create mode 100644 arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts create mode 100644 arch/arm/boot/dts/sun4i-a10-pcduino.dts create mode 100644 arch/arm/boot/dts/sunxi-common-regulators.dtsi delete mode 100644 arch/arm/configs/da8xx_omapl_defconfig delete mode 100644 arch/arm/configs/kzm9d_defconfig create mode 100644 arch/arm/configs/multi_v5_defconfig create mode 100644 arch/arm/configs/mvebu_v5_defconfig rename arch/arm/configs/{mvebu_defconfig => mvebu_v7_defconfig} (91%) create mode 100644 arch/arm/configs/shmobile_defconfig rename arch/arm/{plat-orion/include/plat => include/asm/hardware}/cache-feroceon-l2.h (75%) delete mode 100644 arch/arm/mach-at91/include/mach/timex.h create mode 100644 arch/arm/mach-bcm/bcm_5301x.c create mode 100644 arch/arm/mach-bcm/board_bcm21664.c rename arch/arm/{mach-bcm2835/bcm2835.c => mach-bcm/board_bcm2835.c} (100%) delete mode 100644 arch/arm/mach-bcm2835/Kconfig delete mode 100644 arch/arm/mach-bcm2835/Makefile delete mode 100644 arch/arm/mach-clps711x/include/mach/timex.h delete mode 100644 arch/arm/mach-davinci/board-tnetv107x-evm.c delete mode 100644 arch/arm/mach-davinci/devices-tnetv107x.c delete mode 100644 arch/arm/mach-davinci/include/mach/timex.h delete mode 100644 arch/arm/mach-davinci/include/mach/tnetv107x.h delete mode 100644 arch/arm/mach-davinci/tnetv107x.c delete mode 100644 arch/arm/mach-dove/include/mach/timex.h delete mode 100644 arch/arm/mach-ebsa110/include/mach/timex.h delete mode 100644 arch/arm/mach-efm32/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-efm32/include/mach/timex.h delete mode 100644 arch/arm/mach-ep93xx/include/mach/timex.h delete mode 100644 arch/arm/mach-exynos/include/mach/timex.h delete mode 100644 arch/arm/mach-exynos/include/mach/uncompress.h delete mode 100644 arch/arm/mach-footbridge/include/mach/timex.h delete mode 100644 arch/arm/mach-gemini/include/mach/timex.h create mode 100644 arch/arm/mach-imx/cpuidle-imx6sl.c delete mode 100644 arch/arm/mach-imx/devices/platform-mxc_pwm.c create mode 100644 arch/arm/mach-imx/pm-imx6.c delete mode 100644 arch/arm/mach-imx/pm-imx6q.c create mode 100644 arch/arm/mach-imx/suspend-imx6.S rename arch/arm/mach-integrator/{include/mach/platform.h => hardware.h} (81%) rename arch/arm/mach-integrator/{include/mach => }/impd1.h (83%) delete mode 100644 arch/arm/mach-integrator/include/mach/hardware.h delete mode 100644 arch/arm/mach-integrator/include/mach/timex.h rename arch/arm/mach-integrator/{include/mach => }/lm.h (100%) delete mode 100644 arch/arm/mach-iop13xx/include/mach/timex.h delete mode 100644 arch/arm/mach-iop32x/include/mach/timex.h delete mode 100644 arch/arm/mach-iop33x/include/mach/timex.h delete mode 100644 arch/arm/mach-ixp4xx/include/mach/timex.h delete mode 100644 arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c delete mode 100644 arch/arm/mach-kirkwood/include/mach/timex.h create mode 100644 arch/arm/mach-kirkwood/pm.h delete mode 100644 arch/arm/mach-ks8695/include/mach/timex.h delete mode 100644 arch/arm/mach-msm/headsmp.S delete mode 100644 arch/arm/mach-msm/hotplug.c delete mode 100644 arch/arm/mach-msm/include/mach/timex.h delete mode 100644 arch/arm/mach-msm/platsmp.c delete mode 100644 arch/arm/mach-mv78xx0/include/mach/timex.h create mode 100644 arch/arm/mach-mvebu/board-t5325.c rename arch/arm/mach-mvebu/{armada-370-xp.c => board-v7.c} (58%) create mode 100644 arch/arm/mach-mvebu/board.h rename arch/arm/{mach-dove/board-dt.c => mach-mvebu/dove.c} (61%) create mode 100644 arch/arm/mach-mvebu/kirkwood-pm.c create mode 100644 arch/arm/mach-mvebu/kirkwood-pm.h create mode 100644 arch/arm/mach-mvebu/kirkwood.c create mode 100644 arch/arm/mach-mvebu/kirkwood.h delete mode 100644 arch/arm/mach-netx/include/mach/timex.h delete mode 100644 arch/arm/mach-omap1/include/mach/timex.h delete mode 100644 arch/arm/mach-omap2/include/mach/timex.h delete mode 100644 arch/arm/mach-orion5x/include/mach/timex.h delete mode 100644 arch/arm/mach-pxa/include/mach/timex.h create mode 100644 arch/arm/mach-qcom/Kconfig create mode 100644 arch/arm/mach-qcom/Makefile rename arch/arm/{mach-msm/board-dt.c => mach-qcom/board.c} (52%) create mode 100644 arch/arm/mach-qcom/platsmp.c rename arch/arm/{mach-msm => mach-qcom}/scm-boot.c (100%) rename arch/arm/{mach-msm => mach-qcom}/scm-boot.h (78%) rename arch/arm/{mach-msm => mach-qcom}/scm.c (100%) rename arch/arm/{mach-msm => mach-qcom}/scm.h (100%) delete mode 100644 arch/arm/mach-realview/include/mach/timex.h rename arch/arm/{mach-lpc32xx/include/mach/timex.h => mach-rockchip/core.h} (59%) rename arch/arm/{mach-versatile/include/mach/timex.h => mach-rockchip/headsmp.S} (54%) create mode 100644 arch/arm/mach-rockchip/platsmp.c delete mode 100644 arch/arm/mach-rpc/include/mach/timex.h rename arch/arm/{plat-samsung/include/plat => mach-s3c24xx/include/mach}/rtc-core.h (69%) delete mode 100644 arch/arm/mach-s3c24xx/include/mach/tick.h delete mode 100644 arch/arm/mach-s3c24xx/include/mach/timex.h delete mode 100644 arch/arm/mach-s3c64xx/include/mach/tick.h delete mode 100644 arch/arm/mach-s3c64xx/include/mach/timex.h delete mode 100644 arch/arm/mach-s5p64x0/include/mach/timex.h delete mode 100644 arch/arm/mach-s5pc100/include/mach/tick.h delete mode 100644 arch/arm/mach-s5pc100/include/mach/timex.h delete mode 100644 arch/arm/mach-s5pv210/include/mach/timex.h delete mode 100644 arch/arm/mach-sa1100/include/mach/timex.h delete mode 100644 arch/arm/mach-shmobile/board-kzm9d-reference.c create mode 100644 arch/arm/mach-shmobile/include/mach/head-kzm9g.txt create mode 100644 arch/arm/mach-shmobile/include/mach/pm-rcar.h delete mode 100644 arch/arm/mach-shmobile/include/mach/timex.h create mode 100644 arch/arm/mach-shmobile/pm-r8a7790.c create mode 100644 arch/arm/mach-shmobile/pm-rcar.c delete mode 100644 arch/arm/mach-spear/include/mach/timex.h delete mode 100644 arch/arm/mach-ux500/board-mop500-pins.c delete mode 100644 arch/arm/mach-ux500/irqs-board-mop500.h delete mode 100644 arch/arm/mach-ux500/irqs-db8500.h delete mode 100644 arch/arm/mach-ux500/irqs.h delete mode 100644 arch/arm/mach-virt/Kconfig delete mode 100644 arch/arm/mach-virt/Makefile delete mode 100644 arch/arm/mach-virt/virt.c delete mode 100644 arch/arm/mach-w90x900/include/mach/timex.h delete mode 100644 arch/arm/plat-omap/include/plat/timex.h delete mode 100644 arch/arm/plat-samsung/include/plat/regs-serial.h create mode 100644 drivers/clk/bcm/Kconfig create mode 100644 drivers/clk/bcm/Makefile create mode 100644 drivers/clk/bcm/clk-bcm281xx.c create mode 100644 drivers/clk/bcm/clk-kona-setup.c create mode 100644 drivers/clk/bcm/clk-kona.c create mode 100644 drivers/clk/bcm/clk-kona.h rename arch/arm/mach-msm/timer.c => drivers/clocksource/qcom-timer.c (98%) create mode 100644 drivers/irqchip/irq-clps711x.c create mode 100644 drivers/irqchip/irq-crossbar.c create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c create mode 100644 drivers/reset/sti/Kconfig create mode 100644 drivers/reset/sti/Makefile create mode 100644 drivers/reset/sti/reset-stih415.c create mode 100644 drivers/reset/sti/reset-stih416.c create mode 100644 drivers/reset/sti/reset-syscfg.c create mode 100644 drivers/reset/sti/reset-syscfg.h create mode 100644 include/dt-bindings/clock/bcm281xx.h create mode 100644 include/dt-bindings/reset-controller/stih415-resets.h create mode 100644 include/dt-bindings/reset-controller/stih416-resets.h rename arch/arm/mach-mmp/include/mach/timex.h => include/linux/irqchip/irq-crossbar.h (56%) Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6) $ git merge bcm2835/for-next Already up-to-date. Merging cortex-m/for-next (f0d7515372ff ARM: v7m: add trivial suspend support) $ git merge cortex-m/for-next Already up-to-date. Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next) $ git merge ep93xx/ep93xx-for-next Merge made by the 'recursive' strategy. Merging imx-mxs/for-next (9d18d1dc7b14 Merge branch 'imx/dt' into for-next) $ git merge imx-mxs/for-next Auto-merging arch/arm/Kconfig.debug Merge made by the 'recursive' strategy. .../devicetree/bindings/clock/imx25-clock.txt | 3 + arch/arm/Kconfig.debug | 9 + .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 13 ++ arch/arm/boot/dts/imx25-pdk.dts | 211 ++++++++++++++++++++- arch/arm/boot/dts/imx25.dtsi | 39 ++-- arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 7 + arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi | 16 ++ arch/arm/boot/dts/imx27.dtsi | 1 + .../boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts | 22 +++ arch/arm/boot/dts/imx35.dtsi | 25 ++- arch/arm/boot/dts/imx50.dtsi | 1 + arch/arm/boot/dts/imx51.dtsi | 1 + arch/arm/boot/dts/imx53.dtsi | 1 + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 19 ++ arch/arm/boot/dts/imx6qdl.dtsi | 9 + arch/arm/boot/dts/imx6sl.dtsi | 1 + arch/arm/boot/dts/vf610-twr.dts | 19 ++ arch/arm/boot/dts/vf610.dtsi | 11 ++ arch/arm/configs/imx_v4_v5_defconfig | 6 + arch/arm/include/debug/vf.S | 15 +- arch/arm/mach-imx/clk-imx25.c | 15 +- arch/arm/mach-imx/mach-mx21ads.c | 173 ++++++++--------- 22 files changed, 508 insertions(+), 109 deletions(-) Merging ixp4xx/next (19f949f52599 Linux 3.8) $ git merge ixp4xx/next Already up-to-date. Merging keystone/next (5c0426dcd386 Merge branch 'for_3.15/dts_2' into next) $ git merge keystone/next Already up-to-date! Merge made by the 'recursive' strategy. Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix) $ git merge msm/for-next Already up-to-date. Merging mvebu/for-next (97623e934388 Merge branch 'mvebu/dt' into for-next) $ git merge mvebu/for-next Resolved 'arch/arm/boot/dts/Makefile' using previous resolution. Auto-merging arch/arm/boot/dts/Makefile CONFLICT (content): Merge conflict in arch/arm/boot/dts/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 813821ed1ab7] Merge remote-tracking branch 'mvebu/for-next' $ git diff -M --stat --summary HEAD^.. .../devicetree/bindings/arm/armada-370-xp-mpic.txt | 8 +- .../devicetree/bindings/arm/marvell,dove.txt | 22 + .../devicetree/bindings/clock/mvebu-core-clock.txt | 14 + .../bindings/clock/mvebu-corediv-clock.txt | 5 +- .../bindings/clock/mvebu-gated-clock.txt | 65 ++- .../pinctrl/marvell,armada-370-pinctrl.txt | 1 + .../pinctrl/marvell,armada-375-pinctrl.txt | 82 ++++ .../pinctrl/marvell,armada-38x-pinctrl.txt | 80 ++++ .../bindings/pinctrl/marvell,armada-xp-pinctrl.txt | 1 + .../bindings/pinctrl/marvell,dove-pinctrl.txt | 1 + .../bindings/pinctrl/marvell,kirkwood-pinctrl.txt | 1 + .../bindings/pinctrl/marvell,mvebu-pinctrl.txt | 2 +- arch/arm/boot/dts/Makefile | 2 +- drivers/clk/mvebu/Kconfig | 8 + drivers/clk/mvebu/Makefile | 2 + drivers/clk/mvebu/armada-375.c | 184 ++++++++ drivers/clk/mvebu/armada-38x.c | 167 ++++++++ drivers/clk/mvebu/clk-corediv.c | 154 +++++-- drivers/irqchip/irq-armada-370-xp.c | 96 +++-- drivers/pinctrl/mvebu/Kconfig | 9 + drivers/pinctrl/mvebu/Makefile | 2 + drivers/pinctrl/mvebu/pinctrl-armada-370.c | 20 +- drivers/pinctrl/mvebu/pinctrl-armada-375.c | 459 ++++++++++++++++++++ drivers/pinctrl/mvebu/pinctrl-armada-38x.c | 462 +++++++++++++++++++++ drivers/pinctrl/mvebu/pinctrl-armada-xp.c | 24 +- drivers/pinctrl/mvebu/pinctrl-dove.c | 403 ++++++++++-------- drivers/pinctrl/mvebu/pinctrl-kirkwood.c | 25 +- drivers/pinctrl/mvebu/pinctrl-mvebu.c | 122 ++---- drivers/pinctrl/mvebu/pinctrl-mvebu.h | 55 ++- 29 files changed, 2120 insertions(+), 356 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/marvell,dove.txt create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,armada-375-pinctrl.txt create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,armada-38x-pinctrl.txt create mode 100644 drivers/clk/mvebu/armada-375.c create mode 100644 drivers/clk/mvebu/armada-38x.c create mode 100644 drivers/pinctrl/mvebu/pinctrl-armada-375.c create mode 100644 drivers/pinctrl/mvebu/pinctrl-armada-38x.c Merging renesas/next (68d1f3aad83a Merge branch 'heads/clock-for-v3.15' into next) $ git merge renesas/next Already up-to-date! Merge made by the 'recursive' strategy. Merging samsung/for-next (82cd4473bde8 Merge branch 'v3.15-next/cleanup-exynos' into for-next) $ git merge samsung/for-next Removing arch/arm/plat-samsung/include/plat/uncompress.h Removing arch/arm/mach-s5pv210/include/mach/uncompress.h Removing arch/arm/mach-s5pc100/include/mach/uncompress.h Removing arch/arm/mach-s5p64x0/include/mach/uncompress.h Removing arch/arm/mach-s3c64xx/include/mach/uncompress.h Removing arch/arm/mach-s3c24xx/include/mach/uncompress.h Removing arch/arm/mach-s3c24xx/common-s3c2443.c Removing arch/arm/mach-s3c24xx/clock-s3c2443.c Removing arch/arm/mach-s3c24xx/clock-s3c2416.c Removing arch/arm/mach-s3c24xx/clock-s3c2412.c Removing arch/arm/mach-exynos/mach-exynos5-dt.c Removing arch/arm/mach-exynos/mach-exynos4-dt.c Removing arch/arm/mach-exynos/include/mach/pm-core.h Removing arch/arm/mach-exynos/include/mach/hardware.h Auto-merging arch/arm/mach-exynos/exynos.c Auto-merging arch/arm/Kconfig.debug Removing Documentation/devicetree/bindings/ata/exynos-sata-phy.txt Merge made by the 'recursive' strategy. .../devicetree/bindings/ata/exynos-sata-phy.txt | 14 - .../devicetree/bindings/ata/exynos-sata.txt | 25 +- .../bindings/clock/samsung,s3c2412-clock.txt | 50 ++ .../bindings/clock/samsung,s3c2443-clock.txt | 56 ++ .../devicetree/bindings/phy/samsung-phy.txt | 36 + arch/arm/Kconfig.debug | 4 +- arch/arm/boot/dts/exynos4.dtsi | 5 + arch/arm/boot/dts/exynos4210-origen.dts | 2 +- arch/arm/boot/dts/exynos4210-smdkv310.dts | 2 +- arch/arm/boot/dts/exynos4210-trats.dts | 2 +- arch/arm/boot/dts/exynos4210-universal_c210.dts | 2 +- arch/arm/boot/dts/exynos4210.dtsi | 2 +- arch/arm/boot/dts/exynos4212.dtsi | 15 +- arch/arm/boot/dts/exynos4412-odroidx.dts | 2 +- arch/arm/boot/dts/exynos4412-origen.dts | 2 +- arch/arm/boot/dts/exynos4412-smdk4412.dts | 2 +- arch/arm/boot/dts/exynos4412-tiny4412.dts | 2 +- arch/arm/boot/dts/exynos4412-trats2.dts | 23 +- arch/arm/boot/dts/exynos4412.dtsi | 16 +- arch/arm/boot/dts/exynos4x12.dtsi | 26 + arch/arm/boot/dts/exynos5250-arndale.dts | 23 +- arch/arm/boot/dts/exynos5250-smdk5250.dts | 23 +- arch/arm/boot/dts/exynos5250-snow.dts | 2 +- arch/arm/boot/dts/exynos5250.dtsi | 30 +- arch/arm/boot/dts/exynos5420-arndale-octa.dts | 17 +- arch/arm/boot/dts/exynos5420-smdk5420.dts | 2 +- arch/arm/boot/dts/exynos5420.dtsi | 13 +- arch/arm/boot/dts/exynos5440-sd5v1.dts | 2 +- arch/arm/boot/dts/exynos5440-ssdk5440.dts | 2 +- arch/arm/boot/dts/exynos5440.dtsi | 2 +- arch/arm/boot/dts/s3c2416-smdk2416.dts | 13 + arch/arm/boot/dts/s3c2416.dtsi | 42 ++ arch/arm/mach-exynos/Kconfig | 16 +- arch/arm/mach-exynos/Makefile | 9 +- arch/arm/mach-exynos/common.h | 17 +- arch/arm/mach-exynos/cpuidle.c | 3 +- arch/arm/mach-exynos/{common.c => exynos.c} | 229 +++---- arch/arm/mach-exynos/include/mach/hardware.h | 18 - arch/arm/mach-exynos/include/mach/pm-core.h | 75 -- arch/arm/mach-exynos/mach-exynos4-dt.c | 59 -- arch/arm/mach-exynos/mach-exynos5-dt.c | 81 --- arch/arm/mach-exynos/mfc.h | 16 + arch/arm/mach-exynos/platsmp.c | 2 - arch/arm/mach-exynos/pm.c | 316 ++++----- arch/arm/mach-exynos/regs-pmu.h | 3 +- arch/arm/mach-exynos/sleep.S | 85 +++ arch/arm/mach-s3c24xx/Kconfig | 24 +- arch/arm/mach-s3c24xx/Makefile | 7 +- arch/arm/mach-s3c24xx/clock-s3c2412.c | 760 --------------------- arch/arm/mach-s3c24xx/clock-s3c2416.c | 171 ----- arch/arm/mach-s3c24xx/clock-s3c2443.c | 212 ------ arch/arm/mach-s3c24xx/common-s3c2443.c | 675 ------------------ arch/arm/mach-s3c24xx/common.c | 27 +- arch/arm/mach-s3c24xx/common.h | 10 + arch/arm/mach-s3c24xx/include/mach/hardware.h | 14 +- arch/arm/mach-s3c24xx/include/mach/uncompress.h | 57 -- arch/arm/mach-s3c24xx/mach-jive.c | 9 +- arch/arm/mach-s3c24xx/mach-s3c2416-dt.c | 38 +- arch/arm/mach-s3c24xx/mach-smdk2413.c | 9 +- arch/arm/mach-s3c24xx/mach-smdk2416.c | 9 +- arch/arm/mach-s3c24xx/mach-smdk2443.c | 9 +- arch/arm/mach-s3c24xx/mach-vstms.c | 9 +- arch/arm/mach-s3c24xx/pm.c | 13 +- arch/arm/mach-s3c24xx/s3c2412.c | 43 -- arch/arm/mach-s3c64xx/include/mach/pm-core.h | 2 + arch/arm/mach-s3c64xx/include/mach/uncompress.h | 31 - arch/arm/mach-s3c64xx/pm.c | 1 - arch/arm/mach-s5p64x0/include/mach/pm-core.h | 2 + arch/arm/mach-s5p64x0/include/mach/uncompress.h | 34 - arch/arm/mach-s5p64x0/pm.c | 1 - arch/arm/mach-s5pc100/include/mach/uncompress.h | 30 - arch/arm/mach-s5pv210/include/mach/uncompress.h | 28 - arch/arm/plat-samsung/Makefile | 2 + arch/arm/plat-samsung/clock.c | 1 - arch/arm/plat-samsung/devs.c | 2 +- arch/arm/plat-samsung/include/plat/cpu.h | 10 + arch/arm/plat-samsung/include/plat/mfc.h | 3 - arch/arm/plat-samsung/include/plat/pm-common.h | 110 +++ arch/arm/plat-samsung/include/plat/pm.h | 80 +-- arch/arm/plat-samsung/include/plat/uncompress.h | 175 ----- arch/arm/plat-samsung/init.c | 2 - arch/arm/plat-samsung/pm-check.c | 2 +- arch/arm/plat-samsung/pm-common.c | 75 ++ arch/arm/plat-samsung/pm-debug.c | 97 +++ arch/arm/plat-samsung/pm.c | 145 ---- arch/arm/plat-samsung/s5p-dev-mfc.c | 17 +- arch/arm/plat-samsung/s5p-dev-uart.c | 1 - arch/arm/plat-samsung/s5p-sleep.S | 43 -- drivers/clk/samsung/Makefile | 2 + drivers/clk/samsung/clk-exynos-audss.c | 2 +- drivers/clk/samsung/clk-exynos4.c | 172 ++++- drivers/clk/samsung/clk-exynos5250.c | 49 +- drivers/clk/samsung/clk-exynos5420.c | 49 +- drivers/clk/samsung/clk-exynos5440.c | 2 +- drivers/clk/samsung/clk-pll.c | 266 +++++++- drivers/clk/samsung/clk-pll.h | 6 + drivers/clk/samsung/clk-s3c2412.c | 269 ++++++++ drivers/clk/samsung/clk-s3c2443.c | 462 +++++++++++++ drivers/clk/samsung/clk-s3c64xx.c | 79 ++- drivers/clk/samsung/clk.c | 71 +- drivers/clk/samsung/clk.h | 14 +- .../dt-bindings/{clk => clock}/exynos-audss-clk.h | 0 include/dt-bindings/clock/s3c2412.h | 73 ++ include/dt-bindings/clock/s3c2443.h | 92 +++ include/linux/serial_s3c.h | 2 + 105 files changed, 2671 insertions(+), 3317 deletions(-) delete mode 100644 Documentation/devicetree/bindings/ata/exynos-sata-phy.txt create mode 100644 Documentation/devicetree/bindings/clock/samsung,s3c2412-clock.txt create mode 100644 Documentation/devicetree/bindings/clock/samsung,s3c2443-clock.txt rename arch/arm/mach-exynos/{common.c => exynos.c} (71%) delete mode 100644 arch/arm/mach-exynos/include/mach/hardware.h delete mode 100644 arch/arm/mach-exynos/include/mach/pm-core.h delete mode 100644 arch/arm/mach-exynos/mach-exynos4-dt.c delete mode 100644 arch/arm/mach-exynos/mach-exynos5-dt.c create mode 100644 arch/arm/mach-exynos/mfc.h create mode 100644 arch/arm/mach-exynos/sleep.S delete mode 100644 arch/arm/mach-s3c24xx/clock-s3c2412.c delete mode 100644 arch/arm/mach-s3c24xx/clock-s3c2416.c delete mode 100644 arch/arm/mach-s3c24xx/clock-s3c2443.c delete mode 100644 arch/arm/mach-s3c24xx/common-s3c2443.c delete mode 100644 arch/arm/mach-s3c24xx/include/mach/uncompress.h delete mode 100644 arch/arm/mach-s3c64xx/include/mach/uncompress.h delete mode 100644 arch/arm/mach-s5p64x0/include/mach/uncompress.h delete mode 100644 arch/arm/mach-s5pc100/include/mach/uncompress.h delete mode 100644 arch/arm/mach-s5pv210/include/mach/uncompress.h create mode 100644 arch/arm/plat-samsung/include/plat/pm-common.h delete mode 100644 arch/arm/plat-samsung/include/plat/uncompress.h create mode 100644 arch/arm/plat-samsung/pm-common.c create mode 100644 arch/arm/plat-samsung/pm-debug.c create mode 100644 drivers/clk/samsung/clk-s3c2412.c create mode 100644 drivers/clk/samsung/clk-s3c2443.c rename include/dt-bindings/{clk => clock}/exynos-audss-clk.h (100%) create mode 100644 include/dt-bindings/clock/s3c2412.h create mode 100644 include/dt-bindings/clock/s3c2443.h Merging tegra/for-next (3e00824db87f Merge branch for-3.15/defconfig into for-next) $ git merge tegra/for-next Removing arch/arm/mach-tegra/tegra2_emc.h Removing arch/arm/mach-tegra/tegra2_emc.c Auto-merging arch/arm/configs/tegra_defconfig Auto-merging arch/arm/boot/dts/tegra30.dtsi Auto-merging arch/arm/boot/dts/tegra30-cardhu.dtsi Auto-merging arch/arm/boot/dts/tegra20.dtsi Auto-merging arch/arm/boot/dts/tegra114.dtsi Merge made by the 'recursive' strategy. .../bindings/pci/nvidia,tegra20-pcie.txt | 8 + arch/arm/boot/dts/tegra114-dalmore.dts | 5 + arch/arm/boot/dts/tegra114.dtsi | 8 +- arch/arm/boot/dts/tegra124-venice2.dts | 301 +++++++++++------- arch/arm/boot/dts/tegra124.dtsi | 339 +++++++++++++++----- arch/arm/boot/dts/tegra20-paz00.dts | 46 ++- arch/arm/boot/dts/tegra20-seaboard.dts | 55 +++- arch/arm/boot/dts/tegra20-ventana.dts | 39 ++- arch/arm/boot/dts/tegra20.dtsi | 4 + arch/arm/boot/dts/tegra30-cardhu.dtsi | 7 + arch/arm/boot/dts/tegra30.dtsi | 6 +- arch/arm/configs/tegra_defconfig | 6 +- arch/arm/firmware/Kconfig | 3 +- arch/arm/firmware/trusted_foundations.c | 20 +- arch/arm/include/asm/firmware.h | 4 + arch/arm/include/asm/trusted_foundations.h | 13 +- arch/arm/mach-tegra/Makefile | 1 - arch/arm/mach-tegra/cpuidle-tegra114.c | 7 +- arch/arm/mach-tegra/platsmp.c | 2 +- arch/arm/mach-tegra/powergate.c | 2 + arch/arm/mach-tegra/tegra2_emc.c | 347 --------------------- arch/arm/mach-tegra/tegra2_emc.h | 24 -- drivers/amba/tegra-ahb.c | 2 - 23 files changed, 665 insertions(+), 584 deletions(-) delete mode 100644 arch/arm/mach-tegra/tegra2_emc.c delete mode 100644 arch/arm/mach-tegra/tegra2_emc.h Merging arm64/for-next/core (9c7e535fcc17 arm64: mm: Route pmd thp functions through pte equivalents) $ git merge arm64/for-next/core Auto-merging arch/arm64/include/asm/pgtable.h Merge made by the 'recursive' strategy. Documentation/arm64/memory.txt | 16 +- arch/arm64/Kconfig | 32 ++- arch/arm64/include/asm/Kbuild | 1 + arch/arm64/include/asm/barrier.h | 1 + arch/arm64/include/asm/cacheflush.h | 7 + arch/arm64/include/asm/compat.h | 2 +- arch/arm64/include/asm/cpufeature.h | 29 +++ arch/arm64/include/asm/debug-monitors.h | 64 ++++-- arch/arm64/include/asm/dma-mapping.h | 7 + arch/arm64/include/asm/hwcap.h | 9 +- arch/arm64/include/asm/io.h | 2 +- arch/arm64/include/asm/irqflags.h | 23 +++ arch/arm64/include/asm/kgdb.h | 84 ++++++++ arch/arm64/include/asm/kvm_arm.h | 15 +- arch/arm64/include/asm/pgtable-hwdef.h | 5 +- arch/arm64/include/asm/pgtable.h | 60 +++--- arch/arm64/include/asm/psci.h | 2 +- arch/arm64/include/asm/ptrace.h | 5 +- arch/arm64/include/asm/tlb.h | 136 ++----------- arch/arm64/include/asm/topology.h | 39 ++++ arch/arm64/include/uapi/asm/Kbuild | 1 + arch/arm64/include/uapi/asm/perf_regs.h | 40 ++++ arch/arm64/kernel/Makefile | 6 +- arch/arm64/kernel/debug-monitors.c | 10 +- arch/arm64/kernel/head.S | 20 +- arch/arm64/kernel/kgdb.c | 336 ++++++++++++++++++++++++++++++++ arch/arm64/kernel/perf_event.c | 75 ++++++- arch/arm64/kernel/perf_regs.c | 44 +++++ arch/arm64/kernel/process.c | 11 +- arch/arm64/kernel/psci.c | 13 +- arch/arm64/kernel/setup.c | 33 ++++ arch/arm64/kernel/smp.c | 12 ++ arch/arm64/kernel/smp_spin_table.c | 2 +- arch/arm64/kernel/topology.c | 95 +++++++++ arch/arm64/kernel/vdso.c | 42 ++-- arch/arm64/kvm/hyp-init.S | 6 + arch/arm64/mm/cache.S | 80 +++++++- arch/arm64/mm/dma-mapping.c | 194 ++++++++++++++++-- arch/arm64/mm/init.c | 33 ++-- arch/arm64/mm/proc.S | 14 +- drivers/cpufreq/Kconfig | 2 +- fs/compat_binfmt_elf.c | 5 + include/asm-generic/rwsem.h | 10 +- kernel/debug/debug_core.c | 2 +- 44 files changed, 1321 insertions(+), 304 deletions(-) create mode 100644 arch/arm64/include/asm/cpufeature.h create mode 100644 arch/arm64/include/asm/kgdb.h create mode 100644 arch/arm64/include/asm/topology.h create mode 100644 arch/arm64/include/uapi/asm/perf_regs.h create mode 100644 arch/arm64/kernel/kgdb.c create mode 100644 arch/arm64/kernel/perf_regs.c create mode 100644 arch/arm64/kernel/topology.c Merging blackfin/for-linus (58095fdaaf1c From: Eunbong Song ) $ git merge blackfin/for-linus Already up-to-date. Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h) $ git merge c6x/for-linux-next Already up-to-date. Merging cris/for-next (cd065a010a97 CRISv10: Readd missing header) $ git merge cris/for-next Already up-to-date. Merging hexagon/linux-next (44eb66c228fe Hexagon: update CR year for elf.h) $ git merge hexagon/linux-next Merge made by the 'recursive' strategy. arch/hexagon/Kconfig | 1 + arch/hexagon/include/asm/Kbuild | 4 +- arch/hexagon/include/asm/atomic.h | 15 ++++++- arch/hexagon/include/asm/delay.h | 1 + arch/hexagon/include/asm/dma-mapping.h | 1 - arch/hexagon/include/asm/elf.h | 4 +- arch/hexagon/include/asm/hexagon_vm.h | 72 +++++++++++++++---------------- arch/hexagon/include/asm/io.h | 2 + arch/hexagon/include/asm/kgdb.h | 5 ++- arch/hexagon/include/asm/pgalloc.h | 2 +- arch/hexagon/include/asm/smp.h | 1 - arch/hexagon/include/uapi/asm/registers.h | 4 +- arch/hexagon/include/uapi/asm/setup.h | 5 +++ arch/hexagon/kernel/Makefile | 2 + arch/hexagon/kernel/hexagon_ksyms.c | 24 +++++++++-- arch/hexagon/kernel/kgdb.c | 2 + arch/hexagon/kernel/ptrace.c | 1 + arch/hexagon/kernel/reset.c | 5 +-- arch/hexagon/kernel/screen_info.c | 3 ++ arch/hexagon/kernel/smp.c | 6 +-- arch/hexagon/kernel/time.c | 12 ++++-- 21 files changed, 109 insertions(+), 63 deletions(-) create mode 100644 arch/hexagon/kernel/screen_info.c Merging ia64/next (e8e98a566c71 Merge branch 'pstore' into next) $ git merge ia64/next Merge made by the 'recursive' strategy. arch/ia64/configs/generic_defconfig | 4 ++-- arch/ia64/hp/common/sba_iommu.c | 6 +++--- fs/pstore/platform.c | 1 + fs/pstore/ram.c | 19 +++++++++++-------- fs/pstore/ram_core.c | 4 ++-- 5 files changed, 19 insertions(+), 15 deletions(-) Merging m68k/for-next (eff9cf8d6e8b [SCSI] atari_scsi: Fix sleep_on race) $ git merge m68k/for-next Merge made by the 'recursive' strategy. arch/m68k/kernel/head.S | 70 +++++------------------------------------------ drivers/scsi/atari_scsi.c | 12 ++++++-- 2 files changed, 16 insertions(+), 66 deletions(-) Merging m68knommu/for-next (4dc5aa217237 m68knommu: fix arg types for outs* functions) $ git merge m68knommu/for-next Merge made by the 'recursive' strategy. arch/m68k/configs/m5208evb_defconfig | 1 - arch/m68k/configs/m5249evb_defconfig | 1 - arch/m68k/configs/m5272c3_defconfig | 1 - arch/m68k/configs/m5275evb_defconfig | 1 - arch/m68k/configs/m5307c3_defconfig | 1 - arch/m68k/configs/m5407c3_defconfig | 1 - arch/m68k/include/asm/io_no.h | 6 +++--- 7 files changed, 3 insertions(+), 9 deletions(-) Merging metag/for-next (2aca46ce1b5c sched: remove unused SCHED_INIT_NODE) $ git merge metag/for-next Merge made by the 'recursive' strategy. arch/metag/Kconfig | 2 +- arch/metag/include/asm/topology.h | 27 ---------------------- arch/metag/kernel/irq.c | 22 +++--------------- arch/metag/kernel/signal.c | 48 +++++++++++++++++---------------------- 4 files changed, 25 insertions(+), 74 deletions(-) Merging microblaze/next (cff2ee046e06 microblaze: Wire-up new system calls sched_setattr/getattr) $ git merge microblaze/next Merge made by the 'recursive' strategy. arch/microblaze/include/asm/setup.h | 6 ++---- arch/microblaze/include/uapi/asm/unistd.h | 6 ++++-- arch/microblaze/kernel/heartbeat.c | 4 ++-- arch/microblaze/kernel/syscall_table.S | 8 +++++--- arch/microblaze/kernel/timer.c | 4 ++-- 5 files changed, 15 insertions(+), 13 deletions(-) Merging mips/mips-for-linux-next (edb778195a07 Merge branch '3.14-fixes' into mips-for-linux-next) $ git merge mips/mips-for-linux-next Removing arch/mips/include/asm/gcmpregs.h Removing arch/mips/configs/db1235_defconfig Removing arch/mips/configs/db1000_defconfig Auto-merging arch/mips/alchemy/devboards/db1xxx.c Merge made by the 'recursive' strategy. arch/mips/Kconfig | 100 +++- arch/mips/Makefile | 5 + arch/mips/alchemy/Kconfig | 22 +- arch/mips/alchemy/Platform | 16 +- arch/mips/alchemy/common/setup.c | 10 + arch/mips/alchemy/devboards/Makefile | 4 +- arch/mips/alchemy/devboards/db1000.c | 47 +- arch/mips/alchemy/devboards/db1200.c | 9 + arch/mips/alchemy/devboards/db1300.c | 6 +- arch/mips/alchemy/devboards/db1550.c | 10 +- arch/mips/alchemy/devboards/{db1235.c => db1xxx.c} | 41 +- arch/mips/ar7/time.c | 1 + arch/mips/bcm47xx/board.c | 25 +- arch/mips/bcm47xx/buttons.c | 31 ++ arch/mips/bcm47xx/leds.c | 49 ++ arch/mips/bcm47xx/setup.c | 2 +- arch/mips/bcm63xx/cpu.c | 3 +- arch/mips/configs/db1000_defconfig | 359 ------------- arch/mips/configs/db1235_defconfig | 434 ---------------- arch/mips/configs/db1xxx_defconfig | 248 +++++++++ arch/mips/configs/malta_defconfig | 9 +- arch/mips/configs/malta_kvm_defconfig | 10 +- arch/mips/configs/malta_kvm_guest_defconfig | 7 +- arch/mips/configs/maltaaprp_defconfig | 3 +- arch/mips/configs/maltasmtc_defconfig | 4 +- arch/mips/configs/maltasmvp_defconfig | 5 +- arch/mips/configs/maltasmvp_eva_defconfig | 200 ++++++++ arch/mips/configs/maltaup_defconfig | 3 +- arch/mips/include/asm/asm-eva.h | 135 +++++ arch/mips/include/asm/asm.h | 9 + arch/mips/include/asm/asmmacro-32.h | 128 ++--- arch/mips/include/asm/asmmacro.h | 330 +++++++++--- arch/mips/include/asm/bootinfo.h | 2 + arch/mips/include/asm/checksum.h | 44 +- arch/mips/include/asm/cpu-features.h | 10 +- arch/mips/include/asm/cpu-info.h | 1 + arch/mips/include/asm/cpu-type.h | 2 + arch/mips/include/asm/cpu.h | 10 +- arch/mips/include/asm/fpu.h | 2 +- arch/mips/include/asm/futex.h | 9 +- arch/mips/include/asm/fw/fw.h | 2 +- arch/mips/include/asm/gcmpregs.h | 125 ----- arch/mips/include/asm/gic.h | 3 + arch/mips/include/asm/io.h | 4 +- arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 8 +- .../include/asm/mach-malta/kernel-entry-init.h | 115 ++++- arch/mips/include/asm/mach-malta/spaces.h | 46 ++ arch/mips/include/asm/mips-boards/malta.h | 5 + arch/mips/include/asm/mips-cm.h | 322 ++++++++++++ arch/mips/include/asm/mips-cpc.h | 150 ++++++ arch/mips/include/asm/mipsregs.h | 22 + arch/mips/include/asm/msa.h | 203 ++++++++ arch/mips/include/asm/page.h | 2 + arch/mips/include/asm/processor.h | 45 +- arch/mips/include/asm/ptrace.h | 2 +- arch/mips/include/asm/r4kcache.h | 171 ++++++- arch/mips/include/asm/sigcontext.h | 2 + arch/mips/include/asm/smp-cps.h | 33 ++ arch/mips/include/asm/smp-ops.h | 17 + arch/mips/include/asm/switch_to.h | 22 +- arch/mips/include/asm/syscall.h | 32 +- arch/mips/include/asm/thread_info.h | 7 +- arch/mips/include/asm/uaccess.h | 559 ++++++++++++++++----- arch/mips/include/uapi/asm/inst.h | 25 +- arch/mips/include/uapi/asm/sigcontext.h | 8 + arch/mips/kernel/Makefile | 5 + arch/mips/kernel/asm-offsets.c | 82 +++ arch/mips/kernel/cps-vec.S | 191 +++++++ arch/mips/kernel/cpu-probe.c | 56 ++- arch/mips/kernel/ftrace.c | 4 + arch/mips/kernel/genex.S | 2 + arch/mips/kernel/head.S | 2 +- arch/mips/kernel/idle.c | 3 + arch/mips/kernel/irq-gic.c | 1 - arch/mips/kernel/kgdb.c | 18 +- arch/mips/kernel/mips-cm.c | 121 +++++ arch/mips/kernel/mips-cpc.c | 52 ++ arch/mips/kernel/mips_ksyms.c | 24 +- arch/mips/kernel/perf_event_mipsxx.c | 80 ++- arch/mips/kernel/proc.c | 2 + arch/mips/kernel/process.c | 23 +- arch/mips/kernel/ptrace.c | 161 +++--- arch/mips/kernel/ptrace32.c | 67 +-- arch/mips/kernel/r4k_fpu.S | 213 ++++++++ arch/mips/kernel/r4k_switch.S | 58 ++- arch/mips/kernel/scall32-o32.S | 24 +- arch/mips/kernel/scall64-64.S | 5 +- arch/mips/kernel/scall64-n32.S | 5 +- arch/mips/kernel/scall64-o32.S | 17 +- arch/mips/kernel/signal.c | 170 ++++++- arch/mips/kernel/signal32.c | 137 ++++- arch/mips/kernel/smp-cmp.c | 52 +- arch/mips/kernel/smp-cps.c | 329 ++++++++++++ arch/mips/kernel/smp-gic.c | 53 ++ arch/mips/kernel/spram.c | 5 +- arch/mips/kernel/traps.c | 144 +++++- arch/mips/kernel/unaligned.c | 135 ++++- arch/mips/lib/csum_partial.S | 282 +++++++---- arch/mips/lib/memcpy.S | 416 ++++++++++----- arch/mips/lib/memset.S | 146 ++++-- arch/mips/lib/strlen_user.S | 36 +- arch/mips/lib/strncpy_user.S | 40 +- arch/mips/lib/strnlen_user.S | 36 +- arch/mips/math-emu/cp1emu.c | 58 ++- arch/mips/math-emu/kernel_linkage.c | 76 +-- arch/mips/mm/c-r4k.c | 88 +++- arch/mips/mm/cache.c | 4 +- arch/mips/mm/init.c | 12 +- arch/mips/mm/sc-mips.c | 2 + arch/mips/mm/tlbex.c | 5 +- arch/mips/mti-malta/malta-init.c | 30 +- arch/mips/mti-malta/malta-int.c | 70 +-- arch/mips/mti-malta/malta-memory.c | 58 ++- arch/mips/mti-malta/malta-setup.c | 30 +- arch/mips/mti-sead3/sead3-mtd.c | 3 +- arch/mips/oprofile/common.c | 3 + arch/mips/oprofile/op_model_mipsxx.c | 9 + arch/mips/pci/pci-alchemy.c | 5 +- arch/mips/pci/pci-malta.c | 22 +- drivers/edac/octeon_edac-lmc.c | 179 ++++++- drivers/gpio/gpio-vr41xx.c | 20 + drivers/spi/spi-au1550.c | 9 + 122 files changed, 5963 insertions(+), 2192 deletions(-) rename arch/mips/alchemy/devboards/{db1235.c => db1xxx.c} (65%) delete mode 100644 arch/mips/configs/db1000_defconfig delete mode 100644 arch/mips/configs/db1235_defconfig create mode 100644 arch/mips/configs/db1xxx_defconfig create mode 100644 arch/mips/configs/maltasmvp_eva_defconfig create mode 100644 arch/mips/include/asm/asm-eva.h delete mode 100644 arch/mips/include/asm/gcmpregs.h create mode 100644 arch/mips/include/asm/mach-malta/spaces.h create mode 100644 arch/mips/include/asm/mips-cm.h create mode 100644 arch/mips/include/asm/mips-cpc.h create mode 100644 arch/mips/include/asm/msa.h create mode 100644 arch/mips/include/asm/smp-cps.h create mode 100644 arch/mips/kernel/cps-vec.S create mode 100644 arch/mips/kernel/mips-cm.c create mode 100644 arch/mips/kernel/mips-cpc.c create mode 100644 arch/mips/kernel/smp-cps.c create mode 100644 arch/mips/kernel/smp-gic.c Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() signal_setup_done()) $ git merge openrisc/for-upstream Already up-to-date. Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve()) $ git merge parisc/for-next Already up-to-date. Merging parisc-hd/for-next (38dbfb59d117 Linus 3.14-rc1) $ git merge parisc-hd/for-next Already up-to-date. Merging powerpc/next (c7e64b9ce04a powerpc/powernv Platform dump interface) $ git merge powerpc/next Removing arch/powerpc/platforms/embedded6xx/prpmc2800.c Removing arch/powerpc/configs/prpmc2800_defconfig Merge made by the 'recursive' strategy. Documentation/ABI/stable/sysfs-firmware-opal-dump | 41 ++ Documentation/ABI/stable/sysfs-firmware-opal-elog | 60 +++ arch/powerpc/Kconfig | 9 + arch/powerpc/boot/Makefile | 5 +- arch/powerpc/configs/40x/acadia_defconfig | 1 - arch/powerpc/configs/40x/ep405_defconfig | 1 - arch/powerpc/configs/40x/kilauea_defconfig | 1 - arch/powerpc/configs/40x/makalu_defconfig | 1 - arch/powerpc/configs/40x/walnut_defconfig | 1 - arch/powerpc/configs/44x/arches_defconfig | 1 - arch/powerpc/configs/44x/bluestone_defconfig | 1 - arch/powerpc/configs/44x/canyonlands_defconfig | 1 - arch/powerpc/configs/44x/ebony_defconfig | 1 - arch/powerpc/configs/44x/eiger_defconfig | 1 - arch/powerpc/configs/44x/icon_defconfig | 1 - arch/powerpc/configs/44x/iss476-smp_defconfig | 1 - arch/powerpc/configs/44x/katmai_defconfig | 1 - arch/powerpc/configs/44x/rainier_defconfig | 1 - arch/powerpc/configs/44x/redwood_defconfig | 1 - arch/powerpc/configs/44x/sequoia_defconfig | 1 - arch/powerpc/configs/44x/taishan_defconfig | 1 - arch/powerpc/configs/44x/warp_defconfig | 1 - arch/powerpc/configs/52xx/cm5200_defconfig | 1 - arch/powerpc/configs/52xx/motionpro_defconfig | 1 - arch/powerpc/configs/52xx/pcm030_defconfig | 1 - arch/powerpc/configs/52xx/tqm5200_defconfig | 1 - arch/powerpc/configs/83xx/asp8347_defconfig | 1 - arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | 1 - arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | 1 - arch/powerpc/configs/83xx/mpc836x_mds_defconfig | 1 - arch/powerpc/configs/83xx/mpc836x_rdk_defconfig | 1 - arch/powerpc/configs/83xx/sbc834x_defconfig | 1 - arch/powerpc/configs/85xx/ksi8560_defconfig | 1 - arch/powerpc/configs/85xx/ppa8548_defconfig | 1 - arch/powerpc/configs/85xx/socrates_defconfig | 1 - arch/powerpc/configs/85xx/tqm8540_defconfig | 1 - arch/powerpc/configs/85xx/tqm8541_defconfig | 1 - arch/powerpc/configs/85xx/tqm8548_defconfig | 1 - arch/powerpc/configs/85xx/tqm8555_defconfig | 1 - arch/powerpc/configs/85xx/tqm8560_defconfig | 1 - arch/powerpc/configs/85xx/xes_mpc85xx_defconfig | 1 - arch/powerpc/configs/86xx/gef_ppc9a_defconfig | 1 - arch/powerpc/configs/86xx/gef_sbc310_defconfig | 1 - arch/powerpc/configs/86xx/gef_sbc610_defconfig | 1 - arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig | 1 - arch/powerpc/configs/86xx/sbc8641d_defconfig | 1 - arch/powerpc/configs/c2k_defconfig | 1 - arch/powerpc/configs/corenet64_smp_defconfig | 1 - arch/powerpc/configs/linkstation_defconfig | 1 - arch/powerpc/configs/mpc85xx_defconfig | 1 - arch/powerpc/configs/mpc85xx_smp_defconfig | 1 - arch/powerpc/configs/ppc40x_defconfig | 1 - arch/powerpc/configs/ppc44x_defconfig | 1 - arch/powerpc/configs/prpmc2800_defconfig | 108 ----- arch/powerpc/configs/storcenter_defconfig | 1 - arch/powerpc/configs/tqm8xx_defconfig | 1 - arch/powerpc/include/asm/machdep.h | 7 + arch/powerpc/include/asm/mce.h | 3 +- arch/powerpc/include/asm/opal.h | 30 ++ arch/powerpc/include/asm/rtas.h | 1 + arch/powerpc/kernel/cacheinfo.c | 7 +- arch/powerpc/kernel/mce.c | 4 +- arch/powerpc/kernel/mce_power.c | 37 +- arch/powerpc/kernel/prom.c | 5 + arch/powerpc/kernel/vio.c | 3 +- arch/powerpc/lib/memcpy_64.S | 2 + arch/powerpc/mm/mem.c | 7 +- arch/powerpc/mm/tlb_low_64e.S | 3 +- arch/powerpc/platforms/embedded6xx/Kconfig | 8 - arch/powerpc/platforms/embedded6xx/Makefile | 1 - arch/powerpc/platforms/embedded6xx/prpmc2800.c | 156 ------ arch/powerpc/platforms/powernv/Makefile | 2 +- arch/powerpc/platforms/powernv/opal-dump.c | 525 +++++++++++++++++++++ arch/powerpc/platforms/powernv/opal-elog.c | 313 ++++++++++++ arch/powerpc/platforms/powernv/opal-wrappers.S | 11 + arch/powerpc/platforms/powernv/opal.c | 104 +++- arch/powerpc/platforms/powernv/setup.c | 1 + arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 +- arch/powerpc/platforms/pseries/hotplug-memory.c | 83 ++-- arch/powerpc/platforms/pseries/mobility.c | 26 +- arch/powerpc/platforms/pseries/suspend.c | 44 +- arch/powerpc/xmon/xmon.c | 4 + drivers/macintosh/adb.c | 57 ++- tools/testing/selftests/powerpc/Makefile | 2 +- tools/testing/selftests/powerpc/copyloops/Makefile | 29 ++ .../selftests/powerpc/copyloops/asm/ppc_asm.h | 86 ++++ .../selftests/powerpc/copyloops/asm/processor.h | 0 .../selftests/powerpc/copyloops/copyuser_64.S | 1 + .../selftests/powerpc/copyloops/copyuser_power7.S | 1 + .../selftests/powerpc/copyloops/memcpy_64.S | 1 + .../selftests/powerpc/copyloops/memcpy_power7.S | 1 + .../testing/selftests/powerpc/copyloops/validate.c | 99 ++++ tools/testing/selftests/powerpc/utils.h | 3 + 93 files changed, 1523 insertions(+), 420 deletions(-) create mode 100644 Documentation/ABI/stable/sysfs-firmware-opal-dump create mode 100644 Documentation/ABI/stable/sysfs-firmware-opal-elog delete mode 100644 arch/powerpc/configs/prpmc2800_defconfig delete mode 100644 arch/powerpc/platforms/embedded6xx/prpmc2800.c create mode 100644 arch/powerpc/platforms/powernv/opal-dump.c create mode 100644 arch/powerpc/platforms/powernv/opal-elog.c create mode 100644 tools/testing/selftests/powerpc/copyloops/Makefile create mode 100644 tools/testing/selftests/powerpc/copyloops/asm/ppc_asm.h create mode 100644 tools/testing/selftests/powerpc/copyloops/asm/processor.h create mode 120000 tools/testing/selftests/powerpc/copyloops/copyuser_64.S create mode 120000 tools/testing/selftests/powerpc/copyloops/copyuser_power7.S create mode 120000 tools/testing/selftests/powerpc/copyloops/memcpy_64.S create mode 120000 tools/testing/selftests/powerpc/copyloops/memcpy_power7.S create mode 100644 tools/testing/selftests/powerpc/copyloops/validate.c Merging mpc5xxx/next (bc7505942233 powerpc/512x: dts: add MPC5125 clock specs) $ git merge mpc5xxx/next Already up-to-date. Merging galak/next (9e2ecdbba3b0 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 (454bb787bfab remove unecessary parameter from pgste_ipte_notify) $ git merge s390/features Auto-merging kernel/sched/core.c Auto-merging include/linux/mm.h Auto-merging drivers/s390/net/qeth_core_main.c Removing arch/s390/kernel/compat_exec_domain.c Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 27 ++++- arch/s390/Kconfig | 5 + arch/s390/appldata/appldata_os.c | 2 +- arch/s390/configs/default_defconfig | 46 +++++++-- arch/s390/configs/gcov_defconfig | 33 ++++-- arch/s390/configs/performance_defconfig | 33 ++++-- arch/s390/configs/zfcpdump_defconfig | 1 - arch/s390/defconfig | 10 ++ arch/s390/hypfs/hypfs_vm.c | 9 +- arch/s390/include/asm/airq.h | 14 ++- arch/s390/include/asm/bitops.h | 8 +- arch/s390/include/asm/ccwdev.h | 4 +- arch/s390/include/asm/checksum.h | 11 +- arch/s390/include/asm/futex.h | 13 +-- arch/s390/include/asm/kvm_host.h | 5 +- arch/s390/include/asm/mmu_context.h | 39 +++++++- arch/s390/include/asm/pgalloc.h | 18 +++- arch/s390/include/asm/pgtable.h | 105 ++++++++++++++------ arch/s390/include/asm/ptrace.h | 1 + arch/s390/include/asm/sclp.h | 1 + arch/s390/include/asm/setup.h | 3 - arch/s390/include/asm/thread_info.h | 3 + arch/s390/include/asm/uaccess.h | 171 ++++++++++++++------------------ arch/s390/include/uapi/asm/ptrace.h | 6 ++ arch/s390/kernel/Makefile | 5 +- arch/s390/kernel/compat_exec_domain.c | 29 ------ arch/s390/kernel/early.c | 2 - arch/s390/kernel/entry.S | 9 +- arch/s390/kernel/entry64.S | 9 +- arch/s390/kernel/perf_event.c | 2 +- arch/s390/kernel/ptrace.c | 13 ++- arch/s390/kernel/setup.c | 17 ---- arch/s390/kernel/smp.c | 8 +- arch/s390/kernel/topology.c | 1 - arch/s390/kvm/diag.c | 3 + arch/s390/kvm/kvm-s390.c | 25 +++++ arch/s390/kvm/kvm-s390.h | 2 + arch/s390/kvm/priv.c | 41 ++++++++ arch/s390/lib/Makefile | 3 +- arch/s390/lib/find.c | 2 +- arch/s390/lib/uaccess.h | 8 +- arch/s390/lib/uaccess_mvcos.c | 116 +++++++++++++++++----- arch/s390/lib/uaccess_pt.c | 69 ++++++------- arch/s390/mm/maccess.c | 28 +----- arch/s390/mm/pgtable.c | 158 ++++++++++++++++++++++++++++- arch/s390/pci/pci_debug.c | 2 +- drivers/s390/char/con3215.c | 8 +- drivers/s390/char/con3270.c | 6 +- drivers/s390/char/raw3270.c | 17 +++- drivers/s390/char/raw3270.h | 2 +- drivers/s390/char/sclp_early.c | 31 +++++- drivers/s390/cio/airq.c | 66 +++++++----- drivers/s390/cio/chsc_sch.c | 3 +- drivers/s390/cio/cio.c | 4 +- drivers/s390/cio/device.c | 52 ++++++---- drivers/s390/net/qeth_core_main.c | 4 +- include/asm-generic/pgtable.h | 13 +++ include/linux/mm.h | 10 +- kernel/sched/core.c | 4 +- mm/mmu_context.c | 3 + mm/rmap.c | 10 ++ 61 files changed, 926 insertions(+), 427 deletions(-) delete mode 100644 arch/s390/kernel/compat_exec_domain.c Merging sparc-next/master (049ffa8ab33a Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux) $ git merge sparc-next/master Already up-to-date. Merging tile/master (620830b69549 perf tools: Allow building for tile) $ git merge tile/master Merge made by the 'recursive' strategy. arch/tile/Kconfig | 6 + arch/tile/include/asm/perf_event.h | 22 + arch/tile/include/asm/pmc.h | 64 +++ arch/tile/kernel/Makefile | 2 + arch/tile/kernel/intvec_32.S | 24 +- arch/tile/kernel/intvec_64.S | 24 +- arch/tile/kernel/irq.c | 18 + arch/tile/kernel/messaging.c | 4 +- arch/tile/kernel/perf_event.c | 1005 ++++++++++++++++++++++++++++++++++++ arch/tile/kernel/pmc.c | 121 +++++ arch/tile/kernel/time.c | 10 +- tools/perf/config/Makefile.arch | 3 +- tools/perf/perf.h | 8 + 13 files changed, 1294 insertions(+), 17 deletions(-) create mode 100644 arch/tile/include/asm/perf_event.h create mode 100644 arch/tile/include/asm/pmc.h create mode 100644 arch/tile/kernel/perf_event.c create mode 100644 arch/tile/kernel/pmc.c Merging uml/next (989e59fa41c5 um: Include generic barrier.h) $ git merge uml/next Resolved 'arch/um/include/asm/Kbuild' using previous resolution. Removing arch/x86/um/shared/sysdep/skas_ptrace.h Removing arch/um/sys-ppc/shared/sysdep/skas_ptrace.h Removing arch/um/sys-ia64/sysdep/skas_ptrace.h Removing arch/um/include/shared/skas_ptrace.h Removing arch/um/include/shared/skas/proc_mm.h Auto-merging arch/um/include/asm/Kbuild CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 51a22a36b1a5] Merge remote-tracking branch 'uml/next' $ git diff -M --stat --summary HEAD^.. arch/um/include/shared/os.h | 2 - arch/um/include/shared/skas/proc_mm.h | 44 ------ arch/um/include/shared/skas/skas.h | 3 - arch/um/include/shared/skas_ptrace.h | 14 -- arch/um/kernel/ptrace.c | 32 ---- arch/um/kernel/reboot.c | 35 ++--- arch/um/kernel/skas/mmu.c | 68 +++------ arch/um/kernel/skas/process.c | 27 ---- arch/um/kernel/trap.c | 2 +- arch/um/kernel/um_arch.c | 10 -- arch/um/os-Linux/process.c | 16 -- arch/um/os-Linux/skas/mem.c | 100 ++---------- arch/um/os-Linux/skas/process.c | 200 ++++++------------------ arch/um/os-Linux/start_up.c | 154 ------------------- arch/um/sys-ia64/sysdep/skas_ptrace.h | 22 --- arch/um/sys-ppc/shared/sysdep/skas_ptrace.h | 22 --- arch/x86/um/ldt.c | 227 ++++++---------------------- arch/x86/um/shared/sysdep/faultinfo_32.h | 3 - arch/x86/um/shared/sysdep/faultinfo_64.h | 3 - arch/x86/um/shared/sysdep/skas_ptrace.h | 22 --- 20 files changed, 148 insertions(+), 858 deletions(-) delete mode 100644 arch/um/include/shared/skas/proc_mm.h delete mode 100644 arch/um/include/shared/skas_ptrace.h delete mode 100644 arch/um/sys-ia64/sysdep/skas_ptrace.h delete mode 100644 arch/um/sys-ppc/shared/sysdep/skas_ptrace.h delete mode 100644 arch/x86/um/shared/sysdep/skas_ptrace.h Merging unicore32/unicore32 (c284464658ac arch/unicore32: remove CONFIG_EXPERIMENTAL) $ git merge unicore32/unicore32 Already up-to-date. Merging xtensa/for_next (b3fdfc1b4b64 Merge tag 'xtensa-for-next-20140221-1' into for_next) $ git merge xtensa/for_next Already up-to-date. Merging btrfs/next (cf93da7bcf45 Btrfs: fix spin_unlock in check_ref_cleanup) $ git merge btrfs/next Already up-to-date. Merging ceph/master (bee26897097f libceph: a per-osdc crush scratch buffer) $ git merge ceph/master Merge made by the 'recursive' strategy. include/linux/ceph/osdmap.h | 3 +++ net/ceph/osdmap.c | 25 ++++++++++++++++--------- 2 files changed, 19 insertions(+), 9 deletions(-) Merging cifs/for-next (33807f4f0dae Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6) $ git merge cifs/for-next Already up-to-date. Merging configfs/linux-next (b930c26416c4 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 (9e78d14a9f64 Use %pd in eCryptFS) $ git merge ecryptfs/next Auto-merging fs/ecryptfs/inode.c Merge made by the 'recursive' strategy. fs/ecryptfs/file.c | 4 ++-- fs/ecryptfs/inode.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) Merging ext3/for_next (f294d3e7be28 ext3: explicitly remove inode from orphan list after failed direct io) $ git merge ext3/for_next Merge made by the 'recursive' strategy. fs/ext2/ialloc.c | 2 +- fs/ext2/super.c | 2 +- fs/ext2/xattr_security.c | 4 +-- fs/ext3/balloc.c | 5 +-- fs/ext3/dir.c | 2 +- fs/ext3/ialloc.c | 2 +- fs/ext3/inode.c | 86 ++++++++++++++---------------------------------- fs/ext3/super.c | 2 +- fs/ext3/xattr_security.c | 5 +-- fs/isofs/inode.c | 2 +- fs/quota/Kconfig | 7 ++-- fs/udf/super.c | 8 +++-- 12 files changed, 47 insertions(+), 80 deletions(-) Merging ext4/dev (2c74cd642a46 ext4: each filesystem creates and uses its own mb_cache) $ git merge ext4/dev Auto-merging fs/xfs/xfs_super.c Auto-merging fs/udf/super.c Auto-merging fs/isofs/inode.c Auto-merging fs/ext3/super.c Auto-merging fs/ext2/super.c Auto-merging fs/btrfs/super.c Merge made by the 'recursive' strategy. fs/adfs/super.c | 1 + fs/affs/super.c | 1 + fs/befs/linuxvfs.c | 1 + fs/btrfs/super.c | 1 + fs/cifs/cifsfs.c | 1 + fs/coda/inode.c | 1 + fs/cramfs/inode.c | 1 + fs/debugfs/inode.c | 1 + fs/devpts/inode.c | 1 + fs/efs/super.c | 1 + fs/ext2/super.c | 1 + fs/ext3/super.c | 2 + fs/ext4/ext4.h | 7 + fs/ext4/ext4_jbd2.c | 10 + fs/ext4/extents.c | 806 ++++++++++++++++++++++++++++++++++++++------ fs/ext4/extents_status.c | 28 +- fs/ext4/extents_status.h | 9 + fs/ext4/inode.c | 42 ++- fs/ext4/ioctl.c | 24 +- fs/ext4/mballoc.c | 7 +- fs/ext4/mballoc.h | 4 +- fs/ext4/move_extent.c | 5 +- fs/ext4/super.c | 29 +- fs/ext4/xattr.c | 59 ++-- fs/ext4/xattr.h | 6 +- fs/f2fs/super.c | 2 + fs/fat/inode.c | 2 + fs/freevxfs/vxfs_super.c | 1 + fs/fuse/inode.c | 1 + fs/gfs2/super.c | 2 + fs/hfs/super.c | 1 + fs/hfsplus/super.c | 1 + fs/hpfs/super.c | 2 + fs/isofs/inode.c | 1 + fs/jbd2/commit.c | 77 +++-- fs/jbd2/journal.c | 10 +- fs/jbd2/transaction.c | 46 ++- fs/jffs2/super.c | 1 + fs/jfs/super.c | 1 + fs/mbcache.c | 540 ++++++++++++++++++++--------- fs/minix/inode.c | 1 + fs/ncpfs/inode.c | 1 + fs/nfs/super.c | 2 + fs/nilfs2/super.c | 1 + fs/ntfs/super.c | 2 + fs/ocfs2/super.c | 2 + fs/openpromfs/inode.c | 1 + fs/proc/root.c | 2 + fs/pstore/inode.c | 1 + fs/qnx4/inode.c | 1 + fs/qnx6/inode.c | 1 + fs/reiserfs/super.c | 1 + fs/romfs/super.c | 1 + fs/squashfs/super.c | 1 + fs/super.c | 2 - fs/sysv/inode.c | 1 + fs/ubifs/super.c | 1 + fs/udf/super.c | 1 + fs/ufs/super.c | 1 + fs/xfs/xfs_super.c | 1 + include/linux/mbcache.h | 12 +- include/trace/events/ext4.h | 102 ++++-- 62 files changed, 1416 insertions(+), 460 deletions(-) Merging f2fs/dev (d0482c047eb7 f2fs: change reclaim rate in percentage) $ git merge f2fs/dev Auto-merging fs/f2fs/super.c Merge made by the 'recursive' strategy. Documentation/ABI/testing/sysfs-fs-f2fs | 12 ++ Documentation/filesystems/f2fs.txt | 25 ++- fs/f2fs/checkpoint.c | 144 ++++++++++++++--- fs/f2fs/data.c | 84 +++++----- fs/f2fs/debug.c | 12 +- fs/f2fs/dir.c | 79 +++++----- fs/f2fs/f2fs.h | 85 ++++++---- fs/f2fs/file.c | 13 +- fs/f2fs/gc.c | 16 +- fs/f2fs/inode.c | 27 ++-- fs/f2fs/node.c | 265 ++++++++++++++++++-------------- fs/f2fs/node.h | 24 ++- fs/f2fs/recovery.c | 31 ++-- fs/f2fs/segment.c | 100 ++++-------- fs/f2fs/segment.h | 75 ++++++--- fs/f2fs/super.c | 85 ++++++---- include/linux/f2fs_fs.h | 2 +- 17 files changed, 647 insertions(+), 432 deletions(-) Merging fscache/fscache (fe02fb3ec109 FS-Cache: Handle removal of unadded object to the fscache_object_list rb tree) $ git merge fscache/fscache Merge made by the 'recursive' strategy. Merging fuse/for-next (b2ec2778df9d fuse: Turn writeback cache on) $ git merge fuse/for-next Auto-merging fs/fuse/inode.c Auto-merging fs/fuse/file.c Merge made by the 'recursive' strategy. fs/fuse/cuse.c | 5 +- fs/fuse/dir.c | 119 +++++++++++++++++---- fs/fuse/file.c | 257 ++++++++++++++++++++++++++++++++++++---------- fs/fuse/fuse_i.h | 22 +++- fs/fuse/inode.c | 29 ++++-- include/uapi/linux/fuse.h | 5 + 6 files changed, 355 insertions(+), 82 deletions(-) Merging gfs2/master (733dbc1b21dc GFS2: inline function gfs2_set_mode) $ git merge gfs2/master Auto-merging include/trace/events/writeback.h Auto-merging fs/posix_acl.c Auto-merging fs/gfs2/super.c Auto-merging fs/fs-writeback.c Merge made by the 'recursive' strategy. fs/fs-writeback.c | 2 + fs/gfs2/acl.c | 23 ++----- fs/gfs2/acl.h | 2 +- fs/gfs2/aops.c | 132 ++++++++++++++++++++++++++++----------- fs/gfs2/bmap.c | 115 ++++++++++++++++++++++++++++++++++ fs/gfs2/bmap.h | 2 + fs/gfs2/dir.c | 23 +++++-- fs/gfs2/file.c | 13 ++-- fs/gfs2/glock.c | 28 +++++---- fs/gfs2/glops.c | 2 + fs/gfs2/incore.h | 36 +++++------ fs/gfs2/inode.c | 64 ++++++++++++++----- fs/gfs2/lock_dlm.c | 10 +-- fs/gfs2/log.c | 102 ++++++++++++++++-------------- fs/gfs2/lops.c | 85 ++++++++++++------------- fs/gfs2/lops.h | 5 +- fs/gfs2/main.c | 4 +- fs/gfs2/meta_io.c | 9 +-- fs/gfs2/ops_fstype.c | 87 ++++---------------------- fs/gfs2/quota.c | 17 ++--- fs/gfs2/recovery.c | 16 ++--- fs/gfs2/recovery.h | 6 +- fs/gfs2/rgrp.c | 32 +++++----- fs/gfs2/super.c | 30 ++++----- fs/gfs2/sys.c | 7 ++- fs/gfs2/trans.c | 29 ++++----- fs/gfs2/util.c | 101 ++++++++++++++---------------- fs/gfs2/util.h | 31 ++++----- fs/posix_acl.c | 5 +- include/trace/events/writeback.h | 1 + include/uapi/linux/gfs2_ondisk.h | 12 +++- 31 files changed, 596 insertions(+), 435 deletions(-) Merging jfs/jfs-next (844fa1b5f849 jfs: set i_ctime when setting ACL) $ git merge jfs/jfs-next Already up-to-date. Merging logfs/master (339466142b3f 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 (494314c415e2 SUNRPC: rpc_restart_call/rpc_restart_call_prepare should clear task->tk_status) $ git merge nfs/linux-next Auto-merging fs/nfs/nfs3proc.c Auto-merging fs/nfs/dir.c Merge made by the 'recursive' strategy. fs/nfs/callback_proc.c | 19 +++-- fs/nfs/dir.c | 55 +++++++++++-- fs/nfs/inode.c | 34 ++++++-- fs/nfs/internal.h | 8 ++ fs/nfs/nfs3proc.c | 36 -------- fs/nfs/nfs4_fs.h | 11 +++ fs/nfs/nfs4client.c | 7 ++ fs/nfs/nfs4proc.c | 178 +++++++++++++++++++++------------------- fs/nfs/nfs4state.c | 6 +- fs/nfs/nfs4xdr.c | 3 +- fs/nfs/pnfs.c | 17 +++- fs/nfs/proc.c | 25 ------ fs/nfs/unlink.c | 35 ++++++-- include/linux/nfs_fs.h | 2 +- include/linux/nfs_xdr.h | 3 +- include/linux/sunrpc/bc_xprt.h | 3 +- net/sunrpc/backchannel_rqst.c | 93 ++++++++++++++------- net/sunrpc/clnt.c | 23 +++--- net/sunrpc/sched.c | 3 +- net/sunrpc/xprtrdma/rpc_rdma.c | 4 +- net/sunrpc/xprtrdma/transport.c | 10 +-- net/sunrpc/xprtsock.c | 28 ++----- 22 files changed, 355 insertions(+), 248 deletions(-) Merging nfsd/nfsd-next (1406b916f4a2 nfsd: fix lost nfserrno() call in nfsd_setattr()) $ git merge nfsd/nfsd-next Merge made by the 'recursive' strategy. fs/nfsd/vfs.c | 1 + 1 file changed, 1 insertion(+) Merging omfs/for-next (976d167615b6 Linux 3.1-rc9) $ git merge omfs/for-next Already up-to-date. Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages on decompress error) $ git merge squashfs/master Already up-to-date. Merging v9fs/for-next (38dbfb59d117 Linus 3.14-rc1) $ git merge v9fs/for-next Already up-to-date. Merging ubifs/linux-next (463c5eedb4a1 UBI: make UBI_IOCVOLCRBLK take a parameter for future usage) $ git merge ubifs/linux-next Merge made by the 'recursive' strategy. drivers/mtd/ubi/Kconfig | 16 ++ drivers/mtd/ubi/Makefile | 1 + drivers/mtd/ubi/block.c | 647 ++++++++++++++++++++++++++++++++++++++++++++ drivers/mtd/ubi/build.c | 11 + drivers/mtd/ubi/cdev.c | 20 ++ drivers/mtd/ubi/ubi.h | 20 ++ include/uapi/mtd/ubi-user.h | 22 ++ 7 files changed, 737 insertions(+) create mode 100644 drivers/mtd/ubi/block.c Merging xfs/for-next (fe986f9d88ab Merge branch 'xfs-O_TMPFILE-support' into for-next) $ git merge xfs/for-next Auto-merging include/linux/fs.h Auto-merging fs/xfs/xfs_file.c Auto-merging fs/open.c Merge made by the 'recursive' strategy. fs/direct-io.c | 18 ++- fs/open.c | 29 +++- fs/xfs/kmem.c | 21 ++- fs/xfs/xfs_acl.c | 2 +- fs/xfs/xfs_ag.h | 6 + fs/xfs/xfs_alloc.c | 45 +++--- fs/xfs/xfs_alloc_btree.c | 16 ++- fs/xfs/xfs_aops.c | 84 ++++++----- fs/xfs/xfs_attr_leaf.c | 17 +-- fs/xfs/xfs_attr_remote.c | 15 +- fs/xfs/xfs_bmap.c | 193 +++++++++++++++++++++++++ fs/xfs/xfs_bmap.h | 15 ++ fs/xfs/xfs_bmap_btree.c | 16 +-- fs/xfs/xfs_bmap_util.c | 97 ++++++++++++- fs/xfs/xfs_bmap_util.h | 2 + fs/xfs/xfs_btree.c | 14 +- fs/xfs/xfs_buf.c | 11 ++ fs/xfs/xfs_buf.h | 14 ++ fs/xfs/xfs_buf_item.c | 19 --- fs/xfs/xfs_da_btree.c | 17 +-- fs/xfs/xfs_dinode.h | 2 + fs/xfs/xfs_dir2.c | 342 +++++++++++++++++++++++++++----------------- fs/xfs/xfs_dir2_block.c | 17 +-- fs/xfs/xfs_dir2_data.c | 20 +-- fs/xfs/xfs_dir2_leaf.c | 17 +-- fs/xfs/xfs_dir2_node.c | 17 +-- fs/xfs/xfs_dquot.c | 2 +- fs/xfs/xfs_dquot_buf.c | 11 +- fs/xfs/xfs_error.c | 27 +++- fs/xfs/xfs_error.h | 1 + fs/xfs/xfs_file.c | 26 +++- fs/xfs/xfs_format.h | 2 + fs/xfs/xfs_ialloc.c | 36 +++-- fs/xfs/xfs_ialloc_btree.c | 16 ++- fs/xfs/xfs_inode.c | 123 +++++++++++++++- fs/xfs/xfs_inode.h | 12 ++ fs/xfs/xfs_inode_buf.c | 7 +- fs/xfs/xfs_iomap.c | 10 +- fs/xfs/xfs_iops.c | 30 ++++ fs/xfs/xfs_linux.h | 2 + fs/xfs/xfs_log.h | 2 +- fs/xfs/xfs_log_cil.c | 55 +++++-- fs/xfs/xfs_mount.c | 3 + fs/xfs/xfs_rtalloc.c | 2 +- fs/xfs/xfs_sb.c | 17 +-- fs/xfs/xfs_sb.h | 2 + fs/xfs/xfs_shared.h | 4 +- fs/xfs/xfs_symlink.c | 9 +- fs/xfs/xfs_symlink_remote.c | 16 +-- fs/xfs/xfs_trace.h | 1 + fs/xfs/xfs_trans.c | 12 +- fs/xfs/xfs_trans_buf.c | 11 ++ fs/xfs/xfs_trans_resv.c | 82 +++++++++-- fs/xfs/xfs_trans_resv.h | 3 +- include/linux/fs.h | 3 + include/uapi/linux/falloc.h | 35 +++++ 56 files changed, 1214 insertions(+), 414 deletions(-) Merging file-private-locks/linux-next (bef6f44d4e51 locks: make locks_mandatory_area check for file-private locks) $ git merge file-private-locks/linux-next Auto-merging security/selinux/hooks.c Auto-merging include/linux/fs.h Auto-merging fs/namei.c Auto-merging fs/file_table.c Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 2 + arch/arm/kernel/sys_oabi-compat.c | 3 + fs/compat.c | 35 +++- fs/fcntl.c | 37 ++-- fs/file_table.c | 2 +- fs/locks.c | 387 ++++++++++++++++++++++++-------------- fs/namei.c | 2 +- include/linux/fs.h | 43 +++-- include/uapi/asm-generic/fcntl.h | 19 +- mm/mmap.c | 2 +- mm/nommu.c | 2 +- security/selinux/hooks.c | 3 + 12 files changed, 354 insertions(+), 183 deletions(-) Merging vfs/for-next (527d1511310a Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc) $ git merge vfs/for-next Already up-to-date. Merging pci/next (30723cbf6f7a Merge branch 'pci/resource' into next) $ git merge pci/next Resolved 'drivers/ata/ahci.c' using previous resolution. Auto-merging include/linux/pci.h Auto-merging drivers/pci/pci.c Auto-merging drivers/pci/hotplug/acpiphp_glue.c Auto-merging drivers/pci/host/pci-mvebu.c Auto-merging drivers/pci/bus.c Auto-merging drivers/bus/mvebu-mbus.c Auto-merging drivers/ata/ahci.c CONFLICT (content): Merge conflict in drivers/ata/ahci.c Auto-merging arch/ia64/hp/common/sba_iommu.c Auto-merging arch/arm/kernel/bios32.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master b8b3ea1f369b] Merge remote-tracking branch 'pci/next' $ git diff -M --stat --summary HEAD^.. Documentation/PCI/pci-iov-howto.txt | 4 - arch/alpha/kernel/pci.c | 6 - arch/arm/kernel/bios32.c | 9 +- arch/frv/mb93090-mb00/pci-frv.c | 2 +- arch/ia64/hp/common/sba_iommu.c | 32 ++--- arch/ia64/include/asm/pci.h | 2 +- arch/ia64/kernel/acpi.c | 28 ++--- arch/ia64/pci/fixup.c | 25 ++-- arch/ia64/pci/pci.c | 10 +- arch/microblaze/pci/pci-common.c | 5 - arch/powerpc/kernel/pci_64.c | 4 +- arch/powerpc/platforms/pseries/pci_dlpar.c | 6 +- arch/s390/pci/pci.c | 16 +-- arch/sh/drivers/pci/pci.c | 5 - arch/sparc/kernel/leon_pci.c | 5 - arch/tile/kernel/pci_gx.c | 12 -- arch/x86/include/asm/pci.h | 7 +- arch/x86/include/asm/topology.h | 14 +-- arch/x86/pci/acpi.c | 59 +++------ arch/x86/pci/amd_bus.c | 10 -- arch/x86/pci/bus_numa.c | 13 +- arch/x86/pci/common.c | 128 +++---------------- arch/x86/pci/fixup.c | 24 ++-- arch/x86/pci/irq.c | 6 +- arch/x86/pci/legacy.c | 4 +- arch/x86/pci/numaq_32.c | 6 +- arch/x86/pci/visws.c | 4 +- drivers/acpi/numa.c | 16 +-- drivers/ata/ahci.c | 20 ++- drivers/bus/mvebu-mbus.c | 4 +- drivers/gpu/drm/drm_fops.c | 3 +- drivers/iommu/amd_iommu_types.h | 1 + drivers/message/i2o/iop.c | 85 +++++++------ drivers/misc/mei/hw-me.h | 1 + drivers/misc/mic/card/mic_device.h | 1 + drivers/misc/mic/host/mic_device.h | 1 + drivers/pci/Makefile | 22 ++-- drivers/pci/bus.c | 6 +- drivers/pci/host-bridge.c | 8 -- drivers/pci/host/Kconfig | 2 +- drivers/pci/host/pci-imx6.c | 47 +++++-- drivers/pci/host/pci-mvebu.c | 26 +++- drivers/pci/host/pci-rcar-gen2.c | 180 +++++++++++++++++---------- drivers/pci/host/pcie-designware.c | 2 +- drivers/pci/hotplug/acpiphp_glue.c | 6 +- drivers/pci/hotplug/cpqphp_core.c | 4 +- drivers/pci/hotplug/pciehp.h | 5 + drivers/pci/hotplug/pciehp_acpi.c | 1 + drivers/pci/hotplug/pciehp_core.c | 8 +- drivers/pci/hotplug/pciehp_ctrl.c | 173 ++++++++++++++++++++------ drivers/pci/hotplug/pciehp_hpc.c | 75 ++++++------ drivers/pci/hotplug/pciehp_pci.c | 2 +- drivers/pci/iov.c | 119 ------------------ drivers/pci/pci.c | 118 +++++++++++------- drivers/pci/pci.h | 4 - drivers/pci/probe.c | 93 +++++++------- drivers/pci/quirks.c | 190 +++++++++++++++++++++++++++++ drivers/pci/rom.c | 2 + drivers/pci/search.c | 10 +- drivers/pci/setup-res.c | 37 ++++-- drivers/pcmcia/yenta_socket.c | 18 +-- drivers/vfio/pci/vfio_pci_intrs.c | 12 +- include/acpi/acpi_numa.h | 1 - include/linux/acpi.h | 9 +- include/linux/ioport.h | 12 +- include/linux/pci.h | 11 +- kernel/resource.c | 12 +- lib/vsprintf.c | 13 +- 68 files changed, 943 insertions(+), 863 deletions(-) Merging hid/for-next (df31872aa93e Merge branch 'for-3.15/multitouch' into for-next) $ git merge hid/for-next Resolved 'drivers/hid/hid-core.c' using previous resolution. Resolved 'drivers/hid/hid-ids.h' using previous resolution. Resolved 'drivers/hid/hid-sony.c' using previous resolution. Resolved 'drivers/hid/i2c-hid/i2c-hid.c' using previous resolution. Auto-merging net/bluetooth/hidp/core.c Auto-merging drivers/hid/i2c-hid/i2c-hid.c CONFLICT (content): Merge conflict in drivers/hid/i2c-hid/i2c-hid.c Auto-merging drivers/hid/hidraw.c Auto-merging drivers/hid/hid-sony.c CONFLICT (content): Merge conflict in drivers/hid/hid-sony.c Auto-merging drivers/hid/hid-sensor-hub.c Auto-merging drivers/hid/hid-multitouch.c Auto-merging drivers/hid/hid-microsoft.c Auto-merging drivers/hid/hid-input.c Auto-merging drivers/hid/hid-ids.h CONFLICT (content): Merge conflict in drivers/hid/hid-ids.h Auto-merging drivers/hid/hid-core.c CONFLICT (content): Merge conflict in drivers/hid/hid-core.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 933ee30c35f7] Merge remote-tracking branch 'hid/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/hid/hid-transport.txt | 317 ++++++ drivers/hid/Kconfig | 19 +- drivers/hid/Makefile | 1 + drivers/hid/hid-core.c | 52 +- drivers/hid/hid-cp2112.c | 1073 ++++++++++++++++++++ drivers/hid/hid-ids.h | 5 + drivers/hid/hid-input.c | 21 +- drivers/hid/hid-lg.c | 6 +- drivers/hid/hid-logitech-dj.c | 111 +- drivers/hid/hid-magicmouse.c | 4 +- drivers/hid/hid-microsoft.c | 74 +- drivers/hid/hid-multitouch.c | 281 ++--- drivers/hid/hid-sensor-hub.c | 210 ++-- drivers/hid/hid-sony.c | 796 +++++++++++++-- drivers/hid/hid-thingm.c | 4 +- drivers/hid/hid-wacom.c | 28 +- drivers/hid/hid-wiimote-core.c | 4 +- drivers/hid/hidraw.c | 27 +- drivers/hid/i2c-hid/i2c-hid.c | 139 ++- drivers/hid/uhid.c | 25 +- drivers/hid/usbhid/hid-core.c | 102 +- .../iio/common/hid-sensors/hid-sensor-trigger.c | 39 +- include/linux/hid-sensor-hub.h | 9 +- include/linux/hid-sensor-ids.h | 16 +- include/linux/hid.h | 76 +- net/bluetooth/hidp/core.c | 100 +- 26 files changed, 2885 insertions(+), 654 deletions(-) create mode 100644 Documentation/hid/hid-transport.txt create mode 100644 drivers/hid/hid-cp2112.c Merging i2c/i2c/for-next (0ff83d2cad1a i2c: exynos5: remove unnecessary cast of void pointer) $ git merge i2c/i2c/for-next Auto-merging drivers/i2c/busses/Kconfig Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/i2c/i2c-at91.txt | 2 + .../devicetree/bindings/i2c/i2c-designware.txt | 8 + .../devicetree/bindings/i2c/i2c-mv64xxx.txt | 20 +- Documentation/devicetree/bindings/i2c/i2c-rcar.txt | 14 +- Documentation/i2c/busses/i2c-i801 | 1 + Documentation/i2c/functionality | 2 +- arch/blackfin/include/asm/bfin_twi.h | 143 ++------ arch/blackfin/kernel/debug-mmrs.c | 1 + drivers/i2c/busses/Kconfig | 3 +- drivers/i2c/busses/i2c-ali1535.c | 2 +- drivers/i2c/busses/i2c-ali1563.c | 2 +- drivers/i2c/busses/i2c-ali15x3.c | 2 +- drivers/i2c/busses/i2c-amd756.c | 2 +- drivers/i2c/busses/i2c-amd8111.c | 2 +- drivers/i2c/busses/i2c-at91.c | 12 +- drivers/i2c/busses/i2c-bcm2835.c | 24 +- drivers/i2c/busses/i2c-bfin-twi.c | 20 +- drivers/i2c/busses/i2c-designware-core.c | 27 +- drivers/i2c/busses/i2c-designware-core.h | 2 + drivers/i2c/busses/i2c-designware-pcidrv.c | 125 +++---- drivers/i2c/busses/i2c-designware-platdrv.c | 7 + drivers/i2c/busses/i2c-eg20t.c | 2 +- drivers/i2c/busses/i2c-exynos5.c | 4 +- drivers/i2c/busses/i2c-gpio.c | 3 + drivers/i2c/busses/i2c-hydra.c | 2 +- drivers/i2c/busses/i2c-i801.c | 5 +- drivers/i2c/busses/i2c-ismt.c | 2 +- drivers/i2c/busses/i2c-mv64xxx.c | 81 +++-- drivers/i2c/busses/i2c-mxs.c | 18 +- drivers/i2c/busses/i2c-nforce2.c | 2 +- drivers/i2c/busses/i2c-nomadik.c | 253 ++++++-------- drivers/i2c/busses/i2c-ocores.c | 2 +- drivers/i2c/busses/i2c-omap.c | 2 +- drivers/i2c/busses/i2c-pasemi.c | 2 +- drivers/i2c/busses/i2c-piix4.c | 2 +- drivers/i2c/busses/i2c-pxa-pci.c | 2 +- drivers/i2c/busses/i2c-rcar.c | 3 +- drivers/i2c/busses/i2c-s3c2410.c | 39 ++- drivers/i2c/busses/i2c-sis5595.c | 2 +- drivers/i2c/busses/i2c-sis630.c | 2 +- drivers/i2c/busses/i2c-sis96x.c | 2 +- drivers/i2c/busses/i2c-st.c | 2 +- drivers/i2c/busses/i2c-stu300.c | 2 +- drivers/i2c/busses/i2c-tegra.c | 2 +- drivers/i2c/busses/i2c-via.c | 2 +- drivers/i2c/busses/i2c-viapro.c | 2 +- drivers/i2c/busses/scx200_acb.c | 2 +- drivers/i2c/i2c-core.c | 67 +++- include/linux/i2c.h | 1 + include/linux/i2c/bfin_twi.h | 145 ++++++++ include/linux/platform_data/i2c-s3c2410.h | 9 +- include/trace/events/i2c.h | 372 +++++++++++++++++++++ 52 files changed, 981 insertions(+), 476 deletions(-) create mode 100644 include/linux/i2c/bfin_twi.h create mode 100644 include/trace/events/i2c.h Merging jdelvare-hwmon/master (c1d70b646dae hwmon: (lm90) Convert to use hwmon_device_register_with_groups) $ git merge jdelvare-hwmon/master Merge made by the 'recursive' strategy. drivers/hwmon/adm1021.c | 70 +++++++-------------- drivers/hwmon/asc7621.c | 1 - drivers/hwmon/atxp1.c | 2 - drivers/hwmon/f71805f.c | 2 +- drivers/hwmon/lm63.c | 157 +++++++++++++++++++--------------------------- drivers/hwmon/lm77.c | 1 - drivers/hwmon/lm80.c | 70 +++++++-------------- drivers/hwmon/lm83.c | 1 - drivers/hwmon/lm87.c | 1 - drivers/hwmon/lm90.c | 111 ++++++++++++++------------------ drivers/hwmon/lm92.c | 1 - drivers/hwmon/lm93.c | 1 - drivers/hwmon/max1619.c | 1 - drivers/hwmon/pc87360.c | 12 ++-- drivers/hwmon/w83792d.c | 1 - drivers/hwmon/w83l785ts.c | 4 -- 16 files changed, 162 insertions(+), 274 deletions(-) Merging hwmon-staging/hwmon-next (a2e151074366 hwmon: (pmbus/ltc2978) Add new chip ID for LTC2974) $ git merge hwmon-staging/hwmon-next Merge made by the 'recursive' strategy. Documentation/hwmon/adc128d818 | 47 +++ Documentation/hwmon/lm95245 | 8 +- Documentation/hwmon/ltc2945 | 84 +++++ Documentation/hwmon/ltc4260 | 56 ++++ drivers/hwmon/Kconfig | 698 ++++++++++++++++++++++------------------- drivers/hwmon/Makefile | 4 + drivers/hwmon/adc128d818.c | 491 +++++++++++++++++++++++++++++ drivers/hwmon/coretemp.c | 71 +---- drivers/hwmon/emc2103.c | 2 +- drivers/hwmon/hwmon.c | 5 + drivers/hwmon/iio_hwmon.c | 37 +-- drivers/hwmon/jz4740-hwmon.c | 25 +- drivers/hwmon/lm95241.c | 93 ++---- drivers/hwmon/lm95245.c | 112 +++---- drivers/hwmon/ltc2945.c | 519 ++++++++++++++++++++++++++++++ drivers/hwmon/ltc4215.c | 51 +-- drivers/hwmon/ltc4222.c | 237 ++++++++++++++ drivers/hwmon/ltc4245.c | 30 +- drivers/hwmon/ltc4260.c | 200 ++++++++++++ drivers/hwmon/max1668.c | 81 ++--- drivers/hwmon/max6639.c | 91 ++---- drivers/hwmon/max6650.c | 257 +++++++-------- drivers/hwmon/pmbus/ltc2978.c | 5 +- drivers/hwmon/smm665.c | 2 +- 24 files changed, 2319 insertions(+), 887 deletions(-) create mode 100644 Documentation/hwmon/adc128d818 create mode 100644 Documentation/hwmon/ltc2945 create mode 100644 Documentation/hwmon/ltc4260 create mode 100644 drivers/hwmon/adc128d818.c create mode 100644 drivers/hwmon/ltc2945.c create mode 100644 drivers/hwmon/ltc4222.c create mode 100644 drivers/hwmon/ltc4260.c Merging v4l-dvb/master (e4b7327bd03b Merge branch 'patchwork' into to_next) $ git merge v4l-dvb/master Auto-merging drivers/media/usb/usbtv/usbtv-video.c Removing drivers/media/usb/dvb-usb-v2/it913x.c Removing drivers/media/dvb-frontends/it913x-fe.h Removing drivers/media/dvb-frontends/it913x-fe.c Removing drivers/media/dvb-frontends/it913x-fe-priv.h Auto-merging MAINTAINERS Removing Documentation/dvb/it9137.txt Auto-merging Documentation/DocBook/media/v4l/vidioc-g-edid.xml Merge made by the 'recursive' strategy. CREDITS | 7 + Documentation/ABI/testing/sysfs-class-rc | 111 + Documentation/DocBook/media/dvb/demux.xml | 23 +- Documentation/DocBook/media/dvb/dvbapi.xml | 4 +- Documentation/DocBook/media/dvb/dvbproperty.xml | 2 +- Documentation/DocBook/media/dvb/frontend.xml | 8 +- Documentation/DocBook/media/v4l/common.xml | 412 +- Documentation/DocBook/media/v4l/compat.xml | 15 +- Documentation/DocBook/media/v4l/controls.xml | 176 + Documentation/DocBook/media/v4l/dev-osd.xml | 22 +- Documentation/DocBook/media/v4l/dev-sdr.xml | 110 + Documentation/DocBook/media/v4l/io.xml | 189 +- Documentation/DocBook/media/v4l/pixfmt-nv16m.xml | 9 +- .../DocBook/media/v4l/pixfmt-packed-rgb.xml | 513 +- .../DocBook/media/v4l/pixfmt-sdr-cu08.xml | 44 + .../DocBook/media/v4l/pixfmt-sdr-cu16le.xml | 46 + Documentation/DocBook/media/v4l/pixfmt.xml | 34 +- .../DocBook/media/v4l/remote_controllers.xml | 143 + Documentation/DocBook/media/v4l/v4l2.xml | 26 +- .../DocBook/media/v4l/vidioc-enum-freq-bands.xml | 8 +- ...{vidioc-subdev-g-edid.xml => vidioc-g-edid.xml} | 36 +- .../DocBook/media/v4l/vidioc-g-ext-ctrls.xml | 7 +- Documentation/DocBook/media/v4l/vidioc-g-fmt.xml | 7 + .../DocBook/media/v4l/vidioc-g-frequency.xml | 5 +- .../DocBook/media/v4l/vidioc-g-modulator.xml | 6 +- Documentation/DocBook/media/v4l/vidioc-g-tuner.xml | 15 +- .../DocBook/media/v4l/vidioc-querycap.xml | 6 + .../DocBook/media/v4l/vidioc-s-hw-freq-seek.xml | 8 +- .../DocBook/media/v4l/vidioc-streamon.xml | 28 +- Documentation/DocBook/media_api.tmpl | 90 +- Documentation/devices.txt | 7 + .../devicetree/bindings/media/img-ir-rev1.txt | 34 + .../devicetree/bindings/media/samsung-fimc.txt | 44 +- .../devicetree/bindings/media/samsung-s5c73m3.txt | 97 + .../devicetree/bindings/media/samsung-s5k6a3.txt | 33 + Documentation/dvb/get_dvb_firmware | 22 +- Documentation/dvb/it9137.txt | 9 - Documentation/edac.txt | 2 +- Documentation/video4linux/CARDLIST.bttv | 1 + Documentation/video4linux/CARDLIST.cx23885 | 5 +- Documentation/video4linux/CARDLIST.em28xx | 6 + Documentation/video4linux/fimc.txt | 5 +- Documentation/video4linux/gspca.txt | 1 + Documentation/video4linux/v4l2-framework.txt | 5 + Documentation/video4linux/v4l2-pci-skeleton.c | 913 ++ MAINTAINERS | 52 +- arch/arm/mach-omap2/board-cm-t35.c | 16 + drivers/edac/edac_mc_sysfs.c | 2 +- drivers/edac/ghes_edac.c | 2 +- drivers/edac/i5400_edac.c | 4 +- drivers/edac/i7300_edac.c | 4 +- drivers/edac/i7core_edac.c | 4 +- drivers/edac/sb_edac.c | 4 +- drivers/hid/hid-picolcd_cir.c | 2 +- drivers/media/common/siano/smsdvb-debugfs.c | 2 +- drivers/media/common/siano/smsir.c | 2 +- drivers/media/dvb-core/dvb-usb-ids.h | 1 + drivers/media/dvb-core/dvb_frontend.c | 10 +- drivers/media/dvb-frontends/Kconfig | 12 +- drivers/media/dvb-frontends/Makefile | 2 +- drivers/media/dvb-frontends/af9033.c | 59 +- drivers/media/dvb-frontends/af9033.h | 34 +- drivers/media/dvb-frontends/drx39xyj/Kconfig | 7 + drivers/media/dvb-frontends/drx39xyj/Makefile | 6 + drivers/media/dvb-frontends/drx39xyj/bsp_i2c.h | 139 + drivers/media/dvb-frontends/drx39xyj/drx39xxj.h | 45 + .../media/dvb-frontends/drx39xyj/drx_dap_fasi.h | 256 + drivers/media/dvb-frontends/drx39xyj/drx_driver.h | 2343 +++ .../dvb-frontends/drx39xyj/drx_driver_version.h | 72 + drivers/media/dvb-frontends/drx39xyj/drxj.c | 12400 +++++++++++++++ drivers/media/dvb-frontends/drx39xyj/drxj.h | 650 + drivers/media/dvb-frontends/drx39xyj/drxj_map.h | 15055 +++++++++++++++++++ drivers/media/dvb-frontends/drxd_hard.c | 4 +- drivers/media/dvb-frontends/ds3000.c | 2 +- drivers/media/dvb-frontends/it913x-fe-priv.h | 1051 -- drivers/media/dvb-frontends/it913x-fe.c | 1045 -- drivers/media/dvb-frontends/it913x-fe.h | 237 - drivers/media/dvb-frontends/m88ds3103.c | 28 +- drivers/media/dvb-frontends/m88rs2000.c | 19 +- drivers/media/dvb-frontends/mb86a20s.c | 4 +- drivers/media/dvb-frontends/mb86a20s.h | 2 +- drivers/media/dvb-frontends/rtl2832.c | 191 +- drivers/media/dvb-frontends/rtl2832.h | 34 +- drivers/media/dvb-frontends/rtl2832_priv.h | 54 +- drivers/media/dvb-frontends/s921.c | 4 +- drivers/media/dvb-frontends/s921.h | 2 +- drivers/media/dvb-frontends/stb6100.c | 2 +- drivers/media/dvb-frontends/stv0900_sw.c | 2 +- drivers/media/dvb-frontends/tda10071.c | 68 +- drivers/media/dvb-frontends/tda10071.h | 2 +- drivers/media/i2c/Kconfig | 24 +- drivers/media/i2c/Makefile | 2 + drivers/media/i2c/ad9389b.c | 2 +- drivers/media/i2c/adv7180.c | 100 +- drivers/media/i2c/adv7511.c | 2 +- drivers/media/i2c/adv7604.c | 4 +- drivers/media/i2c/adv7842.c | 153 +- drivers/media/i2c/ir-kbd-i2c.c | 4 +- drivers/media/i2c/lm3560.c | 22 +- drivers/media/i2c/lm3646.c | 414 + drivers/media/i2c/mt9p031.c | 49 +- drivers/media/i2c/mt9t001.c | 229 +- drivers/media/i2c/mt9v011.c | 4 +- drivers/media/i2c/mt9v032.c | 10 +- drivers/media/i2c/s5c73m3/s5c73m3-core.c | 207 +- drivers/media/i2c/s5c73m3/s5c73m3-spi.c | 6 + drivers/media/i2c/s5c73m3/s5c73m3.h | 4 + drivers/media/i2c/s5k6a3.c | 389 + drivers/media/i2c/sr030pc30.c | 2 +- drivers/media/i2c/ths8200.c | 26 +- drivers/media/i2c/tvp5150.c | 8 +- drivers/media/parport/bw-qcam.c | 8 +- drivers/media/pci/bt8xx/bttv-cards.c | 17 +- drivers/media/pci/bt8xx/bttv-input.c | 1 + drivers/media/pci/bt8xx/bttv.h | 1 + drivers/media/pci/cx23885/cx23885-dvb.c | 1 + drivers/media/pci/cx23885/cx23885-input.c | 2 +- drivers/media/pci/cx88/cx88-input.c | 2 +- drivers/media/pci/ddbridge/ddbridge-core.c | 6 +- drivers/media/pci/sta2x11/sta2x11_vip.c | 7 +- drivers/media/pci/ttpci/av7110_hw.c | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/arv.c | 6 +- drivers/media/platform/blackfin/bfin_capture.c | 2 +- drivers/media/platform/coda.c | 7 +- drivers/media/platform/davinci/vpbe_display.c | 9 +- drivers/media/platform/davinci/vpif_capture.c | 9 +- drivers/media/platform/davinci/vpif_display.c | 9 +- drivers/media/platform/exynos-gsc/gsc-m2m.c | 12 +- drivers/media/platform/exynos4-is/Kconfig | 9 + drivers/media/platform/exynos4-is/Makefile | 4 + drivers/media/platform/exynos4-is/fimc-capture.c | 2 +- drivers/media/platform/exynos4-is/fimc-is-param.c | 2 +- drivers/media/platform/exynos4-is/fimc-is-param.h | 5 + drivers/media/platform/exynos4-is/fimc-is-regs.c | 16 +- drivers/media/platform/exynos4-is/fimc-is-regs.h | 1 + drivers/media/platform/exynos4-is/fimc-is-sensor.c | 285 +- drivers/media/platform/exynos4-is/fimc-is-sensor.h | 49 +- drivers/media/platform/exynos4-is/fimc-is.c | 98 +- drivers/media/platform/exynos4-is/fimc-is.h | 9 +- drivers/media/platform/exynos4-is/fimc-isp-video.c | 660 + drivers/media/platform/exynos4-is/fimc-isp-video.h | 44 + drivers/media/platform/exynos4-is/fimc-isp.c | 29 +- drivers/media/platform/exynos4-is/fimc-isp.h | 27 +- drivers/media/platform/exynos4-is/fimc-lite.c | 2 +- drivers/media/platform/exynos4-is/fimc-m2m.c | 7 +- drivers/media/platform/exynos4-is/media-dev.c | 363 +- drivers/media/platform/exynos4-is/media-dev.h | 32 +- drivers/media/platform/m2m-deinterlace.c | 11 +- drivers/media/platform/marvell-ccic/mcam-core.c | 3 +- drivers/media/platform/mem2mem_testdev.c | 95 +- drivers/media/platform/mx2_emmaprp.c | 13 +- drivers/media/platform/omap/omap_vout.c | 1 + drivers/media/platform/omap/omap_vout_vrfb.c | 3 +- drivers/media/platform/omap3isp/isp.c | 7 +- drivers/media/platform/omap3isp/isp.h | 12 +- drivers/media/platform/omap3isp/ispccdc.c | 10 +- drivers/media/platform/omap3isp/ispccdc.h | 6 - drivers/media/platform/omap3isp/ispccp2.c | 6 +- drivers/media/platform/omap3isp/isphist.c | 4 +- drivers/media/platform/omap3isp/isppreview.c | 22 +- drivers/media/platform/omap3isp/ispqueue.c | 2 +- drivers/media/platform/omap3isp/ispresizer.c | 6 +- drivers/media/platform/omap3isp/ispresizer.h | 4 +- drivers/media/platform/omap3isp/ispstat.c | 4 +- drivers/media/platform/omap3isp/ispvideo.c | 12 +- drivers/media/platform/s3c-camif/camif-capture.c | 17 +- drivers/media/platform/s5p-g2d/g2d.c | 7 +- drivers/media/platform/s5p-jpeg/jpeg-core.c | 7 +- drivers/media/platform/s5p-jpeg/jpeg-regs.h | 24 +- drivers/media/platform/s5p-mfc/regs-mfc-v6.h | 1 + drivers/media/platform/s5p-mfc/s5p_mfc.c | 17 +- drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 2 + drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 2 - drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 24 + drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 8 +- drivers/media/platform/s5p-tv/mixer_video.c | 6 +- drivers/media/platform/soc_camera/atmel-isi.c | 2 +- drivers/media/platform/soc_camera/mx2_camera.c | 2 +- drivers/media/platform/soc_camera/mx3_camera.c | 2 +- drivers/media/platform/soc_camera/rcar_vin.c | 11 +- .../platform/soc_camera/sh_mobile_ceu_camera.c | 2 +- drivers/media/platform/ti-vpe/vpe.c | 6 +- drivers/media/platform/vivi.c | 54 +- drivers/media/platform/vsp1/vsp1.h | 2 +- drivers/media/platform/vsp1/vsp1_drv.c | 2 +- drivers/media/platform/vsp1/vsp1_entity.c | 2 +- drivers/media/platform/vsp1/vsp1_entity.h | 2 +- drivers/media/platform/vsp1/vsp1_lif.c | 2 +- drivers/media/platform/vsp1/vsp1_lif.h | 2 +- drivers/media/platform/vsp1/vsp1_rpf.c | 2 +- drivers/media/platform/vsp1/vsp1_rwpf.c | 2 +- drivers/media/platform/vsp1/vsp1_rwpf.h | 2 +- drivers/media/platform/vsp1/vsp1_uds.c | 2 +- drivers/media/platform/vsp1/vsp1_uds.h | 2 +- drivers/media/platform/vsp1/vsp1_video.c | 4 +- drivers/media/platform/vsp1/vsp1_video.h | 2 +- drivers/media/platform/vsp1/vsp1_wpf.c | 2 +- drivers/media/radio/radio-cadet.c | 46 +- drivers/media/radio/radio-keene.c | 19 +- drivers/media/radio/si4713/Kconfig | 6 +- drivers/media/radio/si4713/radio-usb-si4713.c | 4 +- drivers/media/rc/Kconfig | 11 + drivers/media/rc/Makefile | 2 + drivers/media/rc/ati_remote.c | 2 +- drivers/media/rc/ene_ir.c | 2 +- drivers/media/rc/fintek-cir.c | 2 +- drivers/media/rc/gpio-ir-recv.c | 4 +- drivers/media/rc/iguanair.c | 31 +- drivers/media/rc/img-ir/Kconfig | 61 + drivers/media/rc/img-ir/Makefile | 11 + drivers/media/rc/img-ir/img-ir-core.c | 176 + drivers/media/rc/img-ir/img-ir-hw.c | 1053 ++ drivers/media/rc/img-ir/img-ir-hw.h | 269 + drivers/media/rc/img-ir/img-ir-jvc.c | 81 + drivers/media/rc/img-ir/img-ir-nec.c | 148 + drivers/media/rc/img-ir/img-ir-raw.c | 151 + drivers/media/rc/img-ir/img-ir-raw.h | 60 + drivers/media/rc/img-ir/img-ir-sanyo.c | 122 + drivers/media/rc/img-ir/img-ir-sharp.c | 99 + drivers/media/rc/img-ir/img-ir-sony.c | 145 + drivers/media/rc/img-ir/img-ir.h | 166 + drivers/media/rc/imon.c | 7 +- 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 | 11 +- drivers/media/rc/ir-raw.c | 5 +- drivers/media/rc/ir-rc5-decoder.c | 10 +- drivers/media/rc/ir-rc5-sz-decoder.c | 4 +- drivers/media/rc/ir-rc6-decoder.c | 6 +- drivers/media/rc/ir-sanyo-decoder.c | 6 +- drivers/media/rc/ir-sharp-decoder.c | 200 + drivers/media/rc/ir-sony-decoder.c | 10 +- drivers/media/rc/ite-cir.c | 2 +- drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c | 4 +- drivers/media/rc/keymaps/rc-apac-viewcomp.c | 4 +- drivers/media/rc/keymaps/rc-asus-pc39.c | 4 +- drivers/media/rc/keymaps/rc-asus-ps3-100.c | 4 +- drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c | 4 +- drivers/media/rc/keymaps/rc-avermedia-a16d.c | 4 +- drivers/media/rc/keymaps/rc-avermedia-cardbus.c | 4 +- drivers/media/rc/keymaps/rc-avermedia-dvbt.c | 4 +- drivers/media/rc/keymaps/rc-avermedia-m135a.c | 4 +- .../media/rc/keymaps/rc-avermedia-m733a-rm-k6.c | 2 +- drivers/media/rc/keymaps/rc-avermedia.c | 4 +- drivers/media/rc/keymaps/rc-avertv-303.c | 4 +- drivers/media/rc/keymaps/rc-behold-columbus.c | 4 +- drivers/media/rc/keymaps/rc-behold.c | 4 +- drivers/media/rc/keymaps/rc-budget-ci-old.c | 4 +- drivers/media/rc/keymaps/rc-cinergy-1400.c | 4 +- drivers/media/rc/keymaps/rc-cinergy.c | 4 +- drivers/media/rc/keymaps/rc-dib0700-nec.c | 4 +- drivers/media/rc/keymaps/rc-dib0700-rc5.c | 4 +- drivers/media/rc/keymaps/rc-dm1105-nec.c | 4 +- drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c | 4 +- drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c | 4 +- drivers/media/rc/keymaps/rc-em-terratec.c | 4 +- drivers/media/rc/keymaps/rc-encore-enltv-fm53.c | 4 +- drivers/media/rc/keymaps/rc-encore-enltv.c | 4 +- drivers/media/rc/keymaps/rc-encore-enltv2.c | 4 +- drivers/media/rc/keymaps/rc-evga-indtube.c | 4 +- drivers/media/rc/keymaps/rc-eztv.c | 4 +- drivers/media/rc/keymaps/rc-flydvb.c | 4 +- drivers/media/rc/keymaps/rc-flyvideo.c | 4 +- drivers/media/rc/keymaps/rc-fusionhdtv-mce.c | 4 +- drivers/media/rc/keymaps/rc-gadmei-rm008z.c | 4 +- drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c | 4 +- drivers/media/rc/keymaps/rc-gotview7135.c | 4 +- drivers/media/rc/keymaps/rc-hauppauge.c | 4 +- drivers/media/rc/keymaps/rc-iodata-bctv7e.c | 4 +- drivers/media/rc/keymaps/rc-kaiomy.c | 4 +- drivers/media/rc/keymaps/rc-kworld-315u.c | 4 +- drivers/media/rc/keymaps/rc-kworld-pc150u.c | 2 +- .../media/rc/keymaps/rc-kworld-plus-tv-analog.c | 4 +- drivers/media/rc/keymaps/rc-manli.c | 4 +- drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c | 4 +- drivers/media/rc/keymaps/rc-msi-tvanywhere.c | 4 +- drivers/media/rc/keymaps/rc-nebula.c | 4 +- .../media/rc/keymaps/rc-nec-terratec-cinergy-xs.c | 6 +- drivers/media/rc/keymaps/rc-norwood.c | 4 +- drivers/media/rc/keymaps/rc-npgtech.c | 4 +- drivers/media/rc/keymaps/rc-pctv-sedna.c | 4 +- drivers/media/rc/keymaps/rc-pinnacle-color.c | 4 +- drivers/media/rc/keymaps/rc-pinnacle-grey.c | 4 +- drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c | 4 +- drivers/media/rc/keymaps/rc-pixelview-002t.c | 4 +- drivers/media/rc/keymaps/rc-pixelview-mk12.c | 4 +- drivers/media/rc/keymaps/rc-pixelview-new.c | 4 +- drivers/media/rc/keymaps/rc-pixelview.c | 4 +- .../media/rc/keymaps/rc-powercolor-real-angel.c | 4 +- drivers/media/rc/keymaps/rc-proteus-2309.c | 4 +- drivers/media/rc/keymaps/rc-purpletv.c | 4 +- drivers/media/rc/keymaps/rc-pv951.c | 4 +- .../media/rc/keymaps/rc-real-audio-220-32-keys.c | 4 +- drivers/media/rc/keymaps/rc-tbs-nec.c | 4 +- drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c | 4 +- drivers/media/rc/keymaps/rc-tevii-nec.c | 4 +- drivers/media/rc/keymaps/rc-tivo.c | 86 +- drivers/media/rc/keymaps/rc-tt-1500.c | 4 +- drivers/media/rc/keymaps/rc-videomate-s350.c | 4 +- drivers/media/rc/keymaps/rc-videomate-tv-pvr.c | 4 +- drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c | 4 +- drivers/media/rc/keymaps/rc-winfast.c | 4 +- drivers/media/rc/mceusb.c | 184 +- drivers/media/rc/nuvoton-cir.c | 12 +- drivers/media/rc/nuvoton-cir.h | 1 - drivers/media/rc/rc-core-priv.h | 15 +- drivers/media/rc/rc-loopback.c | 2 +- drivers/media/rc/rc-main.c | 253 +- drivers/media/rc/redrat3.c | 2 +- drivers/media/rc/st_rc.c | 2 +- drivers/media/rc/streamzap.c | 2 +- drivers/media/rc/ttusbir.c | 2 +- drivers/media/rc/winbond-cir.c | 2 +- drivers/media/tuners/Kconfig | 3 +- drivers/media/tuners/e4000.c | 602 +- drivers/media/tuners/e4000.h | 21 +- drivers/media/tuners/e4000_priv.h | 88 +- drivers/media/tuners/mt2063.c | 4 +- drivers/media/tuners/r820t.c | 4 +- drivers/media/tuners/tda18212.c | 12 + drivers/media/tuners/tda18212.h | 2 + drivers/media/tuners/tuner-xc2028.c | 3 + drivers/media/usb/au0828/au0828-cards.c | 23 +- drivers/media/usb/cx231xx/cx231xx-input.c | 2 +- drivers/media/usb/dvb-usb-v2/Kconfig | 9 +- drivers/media/usb/dvb-usb-v2/Makefile | 4 +- drivers/media/usb/dvb-usb-v2/af9035.c | 102 +- drivers/media/usb/dvb-usb-v2/af9035.h | 2 + drivers/media/usb/dvb-usb-v2/az6007.c | 4 +- drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 2 +- drivers/media/usb/dvb-usb-v2/it913x.c | 828 - drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 123 +- drivers/media/usb/dvb-usb-v2/rtl28xxu.h | 2 + drivers/media/usb/dvb-usb/dvb-usb-remote.c | 2 +- drivers/media/usb/em28xx/Kconfig | 2 + drivers/media/usb/em28xx/em28xx-audio.c | 103 +- drivers/media/usb/em28xx/em28xx-camera.c | 4 +- drivers/media/usb/em28xx/em28xx-cards.c | 129 +- drivers/media/usb/em28xx/em28xx-core.c | 54 +- drivers/media/usb/em28xx/em28xx-dvb.c | 186 +- drivers/media/usb/em28xx/em28xx-i2c.c | 41 +- drivers/media/usb/em28xx/em28xx-input.c | 55 +- drivers/media/usb/em28xx/em28xx-video.c | 56 +- drivers/media/usb/em28xx/em28xx.h | 15 +- drivers/media/usb/gspca/kinect.c | 7 +- drivers/media/usb/gspca/sn9c20x.c | 1 + drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c | 2 +- drivers/media/usb/gspca/topro.c | 10 +- drivers/media/usb/pwc/pwc-if.c | 19 +- drivers/media/usb/s2255/s2255drv.c | 1271 +- drivers/media/usb/siano/smsusb.c | 2 + drivers/media/usb/stk1160/stk1160-v4l.c | 2 +- drivers/media/usb/tm6000/tm6000-alsa.c | 4 +- drivers/media/usb/tm6000/tm6000-dvb.c | 2 +- drivers/media/usb/tm6000/tm6000-input.c | 2 +- drivers/media/usb/tm6000/tm6000-stds.c | 2 +- drivers/media/usb/usbtv/Makefile | 3 + drivers/media/usb/usbtv/usbtv-core.c | 134 + drivers/media/usb/usbtv/{usbtv.c => usbtv-video.c} | 171 +- drivers/media/usb/usbtv/usbtv.h | 99 + drivers/media/usb/usbvision/usbvision.h | 8 - drivers/media/usb/uvc/uvc_driver.c | 24 +- drivers/media/usb/uvc/uvc_queue.c | 29 +- drivers/media/usb/uvc/uvc_v4l2.c | 11 + drivers/media/usb/uvc/uvc_video.c | 23 +- drivers/media/usb/uvc/uvcvideo.h | 16 +- drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 133 +- drivers/media/v4l2-core/v4l2-ctrls.c | 33 +- drivers/media/v4l2-core/v4l2-dev.c | 32 +- drivers/media/v4l2-core/v4l2-dv-timings.c | 4 + drivers/media/v4l2-core/v4l2-ioctl.c | 91 +- drivers/media/v4l2-core/v4l2-of.c | 52 +- drivers/media/v4l2-core/v4l2-subdev.c | 18 +- drivers/media/v4l2-core/videobuf2-core.c | 658 +- drivers/staging/media/Kconfig | 2 + drivers/staging/media/Makefile | 2 + .../staging/media/davinci_vpfe/dm365_ipipe_hw.c | 2 +- .../staging/media/davinci_vpfe/vpfe_mc_capture.c | 6 +- drivers/staging/media/davinci_vpfe/vpfe_video.c | 3 +- drivers/staging/media/dt3155v4l/dt3155v4l.c | 5 +- drivers/staging/media/go7007/go7007-v4l2.c | 5 +- drivers/staging/media/msi3101/Kconfig | 7 +- drivers/staging/media/msi3101/Makefile | 1 + drivers/staging/media/msi3101/msi001.c | 500 + drivers/staging/media/msi3101/sdr-msi3101.c | 1566 +- drivers/staging/media/omap4iss/iss_video.c | 2 +- drivers/staging/media/rtl2832u_sdr/Kconfig | 7 + drivers/staging/media/rtl2832u_sdr/Makefile | 6 + drivers/staging/media/rtl2832u_sdr/rtl2832_sdr.c | 1500 ++ drivers/staging/media/rtl2832u_sdr/rtl2832_sdr.h | 54 + drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c | 2 +- drivers/staging/media/solo6x10/solo6x10-v4l2.c | 2 +- include/media/adv7842.h | 3 + include/media/lm3646.h | 87 + include/media/rc-core.h | 80 +- include/media/rc-map.h | 6 +- include/media/v4l2-dev.h | 3 +- include/media/v4l2-ioctl.h | 10 + include/media/v4l2-subdev.h | 9 +- include/media/videobuf2-core.h | 117 +- include/trace/events/v4l2.h | 1 + include/uapi/linux/v4l2-common.h | 8 + include/uapi/linux/v4l2-controls.h | 19 + include/uapi/linux/v4l2-dv-timings.h | 17 + include/uapi/linux/v4l2-subdev.h | 14 +- include/uapi/linux/videodev2.h | 74 +- 408 files changed, 45857 insertions(+), 8467 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-class-rc create mode 100644 Documentation/DocBook/media/v4l/dev-sdr.xml create mode 100644 Documentation/DocBook/media/v4l/pixfmt-sdr-cu08.xml create mode 100644 Documentation/DocBook/media/v4l/pixfmt-sdr-cu16le.xml rename Documentation/DocBook/media/v4l/{vidioc-subdev-g-edid.xml => vidioc-g-edid.xml} (77%) create mode 100644 Documentation/devicetree/bindings/media/img-ir-rev1.txt create mode 100644 Documentation/devicetree/bindings/media/samsung-s5c73m3.txt create mode 100644 Documentation/devicetree/bindings/media/samsung-s5k6a3.txt delete mode 100644 Documentation/dvb/it9137.txt create mode 100644 Documentation/video4linux/v4l2-pci-skeleton.c create mode 100644 drivers/media/dvb-frontends/drx39xyj/Kconfig create mode 100644 drivers/media/dvb-frontends/drx39xyj/Makefile create mode 100644 drivers/media/dvb-frontends/drx39xyj/bsp_i2c.h create mode 100644 drivers/media/dvb-frontends/drx39xyj/drx39xxj.h create mode 100644 drivers/media/dvb-frontends/drx39xyj/drx_dap_fasi.h create mode 100644 drivers/media/dvb-frontends/drx39xyj/drx_driver.h create mode 100644 drivers/media/dvb-frontends/drx39xyj/drx_driver_version.h create mode 100644 drivers/media/dvb-frontends/drx39xyj/drxj.c create mode 100644 drivers/media/dvb-frontends/drx39xyj/drxj.h create mode 100644 drivers/media/dvb-frontends/drx39xyj/drxj_map.h delete mode 100644 drivers/media/dvb-frontends/it913x-fe-priv.h delete mode 100644 drivers/media/dvb-frontends/it913x-fe.c delete mode 100644 drivers/media/dvb-frontends/it913x-fe.h create mode 100644 drivers/media/i2c/lm3646.c create mode 100644 drivers/media/i2c/s5k6a3.c create mode 100644 drivers/media/platform/exynos4-is/fimc-isp-video.c create mode 100644 drivers/media/platform/exynos4-is/fimc-isp-video.h create mode 100644 drivers/media/rc/img-ir/Kconfig create mode 100644 drivers/media/rc/img-ir/Makefile create mode 100644 drivers/media/rc/img-ir/img-ir-core.c create mode 100644 drivers/media/rc/img-ir/img-ir-hw.c create mode 100644 drivers/media/rc/img-ir/img-ir-hw.h create mode 100644 drivers/media/rc/img-ir/img-ir-jvc.c create mode 100644 drivers/media/rc/img-ir/img-ir-nec.c create mode 100644 drivers/media/rc/img-ir/img-ir-raw.c create mode 100644 drivers/media/rc/img-ir/img-ir-raw.h create mode 100644 drivers/media/rc/img-ir/img-ir-sanyo.c create mode 100644 drivers/media/rc/img-ir/img-ir-sharp.c create mode 100644 drivers/media/rc/img-ir/img-ir-sony.c create mode 100644 drivers/media/rc/img-ir/img-ir.h create mode 100644 drivers/media/rc/ir-sharp-decoder.c delete mode 100644 drivers/media/usb/dvb-usb-v2/it913x.c create mode 100644 drivers/media/usb/usbtv/usbtv-core.c rename drivers/media/usb/usbtv/{usbtv.c => usbtv-video.c} (81%) create mode 100644 drivers/media/usb/usbtv/usbtv.h create mode 100644 drivers/staging/media/msi3101/msi001.c create mode 100644 drivers/staging/media/rtl2832u_sdr/Kconfig create mode 100644 drivers/staging/media/rtl2832u_sdr/Makefile create mode 100644 drivers/staging/media/rtl2832u_sdr/rtl2832_sdr.c create mode 100644 drivers/staging/media/rtl2832u_sdr/rtl2832_sdr.h create mode 100644 include/media/lm3646.h Merging kbuild/for-next (8f2f9b9f06da Merge branch 'kbuild/kbuild' into kbuild/for-next) $ git merge kbuild/for-next Auto-merging Makefile Merge made by the 'recursive' strategy. Documentation/DocBook/Makefile | 15 ++------------- Makefile | 5 +++-- scripts/Makefile | 6 +++--- scripts/tags.sh | 9 ++++----- 4 files changed, 12 insertions(+), 23 deletions(-) Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings) $ git merge kconfig/for-next Already up-to-date. Merging libata/for-next (3d374c09daac Merge branch 'for-3.15' into for-next) $ git merge libata/for-next Auto-merging drivers/ata/ahci.c Merge made by the 'recursive' strategy. .../devicetree/bindings/ata/ahci-platform.txt | 22 +- .../devicetree/bindings/ata/apm-xgene.txt | 76 +++ arch/arm64/boot/dts/apm-storm.dtsi | 152 ++++++ drivers/ata/Kconfig | 41 +- drivers/ata/Makefile | 3 + drivers/ata/acard-ahci.c | 1 - drivers/ata/ahci.c | 7 +- drivers/ata/ahci.h | 14 +- drivers/ata/ahci_imx.c | 333 +++++-------- drivers/ata/ahci_platform.c | 547 +++++++++++++++------ drivers/ata/ahci_st.c | 245 +++++++++ drivers/ata/ahci_sunxi.c | 249 ++++++++++ drivers/ata/ahci_xgene.c | 486 ++++++++++++++++++ drivers/ata/ata_generic.c | 1 - drivers/ata/libahci.c | 36 +- drivers/ata/libata-acpi.c | 1 + drivers/ata/libata-core.c | 135 +++-- drivers/ata/libata-eh.c | 18 +- drivers/ata/libata-zpodd.c | 21 +- drivers/ata/pata_acpi.c | 1 - drivers/ata/pata_amd.c | 1 - drivers/ata/pata_artop.c | 1 - drivers/ata/pata_at91.c | 1 - drivers/ata/pata_atiixp.c | 1 - drivers/ata/pata_atp867x.c | 1 - drivers/ata/pata_cmd640.c | 1 - drivers/ata/pata_cmd64x.c | 1 - drivers/ata/pata_cs5520.c | 1 - drivers/ata/pata_cs5530.c | 1 - drivers/ata/pata_cs5535.c | 1 - drivers/ata/pata_cs5536.c | 1 - drivers/ata/pata_cypress.c | 1 - drivers/ata/pata_efar.c | 1 - drivers/ata/pata_ep93xx.c | 1 - drivers/ata/pata_hpt366.c | 1 - drivers/ata/pata_hpt37x.c | 1 - drivers/ata/pata_hpt3x2n.c | 1 - drivers/ata/pata_hpt3x3.c | 1 - drivers/ata/pata_imx.c | 18 +- drivers/ata/pata_it8213.c | 1 - drivers/ata/pata_it821x.c | 1 - drivers/ata/pata_jmicron.c | 1 - drivers/ata/pata_legacy.c | 1 - drivers/ata/pata_marvell.c | 1 - drivers/ata/pata_mpiix.c | 1 - drivers/ata/pata_netcell.c | 1 - drivers/ata/pata_ninja32.c | 1 - drivers/ata/pata_ns87410.c | 1 - drivers/ata/pata_ns87415.c | 1 - drivers/ata/pata_oldpiix.c | 1 - drivers/ata/pata_opti.c | 1 - drivers/ata/pata_optidma.c | 1 - drivers/ata/pata_pcmcia.c | 1 - drivers/ata/pata_pdc2027x.c | 1 - drivers/ata/pata_pdc202xx_old.c | 1 - drivers/ata/pata_piccolo.c | 1 - drivers/ata/pata_platform.c | 1 - drivers/ata/pata_pxa.c | 1 - drivers/ata/pata_radisys.c | 1 - drivers/ata/pata_rdc.c | 1 - drivers/ata/pata_rz1000.c | 1 - drivers/ata/pata_sc1200.c | 1 - drivers/ata/pata_scc.c | 1 - drivers/ata/pata_sch.c | 1 - drivers/ata/pata_serverworks.c | 1 - drivers/ata/pata_sil680.c | 1 - drivers/ata/pata_sis.c | 1 - drivers/ata/pata_sl82c105.c | 1 - drivers/ata/pata_triflex.c | 1 - drivers/ata/pata_via.c | 1 - drivers/ata/pdc_adma.c | 1 - drivers/ata/sata_dwc_460ex.c | 1 - drivers/ata/sata_highbank.c | 4 +- drivers/ata/sata_nv.c | 1 - drivers/ata/sata_promise.c | 1 - drivers/ata/sata_qstor.c | 1 - drivers/ata/sata_sil.c | 1 - drivers/ata/sata_sis.c | 1 - drivers/ata/sata_svw.c | 1 - drivers/ata/sata_sx4.c | 1 - drivers/ata/sata_uli.c | 1 - drivers/ata/sata_via.c | 1 - drivers/ata/sata_vsc.c | 1 - drivers/scsi/libsas/sas_ata.c | 35 +- include/linux/ahci_platform.h | 28 +- include/linux/libata.h | 11 +- include/scsi/libsas.h | 1 - 87 files changed, 1943 insertions(+), 604 deletions(-) create mode 100644 Documentation/devicetree/bindings/ata/apm-xgene.txt create mode 100644 drivers/ata/ahci_st.c create mode 100644 drivers/ata/ahci_sunxi.c create mode 100644 drivers/ata/ahci_xgene.c Merging pm/linux-next (916f2dfbf369 Merge branch 'cpu-hotplug' into linux-next) $ git merge pm/linux-next Removing include/linux/video_output.h Removing drivers/video/output.c Auto-merging drivers/pci/hotplug/acpiphp_glue.c Auto-merging drivers/hwmon/coretemp.c Auto-merging drivers/cpufreq/Kconfig.arm Auto-merging drivers/ata/libata-acpi.c Auto-merging arch/x86/pci/amd_bus.c Auto-merging arch/s390/kernel/smp.c Auto-merging arch/ia64/configs/generic_defconfig Auto-merging arch/arm64/kernel/debug-monitors.c Auto-merging arch/arm/kernel/hw_breakpoint.c Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. Documentation/ABI/testing/sysfs-devices-power | 27 +- Documentation/ABI/testing/sysfs-power | 5 +- Documentation/cpu-freq/core.txt | 4 - Documentation/cpu-freq/cpu-drivers.txt | 8 +- Documentation/cpu-hotplug.txt | 45 +++ Documentation/kernel-parameters.txt | 8 + Documentation/power/pm_qos_interface.txt | 82 ++-- Documentation/trace/events-power.txt | 2 +- MAINTAINERS | 8 +- arch/arm/kernel/hw_breakpoint.c | 8 +- arch/arm/kernel/smp.c | 3 +- arch/arm/kernel/smp_twd.c | 2 +- arch/arm/kvm/arm.c | 7 +- arch/arm/mach-pxa/viper.c | 3 - arch/arm/mach-spear/spear1310.c | 1 + arch/arm/mach-spear/spear1340.c | 1 + arch/arm64/kernel/debug-monitors.c | 6 +- arch/arm64/kernel/hw_breakpoint.c | 7 +- arch/ia64/configs/generic_defconfig | 1 - arch/ia64/configs/tiger_defconfig | 1 - arch/ia64/configs/zx1_defconfig | 1 - arch/ia64/kernel/err_inject.c | 15 +- arch/ia64/kernel/palinfo.c | 6 +- arch/ia64/kernel/salinfo.c | 6 +- arch/ia64/kernel/topology.c | 6 +- arch/powerpc/kernel/sysfs.c | 8 +- arch/powerpc/oprofile/op_model_cell.c | 3 +- arch/s390/kernel/cache.c | 5 +- arch/s390/kernel/smp.c | 13 +- arch/sparc/kernel/sysfs.c | 6 +- arch/sparc/kernel/time_64.c | 3 +- arch/x86/configs/i386_defconfig | 1 - arch/x86/configs/x86_64_defconfig | 1 - arch/x86/kernel/cpu/intel_cacheinfo.c | 13 +- arch/x86/kernel/cpu/mcheck/mce.c | 8 +- arch/x86/kernel/cpu/mcheck/therm_throt.c | 18 +- arch/x86/kernel/cpu/perf_event_amd_ibs.c | 6 +- arch/x86/kernel/cpu/perf_event_amd_uncore.c | 7 +- arch/x86/kernel/cpu/perf_event_intel_rapl.c | 9 +- arch/x86/kernel/cpu/perf_event_intel_uncore.c | 6 +- arch/x86/kernel/cpuid.c | 15 +- arch/x86/kernel/hpet.c | 4 +- arch/x86/kernel/msr.c | 16 +- arch/x86/kernel/tsc.c | 3 +- arch/x86/kernel/vsyscall_64.c | 6 +- arch/x86/kvm/x86.c | 7 +- arch/x86/oprofile/nmi_int.c | 15 +- arch/x86/pci/amd_bus.c | 5 +- drivers/acpi/Kconfig | 28 +- drivers/acpi/ac.c | 25 ++ drivers/acpi/acpi_cmos_rtc.c | 2 - drivers/acpi/acpi_lpss.c | 82 +++- drivers/acpi/acpi_pad.c | 24 +- drivers/acpi/acpica/Makefile | 4 +- drivers/acpi/acpica/accommon.h | 2 +- drivers/acpi/acpica/acdebug.h | 4 +- drivers/acpi/acpica/acdispat.h | 2 +- drivers/acpi/acpica/acevents.h | 2 +- drivers/acpi/acpica/acglobal.h | 355 +++++++++-------- drivers/acpi/acpica/achware.h | 2 +- drivers/acpi/acpica/acinterp.h | 6 +- drivers/acpi/acpica/aclocal.h | 2 +- drivers/acpi/acpica/acmacros.h | 16 +- drivers/acpi/acpica/acnamesp.h | 2 +- drivers/acpi/acpica/acobject.h | 2 +- drivers/acpi/acpica/acopcode.h | 2 +- drivers/acpi/acpica/acparser.h | 2 +- drivers/acpi/acpica/acpredef.h | 16 +- drivers/acpi/acpica/acresrc.h | 2 +- drivers/acpi/acpica/acstruct.h | 2 +- drivers/acpi/acpica/actables.h | 2 +- drivers/acpi/acpica/acutils.h | 4 +- drivers/acpi/acpica/amlcode.h | 2 +- drivers/acpi/acpica/amlresrc.h | 2 +- drivers/acpi/acpica/dsargs.c | 2 +- drivers/acpi/acpica/dscontrol.c | 2 +- drivers/acpi/acpica/dsfield.c | 2 +- drivers/acpi/acpica/dsinit.c | 2 +- drivers/acpi/acpica/dsmethod.c | 2 +- drivers/acpi/acpica/dsmthdat.c | 2 +- drivers/acpi/acpica/dsobject.c | 2 +- drivers/acpi/acpica/dsopcode.c | 2 +- drivers/acpi/acpica/dsutils.c | 2 +- drivers/acpi/acpica/dswexec.c | 2 +- drivers/acpi/acpica/dswload.c | 2 +- drivers/acpi/acpica/dswload2.c | 2 +- drivers/acpi/acpica/dswscope.c | 2 +- drivers/acpi/acpica/dswstate.c | 2 +- drivers/acpi/acpica/evevent.c | 2 +- drivers/acpi/acpica/evglock.c | 2 +- drivers/acpi/acpica/evgpe.c | 2 +- drivers/acpi/acpica/evgpeblk.c | 2 +- drivers/acpi/acpica/evgpeinit.c | 2 +- drivers/acpi/acpica/evgpeutil.c | 2 +- drivers/acpi/acpica/evhandler.c | 2 +- drivers/acpi/acpica/evmisc.c | 2 +- drivers/acpi/acpica/evregion.c | 13 +- drivers/acpi/acpica/evrgnini.c | 2 +- drivers/acpi/acpica/evsci.c | 2 +- drivers/acpi/acpica/evxface.c | 2 +- drivers/acpi/acpica/evxfevnt.c | 2 +- drivers/acpi/acpica/evxfgpe.c | 21 +- drivers/acpi/acpica/evxfregn.c | 2 +- drivers/acpi/acpica/exconfig.c | 2 +- drivers/acpi/acpica/exconvrt.c | 2 +- drivers/acpi/acpica/excreate.c | 2 +- drivers/acpi/acpica/exdebug.c | 2 +- drivers/acpi/acpica/exdump.c | 231 ++++++++++-- drivers/acpi/acpica/exfield.c | 2 +- drivers/acpi/acpica/exfldio.c | 2 +- drivers/acpi/acpica/exmisc.c | 2 +- drivers/acpi/acpica/exmutex.c | 2 +- drivers/acpi/acpica/exnames.c | 2 +- drivers/acpi/acpica/exoparg1.c | 2 +- drivers/acpi/acpica/exoparg2.c | 2 +- drivers/acpi/acpica/exoparg3.c | 2 +- drivers/acpi/acpica/exoparg6.c | 2 +- drivers/acpi/acpica/exprep.c | 2 +- drivers/acpi/acpica/exregion.c | 2 +- drivers/acpi/acpica/exresnte.c | 2 +- drivers/acpi/acpica/exresolv.c | 2 +- drivers/acpi/acpica/exresop.c | 2 +- drivers/acpi/acpica/exstore.c | 2 +- drivers/acpi/acpica/exstoren.c | 2 +- drivers/acpi/acpica/exstorob.c | 2 +- drivers/acpi/acpica/exsystem.c | 2 +- drivers/acpi/acpica/exutils.c | 2 +- drivers/acpi/acpica/hwacpi.c | 2 +- drivers/acpi/acpica/hwesleep.c | 2 +- drivers/acpi/acpica/hwgpe.c | 2 +- drivers/acpi/acpica/hwpci.c | 2 +- drivers/acpi/acpica/hwregs.c | 2 +- drivers/acpi/acpica/hwsleep.c | 2 +- drivers/acpi/acpica/hwtimer.c | 2 +- drivers/acpi/acpica/hwvalid.c | 2 +- drivers/acpi/acpica/hwxface.c | 2 +- drivers/acpi/acpica/hwxfsleep.c | 2 +- drivers/acpi/acpica/nsaccess.c | 2 +- drivers/acpi/acpica/nsalloc.c | 2 +- drivers/acpi/acpica/nsarguments.c | 2 +- drivers/acpi/acpica/nsconvert.c | 2 +- drivers/acpi/acpica/nsdump.c | 2 +- drivers/acpi/acpica/nsdumpdv.c | 2 +- drivers/acpi/acpica/nseval.c | 2 +- drivers/acpi/acpica/nsinit.c | 2 +- drivers/acpi/acpica/nsload.c | 2 +- drivers/acpi/acpica/nsnames.c | 2 +- drivers/acpi/acpica/nsobject.c | 12 +- drivers/acpi/acpica/nsparse.c | 2 +- drivers/acpi/acpica/nspredef.c | 2 +- drivers/acpi/acpica/nsprepkg.c | 42 +-- drivers/acpi/acpica/nsrepair.c | 31 +- drivers/acpi/acpica/nsrepair2.c | 39 +- drivers/acpi/acpica/nssearch.c | 2 +- drivers/acpi/acpica/nsutils.c | 2 +- drivers/acpi/acpica/nswalk.c | 2 +- drivers/acpi/acpica/nsxfeval.c | 35 +- drivers/acpi/acpica/nsxfname.c | 2 +- drivers/acpi/acpica/nsxfobj.c | 2 +- drivers/acpi/acpica/psargs.c | 2 +- drivers/acpi/acpica/psloop.c | 2 +- drivers/acpi/acpica/psobject.c | 2 +- drivers/acpi/acpica/psopcode.c | 2 +- drivers/acpi/acpica/psopinfo.c | 2 +- drivers/acpi/acpica/psparse.c | 2 +- drivers/acpi/acpica/psscope.c | 2 +- drivers/acpi/acpica/pstree.c | 2 +- drivers/acpi/acpica/psutils.c | 2 +- drivers/acpi/acpica/pswalk.c | 2 +- drivers/acpi/acpica/psxface.c | 2 +- drivers/acpi/acpica/rsaddr.c | 2 +- drivers/acpi/acpica/rscalc.c | 4 +- drivers/acpi/acpica/rscreate.c | 12 +- drivers/acpi/acpica/rsdump.c | 5 +- drivers/acpi/acpica/rsdumpinfo.c | 4 +- drivers/acpi/acpica/rsinfo.c | 6 +- drivers/acpi/acpica/rsio.c | 2 +- drivers/acpi/acpica/rsirq.c | 2 +- drivers/acpi/acpica/rslist.c | 2 +- drivers/acpi/acpica/rsmemory.c | 2 +- drivers/acpi/acpica/rsmisc.c | 2 +- drivers/acpi/acpica/rsserial.c | 2 +- drivers/acpi/acpica/rsutils.c | 2 +- drivers/acpi/acpica/rsxface.c | 2 +- drivers/acpi/acpica/tbfadt.c | 2 +- drivers/acpi/acpica/tbfind.c | 2 +- drivers/acpi/acpica/tbinstal.c | 17 +- drivers/acpi/acpica/tbprint.c | 22 +- drivers/acpi/acpica/tbutils.c | 2 +- drivers/acpi/acpica/tbxface.c | 2 +- drivers/acpi/acpica/tbxfload.c | 2 +- drivers/acpi/acpica/tbxfroot.c | 2 +- drivers/acpi/acpica/utaddress.c | 2 +- drivers/acpi/acpica/utalloc.c | 2 +- drivers/acpi/acpica/utbuffer.c | 2 +- drivers/acpi/acpica/utcache.c | 2 +- drivers/acpi/acpica/utcopy.c | 8 +- drivers/acpi/acpica/utdebug.c | 2 +- drivers/acpi/acpica/utdecode.c | 2 +- drivers/acpi/acpica/utdelete.c | 17 +- drivers/acpi/acpica/uterror.c | 2 +- drivers/acpi/acpica/uteval.c | 2 +- drivers/acpi/acpica/utexcep.c | 2 +- drivers/acpi/acpica/utglobal.c | 39 +- drivers/acpi/acpica/utids.c | 2 +- drivers/acpi/acpica/utinit.c | 2 +- drivers/acpi/acpica/utlock.c | 2 +- drivers/acpi/acpica/utmath.c | 2 +- drivers/acpi/acpica/utmisc.c | 2 +- drivers/acpi/acpica/utmutex.c | 2 +- drivers/acpi/acpica/utobject.c | 2 +- drivers/acpi/acpica/utosi.c | 28 +- drivers/acpi/acpica/utownerid.c | 2 +- drivers/acpi/acpica/utpredef.c | 2 +- drivers/acpi/acpica/utresrc.c | 5 +- drivers/acpi/acpica/utstate.c | 2 +- drivers/acpi/acpica/utstring.c | 2 +- drivers/acpi/acpica/uttrack.c | 5 +- drivers/acpi/acpica/utxface.c | 2 +- drivers/acpi/acpica/utxferror.c | 2 +- drivers/acpi/acpica/utxfinit.c | 2 +- drivers/acpi/acpica/utxfmutex.c | 2 +- drivers/acpi/apei/Kconfig | 2 +- drivers/acpi/battery.c | 7 +- drivers/acpi/battery.h | 10 + drivers/acpi/bus.c | 63 ++-- drivers/acpi/button.c | 4 + drivers/acpi/container.c | 5 +- drivers/acpi/device_pm.c | 41 +- drivers/acpi/dock.c | 454 ++++++---------------- drivers/acpi/fan.c | 13 +- drivers/acpi/glue.c | 12 + drivers/acpi/internal.h | 13 +- drivers/acpi/osl.c | 27 +- drivers/acpi/pci_irq.c | 36 +- drivers/acpi/pci_link.c | 2 - drivers/acpi/pci_root.c | 4 +- drivers/acpi/power.c | 2 - drivers/acpi/processor_core.c | 1 - drivers/acpi/processor_driver.c | 2 - drivers/acpi/processor_perflib.c | 14 +- drivers/acpi/sbs.c | 2 +- drivers/acpi/scan.c | 261 ++++++++----- drivers/acpi/sysfs.c | 2 - drivers/acpi/tables.c | 128 +++---- drivers/acpi/thermal.c | 37 +- drivers/acpi/utils.c | 16 +- drivers/acpi/video.c | 2 - drivers/acpi/video_detect.c | 2 - drivers/ata/libata-acpi.c | 72 ++-- drivers/base/power/Makefile | 3 +- drivers/base/power/domain.c | 2 +- drivers/base/power/main.c | 280 +++++++++++--- drivers/base/power/power.h | 4 +- drivers/base/power/qos.c | 220 ++++++++--- drivers/base/power/runtime.c | 164 ++++++-- drivers/base/power/sysfs.c | 97 +++-- drivers/base/topology.c | 12 +- drivers/clocksource/dummy_timer.c | 11 +- drivers/cpufreq/Kconfig.arm | 17 +- drivers/cpufreq/acpi-cpufreq.c | 8 +- drivers/cpufreq/arm_big_little.c | 6 +- drivers/cpufreq/blackfin-cpufreq.c | 1 - drivers/cpufreq/cpufreq-cpu0.c | 1 - drivers/cpufreq/cpufreq.c | 446 +++++++++++----------- drivers/cpufreq/cpufreq_stats.c | 38 +- drivers/cpufreq/cris-artpec3-cpufreq.c | 1 - drivers/cpufreq/cris-etraxfs-cpufreq.c | 1 - drivers/cpufreq/davinci-cpufreq.c | 1 - drivers/cpufreq/e_powersaver.c | 1 - drivers/cpufreq/elanfreq.c | 1 - drivers/cpufreq/exynos-cpufreq.c | 97 +---- drivers/cpufreq/exynos5440-cpufreq.c | 1 - drivers/cpufreq/freq_table.c | 46 +-- drivers/cpufreq/ia64-acpi-cpufreq.c | 1 - drivers/cpufreq/imx6q-cpufreq.c | 1 - drivers/cpufreq/intel_pstate.c | 45 +-- drivers/cpufreq/kirkwood-cpufreq.c | 1 - drivers/cpufreq/longhaul.c | 1 - drivers/cpufreq/loongson2_cpufreq.c | 1 - drivers/cpufreq/omap-cpufreq.c | 1 - drivers/cpufreq/p4-clockmod.c | 1 - drivers/cpufreq/pasemi-cpufreq.c | 1 - drivers/cpufreq/powernow-k6.c | 1 - drivers/cpufreq/powernow-k7.c | 2 - drivers/cpufreq/powernow-k8.c | 2 - drivers/cpufreq/ppc-corenet-cpufreq.c | 5 +- drivers/cpufreq/ppc_cbe_cpufreq.c | 1 - drivers/cpufreq/pxa2xx-cpufreq.c | 1 - drivers/cpufreq/pxa3xx-cpufreq.c | 1 - drivers/cpufreq/s5pv210-cpufreq.c | 49 +-- drivers/cpufreq/sc520_freq.c | 1 - drivers/cpufreq/sh-cpufreq.c | 1 - drivers/cpufreq/sparc-us2e-cpufreq.c | 4 +- drivers/cpufreq/sparc-us3-cpufreq.c | 4 +- drivers/cpufreq/spear-cpufreq.c | 14 +- drivers/cpufreq/speedstep-centrino.c | 2 - drivers/cpufreq/speedstep-ich.c | 1 - drivers/cpufreq/speedstep-smi.c | 1 - drivers/cpufreq/tegra-cpufreq.c | 47 +-- drivers/cpuidle/cpuidle.c | 3 +- drivers/cpuidle/driver.c | 2 +- drivers/cpuidle/governors/menu.c | 75 ++-- drivers/gpu/drm/gma500/Kconfig | 1 - drivers/gpu/drm/i915/Kconfig | 1 - drivers/gpu/drm/nouveau/Kconfig | 3 +- drivers/hwmon/coretemp.c | 14 +- drivers/hwmon/via-cputemp.c | 14 +- drivers/idle/intel_idle.c | 12 +- drivers/input/touchscreen/st1232.c | 3 +- drivers/mtd/nand/sh_flctl.c | 2 +- drivers/oprofile/nmi_timer_int.c | 23 +- drivers/pci/hotplug/acpiphp.h | 16 +- drivers/pci/hotplug/acpiphp_glue.c | 523 +++++++++----------------- drivers/pci/pci-driver.c | 33 +- drivers/pcmcia/sa11xx_base.c | 3 - drivers/platform/x86/Kconfig | 2 - drivers/platform/x86/fujitsu-laptop.c | 1 - drivers/powercap/intel_rapl.c | 27 +- drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 12 +- drivers/scsi/bnx2i/bnx2i_init.c | 12 +- drivers/scsi/fcoe/fcoe.c | 15 +- drivers/thermal/x86_pkg_temp_thermal.c | 14 +- drivers/tty/serial/sh-sci.c | 3 +- drivers/video/Kconfig | 6 - drivers/video/Makefile | 2 - drivers/video/output.c | 133 ------- drivers/watchdog/octeon-wdt-main.c | 11 +- drivers/xen/balloon.c | 36 +- drivers/xen/xen-acpi-cpuhotplug.c | 2 +- drivers/xen/xen-acpi-memhotplug.c | 2 +- drivers/xen/xen-acpi-pad.c | 26 +- include/acpi/acbuffer.h | 2 +- include/acpi/acconfig.h | 2 +- include/acpi/acexcep.h | 2 +- include/acpi/acnames.h | 2 +- include/acpi/acoutput.h | 2 +- include/acpi/acpi.h | 5 +- include/acpi/acpi_bus.h | 49 ++- include/acpi/acpi_drivers.h | 26 +- include/acpi/acpiosxf.h | 2 +- include/acpi/acpixf.h | 8 +- include/acpi/acrestyp.h | 2 +- include/acpi/actbl.h | 2 +- include/acpi/actbl1.h | 2 +- include/acpi/actbl2.h | 2 +- include/acpi/actbl3.h | 2 +- include/acpi/actypes.h | 66 ++-- include/acpi/platform/acenv.h | 2 +- include/acpi/platform/acgcc.h | 2 +- include/acpi/platform/aclinux.h | 20 +- include/linux/cpu.h | 47 +++ include/linux/cpufreq.h | 25 +- include/linux/pci-acpi.h | 4 +- include/linux/perf_event.h | 16 +- include/linux/pm.h | 71 ++-- include/linux/pm_qos.h | 34 +- include/linux/pm_runtime.h | 4 + include/linux/video_output.h | 57 --- include/trace/events/power.h | 4 +- kernel/cpu.c | 38 +- kernel/power/hibernate.c | 22 +- kernel/power/main.c | 4 +- kernel/power/power.h | 2 + kernel/power/qos.c | 18 +- kernel/power/snapshot.c | 2 +- kernel/power/suspend.c | 2 +- kernel/power/wakelock.c | 2 + kernel/profile.c | 20 +- kernel/trace/ring_buffer.c | 19 +- mm/vmstat.c | 6 +- mm/zsmalloc.c | 17 +- mm/zswap.c | 8 +- net/core/flow.c | 8 +- net/iucv/iucv.c | 121 +++--- 375 files changed, 3601 insertions(+), 2950 deletions(-) create mode 100644 drivers/acpi/battery.h delete mode 100644 drivers/video/output.c delete mode 100644 include/linux/video_output.h Merging idle/next (62eec04c7fa3 Merge branch 'turbostat' into release) $ git merge idle/next Auto-merging drivers/idle/intel_idle.c Merge made by the 'recursive' strategy. arch/x86/kernel/acpi/cstate.c | 4 +- drivers/idle/intel_idle.c | 62 ++++++++- tools/power/x86/turbostat/turbostat.8 | 127 +++++++------------ tools/power/x86/turbostat/turbostat.c | 228 ++++++++++++++++------------------ 4 files changed, 212 insertions(+), 209 deletions(-) Merging apm/for-next (158204397034 apm-emulation: add hibernation APM events to support suspend2disk) $ git merge apm/for-next Already up-to-date. Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles) $ git merge cpupowerutils/master Already up-to-date. Merging thermal/next (e79ca84d62d2 Merge branches 'soc-fix' and 'thermal-core-fix' of .git into next) $ git merge thermal/next Merge made by the 'recursive' strategy. drivers/thermal/imx_thermal.c | 39 +++++++++++++++++++---------- drivers/thermal/rcar_thermal.c | 9 +++++-- drivers/thermal/ti-soc-thermal/ti-bandgap.c | 6 ++--- 3 files changed, 35 insertions(+), 19 deletions(-) Merging ieee1394/for-next (0ca49345b6f4 firewire: ohci: fix probe failure with Agere/LSI controllers) $ git merge ieee1394/for-next Already up-to-date. Merging dlm/next (075f01775f53 dlm: use INFO for recovery messages) $ git merge dlm/next Merge made by the 'recursive' strategy. fs/dlm/ast.c | 3 ++- fs/dlm/dir.c | 4 ++-- fs/dlm/dlm_internal.h | 2 ++ fs/dlm/lock.c | 7 ++++--- fs/dlm/lockspace.c | 8 ++++---- fs/dlm/member.c | 27 ++++++++++++--------------- fs/dlm/recover.c | 10 +++++----- fs/dlm/recoverd.c | 34 +++++++++++++++++----------------- 8 files changed, 48 insertions(+), 47 deletions(-) Merging swiotlb/linux-next (0cb637bff80d swiotlb: Don't DoS us with 'swiotlb buffer is full' (v2)) $ git merge swiotlb/linux-next Already up-to-date. Merging slave-dma/next (598b2856862d Merge branch 'for-linus' into next) $ git merge slave-dma/next Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/dma/fsl-edma.txt | 76 ++ drivers/dma/Kconfig | 12 +- drivers/dma/Makefile | 1 + drivers/dma/acpi-dma.c | 17 +- drivers/dma/at_hdmac.c | 1 - drivers/dma/cppi41.c | 7 +- drivers/dma/dmaengine.c | 9 +- drivers/dma/dw/core.c | 4 +- drivers/dma/dw/pci.c | 3 + drivers/dma/edma.c | 5 +- drivers/dma/fsl-edma.c | 975 +++++++++++++++++++++ drivers/dma/imx-dma.c | 13 +- drivers/dma/mmp_pdma.c | 8 +- drivers/dma/mmp_tdma.c | 50 ++ drivers/dma/pch_dma.c | 4 +- drivers/dma/s3c24xx-dma.c | 2 +- drivers/dma/sh/shdma-base.c | 10 +- drivers/dma/sh/shdma-of.c | 3 +- drivers/dma/sh/shdmac.c | 13 +- drivers/dma/sh/sudmac.c | 4 +- drivers/usb/musb/musb_cppi41.c | 3 +- include/linux/acpi_dma.h | 5 +- include/linux/dmaengine.h | 14 +- include/linux/dw_dmac.h | 5 +- 24 files changed, 1181 insertions(+), 63 deletions(-) create mode 100644 Documentation/devicetree/bindings/dma/fsl-edma.txt create mode 100644 drivers/dma/fsl-edma.c Merging dmaengine/next (77873803363c net_dma: mark broken) $ git merge dmaengine/next Already up-to-date. Merging net-next/master (a85ae0e97879 Merge branch 'bcmgenet-next') $ git merge net-next/master Auto-merging security/selinux/include/xfrm.h Auto-merging net/xfrm/xfrm_user.c Auto-merging net/openvswitch/datapath.c Auto-merging net/key/af_key.c Auto-merging net/ipv6/ip6_output.c Auto-merging net/ieee802154/6lowpan_rtnl.c Auto-merging net/core/rtnetlink.c Auto-merging net/core/flow.c Auto-merging include/net/tcp.h Auto-merging include/net/6lowpan.h Auto-merging include/linux/usb/cdc_ncm.h Auto-merging drivers/s390/net/qeth_core_main.c Removing drivers/net/wireless/iwlwifi/mvm/power_legacy.c Removing drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h Removing drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c Auto-merging drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c Auto-merging drivers/net/wireless/ath/ath9k/xmit.c Removing drivers/net/wireless/ath/ath9k/rc.h Removing drivers/net/wireless/ath/ath9k/rc.c Auto-merging drivers/net/wireless/ath/ath9k/hw.c Auto-merging drivers/net/vxlan.c Auto-merging drivers/net/usb/cdc_ncm.c Auto-merging drivers/net/phy/phy_device.c Auto-merging drivers/net/ethernet/via/via-rhine.c Auto-merging drivers/net/ethernet/ti/cpsw.c Removing drivers/net/ethernet/freescale/gianfar_sysfs.c Removing drivers/net/can/sja1000/sja1000_of_platform.c Auto-merging MAINTAINERS Auto-merging Documentation/devices.txt Merge made by the 'recursive' strategy. Documentation/ABI/testing/sysfs-bus-mdio | 20 + Documentation/DocBook/80211.tmpl | 2 + Documentation/devices.txt | 1 + .../bindings/net/allwinner,sun4i-emac.txt | 6 +- .../devicetree/bindings/net/altera_tse.txt | 114 + Documentation/devicetree/bindings/net/arc_emac.txt | 11 +- .../devicetree/bindings/net/broadcom-bcmgenet.txt | 121 + .../devicetree/bindings/net/can/sja1000.txt | 4 + .../devicetree/bindings/net/cavium-mix.txt | 7 +- .../devicetree/bindings/net/cavium-pip.txt | 7 +- .../devicetree/bindings/net/cdns-emac.txt | 6 +- Documentation/devicetree/bindings/net/cpsw.txt | 5 +- .../devicetree/bindings/net/davicom-dm9000.txt | 2 - .../devicetree/bindings/net/davinci_emac.txt | 3 +- Documentation/devicetree/bindings/net/ethernet.txt | 25 + Documentation/devicetree/bindings/net/fsl-fec.txt | 5 +- .../devicetree/bindings/net/fsl-tsec-phy.txt | 13 +- Documentation/devicetree/bindings/net/lpc-eth.txt | 5 +- Documentation/devicetree/bindings/net/macb.txt | 6 +- .../bindings/net/marvell-armada-370-neta.txt | 6 +- .../devicetree/bindings/net/marvell-orion-net.txt | 4 +- .../devicetree/bindings/net/micrel-ks8851.txt | 3 - Documentation/devicetree/bindings/net/micrel.txt | 18 + Documentation/devicetree/bindings/net/phy.txt | 10 +- Documentation/devicetree/bindings/net/sh_eth.txt | 55 + .../devicetree/bindings/net/smsc-lan91c111.txt | 3 +- Documentation/devicetree/bindings/net/smsc911x.txt | 5 +- Documentation/devicetree/bindings/net/stmmac.txt | 7 +- .../devicetree/bindings/net/wireless/ti,wl1251.txt | 39 + Documentation/networking/altera_tse.txt | 263 ++ Documentation/networking/bonding.txt | 96 +- Documentation/networking/gianfar.txt | 30 - Documentation/networking/igb.txt | 48 - Documentation/networking/phy.txt | 9 + Documentation/networking/pktgen.txt | 24 +- Documentation/networking/rxrpc.txt | 81 + Documentation/networking/tcp.txt | 2 +- Documentation/networking/timestamping.txt | 6 +- MAINTAINERS | 21 +- arch/arm/mach-omap2/board-omap3pandora.c | 6 +- arch/arm/mach-omap2/board-rx51-peripherals.c | 13 +- block/blk-cgroup.h | 8 +- drivers/atm/ambassador.c | 2 +- drivers/atm/firestream.c | 4 +- drivers/atm/nicstar.c | 24 +- drivers/atm/solos-pci.c | 2 +- drivers/bluetooth/ath3k.c | 84 +- drivers/bluetooth/btusb.c | 58 +- drivers/bluetooth/hci_vhci.c | 3 +- drivers/connector/connector.c | 1 - drivers/infiniband/hw/cxgb4/cm.c | 24 +- drivers/infiniband/hw/cxgb4/device.c | 177 +- drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 9 +- drivers/infiniband/hw/cxgb4/provider.c | 43 +- drivers/infiniband/hw/cxgb4/qp.c | 140 +- drivers/infiniband/hw/cxgb4/t4.h | 6 + drivers/infiniband/hw/cxgb4/user.h | 5 + drivers/infiniband/hw/mlx4/cm.c | 80 +- drivers/infiniband/hw/mlx4/cq.c | 42 +- drivers/infiniband/hw/mlx4/mad.c | 122 +- drivers/infiniband/hw/mlx4/main.c | 31 +- drivers/infiniband/hw/mlx4/mcg.c | 5 +- drivers/infiniband/hw/mlx4/mlx4_ib.h | 24 +- drivers/infiniband/hw/mlx4/qp.c | 319 +- drivers/infiniband/hw/mlx4/sysfs.c | 5 + drivers/isdn/divert/divert_procfs.c | 7 +- drivers/isdn/hisax/elsa.c | 9 +- drivers/isdn/hisax/elsa_ser.c | 3 +- drivers/isdn/hysdn/hysdn_proclog.c | 7 +- drivers/isdn/i4l/isdn_common.c | 13 +- drivers/isdn/pcbit/drv.c | 6 +- drivers/net/Kconfig | 5 - drivers/net/bonding/bond_3ad.c | 74 +- drivers/net/bonding/bond_3ad.h | 175 +- drivers/net/bonding/bond_alb.c | 138 +- drivers/net/bonding/bond_debugfs.c | 10 +- drivers/net/bonding/bond_main.c | 389 +- drivers/net/bonding/bond_netlink.c | 8 +- drivers/net/bonding/bond_options.c | 326 +- drivers/net/bonding/bond_options.h | 62 +- drivers/net/bonding/bond_procfs.c | 14 +- drivers/net/bonding/bond_sysfs.c | 24 +- drivers/net/bonding/bonding.h | 38 +- drivers/net/caif/caif_serial.c | 1 - drivers/net/caif/caif_spi.c | 1 - drivers/net/can/at91_can.c | 10 +- drivers/net/can/bfin_can.c | 1 + drivers/net/can/c_can/c_can.c | 1 + drivers/net/can/cc770/cc770.c | 1 + drivers/net/can/dev.c | 183 +- drivers/net/can/flexcan.c | 11 +- drivers/net/can/grcan.c | 1 + drivers/net/can/janz-ican3.c | 65 +- drivers/net/can/mcp251x.c | 22 +- drivers/net/can/mscan/mscan.c | 7 +- drivers/net/can/pch_can.c | 1 + drivers/net/can/sja1000/Kconfig | 13 +- drivers/net/can/sja1000/Makefile | 1 - drivers/net/can/sja1000/ems_pci.c | 1 + drivers/net/can/sja1000/ems_pcmcia.c | 1 + drivers/net/can/sja1000/kvaser_pci.c | 1 + drivers/net/can/sja1000/peak_pci.c | 1 + drivers/net/can/sja1000/peak_pcmcia.c | 1 + drivers/net/can/sja1000/plx_pci.c | 1 + drivers/net/can/sja1000/sja1000.c | 10 +- drivers/net/can/sja1000/sja1000_of_platform.c | 220 -- drivers/net/can/sja1000/sja1000_platform.c | 194 +- drivers/net/can/slcan.c | 6 + drivers/net/can/softing/softing_main.c | 2 + drivers/net/can/ti_hecc.c | 1 + drivers/net/can/usb/ems_usb.c | 1 + drivers/net/can/usb/esd_usb2.c | 2 + drivers/net/can/usb/kvaser_usb.c | 2 + drivers/net/can/usb/peak_usb/pcan_usb_core.c | 2 + drivers/net/can/usb/usb_8dev.c | 1 + drivers/net/dummy.c | 12 +- drivers/net/ethernet/3com/3c589_cs.c | 1127 +++--- drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/ethernet/altera/Kconfig | 8 + drivers/net/ethernet/altera/Makefile | 7 + drivers/net/ethernet/altera/altera_msgdma.c | 202 ++ drivers/net/ethernet/altera/altera_msgdma.h | 34 + drivers/net/ethernet/altera/altera_msgdmahw.h | 167 + drivers/net/ethernet/altera/altera_sgdma.c | 511 +++ drivers/net/ethernet/altera/altera_sgdma.h | 35 + drivers/net/ethernet/altera/altera_sgdmahw.h | 124 + drivers/net/ethernet/altera/altera_tse.h | 486 +++ drivers/net/ethernet/altera/altera_tse_ethtool.c | 227 ++ drivers/net/ethernet/altera/altera_tse_main.c | 1543 ++++++++ drivers/net/ethernet/altera/altera_utils.c | 44 + drivers/net/ethernet/altera/altera_utils.h | 27 + drivers/net/ethernet/amd/amd8111e.c | 3 + drivers/net/ethernet/amd/pcnet32.c | 124 +- drivers/net/ethernet/broadcom/Kconfig | 11 + drivers/net/ethernet/broadcom/Makefile | 1 + drivers/net/ethernet/broadcom/b44.c | 8 +- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 3 - drivers/net/ethernet/broadcom/bnx2.c | 24 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 24 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 155 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 48 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 8 +- .../net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h | 1 - drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 2 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 235 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 155 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 21 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 289 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 13 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 127 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h | 22 + drivers/net/ethernet/broadcom/genet/Makefile | 2 + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2575 ++++++++++++++ drivers/net/ethernet/broadcom/genet/bcmgenet.h | 628 ++++ drivers/net/ethernet/broadcom/genet/bcmmii.c | 464 +++ drivers/net/ethernet/broadcom/tg3.c | 20 +- drivers/net/ethernet/brocade/bna/bnad.c | 39 +- drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 26 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 16 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 210 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 1 + drivers/net/ethernet/chelsio/cxgb4/sge.c | 166 +- drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 152 +- drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 1 + drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 9 + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 4 + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 35 +- drivers/net/ethernet/cisco/enic/enic_main.c | 20 +- drivers/net/ethernet/emulex/benet/be.h | 20 +- drivers/net/ethernet/emulex/benet/be_cmds.c | 78 +- drivers/net/ethernet/emulex/benet/be_cmds.h | 48 +- drivers/net/ethernet/emulex/benet/be_ethtool.c | 30 +- drivers/net/ethernet/emulex/benet/be_hw.h | 6 +- drivers/net/ethernet/emulex/benet/be_main.c | 325 +- drivers/net/ethernet/emulex/benet/be_roce.c | 2 +- drivers/net/ethernet/emulex/benet/be_roce.h | 2 +- drivers/net/ethernet/freescale/Makefile | 3 +- .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 3 + drivers/net/ethernet/freescale/gianfar.c | 1367 ++++---- drivers/net/ethernet/freescale/gianfar.h | 114 +- drivers/net/ethernet/freescale/gianfar_ethtool.c | 165 +- drivers/net/ethernet/freescale/gianfar_sysfs.c | 340 -- drivers/net/ethernet/ibm/ibmveth.c | 4 +- drivers/net/ethernet/intel/e100.c | 4 +- drivers/net/ethernet/intel/e1000e/80003es2lan.c | 47 +- drivers/net/ethernet/intel/e1000e/80003es2lan.h | 47 +- drivers/net/ethernet/intel/e1000e/82571.c | 47 +- drivers/net/ethernet/intel/e1000e/82571.h | 47 +- drivers/net/ethernet/intel/e1000e/Makefile | 7 +- drivers/net/ethernet/intel/e1000e/defines.h | 55 +- drivers/net/ethernet/intel/e1000e/e1000.h | 50 +- drivers/net/ethernet/intel/e1000e/ethtool.c | 63 +- drivers/net/ethernet/intel/e1000e/hw.h | 55 +- drivers/net/ethernet/intel/e1000e/ich8lan.c | 427 ++- drivers/net/ethernet/intel/e1000e/ich8lan.h | 72 +- drivers/net/ethernet/intel/e1000e/mac.c | 47 +- drivers/net/ethernet/intel/e1000e/mac.h | 47 +- drivers/net/ethernet/intel/e1000e/manage.c | 47 +- drivers/net/ethernet/intel/e1000e/manage.h | 47 +- drivers/net/ethernet/intel/e1000e/netdev.c | 343 +- drivers/net/ethernet/intel/e1000e/nvm.c | 47 +- drivers/net/ethernet/intel/e1000e/nvm.h | 47 +- drivers/net/ethernet/intel/e1000e/param.c | 53 +- drivers/net/ethernet/intel/e1000e/phy.c | 47 +- drivers/net/ethernet/intel/e1000e/phy.h | 47 +- drivers/net/ethernet/intel/e1000e/ptp.c | 52 +- drivers/net/ethernet/intel/e1000e/regs.h | 48 +- drivers/net/ethernet/intel/i40e/i40e.h | 49 +- drivers/net/ethernet/intel/i40e/i40e_adminq.c | 5 +- drivers/net/ethernet/intel/i40e/i40e_common.c | 366 ++ drivers/net/ethernet/intel/i40e/i40e_dcb.c | 9 +- drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 52 +- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 460 ++- drivers/net/ethernet/intel/i40e/i40e_main.c | 464 ++- drivers/net/ethernet/intel/i40e/i40e_nvm.c | 117 +- drivers/net/ethernet/intel/i40e/i40e_prototype.h | 7 + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 424 ++- drivers/net/ethernet/intel/i40e/i40e_type.h | 6 +- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 135 +- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 5 + .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 2 +- drivers/net/ethernet/intel/i40evf/i40e_common.c | 366 ++ drivers/net/ethernet/intel/i40evf/i40e_prototype.h | 7 + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 90 +- drivers/net/ethernet/intel/i40evf/i40e_type.h | 10 +- drivers/net/ethernet/intel/i40evf/i40evf.h | 47 +- drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 13 +- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 291 +- .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 27 +- drivers/net/ethernet/intel/igb/Makefile | 5 +- drivers/net/ethernet/intel/igb/e1000_82575.c | 15 +- drivers/net/ethernet/intel/igb/e1000_82575.h | 12 +- drivers/net/ethernet/intel/igb/e1000_defines.h | 75 +- drivers/net/ethernet/intel/igb/e1000_hw.h | 5 +- drivers/net/ethernet/intel/igb/e1000_i210.c | 25 +- drivers/net/ethernet/intel/igb/e1000_i210.h | 14 +- drivers/net/ethernet/intel/igb/e1000_mac.c | 5 +- drivers/net/ethernet/intel/igb/e1000_mac.h | 5 +- drivers/net/ethernet/intel/igb/e1000_mbx.c | 5 +- drivers/net/ethernet/intel/igb/e1000_mbx.h | 5 +- drivers/net/ethernet/intel/igb/e1000_nvm.c | 5 +- drivers/net/ethernet/intel/igb/e1000_nvm.h | 5 +- drivers/net/ethernet/intel/igb/e1000_phy.c | 76 +- drivers/net/ethernet/intel/igb/e1000_phy.h | 6 +- drivers/net/ethernet/intel/igb/e1000_regs.h | 15 +- drivers/net/ethernet/intel/igb/igb.h | 10 +- drivers/net/ethernet/intel/igb/igb_ethtool.c | 62 +- drivers/net/ethernet/intel/igb/igb_hwmon.c | 5 +- drivers/net/ethernet/intel/igb/igb_main.c | 126 +- drivers/net/ethernet/intel/igb/igb_ptp.c | 15 +- drivers/net/ethernet/intel/igbvf/netdev.c | 10 +- drivers/net/ethernet/intel/ixgb/ixgb_main.c | 6 +- drivers/net/ethernet/intel/ixgbe/ixgbe.h | 7 +- drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 33 +- drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 360 +- drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 197 +- drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 14 +- drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 18 +- drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 11 +- drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 17 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 181 +- drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 45 +- drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 8 +- drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 32 +- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 29 +- drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 6 +- drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 5 +- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 71 +- drivers/net/ethernet/marvell/mvneta.c | 13 +- drivers/net/ethernet/marvell/sky2.c | 26 +- drivers/net/ethernet/mellanox/mlx4/Kconfig | 2 +- drivers/net/ethernet/mellanox/mlx4/cmd.c | 153 +- drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c | 2 +- drivers/net/ethernet/mellanox/mlx4/en_main.c | 45 +- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 34 +- drivers/net/ethernet/mellanox/mlx4/en_port.c | 6 + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 28 + drivers/net/ethernet/mellanox/mlx4/en_selftest.c | 6 +- drivers/net/ethernet/mellanox/mlx4/en_tx.c | 40 +- drivers/net/ethernet/mellanox/mlx4/eq.c | 48 +- drivers/net/ethernet/mellanox/mlx4/fw.c | 68 +- drivers/net/ethernet/mellanox/mlx4/main.c | 174 +- drivers/net/ethernet/mellanox/mlx4/mcg.c | 5 +- drivers/net/ethernet/mellanox/mlx4/mlx4.h | 9 + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 14 +- drivers/net/ethernet/mellanox/mlx4/port.c | 262 +- .../net/ethernet/mellanox/mlx4/resource_tracker.c | 279 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 17 +- drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 40 +- drivers/net/ethernet/neterion/s2io.c | 8 +- drivers/net/ethernet/neterion/vxge/vxge-main.c | 27 +- drivers/net/ethernet/nvidia/forcedeth.c | 49 +- .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 5 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 77 +- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 7 +- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 8 + .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 17 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 22 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h | 8 + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 29 +- .../net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | 233 +- .../net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c | 6 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 102 +- drivers/net/ethernet/qlogic/qlge/qlge_main.c | 16 +- drivers/net/ethernet/realtek/8139cp.c | 7 +- drivers/net/ethernet/realtek/8139too.c | 12 +- drivers/net/ethernet/realtek/r8169.c | 14 +- drivers/net/ethernet/renesas/sh_eth.c | 263 +- drivers/net/ethernet/renesas/sh_eth.h | 3 +- drivers/net/ethernet/sfc/ef10.c | 20 +- drivers/net/ethernet/sfc/ef10_regs.h | 61 - drivers/net/ethernet/sfc/efx.c | 30 +- drivers/net/ethernet/sfc/efx.h | 2 +- drivers/net/ethernet/sfc/ethtool.c | 39 +- drivers/net/ethernet/sfc/falcon.c | 6 +- drivers/net/ethernet/sfc/farch.c | 5 +- drivers/net/ethernet/sfc/filter.h | 2 +- drivers/net/ethernet/sfc/mcdi.c | 14 +- drivers/net/ethernet/sfc/mcdi_port.c | 4 +- drivers/net/ethernet/sfc/net_driver.h | 1 - drivers/net/ethernet/sfc/nic.c | 1 - drivers/net/ethernet/sfc/ptp.c | 92 +- drivers/net/ethernet/sfc/selftest.c | 6 +- drivers/net/ethernet/sfc/siena_sriov.c | 13 +- drivers/net/ethernet/sfc/tx.c | 21 +- drivers/net/ethernet/smsc/smsc911x.c | 2 +- drivers/net/ethernet/sun/niu.c | 11 +- drivers/net/ethernet/ti/cpsw.c | 34 +- drivers/net/ethernet/tile/tilegx.c | 3 + drivers/net/ethernet/tile/tilepro.c | 7 +- drivers/net/ethernet/toshiba/tc35815.c | 3 + drivers/net/ethernet/via/via-rhine.c | 10 +- drivers/net/ethernet/wiznet/w5100.c | 9 +- drivers/net/ethernet/wiznet/w5300.c | 9 +- drivers/net/ethernet/xilinx/ll_temac_main.c | 4 +- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +- drivers/net/hyperv/hyperv_net.h | 207 +- drivers/net/hyperv/netvsc.c | 93 +- drivers/net/hyperv/netvsc_drv.c | 337 +- drivers/net/hyperv/rndis_filter.c | 187 +- drivers/net/ieee802154/Kconfig | 34 +- drivers/net/ieee802154/at86rf230.c | 518 ++- drivers/net/ieee802154/fakehard.c | 22 +- drivers/net/ieee802154/mrf24j40.c | 17 +- drivers/net/ifb.c | 8 +- drivers/net/loopback.c | 16 +- drivers/net/macvlan.c | 13 +- drivers/net/nlmon.c | 15 +- drivers/net/phy/Kconfig | 6 + drivers/net/phy/Makefile | 1 + drivers/net/phy/bcm7xxx.c | 343 ++ drivers/net/phy/broadcom.c | 52 - drivers/net/phy/mdio_bus.c | 20 + drivers/net/phy/micrel.c | 49 +- drivers/net/phy/phy.c | 51 +- drivers/net/phy/phy_device.c | 57 +- drivers/net/team/team.c | 12 +- drivers/net/team/team_mode_loadbalance.c | 4 +- drivers/net/usb/cdc_ncm.c | 17 + drivers/net/usb/lg-vl600.c | 2 +- drivers/net/usb/r8152.c | 1232 +++++-- drivers/net/veth.c | 23 +- drivers/net/virtio_net.c | 8 +- drivers/net/vmxnet3/vmxnet3_drv.c | 110 +- drivers/net/vxlan.c | 13 +- drivers/net/wireless/Kconfig | 8 +- drivers/net/wireless/airo.c | 17 +- drivers/net/wireless/ath/ath.h | 5 +- drivers/net/wireless/ath/ath10k/core.c | 36 +- drivers/net/wireless/ath/ath10k/core.h | 47 +- drivers/net/wireless/ath/ath10k/debug.h | 2 +- drivers/net/wireless/ath/ath10k/htt_rx.c | 35 +- drivers/net/wireless/ath/ath10k/htt_tx.c | 4 +- drivers/net/wireless/ath/ath10k/hw.h | 6 + drivers/net/wireless/ath/ath10k/mac.c | 634 +++- drivers/net/wireless/ath/ath10k/pci.c | 147 +- drivers/net/wireless/ath/ath10k/txrx.c | 8 +- drivers/net/wireless/ath/ath10k/wmi.c | 118 +- drivers/net/wireless/ath/ath10k/wmi.h | 34 +- drivers/net/wireless/ath/ath5k/mac80211-ops.c | 1 + drivers/net/wireless/ath/ath6kl/cfg80211.c | 27 +- drivers/net/wireless/ath/ath6kl/usb.c | 6 +- drivers/net/wireless/ath/ath6kl/wmi.c | 4 +- drivers/net/wireless/ath/ath9k/Kconfig | 12 - drivers/net/wireless/ath/ath9k/Makefile | 4 +- drivers/net/wireless/ath/ath9k/ani.c | 41 +- drivers/net/wireless/ath/ath9k/ani.h | 4 + drivers/net/wireless/ath/ath9k/ar9003_calib.c | 235 +- drivers/net/wireless/ath/ath9k/ar9003_phy.c | 4 - drivers/net/wireless/ath/ath9k/ath9k.h | 13 +- drivers/net/wireless/ath/ath9k/beacon.c | 52 +- drivers/net/wireless/ath/ath9k/common-init.c | 244 ++ drivers/net/wireless/ath/ath9k/common-init.h | 20 + drivers/net/wireless/ath/ath9k/common.c | 244 ++ drivers/net/wireless/ath/ath9k/common.h | 21 + drivers/net/wireless/ath/ath9k/debug.c | 26 +- drivers/net/wireless/ath/ath9k/debug.h | 1 - drivers/net/wireless/ath/ath9k/dfs_debug.h | 2 + drivers/net/wireless/ath/ath9k/hif_usb.c | 2 + drivers/net/wireless/ath/ath9k/htc.h | 2 - drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 22 +- drivers/net/wireless/ath/ath9k/htc_drv_init.c | 230 +- drivers/net/wireless/ath/ath9k/htc_drv_main.c | 1 + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 176 +- drivers/net/wireless/ath/ath9k/htc_hst.c | 36 + drivers/net/wireless/ath/ath9k/htc_hst.h | 12 + drivers/net/wireless/ath/ath9k/hw.c | 1 - drivers/net/wireless/ath/ath9k/init.c | 247 +- drivers/net/wireless/ath/ath9k/mac.h | 9 +- drivers/net/wireless/ath/ath9k/main.c | 24 +- drivers/net/wireless/ath/ath9k/rc.c | 1495 -------- drivers/net/wireless/ath/ath9k/rc.h | 248 -- drivers/net/wireless/ath/ath9k/recv.c | 267 +- drivers/net/wireless/ath/ath9k/xmit.c | 7 +- drivers/net/wireless/ath/regd.c | 10 +- drivers/net/wireless/ath/wcn36xx/dxe.c | 10 +- drivers/net/wireless/ath/wcn36xx/dxe.h | 4 +- drivers/net/wireless/ath/wcn36xx/hal.h | 4 +- drivers/net/wireless/ath/wcn36xx/main.c | 72 +- drivers/net/wireless/ath/wcn36xx/smd.c | 64 +- drivers/net/wireless/ath/wcn36xx/smd.h | 5 +- drivers/net/wireless/ath/wcn36xx/txrx.c | 7 +- drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 10 +- drivers/net/wireless/ath/wil6210/Makefile | 1 + drivers/net/wireless/ath/wil6210/cfg80211.c | 202 +- drivers/net/wireless/ath/wil6210/debugfs.c | 119 +- drivers/net/wireless/ath/wil6210/main.c | 119 +- drivers/net/wireless/ath/wil6210/pcie_bus.c | 32 +- drivers/net/wireless/ath/wil6210/rx_reorder.c | 177 + drivers/net/wireless/ath/wil6210/txrx.c | 125 +- drivers/net/wireless/ath/wil6210/txrx.h | 7 + drivers/net/wireless/ath/wil6210/wil6210.h | 82 +- drivers/net/wireless/ath/wil6210/wmi.c | 116 +- drivers/net/wireless/atmel.c | 8 +- drivers/net/wireless/b43/Kconfig | 2 +- drivers/net/wireless/b43/debugfs.h | 2 +- drivers/net/wireless/b43/main.c | 2 +- drivers/net/wireless/b43/main.h | 35 - drivers/net/wireless/b43/phy_common.c | 4 +- drivers/net/wireless/b43/pio.c | 10 +- drivers/net/wireless/b43/sysfs.c | 2 +- drivers/net/wireless/b43/xmit.c | 14 +- drivers/net/wireless/b43legacy/main.c | 4 +- drivers/net/wireless/b43legacy/sysfs.c | 2 +- drivers/net/wireless/b43legacy/xmit.c | 2 +- drivers/net/wireless/brcm80211/brcmfmac/Makefile | 4 +- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 63 +- drivers/net/wireless/brcm80211/brcmfmac/chip.c | 1029 ++++++ drivers/net/wireless/brcm80211/brcmfmac/chip.h | 91 + .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 4 +- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 745 ++-- drivers/net/wireless/brcm80211/brcmfmac/fwil.c | 5 +- drivers/net/wireless/brcm80211/brcmfmac/fwil.h | 2 +- .../net/wireless/brcm80211/brcmfmac/sdio_chip.c | 972 ----- .../net/wireless/brcm80211/brcmfmac/sdio_chip.h | 231 -- .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 91 + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 138 +- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 4 +- drivers/net/wireless/cw1200/fwio.c | 4 +- drivers/net/wireless/hostap/hostap_cs.c | 2 + drivers/net/wireless/ipw2x00/ipw2100.c | 2 +- drivers/net/wireless/ipw2x00/ipw2200.c | 2 +- drivers/net/wireless/iwlegacy/3945-mac.c | 13 +- drivers/net/wireless/iwlegacy/3945-rs.c | 3 +- drivers/net/wireless/iwlegacy/4965-mac.c | 15 +- drivers/net/wireless/iwlegacy/4965-rs.c | 3 +- drivers/net/wireless/iwlegacy/commands.h | 3 +- drivers/net/wireless/iwlegacy/common.c | 83 +- drivers/net/wireless/iwlegacy/common.h | 17 +- drivers/net/wireless/iwlwifi/Kconfig | 14 + drivers/net/wireless/iwlwifi/Makefile | 2 +- drivers/net/wireless/iwlwifi/dvm/agn.h | 4 +- drivers/net/wireless/iwlwifi/dvm/devices.c | 2 +- drivers/net/wireless/iwlwifi/dvm/mac80211.c | 2 +- drivers/net/wireless/iwlwifi/dvm/rs.c | 23 +- drivers/net/wireless/iwlwifi/dvm/rs.h | 2 +- drivers/net/wireless/iwlwifi/dvm/rx.c | 2 +- drivers/net/wireless/iwlwifi/iwl-7000.c | 23 +- drivers/net/wireless/iwlwifi/iwl-8000.c | 132 + drivers/net/wireless/iwlwifi/iwl-config.h | 18 + drivers/net/wireless/iwlwifi/iwl-csr.h | 32 - drivers/net/wireless/iwlwifi/iwl-debug.h | 2 + drivers/net/wireless/iwlwifi/iwl-drv.c | 58 +- drivers/net/wireless/iwlwifi/iwl-drv.h | 14 + drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h | 5 +- drivers/net/wireless/iwlwifi/iwl-fw-file.h | 17 + drivers/net/wireless/iwlwifi/iwl-fw.h | 31 +- drivers/net/wireless/iwlwifi/iwl-io.c | 15 + drivers/net/wireless/iwlwifi/iwl-io.h | 2 + drivers/net/wireless/iwlwifi/iwl-modparams.h | 2 +- drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 251 +- drivers/net/wireless/iwlwifi/iwl-nvm-parse.h | 3 +- drivers/net/wireless/iwlwifi/iwl-op-mode.h | 24 +- drivers/net/wireless/iwlwifi/iwl-phy-db.c | 4 +- drivers/net/wireless/iwlwifi/iwl-prph.h | 46 + drivers/net/wireless/iwlwifi/iwl-trans.h | 40 +- drivers/net/wireless/iwlwifi/mvm/Makefile | 2 +- drivers/net/wireless/iwlwifi/mvm/bt-coex.c | 138 +- drivers/net/wireless/iwlwifi/mvm/constants.h | 4 + drivers/net/wireless/iwlwifi/mvm/d3.c | 31 +- drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c | 114 +- drivers/net/wireless/iwlwifi/mvm/debugfs.c | 403 ++- drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h | 17 +- drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h | 6 +- drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 33 +- drivers/net/wireless/iwlwifi/mvm/fw-api-rs.h | 3 +- drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h | 31 +- drivers/net/wireless/iwlwifi/mvm/fw-api.h | 131 +- drivers/net/wireless/iwlwifi/mvm/fw.c | 79 +- drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 78 +- drivers/net/wireless/iwlwifi/mvm/mac80211.c | 494 ++- drivers/net/wireless/iwlwifi/mvm/mvm.h | 203 +- drivers/net/wireless/iwlwifi/mvm/nvm.c | 87 +- drivers/net/wireless/iwlwifi/mvm/ops.c | 259 +- drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c | 4 +- drivers/net/wireless/iwlwifi/mvm/power.c | 419 ++- drivers/net/wireless/iwlwifi/mvm/power_legacy.c | 319 -- drivers/net/wireless/iwlwifi/mvm/quota.c | 119 +- drivers/net/wireless/iwlwifi/mvm/rs.c | 122 +- drivers/net/wireless/iwlwifi/mvm/rs.h | 2 +- drivers/net/wireless/iwlwifi/mvm/rx.c | 33 +- drivers/net/wireless/iwlwifi/mvm/scan.c | 19 +- drivers/net/wireless/iwlwifi/mvm/sta.c | 203 +- drivers/net/wireless/iwlwifi/mvm/sta.h | 62 +- drivers/net/wireless/iwlwifi/mvm/time-event.c | 8 +- drivers/net/wireless/iwlwifi/mvm/tt.c | 7 +- drivers/net/wireless/iwlwifi/mvm/tx.c | 27 +- drivers/net/wireless/iwlwifi/mvm/utils.c | 105 +- drivers/net/wireless/iwlwifi/pcie/drv.c | 82 + drivers/net/wireless/iwlwifi/pcie/internal.h | 2 +- drivers/net/wireless/iwlwifi/pcie/rx.c | 50 +- drivers/net/wireless/iwlwifi/pcie/trans.c | 267 +- drivers/net/wireless/iwlwifi/pcie/tx.c | 73 +- drivers/net/wireless/libertas/cfg.c | 3 +- drivers/net/wireless/libertas/if_sdio.c | 4 +- drivers/net/wireless/mac80211_hwsim.c | 113 +- drivers/net/wireless/mac80211_hwsim.h | 6 + drivers/net/wireless/mwifiex/11ac.c | 192 +- drivers/net/wireless/mwifiex/11ac.h | 2 + drivers/net/wireless/mwifiex/11h.c | 4 +- drivers/net/wireless/mwifiex/11n.c | 59 +- drivers/net/wireless/mwifiex/11n.h | 44 +- drivers/net/wireless/mwifiex/11n_rxreorder.c | 59 +- drivers/net/wireless/mwifiex/11n_rxreorder.h | 3 +- drivers/net/wireless/mwifiex/Makefile | 1 + drivers/net/wireless/mwifiex/README | 2 +- drivers/net/wireless/mwifiex/cfg80211.c | 385 +- drivers/net/wireless/mwifiex/cfp.c | 205 +- drivers/net/wireless/mwifiex/cmdevt.c | 149 +- drivers/net/wireless/mwifiex/debugfs.c | 8 +- drivers/net/wireless/mwifiex/decl.h | 23 + drivers/net/wireless/mwifiex/fw.h | 194 +- drivers/net/wireless/mwifiex/ie.c | 6 +- drivers/net/wireless/mwifiex/init.c | 8 +- drivers/net/wireless/mwifiex/ioctl.h | 24 +- drivers/net/wireless/mwifiex/join.c | 66 +- drivers/net/wireless/mwifiex/main.c | 7 +- drivers/net/wireless/mwifiex/main.h | 104 +- drivers/net/wireless/mwifiex/pcie.c | 147 +- drivers/net/wireless/mwifiex/pcie.h | 3 + drivers/net/wireless/mwifiex/scan.c | 598 +++- drivers/net/wireless/mwifiex/sdio.c | 9 +- drivers/net/wireless/mwifiex/sdio.h | 6 + drivers/net/wireless/mwifiex/sta_cmd.c | 457 ++- drivers/net/wireless/mwifiex/sta_cmdresp.c | 121 +- drivers/net/wireless/mwifiex/sta_event.c | 52 +- drivers/net/wireless/mwifiex/sta_ioctl.c | 155 +- drivers/net/wireless/mwifiex/sta_rx.c | 13 +- drivers/net/wireless/mwifiex/sta_tx.c | 3 + drivers/net/wireless/mwifiex/tdls.c | 1044 ++++++ drivers/net/wireless/mwifiex/uap_cmd.c | 4 +- drivers/net/wireless/mwifiex/uap_event.c | 124 +- drivers/net/wireless/mwifiex/usb.c | 10 +- drivers/net/wireless/mwifiex/util.c | 118 +- drivers/net/wireless/mwifiex/util.h | 20 +- drivers/net/wireless/mwifiex/wmm.c | 96 +- drivers/net/wireless/mwifiex/wmm.h | 18 + drivers/net/wireless/mwl8k.c | 197 +- drivers/net/wireless/orinoco/cfg.c | 5 +- drivers/net/wireless/orinoco/hw.c | 2 +- drivers/net/wireless/orinoco/scan.c | 5 +- drivers/net/wireless/orinoco/wext.c | 2 +- drivers/net/wireless/p54/p54usb.c | 2 +- drivers/net/wireless/prism54/isl_ioctl.c | 2 +- drivers/net/wireless/rndis_wlan.c | 7 +- drivers/net/wireless/rt2x00/rt2800usb.c | 12 +- drivers/net/wireless/rt2x00/rt2x00debug.c | 2 +- drivers/net/wireless/rtl818x/rtl8180/dev.c | 49 +- drivers/net/wireless/rtl818x/rtl8187/dev.c | 14 +- drivers/net/wireless/rtl818x/rtl818x.h | 10 +- drivers/net/wireless/rtlwifi/Kconfig | 27 +- drivers/net/wireless/rtlwifi/Makefile | 3 + drivers/net/wireless/rtlwifi/btcoexist/Makefile | 7 + .../net/wireless/rtlwifi/btcoexist/halbt_precomp.h | 75 + .../wireless/rtlwifi/btcoexist/halbtc8723b2ant.c | 3698 ++++++++++++++++++++ .../wireless/rtlwifi/btcoexist/halbtc8723b2ant.h | 173 + .../net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c | 1011 ++++++ .../net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h | 559 +++ drivers/net/wireless/rtlwifi/btcoexist/rtl_btc.c | 218 ++ drivers/net/wireless/rtlwifi/btcoexist/rtl_btc.h | 52 + drivers/net/wireless/rtlwifi/core.c | 124 +- drivers/net/wireless/rtlwifi/core.h | 4 + drivers/net/wireless/rtlwifi/pci.c | 66 +- drivers/net/wireless/rtlwifi/pci.h | 14 + drivers/net/wireless/rtlwifi/ps.c | 100 + drivers/net/wireless/rtlwifi/ps.h | 60 + drivers/net/wireless/rtlwifi/rc.c | 3 +- drivers/net/wireless/rtlwifi/rtl8188ee/Makefile | 1 - drivers/net/wireless/rtlwifi/rtl8188ee/dm.c | 6 +- drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | 62 +- drivers/net/wireless/rtlwifi/rtl8188ee/phy.c | 63 +- drivers/net/wireless/rtlwifi/rtl8188ee/pwrseq.h | 1 - drivers/net/wireless/rtlwifi/rtl8188ee/reg.h | 16 - drivers/net/wireless/rtlwifi/rtl8188ee/trx.c | 10 +- drivers/net/wireless/rtlwifi/rtl8188ee/trx.h | 8 +- drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 20 +- drivers/net/wireless/rtlwifi/rtl8192ce/phy.c | 71 +- drivers/net/wireless/rtlwifi/rtl8192ce/reg.h | 16 - drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 7 +- drivers/net/wireless/rtlwifi/rtl8192ce/trx.h | 7 +- drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 31 +- drivers/net/wireless/rtlwifi/rtl8192cu/phy.c | 71 +- drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 2 +- drivers/net/wireless/rtlwifi/rtl8192cu/trx.h | 2 +- drivers/net/wireless/rtlwifi/rtl8192de/dm.c | 50 +- drivers/net/wireless/rtlwifi/rtl8192de/hw.c | 18 +- drivers/net/wireless/rtlwifi/rtl8192de/phy.c | 429 +-- drivers/net/wireless/rtlwifi/rtl8192de/reg.h | 14 - drivers/net/wireless/rtlwifi/rtl8192de/rf.c | 6 +- drivers/net/wireless/rtlwifi/rtl8192de/trx.c | 5 +- drivers/net/wireless/rtlwifi/rtl8192de/trx.h | 7 +- drivers/net/wireless/rtlwifi/rtl8192se/hw.c | 34 +- drivers/net/wireless/rtlwifi/rtl8192se/phy.c | 87 +- drivers/net/wireless/rtlwifi/rtl8192se/reg.h | 12 - drivers/net/wireless/rtlwifi/rtl8192se/rf.c | 2 +- drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 7 +- drivers/net/wireless/rtlwifi/rtl8192se/trx.h | 8 +- drivers/net/wireless/rtlwifi/rtl8723ae/Makefile | 1 - drivers/net/wireless/rtlwifi/rtl8723ae/def.h | 5 - drivers/net/wireless/rtlwifi/rtl8723ae/dm.c | 42 +- drivers/net/wireless/rtlwifi/rtl8723ae/dm.h | 1 - drivers/net/wireless/rtlwifi/rtl8723ae/fw.c | 260 +- drivers/net/wireless/rtlwifi/rtl8723ae/fw.h | 18 +- .../wireless/rtlwifi/rtl8723ae/hal_bt_coexist.c | 2 + drivers/net/wireless/rtlwifi/rtl8723ae/hal_btc.c | 8 +- drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | 60 +- drivers/net/wireless/rtlwifi/rtl8723ae/phy.c | 530 +-- drivers/net/wireless/rtlwifi/rtl8723ae/phy.h | 21 - drivers/net/wireless/rtlwifi/rtl8723ae/pwrseq.h | 1 - drivers/net/wireless/rtlwifi/rtl8723ae/reg.h | 16 - drivers/net/wireless/rtlwifi/rtl8723ae/sw.c | 13 +- drivers/net/wireless/rtlwifi/rtl8723ae/trx.c | 7 +- drivers/net/wireless/rtlwifi/rtl8723ae/trx.h | 13 +- drivers/net/wireless/rtlwifi/rtl8723be/Makefile | 19 + drivers/net/wireless/rtlwifi/rtl8723be/def.h | 248 ++ drivers/net/wireless/rtlwifi/rtl8723be/dm.c | 1325 +++++++ drivers/net/wireless/rtlwifi/rtl8723be/dm.h | 310 ++ drivers/net/wireless/rtlwifi/rtl8723be/fw.c | 620 ++++ drivers/net/wireless/rtlwifi/rtl8723be/fw.h | 248 ++ drivers/net/wireless/rtlwifi/rtl8723be/hw.c | 2527 +++++++++++++ drivers/net/wireless/rtlwifi/rtl8723be/hw.h | 64 + drivers/net/wireless/rtlwifi/rtl8723be/led.c | 153 + drivers/net/wireless/rtlwifi/rtl8723be/led.h | 35 + drivers/net/wireless/rtlwifi/rtl8723be/phy.c | 2156 ++++++++++++ drivers/net/wireless/rtlwifi/rtl8723be/phy.h | 217 ++ drivers/net/wireless/rtlwifi/rtl8723be/pwrseq.c | 106 + drivers/net/wireless/rtlwifi/rtl8723be/pwrseq.h | 304 ++ drivers/net/wireless/rtlwifi/rtl8723be/pwrseqcmd.c | 140 + drivers/net/wireless/rtlwifi/rtl8723be/pwrseqcmd.h | 95 + drivers/net/wireless/rtlwifi/rtl8723be/reg.h | 2277 ++++++++++++ drivers/net/wireless/rtlwifi/rtl8723be/rf.c | 504 +++ drivers/net/wireless/rtlwifi/rtl8723be/rf.h | 43 + drivers/net/wireless/rtlwifi/rtl8723be/sw.c | 384 ++ drivers/net/wireless/rtlwifi/rtl8723be/sw.h | 35 + drivers/net/wireless/rtlwifi/rtl8723be/table.c | 572 +++ drivers/net/wireless/rtlwifi/rtl8723be/table.h | 43 + drivers/net/wireless/rtlwifi/rtl8723be/trx.c | 960 +++++ drivers/net/wireless/rtlwifi/rtl8723be/trx.h | 617 ++++ drivers/net/wireless/rtlwifi/rtl8723com/Makefile | 9 + .../net/wireless/rtlwifi/rtl8723com/dm_common.c | 65 + .../net/wireless/rtlwifi/rtl8723com/dm_common.h | 33 + .../net/wireless/rtlwifi/rtl8723com/fw_common.c | 329 ++ .../net/wireless/rtlwifi/rtl8723com/fw_common.h | 126 + drivers/net/wireless/rtlwifi/rtl8723com/main.c | 33 + .../net/wireless/rtlwifi/rtl8723com/phy_common.c | 434 +++ .../net/wireless/rtlwifi/rtl8723com/phy_common.h | 89 + drivers/net/wireless/rtlwifi/usb.c | 4 +- drivers/net/wireless/rtlwifi/wifi.h | 518 ++- drivers/net/wireless/ti/wilink_platform_data.c | 37 +- drivers/net/wireless/ti/wl1251/cmd.c | 2 +- drivers/net/wireless/ti/wl1251/sdio.c | 31 +- drivers/net/wireless/ti/wl1251/spi.c | 71 +- drivers/net/wireless/ti/wl1251/wl1251.h | 4 +- drivers/net/wireless/ti/wl12xx/main.c | 67 +- drivers/net/wireless/ti/wl12xx/wl12xx.h | 53 + drivers/net/wireless/ti/wl18xx/main.c | 85 +- drivers/net/wireless/ti/wl18xx/tx.c | 4 +- drivers/net/wireless/ti/wl18xx/wl18xx.h | 62 +- drivers/net/wireless/ti/wlcore/acx.c | 7 +- drivers/net/wireless/ti/wlcore/acx.h | 6 +- drivers/net/wireless/ti/wlcore/cmd.c | 24 +- drivers/net/wireless/ti/wlcore/cmd.h | 9 +- drivers/net/wireless/ti/wlcore/event.c | 4 +- drivers/net/wireless/ti/wlcore/hw_ops.h | 9 + drivers/net/wireless/ti/wlcore/init.c | 6 +- drivers/net/wireless/ti/wlcore/io.h | 8 +- drivers/net/wireless/ti/wlcore/main.c | 200 +- drivers/net/wireless/ti/wlcore/ps.c | 6 +- drivers/net/wireless/ti/wlcore/rx.c | 19 +- drivers/net/wireless/ti/wlcore/rx.h | 2 +- drivers/net/wireless/ti/wlcore/spi.c | 4 +- drivers/net/wireless/ti/wlcore/sysfs.c | 2 +- drivers/net/wireless/ti/wlcore/tx.c | 45 +- drivers/net/wireless/ti/wlcore/tx.h | 1 + drivers/net/wireless/ti/wlcore/wlcore.h | 27 +- drivers/net/wireless/ti/wlcore/wlcore_i.h | 86 +- drivers/net/wireless/wl3501_cs.c | 6 +- drivers/net/wireless/zd1201.c | 9 +- drivers/net/xen-netback/common.h | 113 +- drivers/net/xen-netback/interface.c | 128 +- drivers/net/xen-netback/netback.c | 788 +++-- drivers/net/xen-netfront.c | 12 +- drivers/of/of_mdio.c | 23 +- drivers/of/of_net.c | 26 +- drivers/s390/net/qeth_core.h | 7 +- drivers/s390/net/qeth_core_main.c | 4 +- drivers/s390/net/qeth_l2_main.c | 6 +- drivers/staging/rtl8821ae/rc.c | 1 - drivers/staging/rtl8821ae/rtl8821ae/trx.c | 2 +- drivers/staging/wlan-ng/cfg80211.c | 2 +- include/linux/brcmphy.h | 60 + include/linux/can/dev.h | 9 +- include/linux/ethtool.h | 3 + include/linux/ieee80211.h | 235 +- include/linux/miscdevice.h | 1 + include/linux/mlx4/cmd.h | 7 + include/linux/mlx4/device.h | 46 +- include/linux/mlx4/driver.h | 12 + include/linux/mlx4/qp.h | 11 +- include/linux/mpls.h | 6 + include/linux/netdevice.h | 126 +- include/linux/netfilter/ipset/ip_set.h | 15 +- include/linux/netfilter/nfnetlink.h | 21 + include/linux/netpoll.h | 61 - include/linux/nl802154.h | 12 + include/linux/phy.h | 56 + include/linux/skbuff.h | 61 +- include/linux/tcp.h | 8 +- include/linux/tty.h | 6 +- include/linux/u64_stats_sync.h | 16 +- include/linux/usb/cdc_ncm.h | 1 + include/linux/wl12xx.h | 24 +- {net/ieee802154 => include/net}/6lowpan.h | 115 + include/net/act_api.h | 22 +- include/net/addrconf.h | 6 +- include/net/af_ieee802154.h | 4 +- include/net/bluetooth/bluetooth.h | 1 + include/net/bluetooth/hci.h | 76 +- include/net/bluetooth/hci_core.h | 197 +- include/net/bluetooth/l2cap.h | 8 +- include/net/bluetooth/mgmt.h | 51 +- include/net/bluetooth/rfcomm.h | 10 +- include/net/cfg80211.h | 67 +- include/net/dst.h | 7 +- include/net/flow.h | 6 +- include/net/flowcache.h | 25 + include/net/ieee80211_radiotap.h | 4 + include/net/ieee802154.h | 28 +- include/net/ieee802154_netdev.h | 178 +- include/net/ip.h | 13 +- include/net/ip6_route.h | 9 +- include/net/mac80211.h | 95 +- include/net/mac802154.h | 41 +- include/net/net_namespace.h | 4 + include/net/netfilter/nf_conntrack.h | 11 +- include/net/netfilter/nf_conntrack_core.h | 9 +- include/net/netfilter/nf_conntrack_labels.h | 4 +- include/net/netfilter/nf_tables.h | 28 +- include/net/netns/conntrack.h | 13 +- include/net/netns/ieee802154_6lowpan.h | 22 + include/net/netns/xfrm.h | 11 +- include/net/nl802154.h | 6 +- include/net/rtnetlink.h | 2 +- include/net/sock.h | 8 +- include/net/tc_act/tc_csum.h | 4 +- include/net/tc_act/tc_defact.h | 4 +- include/net/tc_act/tc_gact.h | 4 +- include/net/tc_act/tc_ipt.h | 4 +- include/net/tc_act/tc_mirred.h | 4 +- include/net/tc_act/tc_nat.h | 4 +- include/net/tc_act/tc_pedit.h | 4 +- include/net/tc_act/tc_skbedit.h | 4 +- include/net/tcp.h | 13 +- include/net/wpan-phy.h | 19 +- include/net/xfrm.h | 128 +- include/uapi/linux/can.h | 32 + include/uapi/linux/can/netlink.h | 3 + include/uapi/linux/ethtool.h | 439 ++- include/uapi/linux/if.h | 134 +- include/uapi/linux/if_ether.h | 6 +- include/uapi/linux/in.h | 4 + include/uapi/linux/in6.h | 4 + include/uapi/linux/mpls.h | 34 + include/uapi/linux/netfilter/ipset/ip_set.h | 12 + include/uapi/linux/netfilter/nf_tables.h | 6 +- include/uapi/linux/nl80211.h | 86 +- include/uapi/linux/pfkeyv2.h | 15 +- include/uapi/linux/snmp.h | 6 + include/uapi/linux/tcp.h | 3 + include/uapi/linux/tcp_metrics.h | 7 +- include/uapi/linux/usb/cdc.h | 12 + include/uapi/linux/xfrm.h | 10 + net/8021q/vlan.h | 4 +- net/8021q/vlan_core.c | 4 +- net/8021q/vlan_dev.c | 15 +- net/8021q/vlan_netlink.c | 4 +- net/appletalk/aarp.c | 4 +- net/appletalk/ddp.c | 100 +- net/batman-adv/gateway_client.c | 2 - net/bluetooth/6lowpan.c | 2 +- net/bluetooth/a2mp.c | 8 +- net/bluetooth/af_bluetooth.c | 2 +- net/bluetooth/hci_conn.c | 206 +- net/bluetooth/hci_core.c | 1469 ++++++-- net/bluetooth/hci_event.c | 478 ++- net/bluetooth/hci_sock.c | 1 + net/bluetooth/hci_sysfs.c | 18 +- net/bluetooth/l2cap_core.c | 616 ++-- net/bluetooth/l2cap_sock.c | 62 +- net/bluetooth/mgmt.c | 913 ++++- net/bluetooth/rfcomm/core.c | 92 +- net/bluetooth/rfcomm/sock.c | 33 +- net/bluetooth/rfcomm/tty.c | 262 +- net/bluetooth/smp.c | 418 ++- net/bluetooth/smp.h | 22 +- net/bridge/br_device.c | 15 +- net/bridge/br_multicast.c | 4 +- net/bridge/br_netfilter.c | 4 +- net/bridge/br_private.h | 4 +- net/bridge/netfilter/ebt_among.c | 2 +- net/bridge/netfilter/ebt_dnat.c | 2 +- net/bridge/netfilter/ebt_redirect.c | 6 +- net/bridge/netfilter/ebt_snat.c | 2 +- net/ceph/osd_client.c | 2 - net/core/dev.c | 21 +- net/core/flow.c | 132 +- net/core/flow_dissector.c | 14 +- net/core/neighbour.c | 9 +- net/core/net-sysfs.c | 11 +- net/core/netpoll.c | 492 +-- net/core/pktgen.c | 32 +- net/core/request_sock.c | 1 - net/core/rtnetlink.c | 107 +- net/core/skbuff.c | 166 +- net/hsr/hsr_device.c | 10 +- net/hsr/hsr_framereg.c | 20 +- net/hsr/hsr_main.c | 4 +- net/ieee802154/6lowpan_iphc.c | 3 +- net/ieee802154/{6lowpan.c => 6lowpan_rtnl.c} | 388 +- net/ieee802154/Kconfig | 2 +- net/ieee802154/Makefile | 6 +- net/ieee802154/af802154.h | 5 +- net/ieee802154/af_ieee802154.c | 22 +- net/ieee802154/dgram.c | 60 +- net/ieee802154/header_ops.c | 287 ++ net/ieee802154/ieee802154.h | 1 + net/ieee802154/netlink.c | 1 + net/ieee802154/nl-mac.c | 102 +- net/ieee802154/nl-phy.c | 200 +- net/ieee802154/nl_policy.c | 10 + net/ieee802154/raw.c | 18 +- net/ieee802154/reassembly.c | 571 +++ net/ieee802154/reassembly.h | 41 + net/ieee802154/wpan-class.c | 10 +- net/ipv4/Makefile | 2 +- net/ipv4/af_inet.c | 4 +- net/ipv4/ah4.c | 78 +- net/ipv4/esp4.c | 26 +- net/ipv4/ip_forward.c | 7 +- net/ipv4/ip_output.c | 12 +- net/ipv4/ip_sockglue.c | 21 +- net/ipv4/ip_tunnel.c | 31 +- net/ipv4/ip_tunnel_core.c | 4 +- net/ipv4/ip_vti.c | 310 +- net/ipv4/ipcomp.c | 26 +- net/ipv4/netfilter.c | 2 +- net/ipv4/ping.c | 2 +- net/ipv4/proc.c | 6 + net/ipv4/raw.c | 2 +- net/ipv4/route.c | 1 - net/ipv4/tcp.c | 13 +- net/ipv4/tcp_cong.c | 10 - net/ipv4/tcp_cubic.c | 4 - net/ipv4/tcp_highspeed.c | 1 - net/ipv4/tcp_hybla.c | 13 +- net/ipv4/tcp_illinois.c | 2 - net/ipv4/tcp_input.c | 187 +- net/ipv4/tcp_ipv4.c | 8 +- net/ipv4/tcp_lp.c | 2 - net/ipv4/tcp_metrics.c | 83 +- net/ipv4/tcp_minisocks.c | 4 +- net/ipv4/tcp_output.c | 61 +- net/ipv4/tcp_probe.c | 2 +- net/ipv4/tcp_scalable.c | 1 - net/ipv4/tcp_timer.c | 3 + net/ipv4/tcp_vegas.c | 2 - net/ipv4/tcp_veno.c | 1 - net/ipv4/tcp_westwood.c | 1 - net/ipv4/tcp_yeah.c | 2 - net/ipv4/udp.c | 3 +- net/ipv4/xfrm4_input.c | 9 - net/ipv4/xfrm4_mode_tunnel.c | 68 - net/ipv4/xfrm4_policy.c | 1 + net/ipv4/xfrm4_protocol.c | 286 ++ net/ipv6/Makefile | 2 +- net/ipv6/addrlabel.c | 59 +- net/ipv6/ah6.c | 80 +- net/ipv6/esp6.c | 26 +- net/ipv6/ip6_checksum.c | 4 +- net/ipv6/ip6_flowlabel.c | 6 - net/ipv6/ip6_gre.c | 9 +- net/ipv6/ip6_output.c | 15 +- net/ipv6/ip6_tunnel.c | 13 +- net/ipv6/ip6_vti.c | 316 +- net/ipv6/ipcomp6.c | 22 +- net/ipv6/ipv6_sockglue.c | 2 +- net/ipv6/output_core.c | 2 +- net/ipv6/sit.c | 18 +- net/ipv6/tcp_ipv6.c | 4 +- net/ipv6/xfrm6_mode_tunnel.c | 63 - net/ipv6/xfrm6_policy.c | 7 + net/ipv6/xfrm6_protocol.c | 270 ++ net/ipx/af_ipx.c | 28 +- net/iucv/af_iucv.c | 1 + net/key/af_key.c | 39 +- net/l2tp/l2tp_core.c | 24 +- net/l2tp/l2tp_ppp.c | 3 - net/mac80211/agg-tx.c | 2 +- net/mac80211/cfg.c | 199 +- net/mac80211/cfg.h | 2 +- net/mac80211/chan.c | 2 + net/mac80211/debugfs_netdev.c | 13 + net/mac80211/debugfs_sta.c | 2 +- net/mac80211/driver-ops.h | 12 +- net/mac80211/ht.c | 4 +- net/mac80211/ibss.c | 33 +- net/mac80211/ieee80211_i.h | 16 +- net/mac80211/iface.c | 13 +- net/mac80211/main.c | 21 +- net/mac80211/mesh.c | 96 +- net/mac80211/mlme.c | 113 +- net/mac80211/rate.c | 46 +- net/mac80211/rate.h | 2 +- net/mac80211/rc80211_minstrel.c | 2 +- net/mac80211/rc80211_minstrel.h | 2 +- net/mac80211/rc80211_minstrel_ht.c | 7 +- net/mac80211/rc80211_pid_algo.c | 2 +- net/mac80211/rx.c | 106 +- net/mac80211/scan.c | 9 +- net/mac80211/sta_info.h | 2 + net/mac80211/status.c | 3 +- net/mac80211/tx.c | 33 +- net/mac80211/util.c | 42 +- net/mac80211/vht.c | 26 +- net/mac80211/wpa.c | 9 +- net/mac802154/Makefile | 2 + net/mac802154/ieee802154_dev.c | 72 +- net/mac802154/mac802154.h | 9 +- net/mac802154/mac_cmd.c | 2 +- net/mac802154/mib.c | 26 +- net/mac802154/rx.c | 1 - net/mac802154/wpan.c | 376 +- net/netfilter/ipset/Kconfig | 9 + net/netfilter/ipset/Makefile | 1 + net/netfilter/ipset/ip_set_core.c | 54 +- net/netfilter/ipset/ip_set_hash_gen.h | 43 + net/netfilter/ipset/ip_set_hash_ip.c | 3 +- net/netfilter/ipset/ip_set_hash_ipmark.c | 321 ++ net/netfilter/ipset/ip_set_hash_ipport.c | 3 +- net/netfilter/ipset/ip_set_hash_ipportip.c | 3 +- net/netfilter/ipset/ip_set_hash_ipportnet.c | 3 +- net/netfilter/ipset/ip_set_hash_net.c | 3 +- net/netfilter/ipset/ip_set_hash_netiface.c | 3 +- net/netfilter/ipset/ip_set_hash_netnet.c | 10 +- net/netfilter/ipset/ip_set_hash_netport.c | 3 +- net/netfilter/ipset/ip_set_hash_netportnet.c | 3 +- net/netfilter/ipset/pfxlen.c | 4 +- net/netfilter/ipvs/ip_vs_ctl.c | 6 +- net/netfilter/ipvs/ip_vs_lblc.c | 13 +- net/netfilter/nf_conntrack_core.c | 432 ++- net/netfilter/nf_conntrack_expect.c | 36 +- net/netfilter/nf_conntrack_h323_main.c | 4 +- net/netfilter/nf_conntrack_helper.c | 41 +- net/netfilter/nf_conntrack_netlink.c | 133 +- net/netfilter/nf_conntrack_sip.c | 8 +- net/netfilter/nf_tables_api.c | 80 +- net/netfilter/nfnetlink.c | 8 + net/netfilter/nfnetlink_log.c | 8 - net/netfilter/nft_compat.c | 4 +- net/netfilter/nft_ct.c | 36 +- net/netfilter/nft_hash.c | 261 +- net/netfilter/nft_immediate.c | 3 +- net/netfilter/nft_log.c | 3 +- net/netfilter/nft_lookup.c | 5 +- net/netfilter/nft_nat.c | 22 +- net/netfilter/xt_AUDIT.c | 4 +- net/netfilter/xt_connlimit.c | 311 +- net/netfilter/xt_ipcomp.c | 2 +- net/netlink/af_netlink.c | 31 +- net/netlink/af_netlink.h | 1 + net/openvswitch/datapath.c | 20 +- net/openvswitch/datapath.h | 2 +- net/openvswitch/vport.c | 14 +- net/packet/af_packet.c | 16 +- net/rfkill/core.c | 9 +- net/rxrpc/Makefile | 5 +- net/rxrpc/af_rxrpc.c | 9 + net/rxrpc/ar-ack.c | 61 +- net/rxrpc/ar-call.c | 213 +- net/rxrpc/ar-connection.c | 10 +- net/rxrpc/ar-error.c | 1 + net/rxrpc/ar-input.c | 190 +- net/rxrpc/ar-internal.h | 40 +- net/rxrpc/ar-output.c | 15 +- net/rxrpc/ar-recvmsg.c | 25 +- net/rxrpc/ar-skbuff.c | 7 +- net/rxrpc/ar-transport.c | 10 +- net/rxrpc/sysctl.c | 146 + net/sched/act_api.c | 142 +- net/sched/act_csum.c | 31 +- net/sched/act_gact.c | 34 +- net/sched/act_ipt.c | 68 +- net/sched/act_mirred.c | 56 +- net/sched/act_nat.c | 33 +- net/sched/act_pedit.c | 45 +- net/sched/act_police.c | 22 +- net/sched/act_simple.c | 64 +- net/sched/act_skbedit.c | 36 +- net/sched/cls_fw.c | 33 +- net/sched/sch_api.c | 8 +- net/sched/sch_atm.c | 3 +- net/sched/sch_cbq.c | 6 +- net/sched/sch_fq.c | 3 +- net/sched/sch_fq_codel.c | 3 +- net/sched/sch_hfsc.c | 3 +- net/sched/sch_hhf.c | 3 +- net/sched/sch_htb.c | 20 +- net/sched/sch_ingress.c | 3 +- net/sched/sch_netem.c | 79 +- net/sched/sch_tbf.c | 26 +- net/sctp/associola.c | 3 +- net/sctp/transport.c | 1 - net/socket.c | 13 +- net/tipc/addr.h | 2 + net/tipc/bcast.c | 28 +- net/tipc/bcast.h | 4 +- net/tipc/bearer.c | 44 +- net/tipc/bearer.h | 7 +- net/tipc/core.c | 2 +- net/tipc/discover.c | 4 +- net/tipc/discover.h | 2 +- net/tipc/link.c | 612 ++-- net/tipc/link.h | 57 +- net/tipc/name_distr.c | 8 +- net/tipc/name_distr.h | 2 +- net/tipc/net.c | 10 +- net/tipc/node.c | 14 +- net/tipc/port.c | 301 +- net/tipc/port.h | 130 +- net/tipc/ref.c | 27 +- net/tipc/ref.h | 1 - net/tipc/socket.c | 414 ++- net/tipc/socket.h | 72 + net/wireless/ap.c | 3 +- net/wireless/chan.c | 31 +- net/wireless/core.c | 2 +- net/wireless/core.h | 7 +- net/wireless/genregdb.awk | 2 + net/wireless/ibss.c | 26 +- net/wireless/mesh.c | 12 +- net/wireless/mlme.c | 2 +- net/wireless/nl80211.c | 248 +- net/wireless/nl80211.h | 2 + net/wireless/rdev-ops.h | 9 +- net/wireless/reg.c | 221 +- net/wireless/reg.h | 2 + net/wireless/trace.h | 35 +- net/wireless/util.c | 52 +- net/xfrm/xfrm_input.c | 97 +- net/xfrm/xfrm_policy.c | 40 +- net/xfrm/xfrm_state.c | 72 +- net/xfrm/xfrm_user.c | 37 +- security/selinux/include/xfrm.h | 5 +- tools/net/bpf_dbg.c | 119 +- 1104 files changed, 71071 insertions(+), 23959 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/altera_tse.txt create mode 100644 Documentation/devicetree/bindings/net/broadcom-bcmgenet.txt create mode 100644 Documentation/devicetree/bindings/net/ethernet.txt create mode 100644 Documentation/devicetree/bindings/net/micrel.txt create mode 100644 Documentation/devicetree/bindings/net/sh_eth.txt create mode 100644 Documentation/devicetree/bindings/net/wireless/ti,wl1251.txt create mode 100644 Documentation/networking/altera_tse.txt delete mode 100644 drivers/net/can/sja1000/sja1000_of_platform.c create mode 100644 drivers/net/ethernet/altera/Kconfig create mode 100644 drivers/net/ethernet/altera/Makefile create mode 100644 drivers/net/ethernet/altera/altera_msgdma.c create mode 100644 drivers/net/ethernet/altera/altera_msgdma.h create mode 100644 drivers/net/ethernet/altera/altera_msgdmahw.h create mode 100644 drivers/net/ethernet/altera/altera_sgdma.c create mode 100644 drivers/net/ethernet/altera/altera_sgdma.h create mode 100644 drivers/net/ethernet/altera/altera_sgdmahw.h create mode 100644 drivers/net/ethernet/altera/altera_tse.h create mode 100644 drivers/net/ethernet/altera/altera_tse_ethtool.c create mode 100644 drivers/net/ethernet/altera/altera_tse_main.c create mode 100644 drivers/net/ethernet/altera/altera_utils.c create mode 100644 drivers/net/ethernet/altera/altera_utils.h create mode 100644 drivers/net/ethernet/broadcom/genet/Makefile create mode 100644 drivers/net/ethernet/broadcom/genet/bcmgenet.c create mode 100644 drivers/net/ethernet/broadcom/genet/bcmgenet.h create mode 100644 drivers/net/ethernet/broadcom/genet/bcmmii.c delete mode 100644 drivers/net/ethernet/freescale/gianfar_sysfs.c create mode 100644 drivers/net/phy/bcm7xxx.c create mode 100644 drivers/net/wireless/ath/ath9k/common-init.c create mode 100644 drivers/net/wireless/ath/ath9k/common-init.h delete mode 100644 drivers/net/wireless/ath/ath9k/rc.c delete mode 100644 drivers/net/wireless/ath/ath9k/rc.h create mode 100644 drivers/net/wireless/ath/wil6210/rx_reorder.c create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/chip.c create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/chip.h delete mode 100644 drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c delete mode 100644 drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h create mode 100644 drivers/net/wireless/iwlwifi/iwl-8000.c delete mode 100644 drivers/net/wireless/iwlwifi/mvm/power_legacy.c create mode 100644 drivers/net/wireless/mwifiex/tdls.c create mode 100644 drivers/net/wireless/rtlwifi/btcoexist/Makefile create mode 100644 drivers/net/wireless/rtlwifi/btcoexist/halbt_precomp.h create mode 100644 drivers/net/wireless/rtlwifi/btcoexist/halbtc8723b2ant.c create mode 100644 drivers/net/wireless/rtlwifi/btcoexist/halbtc8723b2ant.h create mode 100644 drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c create mode 100644 drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h create mode 100644 drivers/net/wireless/rtlwifi/btcoexist/rtl_btc.c create mode 100644 drivers/net/wireless/rtlwifi/btcoexist/rtl_btc.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8723be/Makefile create mode 100644 drivers/net/wireless/rtlwifi/rtl8723be/def.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8723be/dm.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8723be/dm.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8723be/fw.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8723be/fw.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8723be/hw.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8723be/hw.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8723be/led.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8723be/led.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8723be/phy.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8723be/phy.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8723be/pwrseq.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8723be/pwrseq.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8723be/pwrseqcmd.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8723be/pwrseqcmd.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8723be/reg.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8723be/rf.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8723be/rf.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8723be/sw.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8723be/sw.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8723be/table.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8723be/table.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8723be/trx.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8723be/trx.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8723com/Makefile create mode 100644 drivers/net/wireless/rtlwifi/rtl8723com/dm_common.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8723com/dm_common.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8723com/fw_common.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8723com/fw_common.h create mode 100644 drivers/net/wireless/rtlwifi/rtl8723com/main.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8723com/phy_common.c create mode 100644 drivers/net/wireless/rtlwifi/rtl8723com/phy_common.h create mode 100644 include/linux/mpls.h rename {net/ieee802154 => include/net}/6lowpan.h (81%) create mode 100644 include/net/flowcache.h create mode 100644 include/net/netns/ieee802154_6lowpan.h create mode 100644 include/uapi/linux/mpls.h rename net/ieee802154/{6lowpan.c => 6lowpan_rtnl.c} (65%) create mode 100644 net/ieee802154/header_ops.c create mode 100644 net/ieee802154/reassembly.c create mode 100644 net/ieee802154/reassembly.h create mode 100644 net/ipv4/xfrm4_protocol.c create mode 100644 net/ipv6/xfrm6_protocol.c create mode 100644 net/netfilter/ipset/ip_set_hash_ipmark.c create mode 100644 net/rxrpc/sysctl.c create mode 100644 net/tipc/socket.h Merging ipsec-next/master (3ab428a4c5ad netfilter: Add missing vmalloc.h include to nft_hash.c) $ git merge ipsec-next/master Already up-to-date. Merging wireless-next/master (67b3bd4e65f0 brcmfmac: fallback to mimo_bw_cap for older firmwares) $ git merge wireless-next/master Auto-merging net/wireless/util.c Auto-merging net/wireless/core.c Auto-merging net/wireless/chan.c Auto-merging drivers/net/wireless/mwifiex/11n.c Auto-merging drivers/net/wireless/iwlwifi/mvm/fw-api-coex.h Auto-merging drivers/net/wireless/iwlwifi/mvm/coex.c Auto-merging drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c Auto-merging drivers/net/wireless/ath/wil6210/pcie_bus.c Auto-merging drivers/net/wireless/ath/ath9k/xmit.c Auto-merging drivers/net/wireless/ath/ath9k/hw.c Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. .../devicetree/bindings/net/nfc/trf7970a.txt | 34 + MAINTAINERS | 1 + drivers/bluetooth/ath3k.c | 13 +- drivers/bluetooth/bfusb.c | 14 +- drivers/bluetooth/bluecard_cs.c | 9 +- drivers/bluetooth/bt3c_cs.c | 7 +- drivers/bluetooth/btuart_cs.c | 6 +- drivers/bluetooth/btusb.c | 1 + drivers/bluetooth/dtl1_cs.c | 9 +- drivers/bluetooth/hci_bcsp.c | 31 +- drivers/bluetooth/hci_h5.c | 10 +- drivers/bluetooth/hci_ldisc.c | 9 +- drivers/net/wireless/Kconfig | 3 +- drivers/net/wireless/Makefile | 1 + drivers/net/wireless/ath/ath.h | 10 + drivers/net/wireless/ath/ath10k/ce.c | 16 +- drivers/net/wireless/ath/ath10k/ce.h | 9 +- drivers/net/wireless/ath/ath10k/core.h | 34 +- drivers/net/wireless/ath/ath10k/hif.h | 25 +- drivers/net/wireless/ath/ath10k/htc.c | 25 +- drivers/net/wireless/ath/ath10k/htt.h | 18 + drivers/net/wireless/ath/ath10k/htt_rx.c | 236 +++- drivers/net/wireless/ath/ath10k/htt_tx.c | 205 +-- drivers/net/wireless/ath/ath10k/mac.c | 268 ++-- drivers/net/wireless/ath/ath10k/pci.c | 389 ++---- drivers/net/wireless/ath/ath10k/pci.h | 28 - drivers/net/wireless/ath/ath10k/txrx.c | 24 +- drivers/net/wireless/ath/ath10k/wmi.c | 18 +- drivers/net/wireless/ath/ath5k/base.c | 3 + drivers/net/wireless/ath/ath9k/Makefile | 3 +- drivers/net/wireless/ath/ath9k/ahb.c | 11 +- drivers/net/wireless/ath/ath9k/ani.c | 11 - drivers/net/wireless/ath/ath9k/ar5008_phy.c | 85 +- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 63 +- drivers/net/wireless/ath/ath9k/ath9k.h | 22 - drivers/net/wireless/ath/ath9k/beacon.c | 165 +-- drivers/net/wireless/ath/ath9k/common-beacon.c | 180 +++ drivers/net/wireless/ath/ath9k/common-beacon.h | 26 + drivers/net/wireless/ath/ath9k/common.h | 14 + drivers/net/wireless/ath/ath9k/debug.c | 60 +- drivers/net/wireless/ath/ath9k/htc.h | 25 +- drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 252 +--- drivers/net/wireless/ath/ath9k/htc_drv_init.c | 10 +- drivers/net/wireless/ath/ath9k/htc_drv_main.c | 53 +- drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 3 +- drivers/net/wireless/ath/ath9k/hw.c | 3 +- drivers/net/wireless/ath/ath9k/link.c | 16 +- drivers/net/wireless/ath/ath9k/mac.c | 2 +- drivers/net/wireless/ath/ath9k/main.c | 45 +- drivers/net/wireless/ath/ath9k/mci.c | 2 +- drivers/net/wireless/ath/ath9k/pci.c | 8 +- drivers/net/wireless/ath/ath9k/tx99.c | 2 +- drivers/net/wireless/ath/ath9k/wow.c | 4 +- drivers/net/wireless/ath/ath9k/xmit.c | 11 +- drivers/net/wireless/ath/wil6210/cfg80211.c | 43 +- drivers/net/wireless/ath/wil6210/debugfs.c | 64 +- drivers/net/wireless/ath/wil6210/interrupt.c | 33 +- drivers/net/wireless/ath/wil6210/main.c | 119 +- drivers/net/wireless/ath/wil6210/netdev.c | 5 +- drivers/net/wireless/ath/wil6210/pcie_bus.c | 5 + drivers/net/wireless/ath/wil6210/txrx.c | 223 ++-- drivers/net/wireless/ath/wil6210/wil6210.h | 82 +- drivers/net/wireless/ath/wil6210/wmi.c | 20 +- drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 44 +- drivers/net/wireless/brcm80211/brcmfmac/chip.c | 5 + drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 261 ++-- .../net/wireless/brcm80211/brcmfmac/fwil_types.h | 10 + drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 6 +- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 130 +- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 17 - .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 20 +- .../net/wireless/brcm80211/include/brcm_hw_ids.h | 1 + drivers/net/wireless/iwlwifi/dvm/main.c | 12 +- drivers/net/wireless/iwlwifi/iwl-7000.c | 4 + drivers/net/wireless/iwlwifi/iwl-config.h | 1 + drivers/net/wireless/iwlwifi/iwl-csr.h | 38 + drivers/net/wireless/iwlwifi/iwl-fw.h | 16 + drivers/net/wireless/iwlwifi/iwl-io.c | 4 +- drivers/net/wireless/iwlwifi/iwl-io.h | 2 + drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 19 +- drivers/net/wireless/iwlwifi/iwl-op-mode.h | 11 +- drivers/net/wireless/iwlwifi/iwl-prph.h | 23 +- drivers/net/wireless/iwlwifi/mvm/Makefile | 4 +- .../net/wireless/iwlwifi/mvm/{bt-coex.c => coex.c} | 336 ++++- drivers/net/wireless/iwlwifi/mvm/constants.h | 4 +- drivers/net/wireless/iwlwifi/mvm/d3.c | 195 +-- drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c | 5 + drivers/net/wireless/iwlwifi/mvm/debugfs.c | 112 +- .../mvm/{fw-api-bt-coex.h => fw-api-coex.h} | 4 + drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h | 8 +- drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h | 3 + drivers/net/wireless/iwlwifi/mvm/fw-api.h | 3 +- drivers/net/wireless/iwlwifi/mvm/fw-error-dump.h | 106 ++ drivers/net/wireless/iwlwifi/mvm/led.c | 2 + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 145 ++- drivers/net/wireless/iwlwifi/mvm/mvm.h | 56 +- drivers/net/wireless/iwlwifi/mvm/offloading.c | 215 +++ drivers/net/wireless/iwlwifi/mvm/ops.c | 232 +++- drivers/net/wireless/iwlwifi/mvm/power.c | 17 +- drivers/net/wireless/iwlwifi/mvm/quota.c | 23 +- drivers/net/wireless/iwlwifi/mvm/rs.c | 88 +- drivers/net/wireless/iwlwifi/mvm/scan.c | 240 ++-- drivers/net/wireless/iwlwifi/mvm/sta.c | 12 +- drivers/net/wireless/iwlwifi/mvm/tx.c | 16 +- drivers/net/wireless/iwlwifi/mvm/utils.c | 49 +- drivers/net/wireless/iwlwifi/pcie/drv.c | 5 +- drivers/net/wireless/iwlwifi/pcie/internal.h | 2 + drivers/net/wireless/iwlwifi/pcie/rx.c | 2 +- drivers/net/wireless/iwlwifi/pcie/trans.c | 143 +- drivers/net/wireless/mwifiex/11n.c | 51 +- drivers/net/wireless/mwifiex/11n.h | 14 + drivers/net/wireless/mwifiex/11n_rxreorder.c | 144 +- drivers/net/wireless/mwifiex/cfg80211.c | 18 +- drivers/net/wireless/mwifiex/cmdevt.c | 1 + drivers/net/wireless/mwifiex/fw.h | 8 + drivers/net/wireless/mwifiex/ioctl.h | 1 + drivers/net/wireless/mwifiex/main.h | 7 +- drivers/net/wireless/mwifiex/pcie.c | 26 + drivers/net/wireless/mwifiex/pcie.h | 2 + drivers/net/wireless/mwifiex/sta_cmd.c | 14 + drivers/net/wireless/mwifiex/sta_cmdresp.c | 9 + drivers/net/wireless/mwifiex/sta_rx.c | 21 +- drivers/net/wireless/mwifiex/uap_cmd.c | 20 + drivers/net/wireless/mwifiex/uap_event.c | 6 + drivers/net/wireless/mwifiex/uap_txrx.c | 22 +- drivers/net/wireless/mwifiex/wmm.c | 37 +- drivers/net/wireless/p54/p54usb.c | 4 + drivers/net/wireless/rsi/Kconfig | 30 + drivers/net/wireless/rsi/Makefile | 12 + drivers/net/wireless/rsi/rsi_91x_core.c | 342 +++++ drivers/net/wireless/rsi/rsi_91x_debugfs.c | 339 +++++ drivers/net/wireless/rsi/rsi_91x_mac80211.c | 1008 ++++++++++++++ drivers/net/wireless/rsi/rsi_91x_main.c | 295 +++++ drivers/net/wireless/rsi/rsi_91x_mgmt.c | 1303 +++++++++++++++++++ drivers/net/wireless/rsi/rsi_91x_pkt.c | 196 +++ drivers/net/wireless/rsi/rsi_91x_sdio.c | 850 ++++++++++++ drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 566 ++++++++ drivers/net/wireless/rsi/rsi_91x_usb.c | 575 ++++++++ drivers/net/wireless/rsi/rsi_91x_usb_ops.c | 177 +++ drivers/net/wireless/rsi/rsi_boot_params.h | 126 ++ drivers/net/wireless/rsi/rsi_common.h | 87 ++ drivers/net/wireless/rsi/rsi_debugfs.h | 48 + drivers/net/wireless/rsi/rsi_main.h | 218 ++++ drivers/net/wireless/rsi/rsi_mgmt.h | 285 ++++ drivers/net/wireless/rsi/rsi_sdio.h | 129 ++ drivers/net/wireless/rsi/rsi_usb.h | 68 + drivers/net/wireless/rtl818x/rtl8180/dev.c | 293 +++-- drivers/net/wireless/rtl818x/rtl8180/rtl8180.h | 10 +- drivers/net/wireless/rtl818x/rtl8180/rtl8225.c | 22 - drivers/net/wireless/rtl818x/rtl818x.h | 1 - drivers/nfc/Kconfig | 12 + drivers/nfc/Makefile | 1 + drivers/nfc/pn533.c | 28 +- drivers/nfc/pn544/i2c.c | 194 ++- drivers/nfc/pn544/pn544.c | 2 +- drivers/nfc/pn544/pn544.h | 3 +- drivers/nfc/port100.c | 25 +- drivers/nfc/trf7970a.c | 1370 ++++++++++++++++++++ include/linux/ieee80211.h | 4 + include/linux/mmc/sdio_ids.h | 1 + include/net/bluetooth/hci_core.h | 11 +- include/net/bluetooth/mgmt.h | 12 + include/net/cfg80211.h | 23 +- include/net/mac80211.h | 6 +- include/net/nfc/digital.h | 7 + include/net/nfc/nfc.h | 3 + include/net/regulatory.h | 21 +- include/uapi/linux/nfc.h | 9 +- include/uapi/linux/nl80211.h | 6 + net/bluetooth/6lowpan.h | 21 + net/bluetooth/Kconfig | 8 +- net/bluetooth/Makefile | 3 +- net/bluetooth/a2mp.c | 12 +- net/bluetooth/hci_conn.c | 37 +- net/bluetooth/hci_core.c | 14 +- net/bluetooth/hci_event.c | 27 +- net/bluetooth/hci_sock.c | 16 +- net/bluetooth/l2cap_core.c | 90 +- net/bluetooth/l2cap_sock.c | 6 +- net/bluetooth/mgmt.c | 83 +- net/bluetooth/rfcomm/core.c | 4 +- net/bluetooth/sco.c | 10 +- net/bluetooth/smp.c | 208 ++- net/bluetooth/smp.h | 4 +- net/mac80211/cfg.c | 121 +- net/mac80211/ibss.c | 12 +- net/mac80211/ieee80211_i.h | 1 + net/mac80211/mlme.c | 70 +- net/mac80211/pm.c | 14 +- net/mac80211/rx.c | 3 + net/mac80211/scan.c | 6 +- net/mac80211/tx.c | 2 +- net/nfc/core.c | 10 +- net/nfc/digital.h | 6 + net/nfc/digital_core.c | 67 +- net/nfc/digital_technology.c | 247 +++- net/nfc/hci/llc.c | 4 +- net/nfc/llcp_core.c | 16 +- net/nfc/nci/core.c | 3 +- net/nfc/nci/spi.c | 3 +- net/nfc/netlink.c | 8 + net/wireless/ap.c | 9 +- net/wireless/chan.c | 56 + net/wireless/core.c | 2 +- net/wireless/core.h | 10 +- net/wireless/genregdb.awk | 8 +- net/wireless/ibss.c | 8 +- net/wireless/mlme.c | 2 +- net/wireless/nl80211.c | 24 +- net/wireless/reg.c | 86 +- net/wireless/reg.h | 1 - net/wireless/scan.c | 31 +- net/wireless/sme.c | 1 - net/wireless/util.c | 5 +- net/wireless/wext-sme.c | 2 +- 215 files changed, 13523 insertions(+), 2758 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/nfc/trf7970a.txt create mode 100644 drivers/net/wireless/ath/ath9k/common-beacon.c create mode 100644 drivers/net/wireless/ath/ath9k/common-beacon.h rename drivers/net/wireless/iwlwifi/mvm/{bt-coex.c => coex.c} (70%) rename drivers/net/wireless/iwlwifi/mvm/{fw-api-bt-coex.h => fw-api-coex.h} (99%) create mode 100644 drivers/net/wireless/iwlwifi/mvm/fw-error-dump.h create mode 100644 drivers/net/wireless/iwlwifi/mvm/offloading.c create mode 100644 drivers/net/wireless/rsi/Kconfig create mode 100644 drivers/net/wireless/rsi/Makefile create mode 100644 drivers/net/wireless/rsi/rsi_91x_core.c create mode 100644 drivers/net/wireless/rsi/rsi_91x_debugfs.c create mode 100644 drivers/net/wireless/rsi/rsi_91x_mac80211.c create mode 100644 drivers/net/wireless/rsi/rsi_91x_main.c create mode 100644 drivers/net/wireless/rsi/rsi_91x_mgmt.c create mode 100644 drivers/net/wireless/rsi/rsi_91x_pkt.c create mode 100644 drivers/net/wireless/rsi/rsi_91x_sdio.c create mode 100644 drivers/net/wireless/rsi/rsi_91x_sdio_ops.c create mode 100644 drivers/net/wireless/rsi/rsi_91x_usb.c create mode 100644 drivers/net/wireless/rsi/rsi_91x_usb_ops.c create mode 100644 drivers/net/wireless/rsi/rsi_boot_params.h create mode 100644 drivers/net/wireless/rsi/rsi_common.h create mode 100644 drivers/net/wireless/rsi/rsi_debugfs.h create mode 100644 drivers/net/wireless/rsi/rsi_main.h create mode 100644 drivers/net/wireless/rsi/rsi_mgmt.h create mode 100644 drivers/net/wireless/rsi/rsi_sdio.h create mode 100644 drivers/net/wireless/rsi/rsi_usb.h create mode 100644 drivers/nfc/trf7970a.c Merging bluetooth/master (61b1a7fbda6f Bluetooth: Fix address value for early disconnection events) $ git merge bluetooth/master Merge made by the 'recursive' strategy. include/net/bluetooth/hci_core.h | 2 +- net/bluetooth/hci_event.c | 4 ++-- net/bluetooth/mgmt.c | 20 ++++---------------- net/bluetooth/smp.c | 18 ++++++++++-------- 4 files changed, 17 insertions(+), 27 deletions(-) Merging infiniband/for-next (e51ec8b4b041 Merge branches 'core', 'cxgb4', 'iser', 'misc', 'mlx4', 'nes', 'ocrdma', 'qib' and 'usnic' into for-next) $ git merge infiniband/for-next Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c Auto-merging drivers/net/ethernet/emulex/benet/be_roce.h Auto-merging drivers/net/ethernet/emulex/benet/be_roce.c Auto-merging drivers/infiniband/hw/mlx5/main.c Auto-merging drivers/infiniband/hw/mlx4/qp.c Auto-merging drivers/infiniband/hw/cxgb4/qp.c Auto-merging drivers/infiniband/hw/cxgb4/iw_cxgb4.h Auto-merging drivers/infiniband/hw/cxgb4/cm.c Merge made by the 'recursive' strategy. drivers/infiniband/core/mad.c | 14 + drivers/infiniband/core/umem.c | 120 +++-- drivers/infiniband/core/verbs.c | 47 ++ drivers/infiniband/hw/amso1100/c2_provider.c | 23 +- drivers/infiniband/hw/cxgb3/iwch_provider.c | 19 +- drivers/infiniband/hw/cxgb4/cm.c | 9 +- drivers/infiniband/hw/cxgb4/cq.c | 7 +- drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 2 + drivers/infiniband/hw/cxgb4/mem.c | 51 +- drivers/infiniband/hw/cxgb4/qp.c | 8 +- drivers/infiniband/hw/ehca/ehca_classes.h | 2 +- drivers/infiniband/hw/ehca/ehca_cq.c | 1 + drivers/infiniband/hw/ehca/ehca_mrmw.c | 245 ++++------ drivers/infiniband/hw/ipath/ipath_diag.c | 66 +-- drivers/infiniband/hw/ipath/ipath_mr.c | 39 +- drivers/infiniband/hw/mlx4/doorbell.c | 4 +- drivers/infiniband/hw/mlx4/mr.c | 39 +- drivers/infiniband/hw/mlx4/qp.c | 2 +- drivers/infiniband/hw/mlx5/cq.c | 62 +++ drivers/infiniband/hw/mlx5/doorbell.c | 4 +- drivers/infiniband/hw/mlx5/main.c | 12 + drivers/infiniband/hw/mlx5/mem.c | 80 ++-- drivers/infiniband/hw/mlx5/mlx5_ib.h | 14 + drivers/infiniband/hw/mlx5/mr.c | 157 +++++++ drivers/infiniband/hw/mlx5/qp.c | 540 +++++++++++++++++++-- drivers/infiniband/hw/mthca/mthca_provider.c | 43 +- drivers/infiniband/hw/nes/nes_cm.c | 121 +++-- drivers/infiniband/hw/nes/nes_cm.h | 3 + drivers/infiniband/hw/nes/nes_user.h | 5 +- drivers/infiniband/hw/nes/nes_verbs.c | 261 +++++------ drivers/infiniband/hw/nes/nes_verbs.h | 1 + drivers/infiniband/hw/ocrdma/Makefile | 2 +- drivers/infiniband/hw/ocrdma/ocrdma.h | 110 ++++- drivers/infiniband/hw/ocrdma/ocrdma_abi.h | 7 +- drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 2 +- drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 299 +++++++++--- drivers/infiniband/hw/ocrdma/ocrdma_hw.h | 6 +- drivers/infiniband/hw/ocrdma/ocrdma_main.c | 81 +++- drivers/infiniband/hw/ocrdma/ocrdma_sli.h | 261 ++++++++++- drivers/infiniband/hw/ocrdma/ocrdma_stats.c | 623 +++++++++++++++++++++++++ drivers/infiniband/hw/ocrdma/ocrdma_stats.h | 54 +++ drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 233 ++++----- drivers/infiniband/hw/qib/qib.h | 12 +- drivers/infiniband/hw/qib/qib_diag.c | 52 +-- drivers/infiniband/hw/qib/qib_file_ops.c | 5 +- drivers/infiniband/hw/qib/qib_fs.c | 1 + drivers/infiniband/hw/qib/qib_iba6120.c | 11 +- drivers/infiniband/hw/qib/qib_iba7220.c | 12 +- drivers/infiniband/hw/qib/qib_iba7322.c | 37 +- drivers/infiniband/hw/qib/qib_init.c | 96 ++-- drivers/infiniband/hw/qib/qib_mad.c | 44 +- drivers/infiniband/hw/qib/qib_mr.c | 14 +- drivers/infiniband/hw/qib/qib_rc.c | 2 +- drivers/infiniband/hw/qib/qib_ruc.c | 1 + drivers/infiniband/hw/qib/qib_ud.c | 6 +- drivers/infiniband/hw/qib/qib_user_sdma.c | 136 +++++- drivers/infiniband/hw/qib/qib_verbs.c | 8 +- drivers/infiniband/hw/qib/qib_verbs.h | 16 +- drivers/infiniband/hw/usnic/usnic_uiom.c | 2 +- drivers/infiniband/ulp/iser/iscsi_iser.c | 46 +- drivers/infiniband/ulp/iser/iscsi_iser.h | 71 ++- drivers/infiniband/ulp/iser/iser_initiator.c | 98 +++- drivers/infiniband/ulp/iser/iser_memory.c | 456 +++++++++++++----- drivers/infiniband/ulp/iser/iser_verbs.c | 299 ++++++++---- drivers/net/ethernet/emulex/benet/be_roce.c | 6 + drivers/net/ethernet/emulex/benet/be_roce.h | 3 + drivers/net/ethernet/mellanox/mlx5/core/main.c | 1 + drivers/net/ethernet/mellanox/mlx5/core/mr.c | 85 ++++ drivers/scsi/libiscsi.c | 32 ++ include/linux/mlx5/cq.h | 1 + include/linux/mlx5/device.h | 43 ++ include/linux/mlx5/driver.h | 41 ++ include/linux/mlx5/qp.h | 67 +++ include/rdma/ib_umem.h | 11 +- include/rdma/ib_verbs.h | 187 +++++++- include/scsi/libiscsi.h | 4 + include/scsi/scsi_transport_iscsi.h | 1 + 77 files changed, 4380 insertions(+), 1206 deletions(-) create mode 100644 drivers/infiniband/hw/ocrdma/ocrdma_stats.c create mode 100644 drivers/infiniband/hw/ocrdma/ocrdma_stats.h Merging mtd/master (fa389e220254 Linux 3.14-rc6) $ git merge mtd/master Already up-to-date. Merging l2-mtd/master (d9ba46d32c0e mtd: st_spi_fsm: Succinctly reorganise .remove()) $ git merge l2-mtd/master Auto-merging drivers/mtd/ubi/ubi.h Auto-merging drivers/mtd/nand/davinci_nand.c Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/mtd/nand.txt | 14 + Documentation/devicetree/bindings/mtd/st-fsm.txt | 26 + drivers/mtd/Kconfig | 2 +- drivers/mtd/bcm47xxpart.c | 11 +- drivers/mtd/chips/cfi_cmdset_0001.c | 40 +- drivers/mtd/chips/cfi_cmdset_0002.c | 9 +- drivers/mtd/chips/cfi_cmdset_0020.c | 3 - drivers/mtd/chips/cfi_probe.c | 4 +- drivers/mtd/chips/cfi_util.c | 4 +- drivers/mtd/chips/gen_probe.c | 2 - drivers/mtd/devices/Kconfig | 8 + drivers/mtd/devices/Makefile | 1 + drivers/mtd/devices/block2mtd.c | 19 +- drivers/mtd/devices/elm.c | 6 +- drivers/mtd/devices/m25p80.c | 35 +- drivers/mtd/devices/mtd_dataflash.c | 24 +- drivers/mtd/devices/phram.c | 41 +- drivers/mtd/devices/pmc551.c | 7 +- drivers/mtd/devices/serial_flash_cmds.h | 81 + drivers/mtd/devices/spear_smi.c | 2 - drivers/mtd/devices/sst25l.c | 1 - drivers/mtd/devices/st_spi_fsm.c | 2108 ++++++++++++++++++++++ drivers/mtd/inftlmount.c | 1 - drivers/mtd/lpddr/lpddr_cmds.c | 4 +- drivers/mtd/lpddr/qinfo_probe.c | 5 +- drivers/mtd/maps/Kconfig | 10 +- drivers/mtd/maps/bfin-async-flash.c | 1 - drivers/mtd/maps/gpio-addr-flash.c | 1 - drivers/mtd/maps/intel_vr_nor.c | 1 - drivers/mtd/maps/ixp4xx.c | 1 - drivers/mtd/maps/lantiq-flash.c | 1 - drivers/mtd/maps/latch-addr-flash.c | 1 - drivers/mtd/maps/pci.c | 1 - drivers/mtd/maps/physmap_of.c | 1 - drivers/mtd/maps/plat-ram.c | 2 - drivers/mtd/maps/pxa2xx-flash.c | 1 - drivers/mtd/maps/rbtx4939-flash.c | 1 - drivers/mtd/maps/scb2_flash.c | 1 - drivers/mtd/maps/sun_uflash.c | 1 - drivers/mtd/mtd_blkdevs.c | 1 - drivers/mtd/mtdchar.c | 20 +- drivers/mtd/mtdcore.c | 24 +- drivers/mtd/mtdpart.c | 14 +- drivers/mtd/nand/Kconfig | 2 + drivers/mtd/nand/ams-delta.c | 1 - drivers/mtd/nand/atmel_nand.c | 14 +- drivers/mtd/nand/au1550nd.c | 4 +- drivers/mtd/nand/bf5xx_nand.c | 1 - drivers/mtd/nand/cafe_nand.c | 68 +- drivers/mtd/nand/davinci_nand.c | 1 - drivers/mtd/nand/diskonchip.c | 3 +- drivers/mtd/nand/fsl_elbc_nand.c | 1 - drivers/mtd/nand/fsl_ifc_nand.c | 1 - drivers/mtd/nand/gpio.c | 1 - drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 102 +- drivers/mtd/nand/mpc5121_nfc.c | 1 - drivers/mtd/nand/mxc_nand.c | 2 + drivers/mtd/nand/nand_base.c | 158 +- drivers/mtd/nand/nand_ids.c | 3 + drivers/mtd/nand/nuc900_nand.c | 6 +- drivers/mtd/nand/omap2.c | 480 +++-- drivers/mtd/nand/pasemi_nand.c | 1 - drivers/mtd/nand/pxa3xx_nand.c | 3 +- drivers/mtd/nand/s3c2410.c | 1 - drivers/mtd/onenand/generic.c | 1 - drivers/mtd/onenand/omap2.c | 1 - drivers/mtd/onenand/onenand_base.c | 38 +- drivers/mtd/onenand/samsung.c | 4 +- drivers/mtd/rfd_ftl.c | 9 +- drivers/mtd/sm_ftl.c | 11 +- drivers/mtd/tests/mtd_test.c | 1 - drivers/mtd/ubi/ubi.h | 1 - drivers/of/of_mtd.c | 34 + fs/jffs2/compr_rtime.c | 4 +- fs/jffs2/fs.c | 9 +- fs/jffs2/nodelist.h | 2 +- fs/jffs2/nodemgmt.c | 14 +- include/linux/mtd/mtd.h | 16 +- include/linux/mtd/nand.h | 126 +- include/linux/of_mtd.h | 12 + include/linux/platform_data/mtd-nand-s3c2410.h | 8 +- 81 files changed, 3118 insertions(+), 568 deletions(-) create mode 100644 Documentation/devicetree/bindings/mtd/st-fsm.txt create mode 100644 drivers/mtd/devices/serial_flash_cmds.h create mode 100644 drivers/mtd/devices/st_spi_fsm.c Merging crypto/master (26a05489ee0e crypto: omap-sham - Map SG pages if they are HIGHMEM before accessing) $ git merge crypto/master Removing drivers/crypto/tegra-aes.h Removing drivers/crypto/tegra-aes.c Auto-merging crypto/crc32c_generic.c Merge made by the 'recursive' strategy. arch/x86/crypto/blowfish_glue.c | 3 - arch/x86/crypto/cast5_avx_glue.c | 3 - crypto/Makefile | 2 +- crypto/blkcipher.c | 81 +- crypto/{crc32c.c => crc32c_generic.c} | 2 + drivers/char/hw_random/atmel-rng.c | 23 +- drivers/char/hw_random/core.c | 17 +- drivers/char/hw_random/nomadik-rng.c | 13 +- drivers/char/hw_random/omap3-rom-rng.c | 3 +- drivers/char/hw_random/picoxcell-rng.c | 27 +- drivers/char/hw_random/timeriomem-rng.c | 40 +- drivers/crypto/Kconfig | 22 +- drivers/crypto/Makefile | 2 +- drivers/crypto/bfin_crc.c | 45 +- drivers/crypto/caam/caamrng.c | 15 +- drivers/crypto/caam/ctrl.c | 61 +- drivers/crypto/caam/ctrl.h | 2 +- drivers/crypto/caam/regs.h | 4 +- drivers/crypto/ccp/ccp-crypto-main.c | 224 +++--- drivers/crypto/ccp/ccp-crypto-sha.c | 130 +--- drivers/crypto/ccp/ccp-crypto.h | 8 +- drivers/crypto/ccp/ccp-dev.c | 21 +- drivers/crypto/ccp/ccp-ops.c | 108 ++- drivers/crypto/mxs-dcp.c | 83 ++- drivers/crypto/omap-aes.c | 4 +- drivers/crypto/omap-des.c | 1216 +++++++++++++++++++++++++++++++ drivers/crypto/omap-sham.c | 12 +- drivers/crypto/picoxcell_crypto.c | 16 +- drivers/crypto/s5p-sss.c | 13 +- drivers/crypto/sahara.c | 26 +- drivers/crypto/talitos.c | 4 +- drivers/crypto/tegra-aes.c | 1087 --------------------------- drivers/crypto/tegra-aes.h | 103 --- include/crypto/algapi.h | 9 +- include/linux/ccp.h | 7 + 35 files changed, 1688 insertions(+), 1748 deletions(-) rename crypto/{crc32c.c => crc32c_generic.c} (98%) create mode 100644 drivers/crypto/omap-des.c delete mode 100644 drivers/crypto/tegra-aes.c delete mode 100644 drivers/crypto/tegra-aes.h Merging drm/drm-next (e84c20aff1ce drm/radeon/kms: merge conflicted badly) $ git merge drm/drm-next Auto-merging drivers/gpu/drm/i915/intel_dp.c Auto-merging drivers/gpu/drm/drm_fops.c Merge made by the 'recursive' strategy. Documentation/DocBook/drm.tmpl | 500 +++++--- .../devicetree/bindings/drm/i2c/tda998x.txt | 27 + drivers/gpu/drm/ast/ast_ttm.c | 5 +- drivers/gpu/drm/bochs/bochs_mm.c | 6 +- drivers/gpu/drm/cirrus/cirrus_ttm.c | 5 +- drivers/gpu/drm/drm_crtc.c | 737 ++++++++++-- drivers/gpu/drm/drm_crtc_helper.c | 193 ++- drivers/gpu/drm/drm_crtc_internal.h | 38 + drivers/gpu/drm/drm_dp_helper.c | 395 ++++++ drivers/gpu/drm/drm_drv.c | 4 +- drivers/gpu/drm/drm_edid.c | 34 +- drivers/gpu/drm/drm_fb_helper.c | 23 +- drivers/gpu/drm/drm_fops.c | 95 +- drivers/gpu/drm/drm_gem.c | 71 +- drivers/gpu/drm/drm_gem_cma_helper.c | 19 - drivers/gpu/drm/drm_mm.c | 211 +++- drivers/gpu/drm/drm_modes.c | 346 +++--- drivers/gpu/drm/drm_pci.c | 4 +- drivers/gpu/drm/drm_platform.c | 2 +- drivers/gpu/drm/drm_prime.c | 110 +- drivers/gpu/drm/drm_stub.c | 430 +++++-- drivers/gpu/drm/drm_usb.c | 2 +- drivers/gpu/drm/i2c/tda998x_drv.c | 602 ++++++---- drivers/gpu/drm/i915/Makefile | 80 +- drivers/gpu/drm/i915/i915_cmd_parser.c | 485 ++++++++ drivers/gpu/drm/i915/i915_debugfs.c | 542 ++++++++- drivers/gpu/drm/i915/i915_dma.c | 107 +- drivers/gpu/drm/i915/i915_drv.c | 195 +-- drivers/gpu/drm/i915/i915_drv.h | 627 +++++++--- drivers/gpu/drm/i915/i915_gem.c | 628 +++++----- drivers/gpu/drm/i915/i915_gem_context.c | 482 ++++++-- drivers/gpu/drm/i915/i915_gem_evict.c | 59 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 194 +-- drivers/gpu/drm/i915/i915_gem_gtt.c | 1251 +++++++++++++++----- drivers/gpu/drm/i915/i915_gem_tiling.c | 2 +- drivers/gpu/drm/i915/i915_gpu_error.c | 612 ++++++---- drivers/gpu/drm/i915/i915_irq.c | 621 ++++++---- drivers/gpu/drm/i915/i915_params.c | 164 +++ drivers/gpu/drm/i915/i915_reg.h | 550 +++++---- drivers/gpu/drm/i915/i915_suspend.c | 40 +- drivers/gpu/drm/i915/i915_sysfs.c | 10 + drivers/gpu/drm/i915/i915_trace.h | 20 +- drivers/gpu/drm/i915/i915_ums.c | 8 + drivers/gpu/drm/i915/intel_bios.c | 8 +- drivers/gpu/drm/i915/intel_bios.h | 174 ++- drivers/gpu/drm/i915/intel_crt.c | 60 +- drivers/gpu/drm/i915/intel_ddi.c | 108 +- drivers/gpu/drm/i915/intel_display.c | 814 ++++++++----- drivers/gpu/drm/i915/intel_dp.c | 433 +++++-- drivers/gpu/drm/i915/intel_drv.h | 69 +- drivers/gpu/drm/i915/intel_dsi.c | 21 +- drivers/gpu/drm/i915/intel_dvo.c | 1 + drivers/gpu/drm/i915/intel_fbdev.c | 216 +++- drivers/gpu/drm/i915/intel_hdmi.c | 72 +- drivers/gpu/drm/i915/intel_lvds.c | 17 +- drivers/gpu/drm/i915/intel_overlay.c | 12 +- drivers/gpu/drm/i915/intel_panel.c | 21 +- drivers/gpu/drm/i915/intel_pm.c | 910 ++++++++++---- drivers/gpu/drm/i915/intel_ringbuffer.c | 63 +- drivers/gpu/drm/i915/intel_ringbuffer.h | 34 + drivers/gpu/drm/i915/intel_sdvo.c | 70 +- drivers/gpu/drm/i915/intel_sprite.c | 18 +- drivers/gpu/drm/i915/intel_tv.c | 9 +- drivers/gpu/drm/i915/intel_uncore.c | 235 ++-- drivers/gpu/drm/mgag200/mgag200_ttm.c | 5 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 2 - drivers/gpu/drm/nouveau/nouveau_ttm.c | 4 +- drivers/gpu/drm/omapdrm/omap_gem.c | 34 +- drivers/gpu/drm/qxl/qxl_object.c | 2 - drivers/gpu/drm/qxl/qxl_ttm.c | 6 +- drivers/gpu/drm/radeon/Makefile | 8 +- drivers/gpu/drm/radeon/btc_dpm.c | 4 + drivers/gpu/drm/radeon/ci_dpm.c | 67 +- drivers/gpu/drm/radeon/cik.c | 109 +- drivers/gpu/drm/radeon/cik_sdma.c | 6 +- drivers/gpu/drm/radeon/cikd.h | 49 + drivers/gpu/drm/radeon/cypress_dpm.c | 4 + drivers/gpu/drm/radeon/evergreen.c | 6 +- drivers/gpu/drm/radeon/evergreen_cs.c | 210 ++-- drivers/gpu/drm/radeon/evergreen_dma.c | 4 +- drivers/gpu/drm/radeon/kv_dpm.c | 64 +- drivers/gpu/drm/radeon/ni.c | 8 +- drivers/gpu/drm/radeon/ni_dma.c | 6 +- drivers/gpu/drm/radeon/ni_dpm.c | 7 +- drivers/gpu/drm/radeon/r100.c | 45 +- drivers/gpu/drm/radeon/r200.c | 20 +- drivers/gpu/drm/radeon/r300.c | 32 +- drivers/gpu/drm/radeon/r600.c | 6 +- drivers/gpu/drm/radeon/r600_cs.c | 110 +- drivers/gpu/drm/radeon/r600_dma.c | 6 +- drivers/gpu/drm/radeon/r600_dpm.c | 48 +- drivers/gpu/drm/radeon/r600_dpm.h | 2 + drivers/gpu/drm/radeon/radeon.h | 158 ++- drivers/gpu/drm/radeon/radeon_asic.c | 19 + drivers/gpu/drm/radeon/radeon_asic.h | 14 + drivers/gpu/drm/radeon/radeon_cs.c | 163 ++- drivers/gpu/drm/radeon/radeon_device.c | 8 +- drivers/gpu/drm/radeon/radeon_drv.c | 3 +- drivers/gpu/drm/radeon/radeon_fence.c | 59 +- drivers/gpu/drm/radeon/radeon_gart.c | 958 --------------- drivers/gpu/drm/radeon/radeon_gem.c | 49 +- drivers/gpu/drm/radeon/radeon_kms.c | 30 +- drivers/gpu/drm/radeon/radeon_object.c | 136 ++- drivers/gpu/drm/radeon/radeon_object.h | 9 +- drivers/gpu/drm/radeon/radeon_pm.c | 32 +- drivers/gpu/drm/radeon/radeon_ring.c | 118 +- drivers/gpu/drm/radeon/radeon_sa.c | 7 +- drivers/gpu/drm/radeon/radeon_semaphore.c | 14 +- drivers/gpu/drm/radeon/radeon_test.c | 39 +- drivers/gpu/drm/radeon/radeon_ttm.c | 13 +- drivers/gpu/drm/radeon/radeon_uvd.c | 5 +- drivers/gpu/drm/radeon/radeon_vce.c | 699 +++++++++++ drivers/gpu/drm/radeon/radeon_vm.c | 966 +++++++++++++++ drivers/gpu/drm/radeon/rs780_dpm.c | 7 +- drivers/gpu/drm/radeon/rv6xx_dpm.c | 7 +- drivers/gpu/drm/radeon/rv770_dpm.c | 7 +- drivers/gpu/drm/radeon/si.c | 10 +- drivers/gpu/drm/radeon/si_dma.c | 4 +- drivers/gpu/drm/radeon/si_dpm.c | 7 +- drivers/gpu/drm/radeon/sid.h | 47 + drivers/gpu/drm/radeon/sumo_dpm.c | 7 +- drivers/gpu/drm/radeon/trinity_dpm.c | 7 +- drivers/gpu/drm/radeon/uvd_v1_0.c | 2 +- drivers/gpu/drm/radeon/vce_v1_0.c | 187 +++ drivers/gpu/drm/radeon/vce_v2_0.c | 181 +++ drivers/gpu/drm/tegra/bus.c | 2 +- drivers/gpu/drm/ttm/ttm_bo.c | 3 +- drivers/gpu/drm/udl/udl_fb.c | 2 +- drivers/gpu/drm/udl/udl_gem.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 5 +- drivers/staging/imx-drm/imx-hdmi.c | 1 - drivers/staging/imx-drm/imx-ldb.c | 2 - drivers/staging/imx-drm/imx-tve.c | 2 - drivers/staging/imx-drm/parallel-display.c | 2 - fs/dcache.c | 1 + include/drm/drmP.h | 70 +- include/drm/drm_crtc.h | 175 +-- include/drm/drm_crtc_helper.h | 6 +- include/drm/drm_dp_helper.h | 121 ++ include/drm/drm_fb_helper.h | 6 + include/drm/drm_mm.h | 154 ++- include/drm/drm_modes.h | 237 ++++ include/drm/drm_vma_manager.h | 6 +- include/drm/ttm/ttm_bo_driver.h | 2 + include/linux/hdmi.h | 12 + include/uapi/drm/radeon_drm.h | 20 + 146 files changed, 13767 insertions(+), 5811 deletions(-) create mode 100644 Documentation/devicetree/bindings/drm/i2c/tda998x.txt create mode 100644 drivers/gpu/drm/drm_crtc_internal.h create mode 100644 drivers/gpu/drm/i915/i915_cmd_parser.c create mode 100644 drivers/gpu/drm/i915/i915_params.c create mode 100644 drivers/gpu/drm/radeon/radeon_vce.c create mode 100644 drivers/gpu/drm/radeon/radeon_vm.c create mode 100644 drivers/gpu/drm/radeon/vce_v1_0.c create mode 100644 drivers/gpu/drm/radeon/vce_v2_0.c create mode 100644 include/drm/drm_modes.h Merging drm-intel/for-linux-next (4726e0b045b8 drm/i915: Enabling 128x128 and 256x256 ARGB Cursor Support) $ git merge drm-intel/for-linux-next Auto-merging drivers/gpu/drm/i915/intel_dp.c Merge made by the 'recursive' strategy. drivers/gpu/drm/drm_dp_helper.c | 3 +- drivers/gpu/drm/i915/i915_cmd_parser.c | 2 +- drivers/gpu/drm/i915/i915_debugfs.c | 148 ++++++-- drivers/gpu/drm/i915/i915_dma.c | 7 +- drivers/gpu/drm/i915/i915_drv.c | 14 +- drivers/gpu/drm/i915/i915_drv.h | 103 +++--- drivers/gpu/drm/i915/i915_gem.c | 18 +- drivers/gpu/drm/i915/i915_gem_context.c | 7 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 12 +- drivers/gpu/drm/i915/i915_gpu_error.c | 6 +- drivers/gpu/drm/i915/i915_irq.c | 85 ++--- drivers/gpu/drm/i915/i915_params.c | 10 - drivers/gpu/drm/i915/i915_reg.h | 6 + drivers/gpu/drm/i915/i915_sysfs.c | 81 ++-- drivers/gpu/drm/i915/i915_trace.h | 4 +- drivers/gpu/drm/i915/intel_crt.c | 2 +- drivers/gpu/drm/i915/intel_ddi.c | 3 +- drivers/gpu/drm/i915/intel_display.c | 632 +++++++++++++++++++++++--------- drivers/gpu/drm/i915/intel_dp.c | 532 ++++++++++----------------- drivers/gpu/drm/i915/intel_drv.h | 35 +- drivers/gpu/drm/i915/intel_dsi.c | 2 +- drivers/gpu/drm/i915/intel_dvo.c | 5 +- drivers/gpu/drm/i915/intel_fbdev.c | 144 +++++++- drivers/gpu/drm/i915/intel_hdmi.c | 36 +- drivers/gpu/drm/i915/intel_lvds.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 182 +++++---- drivers/gpu/drm/i915/intel_ringbuffer.c | 26 +- drivers/gpu/drm/i915/intel_ringbuffer.h | 2 + drivers/gpu/drm/i915/intel_sdvo.c | 2 +- drivers/gpu/drm/i915/intel_tv.c | 3 +- drivers/gpu/drm/i915/intel_uncore.c | 100 ++--- include/drm/drm_dp_helper.h | 4 + 32 files changed, 1295 insertions(+), 923 deletions(-) Merging drm-tegra/drm/for-next (c1a68b4c29b8 drm/tegra: Add eDP support) $ git merge drm-tegra/drm/for-next Auto-merging drivers/gpu/drm/tegra/drm.c Merge made by the 'recursive' strategy. .../bindings/gpu/nvidia,tegra20-host1x.txt | 42 + .../devicetree/bindings/panel/lg,lp129qe.txt | 7 + drivers/gpu/drm/panel/panel-simple.c | 25 + drivers/gpu/drm/tegra/Makefile | 2 + drivers/gpu/drm/tegra/dc.h | 1 + drivers/gpu/drm/tegra/dpaux.c | 544 ++++++++++ drivers/gpu/drm/tegra/dpaux.h | 73 ++ drivers/gpu/drm/tegra/drm.c | 19 +- drivers/gpu/drm/tegra/drm.h | 20 + drivers/gpu/drm/tegra/gem.c | 14 + drivers/gpu/drm/tegra/output.c | 8 + drivers/gpu/drm/tegra/sor.c | 1092 ++++++++++++++++++++ drivers/gpu/drm/tegra/sor.h | 278 +++++ drivers/gpu/host1x/syncpt.c | 1 + include/linux/host1x.h | 1 + 15 files changed, 2125 insertions(+), 2 deletions(-) create mode 100644 Documentation/devicetree/bindings/panel/lg,lp129qe.txt create mode 100644 drivers/gpu/drm/tegra/dpaux.c create mode 100644 drivers/gpu/drm/tegra/dpaux.h create mode 100644 drivers/gpu/drm/tegra/sor.c create mode 100644 drivers/gpu/drm/tegra/sor.h Merging sound/for-next (2df6742f6138 ALSA: hda - verify pin:cvt connection on preparing a stream for Intel HDMI codec) $ git merge sound/for-next Resolved 'sound/soc/kirkwood/Kconfig' using previous resolution. Removing sound/soc/sh/rcar/scu.c Auto-merging sound/soc/kirkwood/Kconfig CONFLICT (content): Merge conflict in sound/soc/kirkwood/Kconfig Auto-merging sound/soc/intel/sst-mfld-platform.h Auto-merging sound/soc/intel/sst-mfld-platform.c Auto-merging sound/soc/intel/sst-mfld-dsp.h Auto-merging drivers/media/usb/tm6000/tm6000-alsa.c Auto-merging drivers/media/usb/em28xx/em28xx-audio.c Auto-merging MAINTAINERS Auto-merging Documentation/devicetree/bindings/i2c/trivial-devices.txt Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master fde5e478ed44] Merge remote-tracking branch 'sound/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/DocBook/writing-an-alsa-driver.tmpl | 72 +- .../devicetree/bindings/i2c/trivial-devices.txt | 1 + .../devicetree/bindings/misc/atmel-ssc.txt | 8 + .../bindings/sound/armada-370db-audio.txt | 24 + Documentation/devicetree/bindings/sound/da9055.txt | 22 + .../bindings/sound/davinci-evm-audio.txt | 9 +- .../devicetree/bindings/sound/eukrea-tlv320.txt | 21 + .../devicetree/bindings/sound/fsl,esai.txt | 5 + .../devicetree/bindings/sound/fsl,spdif.txt | 5 + .../devicetree/bindings/sound/mvebu-audio.txt | 1 + .../devicetree/bindings/sound/pcm512x.txt | 30 + .../devicetree/bindings/sound/simple-card.txt | 17 +- .../devicetree/bindings/sound/sirf-audio-codec.txt | 17 + .../devicetree/bindings/sound/sirf-audio-port.txt | 20 + .../devicetree/bindings/sound/sirf-audio.txt | 41 + .../devicetree/bindings/sound/tdm-slot.txt | 20 + .../devicetree/bindings/sound/tlv320aic31xx.txt | 61 + .../devicetree/bindings/sound/tlv320aic32x4.txt | 30 + .../devicetree/bindings/sound/tlv320aic3x.txt | 1 - .../devicetree/bindings/sound/widgets.txt | 20 + MAINTAINERS | 7 + drivers/base/regmap/regmap.c | 12 + drivers/hid/hid-prodikeys.c | 5 +- drivers/media/pci/cx18/cx18-alsa-main.c | 9 +- drivers/media/pci/cx23885/cx23885-alsa.c | 5 +- drivers/media/pci/cx25821/cx25821-alsa.c | 7 +- drivers/media/pci/cx88/cx88-alsa.c | 6 +- drivers/media/pci/ivtv/ivtv-alsa-main.c | 9 +- drivers/media/pci/saa7134/saa7134-alsa.c | 6 +- drivers/media/usb/cx231xx/cx231xx-audio.c | 5 +- drivers/media/usb/em28xx/em28xx-audio.c | 5 +- drivers/media/usb/stk1160/stk1160-ac97.c | 6 +- drivers/media/usb/tlg2300/pd-alsa.c | 3 +- drivers/media/usb/tm6000/tm6000-alsa.c | 4 +- drivers/misc/atmel-ssc.c | 6 + drivers/platform/x86/thinkpad_acpi.c | 6 +- drivers/staging/line6/audio.c | 5 +- drivers/staging/line6/midi.c | 2 - drivers/staging/line6/pcm.c | 2 - drivers/staging/media/go7007/snd-go7007.c | 5 +- drivers/staging/media/solo6x10/solo6x10-g723.c | 6 +- drivers/usb/gadget/f_midi.c | 7 +- drivers/usb/gadget/f_uac2.c | 4 +- include/dt-bindings/sound/tlv320aic31xx-micbias.h | 8 + include/linux/atmel-ssc.h | 1 + include/linux/mfd/arizona/registers.h | 6 +- include/linux/platform_data/adau1977.h | 45 + include/linux/platform_data/asoc-s3c.h | 3 +- include/linux/platform_data/asoc-s3c24xx_simtec.h | 3 +- include/linux/platform_data/davinci_asp.h | 4 +- include/linux/regmap.h | 9 + include/sound/core.h | 113 +- include/sound/emu10k1.h | 2 - include/sound/hwdep.h | 3 +- include/sound/pcm.h | 8 + include/sound/rawmidi.h | 2 - include/sound/rcar_snd.h | 36 +- include/sound/simple_card.h | 6 +- include/sound/soc-dai.h | 3 + include/sound/soc-dapm.h | 40 +- include/sound/soc.h | 139 +- include/trace/events/hswadsp.h | 384 +++ include/trace/events/intel-sst.h | 148 + sound/aoa/aoa.h | 2 +- sound/aoa/codecs/onyx.c | 2 +- sound/aoa/codecs/tas.c | 2 +- sound/aoa/codecs/toonie.c | 2 +- sound/aoa/core/alsa.c | 7 +- sound/arm/aaci.c | 6 +- sound/arm/pxa2xx-ac97.c | 6 +- sound/atmel/abdac.c | 13 +- sound/atmel/ac97c.c | 10 +- sound/core/control.c | 17 +- sound/core/control_compat.c | 2 +- sound/core/device.c | 175 +- sound/core/hrtimer.c | 3 +- sound/core/hwdep.c | 53 +- sound/core/info.c | 15 +- sound/core/init.c | 186 +- sound/core/isadma.c | 2 +- sound/core/memalloc.c | 4 +- sound/core/oss/mixer_oss.c | 20 +- sound/core/oss/pcm_oss.c | 103 +- sound/core/pcm.c | 52 +- sound/core/pcm_lib.c | 28 +- sound/core/pcm_native.c | 51 +- sound/core/pcm_timer.c | 4 +- sound/core/rawmidi.c | 90 +- sound/core/rtctimer.c | 7 +- sound/core/seq/oss/seq_oss.c | 22 +- sound/core/seq/oss/seq_oss_device.h | 13 - sound/core/seq/oss/seq_oss_init.c | 29 +- sound/core/seq/oss/seq_oss_ioctl.c | 18 - sound/core/seq/oss/seq_oss_midi.c | 7 +- sound/core/seq/oss/seq_oss_readq.c | 4 +- sound/core/seq/oss/seq_oss_synth.c | 11 +- sound/core/seq/oss/seq_oss_timer.c | 7 - sound/core/seq/seq_clientmgr.c | 16 +- sound/core/seq/seq_device.c | 18 +- sound/core/seq/seq_dummy.c | 2 +- sound/core/seq/seq_fifo.c | 2 +- sound/core/seq/seq_lock.c | 4 +- sound/core/seq/seq_memory.c | 8 +- sound/core/seq/seq_midi.c | 8 +- sound/core/seq/seq_midi_emul.c | 6 +- sound/core/seq/seq_ports.c | 4 +- sound/core/seq/seq_prioq.c | 14 +- sound/core/seq/seq_queue.c | 2 +- sound/core/seq/seq_timer.c | 10 +- sound/core/seq/seq_virmidi.c | 2 +- sound/core/sound.c | 29 +- sound/core/sound_oss.c | 7 +- sound/core/timer.c | 17 +- sound/core/vmaster.c | 2 +- sound/drivers/aloop.c | 4 +- sound/drivers/dummy.c | 6 +- sound/drivers/ml403-ac97cr.c | 5 +- sound/drivers/mpu401/mpu401.c | 12 +- sound/drivers/mtpav.c | 4 +- sound/drivers/mts64.c | 5 +- sound/drivers/opl3/opl3_lib.c | 4 +- sound/drivers/opl3/opl3_synth.c | 2 +- sound/drivers/pcsp/pcsp.c | 4 +- sound/drivers/pcsp/pcsp_input.c | 1 + sound/drivers/portman2x4.c | 5 +- sound/drivers/serial-u16550.c | 5 +- sound/drivers/virmidi.c | 6 +- sound/firewire/dice.c | 4 +- sound/firewire/isight.c | 4 +- sound/firewire/scs1x.c | 4 +- sound/firewire/speakers.c | 4 +- sound/i2c/other/ak4113.c | 2 +- sound/i2c/other/ak4114.c | 2 +- sound/i2c/other/ak4117.c | 2 +- sound/isa/ad1816a/ad1816a.c | 6 +- sound/isa/ad1848/ad1848.c | 4 +- sound/isa/adlib.c | 4 +- sound/isa/als100.c | 6 +- sound/isa/azt2320.c | 6 +- sound/isa/cmi8328.c | 5 +- sound/isa/cmi8330.c | 13 +- sound/isa/cs423x/cs4231.c | 4 +- sound/isa/cs423x/cs4236.c | 16 +- sound/isa/es1688/es1688.c | 12 +- sound/isa/es18xx.c | 16 +- sound/isa/galaxy/galaxy.c | 6 +- sound/isa/gus/gusclassic.c | 4 +- sound/isa/gus/gusextreme.c | 6 +- sound/isa/gus/gusmax.c | 6 +- sound/isa/gus/interwave.c | 13 +- sound/isa/msnd/msnd_pinnacle.c | 11 +- sound/isa/opl3sa2.c | 16 +- sound/isa/opti9xx/miro.c | 11 +- sound/isa/opti9xx/opti92x-ad1848.c | 12 +- sound/isa/sb/jazz16.c | 6 +- sound/isa/sb/sb16.c | 13 +- sound/isa/sb/sb8.c | 6 +- sound/isa/sc6000.c | 6 +- sound/isa/sscape.c | 11 +- sound/isa/wavefront/wavefront.c | 13 +- sound/mips/au1x00.c | 241 +- sound/mips/hal2.c | 3 +- sound/mips/sgio2audio.c | 3 +- sound/oss/pas2.h | 3 + sound/oss/pas2_card.c | 2 - sound/parisc/harmony.c | 4 +- sound/pci/Kconfig | 9 +- sound/pci/ac97/ac97_codec.c | 45 +- sound/pci/ac97/ac97_patch.c | 3 +- sound/pci/ac97/ac97_pcm.c | 15 +- sound/pci/ad1889.c | 37 +- sound/pci/ali5451/ali5451.c | 152 +- sound/pci/als300.c | 57 +- sound/pci/als4000.c | 22 +- sound/pci/asihpi/asihpi.c | 16 +- sound/pci/atiixp.c | 33 +- sound/pci/atiixp_modem.c | 28 +- sound/pci/au88x0/au88x0.c | 5 +- sound/pci/aw2/aw2-alsa.c | 46 +- sound/pci/aw2/aw2-saa7146.c | 6 +- sound/pci/azt3328.c | 351 +-- sound/pci/bt87x.c | 41 +- sound/pci/ca0106/ca0106_main.c | 89 +- sound/pci/ca0106/ca_midi.c | 4 +- sound/pci/cmipci.c | 41 +- sound/pci/cs4281.c | 49 +- sound/pci/cs46xx/cs46xx.c | 3 +- sound/pci/cs46xx/cs46xx_lib.c | 145 +- sound/pci/cs46xx/dsp_spos.c | 126 +- sound/pci/cs46xx/dsp_spos_scb_lib.c | 57 +- sound/pci/cs5530.c | 27 +- sound/pci/cs5535audio/cs5535audio.c | 31 +- sound/pci/cs5535audio/cs5535audio_olpc.c | 7 +- sound/pci/cs5535audio/cs5535audio_pcm.c | 6 +- sound/pci/cs5535audio/cs5535audio_pm.c | 7 +- sound/pci/ctxfi/ctatc.c | 2 - sound/pci/ctxfi/xfi.c | 3 +- sound/pci/echoaudio/echoaudio.c | 26 +- sound/pci/echoaudio/echoaudio_dsp.c | 9 +- sound/pci/echoaudio/midi.c | 3 +- sound/pci/emu10k1/emu10k1.c | 9 +- sound/pci/emu10k1/emu10k1_callback.c | 4 +- sound/pci/emu10k1/emu10k1_main.c | 74 +- sound/pci/emu10k1/emu10k1_patch.c | 6 +- sound/pci/emu10k1/emu10k1x.c | 32 +- sound/pci/emu10k1/emufx.c | 12 +- sound/pci/emu10k1/emumixer.c | 6 +- sound/pci/emu10k1/emumpu401.c | 7 +- sound/pci/emu10k1/emupcm.c | 22 +- sound/pci/emu10k1/io.c | 13 +- sound/pci/emu10k1/irq.c | 21 +- sound/pci/emu10k1/memory.c | 12 +- sound/pci/emu10k1/p16v.c | 45 +- sound/pci/emu10k1/voice.c | 6 +- sound/pci/ens1370.c | 44 +- sound/pci/es1938.c | 79 +- sound/pci/es1968.c | 54 +- sound/pci/fm801.c | 31 +- sound/pci/hda/Kconfig | 45 +- sound/pci/hda/Makefile | 8 +- sound/pci/hda/hda_auto_parser.c | 35 +- sound/pci/hda/hda_beep.c | 36 +- sound/pci/hda/hda_beep.h | 6 + sound/pci/hda/hda_codec.c | 238 +- sound/pci/hda/hda_codec.h | 8 +- sound/pci/hda/hda_controller.c | 2031 ++++++++++++++ sound/pci/hda/hda_controller.h | 53 + sound/pci/hda/hda_eld.c | 17 +- sound/pci/hda/hda_generic.c | 49 +- sound/pci/hda/hda_generic.h | 1 - sound/pci/hda/hda_hwdep.c | 769 +----- sound/pci/hda/hda_i915.c | 6 +- sound/pci/hda/hda_intel.c | 2824 ++------------------ sound/pci/hda/hda_local.h | 26 +- sound/pci/hda/hda_priv.h | 463 ++++ sound/pci/hda/hda_sysfs.c | 780 ++++++ sound/pci/hda/patch_analog.c | 1 - sound/pci/hda/patch_ca0110.c | 1 - sound/pci/hda/patch_ca0132.c | 209 +- sound/pci/hda/patch_cirrus.c | 1 - sound/pci/hda/patch_cmedia.c | 34 +- sound/pci/hda/patch_conexant.c | 847 +++--- sound/pci/hda/patch_hdmi.c | 109 +- sound/pci/hda/patch_realtek.c | 438 ++- sound/pci/hda/patch_si3054.c | 5 +- sound/pci/hda/patch_sigmatel.c | 15 +- sound/pci/hda/patch_via.c | 8 +- sound/pci/hda/thinkpad_helper.c | 6 +- sound/pci/ice1712/aureon.c | 7 +- sound/pci/ice1712/delta.c | 5 +- sound/pci/ice1712/ews.c | 12 +- sound/pci/ice1712/ice1712.c | 38 +- sound/pci/ice1712/ice1724.c | 50 +- sound/pci/ice1712/juli.c | 14 +- sound/pci/ice1712/prodigy192.c | 13 +- sound/pci/ice1712/quartet.c | 6 +- sound/pci/intel8x0.c | 90 +- sound/pci/intel8x0m.c | 50 +- sound/pci/korg1212/korg1212.c | 5 +- sound/pci/lola/lola.c | 46 +- sound/pci/lola/lola_clock.c | 14 +- sound/pci/lola/lola_mixer.c | 22 +- sound/pci/lola/lola_pcm.c | 26 +- sound/pci/lx6464es/lx6464es.c | 162 +- sound/pci/lx6464es/lx_core.c | 173 +- sound/pci/maestro3.c | 42 +- sound/pci/mixart/mixart.c | 123 +- sound/pci/mixart/mixart_core.c | 49 +- sound/pci/mixart/mixart_hwdep.c | 65 +- sound/pci/mixart/mixart_mixer.c | 16 +- sound/pci/nm256/nm256.c | 79 +- sound/pci/oxygen/oxygen_io.c | 8 +- sound/pci/oxygen/oxygen_lib.c | 14 +- sound/pci/oxygen/xonar_hdmi.c | 2 +- sound/pci/oxygen/xonar_lib.c | 4 +- sound/pci/pcxhr/pcxhr.c | 58 +- sound/pci/pcxhr/pcxhr_core.c | 108 +- sound/pci/pcxhr/pcxhr_hwdep.c | 31 +- sound/pci/pcxhr/pcxhr_mix22.c | 23 +- sound/pci/pcxhr/pcxhr_mixer.c | 13 +- sound/pci/riptide/riptide.c | 5 +- sound/pci/rme32.c | 10 +- sound/pci/rme96.c | 51 +- sound/pci/rme9652/hdsp.c | 133 +- sound/pci/rme9652/hdspm.c | 131 +- sound/pci/rme9652/rme9652.c | 24 +- sound/pci/sis7019.c | 5 +- sound/pci/sonicvibes.c | 240 +- sound/pci/trident/trident.c | 3 +- sound/pci/trident/trident_main.c | 90 +- sound/pci/via82xx.c | 73 +- sound/pci/via82xx_modem.c | 49 +- sound/pci/vx222/vx222.c | 12 +- sound/pci/vx222/vx222_ops.c | 19 +- sound/pci/ymfpci/ymfpci.c | 25 +- sound/pci/ymfpci/ymfpci_main.c | 28 +- sound/pcmcia/pdaudiocf/pdaudiocf.c | 5 +- sound/pcmcia/vx/vxpocket.c | 4 +- sound/ppc/powermac.c | 4 +- sound/ppc/snd_ps3.c | 4 +- sound/sh/aica.c | 5 +- sound/sh/sh_dac_audio.c | 2 +- sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/atmel/Kconfig | 2 +- sound/soc/atmel/atmel_ssc_dai.c | 13 +- sound/soc/atmel/sam9g20_wm8731.c | 20 +- sound/soc/blackfin/Kconfig | 9 +- sound/soc/cirrus/Kconfig | 4 +- sound/soc/cirrus/snappercl15.c | 18 +- sound/soc/codecs/88pm860x-codec.c | 119 +- sound/soc/codecs/Kconfig | 187 +- sound/soc/codecs/Makefile | 35 +- sound/soc/codecs/ad1836.c | 4 +- sound/soc/codecs/ad193x-i2c.c | 54 + sound/soc/codecs/ad193x-spi.c | 48 + sound/soc/codecs/ad193x.c | 154 +- sound/soc/codecs/ad193x.h | 7 + sound/soc/codecs/adau1373.c | 39 +- sound/soc/codecs/adau1977-i2c.c | 59 + sound/soc/codecs/adau1977-spi.c | 76 + sound/soc/codecs/adau1977.c | 1018 +++++++ sound/soc/codecs/adau1977.h | 37 + sound/soc/codecs/adav801.c | 53 + sound/soc/codecs/adav803.c | 50 + sound/soc/codecs/adav80x.c | 159 +- sound/soc/codecs/adav80x.h | 7 + sound/soc/codecs/ak4104.c | 2 - sound/soc/codecs/ak4535.c | 9 - sound/soc/codecs/ak4641.c | 24 +- sound/soc/codecs/ak4642.c | 8 - sound/soc/codecs/ak4671.c | 250 +- sound/soc/codecs/ak4671.h | 2 - sound/soc/codecs/alc5623.c | 120 +- sound/soc/codecs/alc5632.c | 48 +- sound/soc/codecs/arizona.c | 325 ++- sound/soc/codecs/cq93vc.c | 3 +- sound/soc/codecs/cs4270.c | 9 - sound/soc/codecs/cs4271.c | 63 +- sound/soc/codecs/cs42l51.c | 90 +- sound/soc/codecs/cs42l52.c | 101 +- sound/soc/codecs/cs42l73.c | 66 +- sound/soc/codecs/da7210.c | 28 +- sound/soc/codecs/da7213.c | 159 +- sound/soc/codecs/da732x.c | 196 +- sound/soc/codecs/da732x.h | 3 - sound/soc/codecs/da9055.c | 100 +- sound/soc/codecs/isabelle.c | 16 - sound/soc/codecs/lm4857.c | 3 +- sound/soc/codecs/lm49453.c | 47 +- sound/soc/codecs/max9768.c | 5 - sound/soc/codecs/max98088.c | 47 +- sound/soc/codecs/max98090.c | 180 +- sound/soc/codecs/max98095.c | 60 +- sound/soc/codecs/max9850.c | 8 - sound/soc/codecs/mc13783.c | 24 +- sound/soc/codecs/ml26124.c | 22 +- sound/soc/codecs/pcm1681.c | 15 +- sound/soc/codecs/pcm1792a.c | 33 +- sound/soc/codecs/pcm512x-i2c.c | 71 + sound/soc/codecs/pcm512x-spi.c | 69 + sound/soc/codecs/pcm512x.c | 589 ++++ sound/soc/codecs/pcm512x.h | 171 ++ sound/soc/codecs/rt5631.c | 84 +- sound/soc/codecs/rt5640.c | 83 +- sound/soc/codecs/sgtl5000.c | 18 +- sound/soc/codecs/si476x.c | 6 +- sound/soc/codecs/sirf-audio-codec.c | 533 ++++ sound/soc/codecs/sirf-audio-codec.h | 75 + sound/soc/codecs/sn95031.c | 46 +- sound/soc/codecs/ssm2518.c | 24 +- sound/soc/codecs/ssm2602-i2c.c | 57 + sound/soc/codecs/ssm2602-spi.c | 41 + sound/soc/codecs/ssm2602.c | 180 +- sound/soc/codecs/ssm2602.h | 14 + sound/soc/codecs/sta32x.c | 14 - sound/soc/codecs/sta529.c | 12 +- sound/soc/codecs/stac9766.c | 38 +- sound/soc/codecs/tlv320aic23-i2c.c | 59 + sound/soc/codecs/tlv320aic23-spi.c | 56 + sound/soc/codecs/tlv320aic23.c | 79 +- sound/soc/codecs/tlv320aic23.h | 6 + sound/soc/codecs/tlv320aic26.c | 7 +- sound/soc/codecs/tlv320aic31xx.c | 1285 +++++++++ sound/soc/codecs/tlv320aic31xx.h | 258 ++ sound/soc/codecs/tlv320aic32x4.c | 234 +- sound/soc/codecs/tlv320aic3x.c | 6 - sound/soc/codecs/tlv320dac33.c | 35 +- sound/soc/codecs/twl4030.c | 101 +- sound/soc/codecs/twl6040.c | 17 +- sound/soc/codecs/uda1380.c | 40 +- sound/soc/codecs/wl1273.c | 9 +- sound/soc/codecs/wm2000.c | 2 - sound/soc/codecs/wm2200.c | 25 +- sound/soc/codecs/wm5100.c | 43 +- sound/soc/codecs/wm5102.c | 32 +- sound/soc/codecs/wm5110.c | 22 +- sound/soc/codecs/wm8350.c | 4 +- sound/soc/codecs/wm8400.c | 3 +- sound/soc/codecs/wm8510.c | 10 +- sound/soc/codecs/wm8523.c | 11 +- sound/soc/codecs/wm8580.c | 6 - sound/soc/codecs/wm8711.c | 8 +- sound/soc/codecs/wm8728.c | 11 +- sound/soc/codecs/wm8731.c | 11 +- sound/soc/codecs/wm8737.c | 56 +- sound/soc/codecs/wm8741.c | 40 +- sound/soc/codecs/wm8750.c | 6 - sound/soc/codecs/wm8753.c | 12 +- sound/soc/codecs/wm8770.c | 6 - sound/soc/codecs/wm8776.c | 6 - sound/soc/codecs/wm8804.c | 10 +- sound/soc/codecs/wm8900.c | 8 +- sound/soc/codecs/wm8903.c | 118 +- sound/soc/codecs/wm8904.c | 86 +- sound/soc/codecs/wm8940.c | 26 +- sound/soc/codecs/wm8955.c | 19 +- sound/soc/codecs/wm8958-dsp2.c | 8 +- sound/soc/codecs/wm8960.c | 6 - sound/soc/codecs/wm8961.c | 23 +- sound/soc/codecs/wm8962.c | 87 +- sound/soc/codecs/wm8971.c | 6 - sound/soc/codecs/wm8974.c | 10 +- sound/soc/codecs/wm8978.c | 38 +- sound/soc/codecs/wm8983.c | 51 +- sound/soc/codecs/wm8985.c | 46 +- sound/soc/codecs/wm8988.c | 70 +- sound/soc/codecs/wm8990.c | 49 +- sound/soc/codecs/wm8991.c | 52 +- sound/soc/codecs/wm8993.c | 73 +- sound/soc/codecs/wm8994.c | 55 +- sound/soc/codecs/wm8995.c | 50 +- sound/soc/codecs/wm8996.c | 87 +- sound/soc/codecs/wm8997.c | 29 +- sound/soc/codecs/wm9081.c | 34 +- sound/soc/codecs/wm9090.c | 10 - sound/soc/codecs/wm9705.c | 12 +- sound/soc/codecs/wm_adsp.c | 50 +- sound/soc/codecs/wm_hubs.c | 16 +- sound/soc/davinci/davinci-evm.c | 58 +- sound/soc/davinci/davinci-mcasp.c | 196 +- sound/soc/fsl/Kconfig | 12 +- sound/soc/fsl/eukrea-tlv320.c | 108 +- sound/soc/fsl/fsl_esai.c | 32 +- sound/soc/fsl/fsl_sai.c | 332 ++- sound/soc/fsl/fsl_sai.h | 48 +- sound/soc/fsl/fsl_spdif.c | 9 +- sound/soc/fsl/imx-pcm-fiq.c | 7 +- sound/soc/fsl/wm1133-ev1.c | 11 +- sound/soc/generic/simple-card.c | 245 +- sound/soc/intel/Kconfig | 42 +- sound/soc/intel/Makefile | 27 +- sound/soc/intel/byt-rt5640.c | 187 ++ sound/soc/intel/haswell.c | 235 ++ sound/soc/intel/mfld_machine.c | 65 +- sound/soc/intel/sst-acpi.c | 284 ++ sound/soc/intel/sst-baytrail-dsp.c | 372 +++ sound/soc/intel/sst-baytrail-ipc.c | 867 ++++++ sound/soc/intel/sst-baytrail-ipc.h | 69 + sound/soc/intel/sst-baytrail-pcm.c | 422 +++ sound/soc/intel/sst-dsp-priv.h | 309 +++ sound/soc/intel/sst-dsp.c | 385 +++ sound/soc/intel/sst-dsp.h | 233 ++ sound/soc/intel/sst-firmware.c | 587 ++++ sound/soc/intel/sst-haswell-dsp.c | 517 ++++ sound/soc/intel/sst-haswell-ipc.c | 1785 +++++++++++++ sound/soc/intel/sst-haswell-ipc.h | 488 ++++ sound/soc/intel/sst-haswell-pcm.c | 872 ++++++ sound/soc/intel/{sst_dsp.h => sst-mfld-dsp.h} | 8 +- .../intel/{sst_platform.c => sst-mfld-platform.c} | 8 +- .../intel/{sst_platform.h => sst-mfld-platform.h} | 4 +- sound/soc/kirkwood/Kconfig | 10 +- sound/soc/kirkwood/Makefile | 2 + sound/soc/kirkwood/armada-370-db.c | 120 + sound/soc/kirkwood/kirkwood-i2s.c | 1 + sound/soc/omap/Kconfig | 4 +- sound/soc/omap/ams-delta.c | 55 +- sound/soc/omap/n810.c | 22 +- sound/soc/omap/rx51.c | 22 +- sound/soc/pxa/corgi.c | 49 +- sound/soc/pxa/e740_wm9705.c | 10 +- sound/soc/pxa/e750_wm9705.c | 10 +- sound/soc/pxa/e800_wm9712.c | 19 +- sound/soc/pxa/magician.c | 60 +- sound/soc/pxa/mioa701_wm9713.c | 19 +- sound/soc/pxa/poodle.c | 7 +- sound/soc/pxa/spitz.c | 58 +- sound/soc/pxa/tosa.c | 67 +- sound/soc/pxa/zylonite.c | 17 +- sound/soc/s6000/s6105-ipcam.c | 28 +- sound/soc/samsung/Kconfig | 2 +- sound/soc/samsung/h1940_uda1380.c | 7 +- sound/soc/samsung/neo1973_wm8753.c | 168 +- sound/soc/samsung/rx1950_uda1380.c | 5 - sound/soc/samsung/smdk_wm8994.c | 2 +- sound/soc/samsung/tobermory.c | 2 + sound/soc/sh/migor.c | 19 +- sound/soc/sh/rcar/Makefile | 2 +- sound/soc/sh/rcar/adg.c | 228 +- sound/soc/sh/rcar/core.c | 306 ++- sound/soc/sh/rcar/gen.c | 98 +- sound/soc/sh/rcar/rsnd.h | 195 +- sound/soc/sh/rcar/scu.c | 384 --- sound/soc/sh/rcar/src.c | 687 +++++ sound/soc/sh/rcar/ssi.c | 332 +-- sound/soc/sirf/Kconfig | 14 + sound/soc/sirf/Makefile | 5 + sound/soc/sirf/sirf-audio-port.c | 194 ++ sound/soc/sirf/sirf-audio-port.h | 62 + sound/soc/sirf/sirf-audio.c | 156 ++ sound/soc/soc-cache.c | 13 +- sound/soc/soc-compress.c | 65 +- sound/soc/soc-core.c | 599 +++-- sound/soc/soc-dapm.c | 465 ++-- sound/soc/soc-io.c | 64 +- sound/soc/soc-jack.c | 5 +- sound/soc/soc-pcm.c | 109 +- sound/soc/spear/spdif_out.c | 10 +- sound/soc/tegra/Kconfig | 2 +- sound/sparc/amd7930.c | 4 +- sound/sparc/cs4231.c | 11 +- sound/sparc/dbri.c | 4 +- sound/spi/at73c213.c | 6 +- sound/usb/6fire/chip.c | 13 +- sound/usb/6fire/comm.c | 4 +- sound/usb/6fire/control.c | 18 +- sound/usb/6fire/firmware.c | 70 +- sound/usb/6fire/midi.c | 12 +- sound/usb/6fire/pcm.c | 46 +- sound/usb/caiaq/device.c | 6 +- sound/usb/card.c | 69 +- sound/usb/clock.c | 65 +- sound/usb/endpoint.c | 32 +- sound/usb/format.c | 68 +- sound/usb/hiface/chip.c | 10 +- sound/usb/midi.c | 45 +- sound/usb/misc/ua101.c | 7 +- sound/usb/mixer.c | 225 +- sound/usb/mixer.h | 7 +- sound/usb/mixer_quirks.c | 10 +- sound/usb/pcm.c | 83 +- sound/usb/quirks.c | 52 +- sound/usb/stream.c | 50 +- sound/usb/usbaudio.h | 9 + sound/usb/usx2y/us122l.c | 11 +- sound/usb/usx2y/usbusx2y.c | 13 +- sound/usb/usx2y/usbusx2y.h | 2 +- sound/usb/usx2y/usbusx2yaudio.c | 60 +- sound/usb/usx2y/usx2yhwdeppcm.c | 76 +- 549 files changed, 28143 insertions(+), 13103 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/armada-370db-audio.txt create mode 100644 Documentation/devicetree/bindings/sound/da9055.txt create mode 100644 Documentation/devicetree/bindings/sound/eukrea-tlv320.txt create mode 100644 Documentation/devicetree/bindings/sound/pcm512x.txt create mode 100644 Documentation/devicetree/bindings/sound/sirf-audio-codec.txt create mode 100644 Documentation/devicetree/bindings/sound/sirf-audio-port.txt create mode 100644 Documentation/devicetree/bindings/sound/sirf-audio.txt create mode 100644 Documentation/devicetree/bindings/sound/tdm-slot.txt create mode 100644 Documentation/devicetree/bindings/sound/tlv320aic31xx.txt create mode 100644 Documentation/devicetree/bindings/sound/tlv320aic32x4.txt create mode 100644 Documentation/devicetree/bindings/sound/widgets.txt create mode 100644 include/dt-bindings/sound/tlv320aic31xx-micbias.h create mode 100644 include/linux/platform_data/adau1977.h create mode 100644 include/trace/events/hswadsp.h create mode 100644 include/trace/events/intel-sst.h create mode 100644 sound/pci/hda/hda_controller.c create mode 100644 sound/pci/hda/hda_controller.h create mode 100644 sound/pci/hda/hda_priv.h create mode 100644 sound/pci/hda/hda_sysfs.c create mode 100644 sound/soc/codecs/ad193x-i2c.c create mode 100644 sound/soc/codecs/ad193x-spi.c create mode 100644 sound/soc/codecs/adau1977-i2c.c create mode 100644 sound/soc/codecs/adau1977-spi.c create mode 100644 sound/soc/codecs/adau1977.c create mode 100644 sound/soc/codecs/adau1977.h create mode 100644 sound/soc/codecs/adav801.c create mode 100644 sound/soc/codecs/adav803.c create mode 100644 sound/soc/codecs/pcm512x-i2c.c create mode 100644 sound/soc/codecs/pcm512x-spi.c create mode 100644 sound/soc/codecs/pcm512x.c create mode 100644 sound/soc/codecs/pcm512x.h create mode 100644 sound/soc/codecs/sirf-audio-codec.c create mode 100644 sound/soc/codecs/sirf-audio-codec.h create mode 100644 sound/soc/codecs/ssm2602-i2c.c create mode 100644 sound/soc/codecs/ssm2602-spi.c create mode 100644 sound/soc/codecs/tlv320aic23-i2c.c create mode 100644 sound/soc/codecs/tlv320aic23-spi.c create mode 100644 sound/soc/codecs/tlv320aic31xx.c create mode 100644 sound/soc/codecs/tlv320aic31xx.h create mode 100644 sound/soc/intel/byt-rt5640.c create mode 100644 sound/soc/intel/haswell.c create mode 100644 sound/soc/intel/sst-acpi.c create mode 100644 sound/soc/intel/sst-baytrail-dsp.c create mode 100644 sound/soc/intel/sst-baytrail-ipc.c create mode 100644 sound/soc/intel/sst-baytrail-ipc.h create mode 100644 sound/soc/intel/sst-baytrail-pcm.c create mode 100644 sound/soc/intel/sst-dsp-priv.h create mode 100644 sound/soc/intel/sst-dsp.c create mode 100644 sound/soc/intel/sst-dsp.h create mode 100644 sound/soc/intel/sst-firmware.c create mode 100644 sound/soc/intel/sst-haswell-dsp.c create mode 100644 sound/soc/intel/sst-haswell-ipc.c create mode 100644 sound/soc/intel/sst-haswell-ipc.h create mode 100644 sound/soc/intel/sst-haswell-pcm.c rename sound/soc/intel/{sst_dsp.h => sst-mfld-dsp.h} (96%) rename sound/soc/intel/{sst_platform.c => sst-mfld-platform.c} (99%) rename sound/soc/intel/{sst_platform.h => sst-mfld-platform.h} (97%) create mode 100644 sound/soc/kirkwood/armada-370-db.c delete mode 100644 sound/soc/sh/rcar/scu.c create mode 100644 sound/soc/sh/rcar/src.c create mode 100644 sound/soc/sirf/Kconfig create mode 100644 sound/soc/sirf/Makefile create mode 100644 sound/soc/sirf/sirf-audio-port.c create mode 100644 sound/soc/sirf/sirf-audio-port.h create mode 100644 sound/soc/sirf/sirf-audio.c Merging sound-asoc/for-next (bb4d25576fcc Merge remote-tracking branches 'asoc/topic/simple' and 'asoc/topic/sirf' into asoc-next) $ git merge sound-asoc/for-next Auto-merging sound/soc/kirkwood/Kconfig Auto-merging arch/arm/mach-shmobile/board-armadillo800eva.c Merge made by the 'recursive' strategy. .../bindings/sound/armada-370db-audio.txt | 9 ++- .../devicetree/bindings/sound/simple-card.txt | 6 ++ arch/arm/mach-shmobile/board-armadillo800eva.c | 4 +- arch/arm/mach-shmobile/board-kzm9g.c | 4 +- arch/arm/mach-shmobile/board-mackerel.c | 6 +- arch/sh/boards/mach-ecovec24/setup.c | 4 +- arch/sh/boards/mach-se/7724/setup.c | 4 +- include/sound/soc.h | 13 ++++ sound/soc/codecs/cs42l51.c | 9 ++- sound/soc/codecs/cs42l52.c | 8 +-- sound/soc/codecs/cs42l73.c | 6 +- sound/soc/codecs/isabelle.c | 3 +- sound/soc/codecs/max98090.c | 1 - sound/soc/codecs/max98090.h | 1 - sound/soc/codecs/mc13783.c | 6 +- sound/soc/codecs/rt5640.c | 3 +- sound/soc/codecs/sirf-audio-codec.c | 9 --- sound/soc/codecs/sta529.c | 3 +- sound/soc/codecs/tlv320aic31xx.c | 19 ++--- sound/soc/codecs/uda134x.c | 3 +- sound/soc/codecs/uda1380.c | 3 +- sound/soc/codecs/wm8580.c | 3 +- sound/soc/davinci/davinci-evm.c | 22 +++--- sound/soc/davinci/davinci-mcasp.c | 21 ++++-- sound/soc/davinci/edma-pcm.c | 57 +++++++++++++++ sound/soc/davinci/edma-pcm.h | 25 +++++++ sound/soc/generic/simple-card.c | 80 +++++++++++++++------- sound/soc/kirkwood/Kconfig | 1 + sound/soc/kirkwood/armada-370-db.c | 28 ++++++++ sound/soc/omap/omap-abe-twl6040.c | 3 +- sound/soc/sh/fsi.c | 2 +- sound/soc/sh/rcar/core.c | 4 +- sound/soc/soc-io.c | 35 ++-------- sound/soc/tegra/tegra20_ac97.c | 2 +- sound/soc/tegra/tegra20_das.c | 2 +- sound/soc/tegra/tegra20_i2s.c | 2 +- sound/soc/tegra/tegra20_spdif.c | 2 +- sound/soc/tegra/tegra30_ahub.c | 4 +- sound/soc/tegra/tegra30_i2s.c | 2 +- 39 files changed, 263 insertions(+), 156 deletions(-) create mode 100644 sound/soc/davinci/edma-pcm.c create mode 100644 sound/soc/davinci/edma-pcm.h Merging modules/modules-next (c6bda7c988a5 kallsyms: fix percpu vars on x86-64 with relocation.) $ git merge modules/modules-next Merge made by the 'recursive' strategy. Documentation/ABI/testing/sysfs-module | 1 + Documentation/module-signing.txt | 3 +- Documentation/oops-tracing.txt | 3 ++ Documentation/sysctl/kernel.txt | 2 + include/linux/isapnp.h | 4 -- include/linux/kernel.h | 1 + include/linux/module.h | 19 ++++----- include/linux/moduleparam.h | 2 +- include/trace/events/module.h | 4 +- kernel/module.c | 10 +++-- kernel/panic.c | 2 + kernel/tracepoint.c | 5 ++- scripts/kallsyms.c | 74 ++++++++++++++++++++++++---------- scripts/link-vmlinux.sh | 4 ++ scripts/mod/file2alias.c | 14 ++++--- 15 files changed, 98 insertions(+), 50 deletions(-) Merging virtio/virtio-next (70670444c20a virtio: fail adding buffer on broken queues.) $ git merge virtio/virtio-next Auto-merging drivers/net/virtio_net.c Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 6 +++--- drivers/block/virtio_blk.c | 10 ++++++++-- drivers/char/hw_random/virtio-rng.c | 3 +-- drivers/net/virtio_net.c | 2 +- drivers/virtio/virtio_balloon.c | 14 +++++++++----- drivers/virtio/virtio_pci.c | 6 ++---- drivers/virtio/virtio_ring.c | 12 +++++++++--- tools/virtio/linux/kmemleak.h | 3 +++ tools/virtio/linux/virtio.h | 4 ++-- tools/virtio/virtio_test.c | 2 +- 10 files changed, 39 insertions(+), 23 deletions(-) create mode 100644 tools/virtio/linux/kmemleak.h Merging input/next (7fb45edba8b5 Input: imx_keypad - Propagate the real error code on platform_get_irq() failure) $ git merge input/next Auto-merging drivers/input/touchscreen/zforce_ts.c Merge made by the 'recursive' strategy. .../bindings/input/touchscreen/zforce_ts.txt | 30 +++ drivers/input/keyboard/imx_keypad.c | 4 +- drivers/input/misc/ims-pcu.c | 258 ++++++++++++++++++++- drivers/input/misc/sirfsoc-onkey.c | 110 ++++++--- drivers/input/misc/uinput.c | 97 +++++--- drivers/input/misc/wistron_btns.c | 19 ++ drivers/input/tablet/gtco.c | 2 +- drivers/input/touchscreen/zforce_ts.c | 95 ++++++-- include/linux/platform_data/touchscreen-s3c2410.h | 17 +- include/linux/uinput.h | 2 + include/uapi/linux/uinput.h | 13 +- 11 files changed, 552 insertions(+), 95 deletions(-) create mode 100644 Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) $ git merge input-mt/for-next Already up-to-date. Merging block/for-next (75e14e1b3ba7 Merge branch 'for-3.15/core' into for-next) $ git merge block/for-next Resolved 'block/blk-mq.c' using previous resolution. Resolved 'fs/bio-integrity.c' using previous resolution. Auto-merging net/core/dev.c Auto-merging kernel/sched/core.c Auto-merging include/linux/blk-mq.h Auto-merging fs/bio-integrity.c CONFLICT (content): Merge conflict in fs/bio-integrity.c Auto-merging drivers/scsi/be2iscsi/be_main.c Auto-merging drivers/block/virtio_blk.c Auto-merging drivers/block/mtip32xx/mtip32xx.h Auto-merging drivers/block/mtip32xx/mtip32xx.c Auto-merging block/blk-mq.h Auto-merging block/blk-mq.c CONFLICT (content): Merge conflict in block/blk-mq.c Auto-merging block/blk-core.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 4a100ddba49c] Merge remote-tracking branch 'block/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/blockdev/drbd/data-structure-v9.txt | 38 + block/blk-cgroup.c | 2 +- block/blk-core.c | 2 +- block/blk-ioc.c | 2 +- block/blk-iopoll.c | 3 - block/blk-mq-cpumap.c | 10 - block/blk-mq-sysfs.c | 31 + block/blk-mq.c | 70 +- block/blk-mq.h | 2 + block/blk-softirq.c | 19 +- block/cfq-iosched.c | 8 +- block/deadline-iosched.c | 8 +- block/partitions/atari.h | 4 +- block/partitions/efi.h | 9 +- block/partitions/karma.c | 3 +- drivers/block/DAC960.c | 34 +- drivers/block/ataflop.c | 16 +- drivers/block/cciss.c | 2 - drivers/block/drbd/drbd_actlog.c | 629 ++--- drivers/block/drbd/drbd_bitmap.c | 368 ++- drivers/block/drbd/drbd_int.h | 1130 ++++----- drivers/block/drbd/drbd_main.c | 2009 ++++++++-------- drivers/block/drbd/drbd_nl.c | 1653 +++++++------- drivers/block/drbd/drbd_proc.c | 140 +- drivers/block/drbd/drbd_protocol.h | 295 +++ drivers/block/drbd/drbd_receiver.c | 2532 +++++++++++---------- drivers/block/drbd/drbd_req.c | 464 ++-- drivers/block/drbd/drbd_req.h | 20 +- drivers/block/drbd/drbd_state.c | 859 +++---- drivers/block/drbd/drbd_state.h | 40 +- drivers/block/drbd/drbd_strings.c | 1 + drivers/block/drbd/drbd_strings.h | 9 + drivers/block/drbd/drbd_worker.c | 944 ++++---- drivers/block/drbd/drbd_wrappers.h | 14 +- drivers/block/mtip32xx/mtip32xx.c | 92 +- drivers/block/mtip32xx/mtip32xx.h | 2 +- drivers/block/nvme-core.c | 33 +- drivers/block/skd_main.c | 67 +- drivers/block/swim3.c | 18 +- drivers/block/virtio_blk.c | 3 +- drivers/cpuidle/coupled.c | 2 +- drivers/md/bcache/Kconfig | 8 - drivers/md/bcache/alloc.c | 173 +- drivers/md/bcache/bcache.h | 56 +- drivers/md/bcache/bset.c | 4 +- drivers/md/bcache/bset.h | 6 + drivers/md/bcache/btree.c | 592 +++-- drivers/md/bcache/btree.h | 12 +- drivers/md/bcache/extents.c | 36 +- drivers/md/bcache/journal.c | 46 +- drivers/md/bcache/journal.h | 1 + drivers/md/bcache/movinggc.c | 18 +- drivers/md/bcache/request.c | 201 +- drivers/md/bcache/request.h | 19 +- drivers/md/bcache/stats.c | 3 - drivers/md/bcache/super.c | 64 +- drivers/md/bcache/sysfs.c | 155 +- drivers/md/bcache/trace.c | 2 +- drivers/scsi/be2iscsi/be_main.c | 206 +- drivers/scsi/ipr.c | 15 +- fs/bio-integrity.c | 83 +- fs/bio.c | 1 - include/linux/blk-iopoll.h | 2 - include/linux/blk-mq.h | 5 +- include/linux/blkdev.h | 1 + include/linux/drbd.h | 8 +- include/linux/drbd_genl.h | 6 +- include/linux/elevator.h | 11 +- include/linux/idr.h | 1 + include/linux/smp.h | 8 +- include/trace/events/bcache.h | 52 +- include/trace/events/block.h | 33 +- kernel/sched/core.c | 2 +- kernel/smp.c | 139 +- kernel/sysctl.c | 12 - kernel/trace/blktrace.c | 20 +- kernel/up.c | 6 +- kernel/watchdog.c | 3 +- lib/idr.c | 10 + net/core/dev.c | 4 +- 80 files changed, 6956 insertions(+), 6655 deletions(-) create mode 100644 Documentation/blockdev/drbd/data-structure-v9.txt create mode 100644 drivers/block/drbd/drbd_protocol.h create mode 100644 drivers/block/drbd/drbd_strings.h Merging device-mapper/for-next (2ef30d539ae4 Merge branch 'for-linus' into for-next) $ git merge device-mapper/for-next Merge made by the 'recursive' strategy. Documentation/device-mapper/era.txt | 108 ++ drivers/md/Kconfig | 11 + drivers/md/Makefile | 2 + drivers/md/dm-cache-target.c | 10 +- drivers/md/dm-era-target.c | 1683 ++++++++++++++++++++++++++++++++ drivers/md/dm-mpath.c | 219 ++--- drivers/md/dm-table.c | 21 +- drivers/md/dm.c | 22 +- drivers/md/dm.h | 2 +- drivers/md/persistent-data/dm-bitset.c | 10 +- drivers/md/persistent-data/dm-bitset.h | 1 + include/linux/device-mapper.h | 8 +- 12 files changed, 1934 insertions(+), 163 deletions(-) create mode 100644 Documentation/device-mapper/era.txt create mode 100644 drivers/md/dm-era-target.c Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence) $ git merge embedded/master Already up-to-date. Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3) $ git merge firmware/master Already up-to-date. Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage) $ git merge pcmcia/master Already up-to-date. Merging mmc/mmc-next (655bca7616bf mmc: sdhci: Allow for irq being shared) $ git merge mmc/mmc-next Auto-merging drivers/mmc/host/mmci.h Removing drivers/mmc/host/dw_mmc-socfpga.c Auto-merging arch/arm/configs/omap2plus_defconfig Auto-merging arch/arm/boot/dts/omap5.dtsi Auto-merging arch/arm/boot/dts/omap4.dtsi Auto-merging arch/arm/boot/dts/omap3.dtsi Auto-merging arch/arm/boot/dts/omap2430.dtsi Auto-merging arch/arm/boot/dts/dra7.dtsi Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/mmc/mmc.txt | 9 + .../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 1 + .../bindings/regulator/pbias-regulator.txt | 27 ++ MAINTAINERS | 1 + arch/arm/boot/dts/dra7.dtsi | 17 + arch/arm/boot/dts/omap2430.dtsi | 17 + arch/arm/boot/dts/omap3-ldp.dts | 23 + arch/arm/boot/dts/omap3.dtsi | 17 + arch/arm/boot/dts/omap4.dtsi | 17 + arch/arm/boot/dts/omap5.dtsi | 17 + arch/arm/configs/omap2plus_defconfig | 2 + drivers/mfd/rtsx_pcr.c | 132 +++-- drivers/mmc/card/block.c | 181 ++++--- drivers/mmc/core/Kconfig | 15 - drivers/mmc/core/bus.c | 12 +- drivers/mmc/core/core.c | 87 +--- drivers/mmc/core/host.c | 18 + drivers/mmc/core/mmc.c | 65 ++- drivers/mmc/core/mmc_ops.c | 64 ++- drivers/mmc/core/sd.c | 23 +- drivers/mmc/core/slot-gpio.c | 180 +++++-- drivers/mmc/host/Kconfig | 8 - drivers/mmc/host/Makefile | 1 - drivers/mmc/host/davinci_mmc.c | 4 +- drivers/mmc/host/dw_mmc-k3.c | 2 + drivers/mmc/host/dw_mmc-pltfm.c | 12 +- drivers/mmc/host/dw_mmc-socfpga.c | 138 ------ drivers/mmc/host/dw_mmc.c | 2 +- drivers/mmc/host/dw_mmc.h | 3 +- drivers/mmc/host/mmci.c | 54 ++- drivers/mmc/host/mmci.h | 2 + drivers/mmc/host/omap.c | 93 ++-- drivers/mmc/host/omap_hsmmc.c | 242 +++++++--- drivers/mmc/host/rtsx_pci_sdmmc.c | 529 +++++++++++++++------ drivers/mmc/host/sdhci-acpi.c | 79 +-- drivers/mmc/host/sdhci-bcm-kona.c | 39 +- drivers/mmc/host/sdhci-dove.c | 2 +- drivers/mmc/host/sdhci-pci.c | 20 + drivers/mmc/host/sdhci-s3c.c | 170 +++---- drivers/mmc/host/sdhci-spear.c | 199 ++------ drivers/mmc/host/sdhci.c | 17 +- drivers/mmc/host/sh_mobile_sdhi.c | 50 +- drivers/mmc/host/tmio_mmc.c | 30 +- drivers/mmc/host/tmio_mmc.h | 7 +- drivers/mmc/host/tmio_mmc_pio.c | 7 +- drivers/mmc/host/ushc.c | 2 +- drivers/mmc/host/wmt-sdmmc.c | 4 +- drivers/regulator/Kconfig | 9 + drivers/regulator/Makefile | 1 + drivers/regulator/pbias-regulator.c | 255 ++++++++++ include/linux/mfd/rtsx_common.h | 1 + include/linux/mfd/rtsx_pci.h | 8 +- include/linux/mmc/core.h | 4 +- include/linux/mmc/host.h | 13 +- include/linux/mmc/sdhci-spear.h | 8 - include/linux/mmc/sdhci.h | 2 + include/linux/mmc/slot-gpio.h | 6 + include/linux/platform_data/mmc-msm_sdcc.h | 7 +- include/linux/platform_data/mmc-mvsdio.h | 6 +- 59 files changed, 1801 insertions(+), 1160 deletions(-) create mode 100644 Documentation/devicetree/bindings/regulator/pbias-regulator.txt delete mode 100644 drivers/mmc/host/dw_mmc-socfpga.c create mode 100644 drivers/regulator/pbias-regulator.c Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command) $ git merge kgdb/kgdb-next Merge made by the 'recursive' strategy. Merging slab/for-next (26e4f2057516 slub: Fix possible format string bug.) $ git merge slab/for-next Already up-to-date. Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) $ git merge uclinux/for-next Already up-to-date. Merging md/for-next (789b5e031528 md/raid5: Fix CPU hotplug callback registration) $ git merge md/for-next Already up-to-date. Merging mfd/master (90b128ed1557 Merge tag 'mfd-lee-3.13-3' of git://git.linaro.org/people/ljones/mfd) $ git merge mfd/master Already up-to-date. Merging mfd-lj/for-mfd-next (204747c970c0 mfd: kempld-core: Fix potential hang-up during boot) $ git merge mfd-lj/for-mfd-next Removing include/linux/mfd/pm8xxx/pm8921.h Removing include/linux/mfd/pm8xxx/irq.h Auto-merging include/linux/mfd/arizona/registers.h Auto-merging drivers/regulator/Makefile Auto-merging drivers/regulator/Kconfig Removing drivers/mfd/ti-ssp.c Removing drivers/mfd/pm8xxx-irq.c Auto-merging drivers/iio/adc/twl4030-madc.c Auto-merging arch/arm/mach-omap2/omap_hwmod_3xxx_data.c Auto-merging arch/arm/mach-omap2/cclock3xxx_data.c Auto-merging arch/arm/boot/dts/omap5.dtsi Auto-merging arch/arm/boot/dts/omap4.dtsi Merge made by the 'recursive' strategy. .../devicetree/bindings/iio/adc/twl4030-madc.txt | 24 + Documentation/devicetree/bindings/mfd/bcm590xx.txt | 37 + Documentation/devicetree/bindings/mfd/da9055.txt | 72 ++ .../devicetree/bindings/mfd/omap-usb-host.txt | 23 + .../devicetree/bindings/mfd/omap-usb-tll.txt | 10 + .../devicetree/bindings/mfd/qcom,pm8xxx.txt | 63 ++ Documentation/devicetree/bindings/mfd/s2mpa01.txt | 90 +++ Documentation/devicetree/bindings/mfd/s2mps11.txt | 24 +- arch/arm/boot/dts/omap4.dtsi | 6 + arch/arm/boot/dts/omap5.dtsi | 6 + arch/arm/mach-omap2/cclock3xxx_data.c | 4 - arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 6 - drivers/clk/ti/clk-3xxx.c | 4 - drivers/gpio/gpio-ich.c | 96 ++- drivers/iio/adc/Kconfig | 10 + drivers/iio/adc/Makefile | 1 + drivers/{mfd => iio/adc}/twl4030-madc.c | 321 +++++---- drivers/mfd/88pm800.c | 3 +- drivers/mfd/88pm860x-core.c | 6 + drivers/mfd/Kconfig | 98 +-- drivers/mfd/Makefile | 6 +- drivers/mfd/adp5520.c | 1 - drivers/mfd/as3722.c | 1 + drivers/mfd/bcm590xx.c | 93 +++ drivers/mfd/cs5535-mfd.c | 1 - drivers/mfd/da9052-core.c | 3 + drivers/mfd/da9052-i2c.c | 5 +- drivers/mfd/da9052-spi.c | 1 + drivers/mfd/da9055-i2c.c | 8 + drivers/mfd/da9063-core.c | 25 +- drivers/mfd/janz-cmodio.c | 1 - drivers/mfd/kempld-core.c | 31 +- drivers/mfd/lpc_ich.c | 151 ++-- drivers/mfd/lpc_sch.c | 1 - drivers/mfd/max14577.c | 6 +- drivers/mfd/max77686.c | 4 + drivers/mfd/max77693.c | 12 +- drivers/mfd/max8925-i2c.c | 9 + drivers/mfd/max8997.c | 18 + drivers/mfd/max8998.c | 4 + drivers/mfd/mc13xxx-spi.c | 5 + drivers/mfd/mcp-sa11x0.c | 1 - drivers/mfd/omap-usb-host.c | 189 +++-- drivers/mfd/omap-usb-tll.c | 2 +- drivers/mfd/pcf50633-adc.c | 1 - drivers/mfd/pm8921-core.c | 419 ++++++++++-- drivers/mfd/pm8xxx-irq.c | 371 ---------- drivers/mfd/rc5t583-irq.c | 1 - drivers/mfd/rdc321x-southbridge.c | 1 - drivers/mfd/retu-mfd.c | 1 - drivers/mfd/rtsx_usb.c | 760 +++++++++++++++++++++ drivers/mfd/sec-core.c | 129 +++- drivers/mfd/sec-irq.c | 97 ++- drivers/mfd/smsc-ece1099.c | 1 - drivers/mfd/stmpe.c | 2 +- drivers/mfd/stw481x.c | 8 +- drivers/mfd/syscon.c | 9 +- drivers/mfd/tc3589x.c | 84 ++- drivers/mfd/ti-ssp.c | 465 ------------- drivers/mfd/ti_am335x_tscadc.c | 24 +- drivers/mfd/timberdale.c | 2 +- drivers/mfd/tps65218.c | 282 ++++++++ drivers/mfd/tps65910.c | 5 +- drivers/mfd/tps65912-core.c | 1 - drivers/mfd/tps65912-irq.c | 1 - drivers/mfd/twl-core.c | 10 +- drivers/mfd/twl4030-irq.c | 1 - drivers/mfd/twl6030-irq.c | 1 - drivers/mfd/twl6040.c | 6 +- drivers/mfd/ucb1x00-core.c | 4 +- drivers/mfd/vexpress-config.c | 3 +- drivers/mfd/vexpress-sysreg.c | 2 +- drivers/mfd/wm5102-tables.c | 35 + drivers/mfd/wm5110-tables.c | 168 +++++ drivers/mfd/wm8350-core.c | 1 - drivers/mfd/wm8350-irq.c | 1 - drivers/mfd/wm8400-core.c | 22 +- drivers/regulator/Kconfig | 7 + drivers/regulator/Makefile | 1 + drivers/regulator/s2mpa01.c | 481 +++++++++++++ drivers/watchdog/iTCO_wdt.c | 137 ++-- include/linux/i2c/twl.h | 12 + include/linux/i2c/twl4030-madc.h | 2 +- include/linux/mfd/arizona/registers.h | 84 +++ include/linux/mfd/bcm590xx.h | 31 + include/linux/mfd/da9052/da9052.h | 1 + include/linux/mfd/da9063/core.h | 6 +- include/linux/mfd/da9063/registers.h | 120 ++-- include/linux/mfd/lpc_ich.h | 25 +- include/linux/mfd/max14577-private.h | 8 - include/linux/mfd/max14577.h | 5 - include/linux/mfd/pm8xxx/irq.h | 59 -- include/linux/mfd/pm8xxx/pm8921.h | 30 - include/linux/mfd/rtsx_usb.h | 628 +++++++++++++++++ include/linux/mfd/samsung/core.h | 19 +- include/linux/mfd/samsung/irq.h | 81 ++- include/linux/mfd/samsung/rtc.h | 57 +- include/linux/mfd/samsung/s2mpa01.h | 192 ++++++ include/linux/mfd/samsung/s2mps14.h | 152 +++++ include/linux/mfd/tps65218.h | 284 ++++++++ include/linux/ssbi.h | 20 + 101 files changed, 5223 insertions(+), 1619 deletions(-) create mode 100644 Documentation/devicetree/bindings/iio/adc/twl4030-madc.txt create mode 100644 Documentation/devicetree/bindings/mfd/bcm590xx.txt create mode 100644 Documentation/devicetree/bindings/mfd/da9055.txt create mode 100644 Documentation/devicetree/bindings/mfd/qcom,pm8xxx.txt create mode 100644 Documentation/devicetree/bindings/mfd/s2mpa01.txt rename drivers/{mfd => iio/adc}/twl4030-madc.c (74%) create mode 100644 drivers/mfd/bcm590xx.c delete mode 100644 drivers/mfd/pm8xxx-irq.c create mode 100644 drivers/mfd/rtsx_usb.c delete mode 100644 drivers/mfd/ti-ssp.c create mode 100644 drivers/mfd/tps65218.c create mode 100644 drivers/regulator/s2mpa01.c create mode 100644 include/linux/mfd/bcm590xx.h delete mode 100644 include/linux/mfd/pm8xxx/irq.h delete mode 100644 include/linux/mfd/pm8xxx/pm8921.h create mode 100644 include/linux/mfd/rtsx_usb.h create mode 100644 include/linux/mfd/samsung/s2mpa01.h create mode 100644 include/linux/mfd/samsung/s2mps14.h create mode 100644 include/linux/mfd/tps65218.h Merging battery/master (ac323d8d8070 power: max17040: Fix NULL pointer dereference when there is no platform_data) $ git merge battery/master Already up-to-date. Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path) $ git merge fbdev/for-next Already up-to-date. Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par) $ git merge viafb/viafb-next Already up-to-date. Merging omap_dss2/for-next (d754589d8044 OMAPDSS: add missing __init for dss_init_ports) $ git merge omap_dss2/for-next Recorded preimage for 'drivers/video/Makefile' Removing include/linux/xilinxfb.h Removing drivers/video/omap2/Kconfig Auto-merging drivers/video/fbdev/xilinxfb.c Auto-merging drivers/video/fbdev/wmt_ge_rops.c Auto-merging drivers/video/fbdev/vesafb.c Auto-merging drivers/video/fbdev/uvesafb.c Auto-merging drivers/video/fbdev/tgafb.c Auto-merging drivers/video/fbdev/sis/init.c Auto-merging drivers/video/fbdev/pxa3xx-gcu.c Auto-merging drivers/video/fbdev/omap2/omapfb/omapfb-main.c Auto-merging drivers/video/fbdev/omap2/dss/venc_panel.c Auto-merging drivers/video/fbdev/omap2/dss/venc.c Auto-merging drivers/video/fbdev/omap2/dss/sdi.c Auto-merging drivers/video/fbdev/omap2/dss/hdmi_common.c Auto-merging drivers/video/fbdev/omap2/dss/hdmi4.c Auto-merging drivers/video/fbdev/omap2/dss/dss.h Auto-merging drivers/video/fbdev/omap2/dss/dss.c Auto-merging drivers/video/fbdev/omap2/dss/dsi.c Auto-merging drivers/video/fbdev/omap2/dss/dpi.c Auto-merging drivers/video/fbdev/omap2/dss/display.c Auto-merging drivers/video/fbdev/omap2/dss/display-sysfs.c Auto-merging drivers/video/fbdev/omap2/dss/dispc.c Auto-merging drivers/video/fbdev/omap2/dss/Makefile Auto-merging drivers/video/fbdev/omap2/displays-new/panel-tpo-td043mtea1.c Auto-merging drivers/video/fbdev/omap2/displays-new/panel-tpo-td028ttec1.c Auto-merging drivers/video/fbdev/omap2/displays-new/panel-sony-acx565akm.c Auto-merging drivers/video/fbdev/omap2/displays-new/panel-sharp-ls037v7dw01.c Auto-merging drivers/video/fbdev/omap2/displays-new/panel-nec-nl8048hl11.c Auto-merging drivers/video/fbdev/omap2/displays-new/panel-lgphilips-lb035q02.c Auto-merging drivers/video/fbdev/omap2/displays-new/panel-dsi-cm.c Auto-merging drivers/video/fbdev/omap2/displays-new/encoder-tpd12s015.c Auto-merging drivers/video/fbdev/omap2/displays-new/encoder-tfp410.c Auto-merging drivers/video/fbdev/omap2/displays-new/connector-hdmi.c Auto-merging drivers/video/fbdev/omap2/displays-new/connector-dvi.c Auto-merging drivers/video/fbdev/omap2/displays-new/connector-analog-tv.c Auto-merging drivers/video/fbdev/mmp/Kconfig Auto-merging drivers/video/fbdev/matrox/matroxfb_base.h Auto-merging drivers/video/fbdev/matrox/matroxfb_base.c Auto-merging drivers/video/fbdev/matrox/matroxfb_accel.c Auto-merging drivers/video/fbdev/imxfb.c Auto-merging drivers/video/fbdev/exynos/s6e8ax0.c Auto-merging drivers/video/fbdev/exynos/Kconfig Auto-merging drivers/video/fbdev/efifb.c Auto-merging drivers/video/fbdev/da8xx-fb.c Auto-merging drivers/video/fbdev/core/fbmon.c Auto-merging drivers/video/fbdev/core/fb_ddc.c Auto-merging drivers/video/fbdev/core/cfbcopyarea.c Auto-merging drivers/video/fbdev/aty/mach64_cursor.c Auto-merging drivers/video/fbdev/aty/mach64_accel.c Auto-merging drivers/video/fbdev/aty/atyfb_base.c Auto-merging drivers/video/fbdev/atmel_lcdfb.c Auto-merging drivers/video/Makefile CONFLICT (content): Merge conflict in drivers/video/Makefile Auto-merging drivers/video/Kconfig Auto-merging arch/arm/mach-omap2/pdata-quirks.c Auto-merging arch/arm/mach-omap2/board-generic.c Auto-merging arch/arm/boot/dts/omap4.dtsi Auto-merging arch/arm/boot/dts/omap3.dtsi Auto-merging arch/arm/boot/dts/omap3-igep0020.dts Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/video/Makefile'. [master ad112c95e08b] Merge remote-tracking branch 'omap_dss2/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/DocBook/device-drivers.tmpl | 10 +- .../bindings/video/analog-tv-connector.txt | 25 + .../devicetree/bindings/video/dvi-connector.txt | 35 + .../devicetree/bindings/video/fsl,imx-fb.txt | 4 + .../devicetree/bindings/video/hdmi-connector.txt | 28 + .../devicetree/bindings/video/panel-dsi-cm.txt | 29 + .../devicetree/bindings/video/sony,acx565akm.txt | 30 + .../devicetree/bindings/video/ti,omap-dss.txt | 211 ++ .../devicetree/bindings/video/ti,omap2-dss.txt | 54 + .../devicetree/bindings/video/ti,omap3-dss.txt | 83 + .../devicetree/bindings/video/ti,omap4-dss.txt | 111 + .../devicetree/bindings/video/ti,tfp410.txt | 41 + .../devicetree/bindings/video/ti,tpd12s015.txt | 44 + arch/arm/boot/dts/omap2.dtsi | 31 + arch/arm/boot/dts/omap3-beagle-xm.dts | 138 +- arch/arm/boot/dts/omap3-beagle.dts | 135 ++ arch/arm/boot/dts/omap3-igep0020.dts | 58 +- arch/arm/boot/dts/omap3-n900.dts | 77 +- arch/arm/boot/dts/omap3.dtsi | 52 + arch/arm/boot/dts/omap3430es1-clocks.dtsi | 6 +- .../omap36xx-am35xx-omap3430es2plus-clocks.dtsi | 6 +- arch/arm/boot/dts/omap36xx-clocks.dtsi | 20 + arch/arm/boot/dts/omap36xx.dtsi | 8 +- arch/arm/boot/dts/omap3xxx-clocks.dtsi | 8 +- arch/arm/boot/dts/omap4-panda-common.dtsi | 115 + arch/arm/boot/dts/omap4-sdp.dts | 113 + arch/arm/boot/dts/omap4.dtsi | 79 + arch/arm/mach-imx/mach-mx27ads.c | 55 +- arch/arm/mach-omap2/board-generic.c | 4 + arch/arm/mach-omap2/common.h | 3 + arch/arm/mach-omap2/display.c | 167 +- arch/arm/mach-omap2/display.h | 3 + arch/arm/mach-omap2/dss-common.c | 224 +- arch/arm/mach-omap2/pdata-quirks.c | 3 - drivers/Makefile | 4 +- drivers/gpu/drm/omapdrm/omap_connector.c | 6 +- drivers/staging/xgifb/vb_def.h | 2 +- drivers/staging/xgifb/vb_struct.h | 2 +- drivers/staging/xgifb/vgatypes.h | 4 +- drivers/video/Kconfig | 2487 +------------------- drivers/video/Makefile | 167 +- drivers/video/console/fbcon.c | 27 +- drivers/video/console/sticon.c | 2 +- drivers/video/console/sticore.c | 2 +- drivers/video/{ => fbdev}/68328fb.c | 0 drivers/video/fbdev/Kconfig | 2481 +++++++++++++++++++ drivers/video/fbdev/Makefile | 153 ++ drivers/video/{ => fbdev}/acornfb.c | 0 drivers/video/{ => fbdev}/acornfb.h | 0 drivers/video/{ => fbdev}/amba-clcd.c | 0 drivers/video/{ => fbdev}/amifb.c | 0 drivers/video/{ => fbdev}/arcfb.c | 0 drivers/video/{ => fbdev}/arkfb.c | 0 drivers/video/{ => fbdev}/asiliantfb.c | 0 drivers/video/{ => fbdev}/atafb.c | 0 drivers/video/{ => fbdev}/atafb.h | 0 drivers/video/{ => fbdev}/atafb_iplan2p2.c | 0 drivers/video/{ => fbdev}/atafb_iplan2p4.c | 0 drivers/video/{ => fbdev}/atafb_iplan2p8.c | 0 drivers/video/{ => fbdev}/atafb_mfb.c | 0 drivers/video/{ => fbdev}/atafb_utils.h | 0 drivers/video/{ => fbdev}/atmel_lcdfb.c | 8 +- drivers/video/{ => fbdev}/aty/Makefile | 0 drivers/video/{ => fbdev}/aty/ati_ids.h | 0 drivers/video/{ => fbdev}/aty/aty128fb.c | 0 drivers/video/{ => fbdev}/aty/atyfb.h | 0 drivers/video/{ => fbdev}/aty/atyfb_base.c | 7 +- drivers/video/{ => fbdev}/aty/mach64_accel.c | 3 +- drivers/video/{ => fbdev}/aty/mach64_ct.c | 0 drivers/video/{ => fbdev}/aty/mach64_cursor.c | 22 +- drivers/video/{ => fbdev}/aty/mach64_gx.c | 0 drivers/video/{ => fbdev}/aty/radeon_accel.c | 0 drivers/video/{ => fbdev}/aty/radeon_backlight.c | 0 drivers/video/{ => fbdev}/aty/radeon_base.c | 0 drivers/video/{ => fbdev}/aty/radeon_i2c.c | 0 drivers/video/{ => fbdev}/aty/radeon_monitor.c | 0 drivers/video/{ => fbdev}/aty/radeon_pm.c | 0 drivers/video/{ => fbdev}/aty/radeonfb.h | 0 drivers/video/{ => fbdev}/au1100fb.c | 0 drivers/video/{ => fbdev}/au1100fb.h | 0 drivers/video/{ => fbdev}/au1200fb.c | 0 drivers/video/{ => fbdev}/au1200fb.h | 0 drivers/video/{ => fbdev}/auo_k1900fb.c | 0 drivers/video/{ => fbdev}/auo_k1901fb.c | 0 drivers/video/{ => fbdev}/auo_k190x.c | 0 drivers/video/{ => fbdev}/auo_k190x.h | 0 drivers/video/{ => fbdev}/bf537-lq035.c | 0 drivers/video/{ => fbdev}/bf54x-lq043fb.c | 0 drivers/video/{ => fbdev}/bfin-lq035q1-fb.c | 0 drivers/video/{ => fbdev}/bfin-t350mcqb-fb.c | 0 drivers/video/{ => fbdev}/bfin_adv7393fb.c | 0 drivers/video/{ => fbdev}/bfin_adv7393fb.h | 0 drivers/video/{ => fbdev}/broadsheetfb.c | 0 drivers/video/{ => fbdev}/bt431.h | 0 drivers/video/{ => fbdev}/bt455.h | 0 drivers/video/{ => fbdev}/bw2.c | 0 drivers/video/{ => fbdev}/c2p.h | 0 drivers/video/{ => fbdev}/c2p_core.h | 0 drivers/video/{ => fbdev}/c2p_iplan2.c | 0 drivers/video/{ => fbdev}/c2p_planar.c | 0 drivers/video/{ => fbdev}/carminefb.c | 0 drivers/video/{ => fbdev}/carminefb.h | 0 drivers/video/{ => fbdev}/carminefb_regs.h | 0 drivers/video/{ => fbdev}/cg14.c | 0 drivers/video/{ => fbdev}/cg3.c | 0 drivers/video/{ => fbdev}/cg6.c | 0 drivers/video/{ => fbdev}/chipsfb.c | 0 drivers/video/{ => fbdev}/cirrusfb.c | 0 drivers/video/{ => fbdev}/clps711xfb.c | 0 drivers/video/{ => fbdev}/cobalt_lcdfb.c | 0 drivers/video/{ => fbdev}/controlfb.c | 0 drivers/video/{ => fbdev}/controlfb.h | 0 drivers/video/fbdev/core/Makefile | 16 + drivers/video/{ => fbdev/core}/cfbcopyarea.c | 153 +- drivers/video/{ => fbdev/core}/cfbfillrect.c | 0 drivers/video/{ => fbdev/core}/cfbimgblt.c | 0 drivers/video/{ => fbdev/core}/fb_ddc.c | 2 +- drivers/video/{ => fbdev/core}/fb_defio.c | 0 drivers/video/{ => fbdev/core}/fb_draw.h | 0 drivers/video/{ => fbdev/core}/fb_notify.c | 0 drivers/video/{ => fbdev/core}/fb_sys_fops.c | 0 drivers/video/{ => fbdev/core}/fbcmap.c | 0 drivers/video/{ => fbdev/core}/fbcvt.c | 0 drivers/video/{ => fbdev/core}/fbmem.c | 0 drivers/video/{ => fbdev/core}/fbmon.c | 2 +- drivers/video/{ => fbdev/core}/fbsysfs.c | 0 drivers/video/{ => fbdev/core}/modedb.c | 0 drivers/video/{ => fbdev/core}/svgalib.c | 0 drivers/video/{ => fbdev/core}/syscopyarea.c | 0 drivers/video/{ => fbdev/core}/sysfillrect.c | 0 drivers/video/{ => fbdev/core}/sysimgblt.c | 0 drivers/video/{ => fbdev}/cyber2000fb.c | 0 drivers/video/{ => fbdev}/cyber2000fb.h | 0 drivers/video/{ => fbdev}/da8xx-fb.c | 22 +- drivers/video/{ => fbdev}/dnfb.c | 0 drivers/video/{ => fbdev}/edid.h | 0 drivers/video/{ => fbdev}/efifb.c | 13 +- drivers/video/{ => fbdev}/ep93xx-fb.c | 0 drivers/video/{ => fbdev}/exynos/Kconfig | 2 +- drivers/video/{ => fbdev}/exynos/Makefile | 0 drivers/video/{ => fbdev}/exynos/exynos_dp_core.c | 0 drivers/video/{ => fbdev}/exynos/exynos_dp_core.h | 0 drivers/video/{ => fbdev}/exynos/exynos_dp_reg.c | 0 drivers/video/{ => fbdev}/exynos/exynos_dp_reg.h | 0 drivers/video/{ => fbdev}/exynos/exynos_mipi_dsi.c | 0 .../{ => fbdev}/exynos/exynos_mipi_dsi_common.c | 0 .../{ => fbdev}/exynos/exynos_mipi_dsi_common.h | 0 .../{ => fbdev}/exynos/exynos_mipi_dsi_lowlevel.c | 0 .../{ => fbdev}/exynos/exynos_mipi_dsi_lowlevel.h | 0 .../{ => fbdev}/exynos/exynos_mipi_dsi_regs.h | 0 drivers/video/{ => fbdev}/exynos/s6e8ax0.c | 13 +- drivers/video/{ => fbdev}/fb-puv3.c | 0 drivers/video/{ => fbdev}/ffb.c | 0 drivers/video/{ => fbdev}/fm2fb.c | 0 drivers/video/{ => fbdev}/fsl-diu-fb.c | 0 drivers/video/{ => fbdev}/g364fb.c | 0 drivers/video/{ => fbdev}/gbefb.c | 0 drivers/video/{ => fbdev}/geode/Kconfig | 0 drivers/video/{ => fbdev}/geode/Makefile | 0 drivers/video/{ => fbdev}/geode/display_gx.c | 0 drivers/video/{ => fbdev}/geode/display_gx1.c | 0 drivers/video/{ => fbdev}/geode/display_gx1.h | 0 drivers/video/{ => fbdev}/geode/geodefb.h | 0 drivers/video/{ => fbdev}/geode/gx1fb_core.c | 0 drivers/video/{ => fbdev}/geode/gxfb.h | 0 drivers/video/{ => fbdev}/geode/gxfb_core.c | 0 drivers/video/{ => fbdev}/geode/lxfb.h | 0 drivers/video/{ => fbdev}/geode/lxfb_core.c | 0 drivers/video/{ => fbdev}/geode/lxfb_ops.c | 0 drivers/video/{ => fbdev}/geode/suspend_gx.c | 0 drivers/video/{ => fbdev}/geode/video_cs5530.c | 0 drivers/video/{ => fbdev}/geode/video_cs5530.h | 0 drivers/video/{ => fbdev}/geode/video_gx.c | 0 drivers/video/{ => fbdev}/goldfishfb.c | 0 drivers/video/{ => fbdev}/grvga.c | 0 drivers/video/{ => fbdev}/gxt4500.c | 0 drivers/video/{ => fbdev}/hecubafb.c | 0 drivers/video/{ => fbdev}/hgafb.c | 0 drivers/video/{ => fbdev}/hitfb.c | 0 drivers/video/{ => fbdev}/hpfb.c | 0 drivers/video/{ => fbdev}/hyperv_fb.c | 0 drivers/video/{ => fbdev}/i740_reg.h | 0 drivers/video/{ => fbdev}/i740fb.c | 0 drivers/video/{ => fbdev}/i810/Makefile | 0 drivers/video/{ => fbdev}/i810/i810-i2c.c | 0 drivers/video/{ => fbdev}/i810/i810.h | 0 drivers/video/{ => fbdev}/i810/i810_accel.c | 0 drivers/video/{ => fbdev}/i810/i810_dvt.c | 0 drivers/video/{ => fbdev}/i810/i810_gtf.c | 0 drivers/video/{ => fbdev}/i810/i810_main.c | 0 drivers/video/{ => fbdev}/i810/i810_main.h | 0 drivers/video/{ => fbdev}/i810/i810_regs.h | 0 drivers/video/{ => fbdev}/igafb.c | 0 drivers/video/{ => fbdev}/imsttfb.c | 0 drivers/video/{ => fbdev}/imxfb.c | 380 ++- drivers/video/{ => fbdev}/intelfb/Makefile | 0 drivers/video/{ => fbdev}/intelfb/intelfb.h | 0 drivers/video/{ => fbdev}/intelfb/intelfb_i2c.c | 0 drivers/video/{ => fbdev}/intelfb/intelfbdrv.c | 0 drivers/video/{ => fbdev}/intelfb/intelfbhw.c | 0 drivers/video/{ => fbdev}/intelfb/intelfbhw.h | 0 drivers/video/{ => fbdev}/jz4740_fb.c | 0 drivers/video/{ => fbdev}/kyro/Makefile | 0 drivers/video/{ => fbdev}/kyro/STG4000InitDevice.c | 0 drivers/video/{ => fbdev}/kyro/STG4000Interface.h | 0 .../video/{ => fbdev}/kyro/STG4000OverlayDevice.c | 0 drivers/video/{ => fbdev}/kyro/STG4000Ramdac.c | 0 drivers/video/{ => fbdev}/kyro/STG4000Reg.h | 0 drivers/video/{ => fbdev}/kyro/STG4000VTG.c | 0 drivers/video/{ => fbdev}/kyro/fbdev.c | 0 drivers/video/{ => fbdev}/leo.c | 0 drivers/video/{ => fbdev}/macfb.c | 0 drivers/video/{ => fbdev}/macmodes.c | 0 drivers/video/{ => fbdev}/macmodes.h | 0 drivers/video/{ => fbdev}/matrox/Makefile | 0 drivers/video/{ => fbdev}/matrox/g450_pll.c | 0 drivers/video/{ => fbdev}/matrox/g450_pll.h | 0 drivers/video/{ => fbdev}/matrox/i2c-matroxfb.c | 0 .../video/{ => fbdev}/matrox/matroxfb_DAC1064.c | 0 .../video/{ => fbdev}/matrox/matroxfb_DAC1064.h | 0 drivers/video/{ => fbdev}/matrox/matroxfb_Ti3026.c | 0 drivers/video/{ => fbdev}/matrox/matroxfb_Ti3026.h | 0 drivers/video/{ => fbdev}/matrox/matroxfb_accel.c | 38 +- drivers/video/{ => fbdev}/matrox/matroxfb_accel.h | 0 drivers/video/{ => fbdev}/matrox/matroxfb_base.c | 3 +- drivers/video/{ => fbdev}/matrox/matroxfb_base.h | 2 + drivers/video/{ => fbdev}/matrox/matroxfb_crtc2.c | 0 drivers/video/{ => fbdev}/matrox/matroxfb_crtc2.h | 0 drivers/video/{ => fbdev}/matrox/matroxfb_g450.c | 0 drivers/video/{ => fbdev}/matrox/matroxfb_g450.h | 0 drivers/video/{ => fbdev}/matrox/matroxfb_maven.c | 0 drivers/video/{ => fbdev}/matrox/matroxfb_maven.h | 0 drivers/video/{ => fbdev}/matrox/matroxfb_misc.c | 0 drivers/video/{ => fbdev}/matrox/matroxfb_misc.h | 0 drivers/video/{ => fbdev}/maxinefb.c | 0 drivers/video/{ => fbdev}/mb862xx/Makefile | 0 drivers/video/{ => fbdev}/mb862xx/mb862xx-i2c.c | 0 drivers/video/{ => fbdev}/mb862xx/mb862xx_reg.h | 0 drivers/video/{ => fbdev}/mb862xx/mb862xxfb.h | 0 .../video/{ => fbdev}/mb862xx/mb862xxfb_accel.c | 0 .../video/{ => fbdev}/mb862xx/mb862xxfb_accel.h | 0 drivers/video/{ => fbdev}/mb862xx/mb862xxfbdrv.c | 0 drivers/video/{ => fbdev}/mbx/Makefile | 0 drivers/video/{ => fbdev}/mbx/mbxdebugfs.c | 0 drivers/video/{ => fbdev}/mbx/mbxfb.c | 0 drivers/video/{ => fbdev}/mbx/reg_bits.h | 0 drivers/video/{ => fbdev}/mbx/regs.h | 0 drivers/video/{ => fbdev}/metronomefb.c | 0 drivers/video/{ => fbdev}/mmp/Kconfig | 6 +- drivers/video/{ => fbdev}/mmp/Makefile | 0 drivers/video/{ => fbdev}/mmp/core.c | 0 drivers/video/{ => fbdev}/mmp/fb/Kconfig | 0 drivers/video/{ => fbdev}/mmp/fb/Makefile | 0 drivers/video/{ => fbdev}/mmp/fb/mmpfb.c | 0 drivers/video/{ => fbdev}/mmp/fb/mmpfb.h | 0 drivers/video/{ => fbdev}/mmp/hw/Kconfig | 0 drivers/video/{ => fbdev}/mmp/hw/Makefile | 0 drivers/video/{ => fbdev}/mmp/hw/mmp_ctrl.c | 0 drivers/video/{ => fbdev}/mmp/hw/mmp_ctrl.h | 0 drivers/video/{ => fbdev}/mmp/hw/mmp_spi.c | 0 drivers/video/{ => fbdev}/mmp/panel/Kconfig | 0 drivers/video/{ => fbdev}/mmp/panel/Makefile | 0 .../video/{ => fbdev}/mmp/panel/tpo_tj032md01bw.c | 0 drivers/video/{ => fbdev}/msm/Makefile | 0 drivers/video/{ => fbdev}/msm/mddi.c | 0 drivers/video/{ => fbdev}/msm/mddi_client_dummy.c | 0 .../video/{ => fbdev}/msm/mddi_client_nt35399.c | 0 .../video/{ => fbdev}/msm/mddi_client_toshiba.c | 0 drivers/video/{ => fbdev}/msm/mddi_hw.h | 0 drivers/video/{ => fbdev}/msm/mdp.c | 0 drivers/video/{ => fbdev}/msm/mdp_csc_table.h | 0 drivers/video/{ => fbdev}/msm/mdp_hw.h | 0 drivers/video/{ => fbdev}/msm/mdp_ppp.c | 0 drivers/video/{ => fbdev}/msm/mdp_scale_tables.c | 0 drivers/video/{ => fbdev}/msm/mdp_scale_tables.h | 0 drivers/video/{ => fbdev}/msm/msm_fb.c | 0 drivers/video/{ => fbdev}/mx3fb.c | 0 drivers/video/{ => fbdev}/mxsfb.c | 0 drivers/video/{ => fbdev}/n411.c | 0 drivers/video/{ => fbdev}/neofb.c | 0 drivers/video/{ => fbdev}/nuc900fb.c | 0 drivers/video/{ => fbdev}/nuc900fb.h | 0 drivers/video/{ => fbdev}/nvidia/Makefile | 0 drivers/video/{ => fbdev}/nvidia/nv_accel.c | 0 drivers/video/{ => fbdev}/nvidia/nv_backlight.c | 0 drivers/video/{ => fbdev}/nvidia/nv_dma.h | 0 drivers/video/{ => fbdev}/nvidia/nv_hw.c | 0 drivers/video/{ => fbdev}/nvidia/nv_i2c.c | 0 drivers/video/{ => fbdev}/nvidia/nv_local.h | 0 drivers/video/{ => fbdev}/nvidia/nv_of.c | 0 drivers/video/{ => fbdev}/nvidia/nv_proto.h | 0 drivers/video/{ => fbdev}/nvidia/nv_setup.c | 0 drivers/video/{ => fbdev}/nvidia/nv_type.h | 0 drivers/video/{ => fbdev}/nvidia/nvidia.c | 0 drivers/video/{ => fbdev}/ocfb.c | 0 drivers/video/{ => fbdev}/offb.c | 0 drivers/video/{ => fbdev}/omap/Kconfig | 0 drivers/video/{ => fbdev}/omap/Makefile | 0 drivers/video/{ => fbdev}/omap/hwa742.c | 0 drivers/video/{ => fbdev}/omap/lcd_ams_delta.c | 0 drivers/video/{ => fbdev}/omap/lcd_h3.c | 0 drivers/video/{ => fbdev}/omap/lcd_htcherald.c | 0 drivers/video/{ => fbdev}/omap/lcd_inn1510.c | 0 drivers/video/{ => fbdev}/omap/lcd_inn1610.c | 0 drivers/video/{ => fbdev}/omap/lcd_mipid.c | 0 drivers/video/{ => fbdev}/omap/lcd_osk.c | 0 drivers/video/{ => fbdev}/omap/lcd_palmte.c | 0 drivers/video/{ => fbdev}/omap/lcd_palmtt.c | 0 drivers/video/{ => fbdev}/omap/lcd_palmz71.c | 0 drivers/video/{ => fbdev}/omap/lcdc.c | 0 drivers/video/{ => fbdev}/omap/lcdc.h | 0 drivers/video/{ => fbdev}/omap/omapfb.h | 0 drivers/video/{ => fbdev}/omap/omapfb_main.c | 0 drivers/video/{ => fbdev}/omap/sossi.c | 0 drivers/video/fbdev/omap2/Kconfig | 10 + drivers/video/{ => fbdev}/omap2/Makefile | 0 .../video/{ => fbdev}/omap2/displays-new/Kconfig | 0 .../video/{ => fbdev}/omap2/displays-new/Makefile | 0 .../omap2/displays-new/connector-analog-tv.c | 45 +- .../{ => fbdev}/omap2/displays-new/connector-dvi.c | 45 +- .../omap2/displays-new/connector-hdmi.c | 32 +- .../omap2/displays-new/encoder-tfp410.c | 43 +- .../omap2/displays-new/encoder-tpd12s015.c | 56 + .../{ => fbdev}/omap2/displays-new/panel-dpi.c | 0 .../{ => fbdev}/omap2/displays-new/panel-dsi-cm.c | 62 +- .../omap2/displays-new/panel-lgphilips-lb035q02.c | 2 +- .../omap2/displays-new/panel-nec-nl8048hl11.c | 4 +- .../omap2/displays-new/panel-sharp-ls037v7dw01.c | 2 +- .../omap2/displays-new/panel-sony-acx565akm.c | 35 +- .../omap2/displays-new/panel-tpo-td028ttec1.c | 2 +- .../omap2/displays-new/panel-tpo-td043mtea1.c | 2 +- drivers/video/{ => fbdev}/omap2/dss/Kconfig | 0 drivers/video/{ => fbdev}/omap2/dss/Makefile | 2 +- drivers/video/{ => fbdev}/omap2/dss/apply.c | 0 drivers/video/{ => fbdev}/omap2/dss/core.c | 0 drivers/video/{ => fbdev}/omap2/dss/dispc-compat.c | 0 drivers/video/{ => fbdev}/omap2/dss/dispc-compat.h | 0 drivers/video/{ => fbdev}/omap2/dss/dispc.c | 40 +- drivers/video/{ => fbdev}/omap2/dss/dispc.h | 0 drivers/video/{ => fbdev}/omap2/dss/dispc_coefs.c | 0 .../video/{ => fbdev}/omap2/dss/display-sysfs.c | 4 +- drivers/video/{ => fbdev}/omap2/dss/display.c | 32 +- drivers/video/{ => fbdev}/omap2/dss/dpi.c | 72 +- drivers/video/{ => fbdev}/omap2/dss/dsi.c | 163 +- drivers/video/fbdev/omap2/dss/dss-of.c | 159 ++ drivers/video/{ => fbdev}/omap2/dss/dss.c | 82 +- drivers/video/{ => fbdev}/omap2/dss/dss.h | 8 +- drivers/video/{ => fbdev}/omap2/dss/dss_features.c | 0 drivers/video/{ => fbdev}/omap2/dss/dss_features.h | 0 drivers/video/{ => fbdev}/omap2/dss/hdmi.h | 0 drivers/video/{ => fbdev}/omap2/dss/hdmi4.c | 23 +- drivers/video/{ => fbdev}/omap2/dss/hdmi4_core.c | 0 drivers/video/{ => fbdev}/omap2/dss/hdmi4_core.h | 0 drivers/video/{ => fbdev}/omap2/dss/hdmi_common.c | 74 +- drivers/video/{ => fbdev}/omap2/dss/hdmi_phy.c | 0 drivers/video/{ => fbdev}/omap2/dss/hdmi_pll.c | 0 drivers/video/{ => fbdev}/omap2/dss/hdmi_wp.c | 0 .../video/{ => fbdev}/omap2/dss/manager-sysfs.c | 0 drivers/video/{ => fbdev}/omap2/dss/manager.c | 0 drivers/video/{ => fbdev}/omap2/dss/output.c | 0 .../video/{ => fbdev}/omap2/dss/overlay-sysfs.c | 0 drivers/video/{ => fbdev}/omap2/dss/overlay.c | 0 drivers/video/{ => fbdev}/omap2/dss/rfbi.c | 0 drivers/video/{ => fbdev}/omap2/dss/sdi.c | 60 +- drivers/video/{ => fbdev}/omap2/dss/venc.c | 70 +- drivers/video/{ => fbdev}/omap2/dss/venc_panel.c | 2 +- drivers/video/{ => fbdev}/omap2/omapfb/Kconfig | 0 drivers/video/{ => fbdev}/omap2/omapfb/Makefile | 0 .../video/{ => fbdev}/omap2/omapfb/omapfb-ioctl.c | 0 .../video/{ => fbdev}/omap2/omapfb/omapfb-main.c | 75 +- .../video/{ => fbdev}/omap2/omapfb/omapfb-sysfs.c | 0 drivers/video/{ => fbdev}/omap2/omapfb/omapfb.h | 0 drivers/video/{ => fbdev}/omap2/vrfb.c | 0 drivers/video/{ => fbdev}/p9100.c | 0 drivers/video/{ => fbdev}/platinumfb.c | 0 drivers/video/{ => fbdev}/platinumfb.h | 0 drivers/video/{ => fbdev}/pm2fb.c | 0 drivers/video/{ => fbdev}/pm3fb.c | 0 drivers/video/{ => fbdev}/pmag-aa-fb.c | 0 drivers/video/{ => fbdev}/pmag-ba-fb.c | 0 drivers/video/{ => fbdev}/pmagb-b-fb.c | 0 drivers/video/{ => fbdev}/ps3fb.c | 0 drivers/video/{ => fbdev}/pvr2fb.c | 0 drivers/video/{ => fbdev}/pxa168fb.c | 0 drivers/video/{ => fbdev}/pxa168fb.h | 0 drivers/video/{ => fbdev}/pxa3xx-gcu.c | 191 +- drivers/video/{ => fbdev}/pxa3xx-gcu.h | 0 drivers/video/{ => fbdev}/pxafb.c | 0 drivers/video/{ => fbdev}/pxafb.h | 0 drivers/video/{ => fbdev}/q40fb.c | 0 drivers/video/{ => fbdev}/riva/Makefile | 0 drivers/video/{ => fbdev}/riva/fbdev.c | 0 drivers/video/{ => fbdev}/riva/nv_driver.c | 0 drivers/video/{ => fbdev}/riva/nv_type.h | 0 drivers/video/{ => fbdev}/riva/nvreg.h | 0 drivers/video/{ => fbdev}/riva/riva_hw.c | 0 drivers/video/{ => fbdev}/riva/riva_hw.h | 0 drivers/video/{ => fbdev}/riva/riva_tbl.h | 0 drivers/video/{ => fbdev}/riva/rivafb-i2c.c | 0 drivers/video/{ => fbdev}/riva/rivafb.h | 0 drivers/video/{ => fbdev}/s1d13xxxfb.c | 0 drivers/video/{ => fbdev}/s3c-fb.c | 0 drivers/video/{ => fbdev}/s3c2410fb.c | 0 drivers/video/{ => fbdev}/s3c2410fb.h | 0 drivers/video/{ => fbdev}/s3fb.c | 0 drivers/video/{ => fbdev}/sa1100fb.c | 0 drivers/video/{ => fbdev}/sa1100fb.h | 0 drivers/video/{ => fbdev}/savage/Makefile | 0 drivers/video/{ => fbdev}/savage/savagefb-i2c.c | 0 drivers/video/{ => fbdev}/savage/savagefb.h | 0 drivers/video/{ => fbdev}/savage/savagefb_accel.c | 0 drivers/video/{ => fbdev}/savage/savagefb_driver.c | 0 drivers/video/{ => fbdev}/sbuslib.c | 0 drivers/video/{ => fbdev}/sbuslib.h | 0 drivers/video/{ => fbdev}/sgivwfb.c | 0 drivers/video/{ => fbdev}/sh7760fb.c | 0 drivers/video/{ => fbdev}/sh_mipi_dsi.c | 0 drivers/video/{ => fbdev}/sh_mobile_hdmi.c | 0 drivers/video/{ => fbdev}/sh_mobile_lcdcfb.c | 0 drivers/video/{ => fbdev}/sh_mobile_lcdcfb.h | 0 drivers/video/{ => fbdev}/sh_mobile_meram.c | 0 drivers/video/{ => fbdev}/simplefb.c | 0 drivers/video/{ => fbdev}/sis/300vtbl.h | 0 drivers/video/{ => fbdev}/sis/310vtbl.h | 0 drivers/video/{ => fbdev}/sis/Makefile | 0 drivers/video/{ => fbdev}/sis/init.c | 1 + drivers/video/{ => fbdev}/sis/init.h | 0 drivers/video/{ => fbdev}/sis/init301.c | 0 drivers/video/{ => fbdev}/sis/init301.h | 0 drivers/video/{ => fbdev}/sis/initdef.h | 0 drivers/video/{ => fbdev}/sis/initextlfb.c | 0 drivers/video/{ => fbdev}/sis/oem300.h | 0 drivers/video/{ => fbdev}/sis/oem310.h | 0 drivers/video/{ => fbdev}/sis/sis.h | 0 drivers/video/{ => fbdev}/sis/sis_accel.c | 0 drivers/video/{ => fbdev}/sis/sis_accel.h | 0 drivers/video/{ => fbdev}/sis/sis_main.c | 0 drivers/video/{ => fbdev}/sis/sis_main.h | 0 drivers/video/{ => fbdev}/sis/vgatypes.h | 0 drivers/video/{ => fbdev}/sis/vstruct.h | 0 drivers/video/{ => fbdev}/skeletonfb.c | 0 drivers/video/{ => fbdev}/sm501fb.c | 0 drivers/video/{ => fbdev}/smscufx.c | 0 drivers/video/{ => fbdev}/ssd1307fb.c | 0 drivers/video/{ => fbdev}/sstfb.c | 0 drivers/video/{ => fbdev}/sticore.h | 0 drivers/video/{ => fbdev}/stifb.c | 0 drivers/video/{ => fbdev}/sunxvr1000.c | 0 drivers/video/{ => fbdev}/sunxvr2500.c | 0 drivers/video/{ => fbdev}/sunxvr500.c | 0 drivers/video/{ => fbdev}/tcx.c | 0 drivers/video/{ => fbdev}/tdfxfb.c | 0 drivers/video/{ => fbdev}/tgafb.c | 288 +-- drivers/video/{ => fbdev}/tmiofb.c | 0 drivers/video/{ => fbdev}/tridentfb.c | 0 drivers/video/{ => fbdev}/udlfb.c | 0 drivers/video/{ => fbdev}/uvesafb.c | 15 +- drivers/video/{ => fbdev}/valkyriefb.c | 0 drivers/video/{ => fbdev}/valkyriefb.h | 0 drivers/video/{ => fbdev}/vermilion/Makefile | 0 drivers/video/{ => fbdev}/vermilion/cr_pll.c | 0 drivers/video/{ => fbdev}/vermilion/vermilion.c | 0 drivers/video/{ => fbdev}/vermilion/vermilion.h | 0 drivers/video/{ => fbdev}/vesafb.c | 13 +- drivers/video/{ => fbdev}/vfb.c | 0 drivers/video/{ => fbdev}/vga16fb.c | 0 drivers/video/{ => fbdev}/via/Makefile | 0 drivers/video/{ => fbdev}/via/accel.c | 0 drivers/video/{ => fbdev}/via/accel.h | 0 drivers/video/{ => fbdev}/via/chip.h | 0 drivers/video/{ => fbdev}/via/debug.h | 0 drivers/video/{ => fbdev}/via/dvi.c | 0 drivers/video/{ => fbdev}/via/dvi.h | 0 drivers/video/{ => fbdev}/via/global.c | 0 drivers/video/{ => fbdev}/via/global.h | 0 drivers/video/{ => fbdev}/via/hw.c | 0 drivers/video/{ => fbdev}/via/hw.h | 0 drivers/video/{ => fbdev}/via/ioctl.c | 0 drivers/video/{ => fbdev}/via/ioctl.h | 0 drivers/video/{ => fbdev}/via/lcd.c | 0 drivers/video/{ => fbdev}/via/lcd.h | 0 drivers/video/{ => fbdev}/via/share.h | 0 drivers/video/{ => fbdev}/via/tblDPASetting.c | 0 drivers/video/{ => fbdev}/via/tblDPASetting.h | 0 drivers/video/{ => fbdev}/via/via-core.c | 0 drivers/video/{ => fbdev}/via/via-gpio.c | 0 drivers/video/{ => fbdev}/via/via_aux.c | 0 drivers/video/{ => fbdev}/via/via_aux.h | 0 drivers/video/{ => fbdev}/via/via_aux_ch7301.c | 0 drivers/video/{ => fbdev}/via/via_aux_edid.c | 0 drivers/video/{ => fbdev}/via/via_aux_sii164.c | 0 drivers/video/{ => fbdev}/via/via_aux_vt1621.c | 0 drivers/video/{ => fbdev}/via/via_aux_vt1622.c | 0 drivers/video/{ => fbdev}/via/via_aux_vt1625.c | 0 drivers/video/{ => fbdev}/via/via_aux_vt1631.c | 0 drivers/video/{ => fbdev}/via/via_aux_vt1632.c | 0 drivers/video/{ => fbdev}/via/via_aux_vt1636.c | 0 drivers/video/{ => fbdev}/via/via_clock.c | 0 drivers/video/{ => fbdev}/via/via_clock.h | 0 drivers/video/{ => fbdev}/via/via_i2c.c | 0 drivers/video/{ => fbdev}/via/via_modesetting.c | 0 drivers/video/{ => fbdev}/via/via_modesetting.h | 0 drivers/video/{ => fbdev}/via/via_utility.c | 0 drivers/video/{ => fbdev}/via/via_utility.h | 0 drivers/video/{ => fbdev}/via/viafbdev.c | 0 drivers/video/{ => fbdev}/via/viafbdev.h | 0 drivers/video/{ => fbdev}/via/viamode.c | 0 drivers/video/{ => fbdev}/via/viamode.h | 0 drivers/video/{ => fbdev}/via/vt1636.c | 0 drivers/video/{ => fbdev}/via/vt1636.h | 0 drivers/video/{ => fbdev}/vt8500lcdfb.c | 0 drivers/video/{ => fbdev}/vt8500lcdfb.h | 0 drivers/video/{ => fbdev}/vt8623fb.c | 0 drivers/video/{ => fbdev}/w100fb.c | 0 drivers/video/{ => fbdev}/w100fb.h | 0 drivers/video/{ => fbdev}/wm8505fb.c | 0 drivers/video/{ => fbdev}/wm8505fb_regs.h | 0 drivers/video/{ => fbdev}/wmt_ge_rops.c | 2 +- drivers/video/{ => fbdev}/wmt_ge_rops.h | 0 drivers/video/{ => fbdev}/xen-fbfront.c | 0 drivers/video/{ => fbdev}/xilinxfb.c | 15 +- drivers/video/omap2/Kconfig | 10 - include/linux/platform_data/video-imxfb.h | 12 - include/linux/xilinxfb.h | 30 - include/video/omapdss.h | 19 +- 525 files changed, 6005 insertions(+), 3836 deletions(-) create mode 100644 Documentation/devicetree/bindings/video/analog-tv-connector.txt create mode 100644 Documentation/devicetree/bindings/video/dvi-connector.txt create mode 100644 Documentation/devicetree/bindings/video/hdmi-connector.txt create mode 100644 Documentation/devicetree/bindings/video/panel-dsi-cm.txt create mode 100644 Documentation/devicetree/bindings/video/sony,acx565akm.txt create mode 100644 Documentation/devicetree/bindings/video/ti,omap-dss.txt create mode 100644 Documentation/devicetree/bindings/video/ti,omap2-dss.txt create mode 100644 Documentation/devicetree/bindings/video/ti,omap3-dss.txt create mode 100644 Documentation/devicetree/bindings/video/ti,omap4-dss.txt create mode 100644 Documentation/devicetree/bindings/video/ti,tfp410.txt create mode 100644 Documentation/devicetree/bindings/video/ti,tpd12s015.txt rename drivers/video/{ => fbdev}/68328fb.c (100%) create mode 100644 drivers/video/fbdev/Kconfig create mode 100644 drivers/video/fbdev/Makefile rename drivers/video/{ => fbdev}/acornfb.c (100%) rename drivers/video/{ => fbdev}/acornfb.h (100%) rename drivers/video/{ => fbdev}/amba-clcd.c (100%) rename drivers/video/{ => fbdev}/amifb.c (100%) rename drivers/video/{ => fbdev}/arcfb.c (100%) rename drivers/video/{ => fbdev}/arkfb.c (100%) rename drivers/video/{ => fbdev}/asiliantfb.c (100%) rename drivers/video/{ => fbdev}/atafb.c (100%) rename drivers/video/{ => fbdev}/atafb.h (100%) rename drivers/video/{ => fbdev}/atafb_iplan2p2.c (100%) rename drivers/video/{ => fbdev}/atafb_iplan2p4.c (100%) rename drivers/video/{ => fbdev}/atafb_iplan2p8.c (100%) rename drivers/video/{ => fbdev}/atafb_mfb.c (100%) rename drivers/video/{ => fbdev}/atafb_utils.h (100%) rename drivers/video/{ => fbdev}/atmel_lcdfb.c (99%) rename drivers/video/{ => fbdev}/aty/Makefile (100%) rename drivers/video/{ => fbdev}/aty/ati_ids.h (100%) rename drivers/video/{ => fbdev}/aty/aty128fb.c (100%) rename drivers/video/{ => fbdev}/aty/atyfb.h (100%) rename drivers/video/{ => fbdev}/aty/atyfb_base.c (99%) rename drivers/video/{ => fbdev}/aty/mach64_accel.c (99%) rename drivers/video/{ => fbdev}/aty/mach64_ct.c (100%) rename drivers/video/{ => fbdev}/aty/mach64_cursor.c (90%) rename drivers/video/{ => fbdev}/aty/mach64_gx.c (100%) rename drivers/video/{ => fbdev}/aty/radeon_accel.c (100%) rename drivers/video/{ => fbdev}/aty/radeon_backlight.c (100%) rename drivers/video/{ => fbdev}/aty/radeon_base.c (100%) rename drivers/video/{ => fbdev}/aty/radeon_i2c.c (100%) rename drivers/video/{ => fbdev}/aty/radeon_monitor.c (100%) rename drivers/video/{ => fbdev}/aty/radeon_pm.c (100%) rename drivers/video/{ => fbdev}/aty/radeonfb.h (100%) rename drivers/video/{ => fbdev}/au1100fb.c (100%) rename drivers/video/{ => fbdev}/au1100fb.h (100%) rename drivers/video/{ => fbdev}/au1200fb.c (100%) rename drivers/video/{ => fbdev}/au1200fb.h (100%) rename drivers/video/{ => fbdev}/auo_k1900fb.c (100%) rename drivers/video/{ => fbdev}/auo_k1901fb.c (100%) rename drivers/video/{ => fbdev}/auo_k190x.c (100%) rename drivers/video/{ => fbdev}/auo_k190x.h (100%) rename drivers/video/{ => fbdev}/bf537-lq035.c (100%) rename drivers/video/{ => fbdev}/bf54x-lq043fb.c (100%) rename drivers/video/{ => fbdev}/bfin-lq035q1-fb.c (100%) rename drivers/video/{ => fbdev}/bfin-t350mcqb-fb.c (100%) rename drivers/video/{ => fbdev}/bfin_adv7393fb.c (100%) rename drivers/video/{ => fbdev}/bfin_adv7393fb.h (100%) rename drivers/video/{ => fbdev}/broadsheetfb.c (100%) rename drivers/video/{ => fbdev}/bt431.h (100%) rename drivers/video/{ => fbdev}/bt455.h (100%) rename drivers/video/{ => fbdev}/bw2.c (100%) rename drivers/video/{ => fbdev}/c2p.h (100%) rename drivers/video/{ => fbdev}/c2p_core.h (100%) rename drivers/video/{ => fbdev}/c2p_iplan2.c (100%) rename drivers/video/{ => fbdev}/c2p_planar.c (100%) rename drivers/video/{ => fbdev}/carminefb.c (100%) rename drivers/video/{ => fbdev}/carminefb.h (100%) rename drivers/video/{ => fbdev}/carminefb_regs.h (100%) rename drivers/video/{ => fbdev}/cg14.c (100%) rename drivers/video/{ => fbdev}/cg3.c (100%) rename drivers/video/{ => fbdev}/cg6.c (100%) rename drivers/video/{ => fbdev}/chipsfb.c (100%) rename drivers/video/{ => fbdev}/cirrusfb.c (100%) rename drivers/video/{ => fbdev}/clps711xfb.c (100%) rename drivers/video/{ => fbdev}/cobalt_lcdfb.c (100%) rename drivers/video/{ => fbdev}/controlfb.c (100%) rename drivers/video/{ => fbdev}/controlfb.h (100%) create mode 100644 drivers/video/fbdev/core/Makefile rename drivers/video/{ => fbdev/core}/cfbcopyarea.c (78%) rename drivers/video/{ => fbdev/core}/cfbfillrect.c (100%) rename drivers/video/{ => fbdev/core}/cfbimgblt.c (100%) rename drivers/video/{ => fbdev/core}/fb_ddc.c (99%) rename drivers/video/{ => fbdev/core}/fb_defio.c (100%) rename drivers/video/{ => fbdev/core}/fb_draw.h (100%) rename drivers/video/{ => fbdev/core}/fb_notify.c (100%) rename drivers/video/{ => fbdev/core}/fb_sys_fops.c (100%) rename drivers/video/{ => fbdev/core}/fbcmap.c (100%) rename drivers/video/{ => fbdev/core}/fbcvt.c (100%) rename drivers/video/{ => fbdev/core}/fbmem.c (100%) rename drivers/video/{ => fbdev/core}/fbmon.c (99%) rename drivers/video/{ => fbdev/core}/fbsysfs.c (100%) rename drivers/video/{ => fbdev/core}/modedb.c (100%) rename drivers/video/{ => fbdev/core}/svgalib.c (100%) rename drivers/video/{ => fbdev/core}/syscopyarea.c (100%) rename drivers/video/{ => fbdev/core}/sysfillrect.c (100%) rename drivers/video/{ => fbdev/core}/sysimgblt.c (100%) rename drivers/video/{ => fbdev}/cyber2000fb.c (100%) rename drivers/video/{ => fbdev}/cyber2000fb.h (100%) rename drivers/video/{ => fbdev}/da8xx-fb.c (99%) rename drivers/video/{ => fbdev}/dnfb.c (100%) rename drivers/video/{ => fbdev}/edid.h (100%) rename drivers/video/{ => fbdev}/efifb.c (97%) rename drivers/video/{ => fbdev}/ep93xx-fb.c (100%) rename drivers/video/{ => fbdev}/exynos/Kconfig (96%) rename drivers/video/{ => fbdev}/exynos/Makefile (100%) rename drivers/video/{ => fbdev}/exynos/exynos_dp_core.c (100%) rename drivers/video/{ => fbdev}/exynos/exynos_dp_core.h (100%) rename drivers/video/{ => fbdev}/exynos/exynos_dp_reg.c (100%) rename drivers/video/{ => fbdev}/exynos/exynos_dp_reg.h (100%) rename drivers/video/{ => fbdev}/exynos/exynos_mipi_dsi.c (100%) rename drivers/video/{ => fbdev}/exynos/exynos_mipi_dsi_common.c (100%) rename drivers/video/{ => fbdev}/exynos/exynos_mipi_dsi_common.h (100%) rename drivers/video/{ => fbdev}/exynos/exynos_mipi_dsi_lowlevel.c (100%) rename drivers/video/{ => fbdev}/exynos/exynos_mipi_dsi_lowlevel.h (100%) rename drivers/video/{ => fbdev}/exynos/exynos_mipi_dsi_regs.h (100%) rename drivers/video/{ => fbdev}/exynos/s6e8ax0.c (98%) rename drivers/video/{ => fbdev}/fb-puv3.c (100%) rename drivers/video/{ => fbdev}/ffb.c (100%) rename drivers/video/{ => fbdev}/fm2fb.c (100%) rename drivers/video/{ => fbdev}/fsl-diu-fb.c (100%) rename drivers/video/{ => fbdev}/g364fb.c (100%) rename drivers/video/{ => fbdev}/gbefb.c (100%) rename drivers/video/{ => fbdev}/geode/Kconfig (100%) rename drivers/video/{ => fbdev}/geode/Makefile (100%) rename drivers/video/{ => fbdev}/geode/display_gx.c (100%) rename drivers/video/{ => fbdev}/geode/display_gx1.c (100%) rename drivers/video/{ => fbdev}/geode/display_gx1.h (100%) rename drivers/video/{ => fbdev}/geode/geodefb.h (100%) rename drivers/video/{ => fbdev}/geode/gx1fb_core.c (100%) rename drivers/video/{ => fbdev}/geode/gxfb.h (100%) rename drivers/video/{ => fbdev}/geode/gxfb_core.c (100%) rename drivers/video/{ => fbdev}/geode/lxfb.h (100%) rename drivers/video/{ => fbdev}/geode/lxfb_core.c (100%) rename drivers/video/{ => fbdev}/geode/lxfb_ops.c (100%) rename drivers/video/{ => fbdev}/geode/suspend_gx.c (100%) rename drivers/video/{ => fbdev}/geode/video_cs5530.c (100%) rename drivers/video/{ => fbdev}/geode/video_cs5530.h (100%) rename drivers/video/{ => fbdev}/geode/video_gx.c (100%) rename drivers/video/{ => fbdev}/goldfishfb.c (100%) rename drivers/video/{ => fbdev}/grvga.c (100%) rename drivers/video/{ => fbdev}/gxt4500.c (100%) rename drivers/video/{ => fbdev}/hecubafb.c (100%) rename drivers/video/{ => fbdev}/hgafb.c (100%) rename drivers/video/{ => fbdev}/hitfb.c (100%) rename drivers/video/{ => fbdev}/hpfb.c (100%) rename drivers/video/{ => fbdev}/hyperv_fb.c (100%) rename drivers/video/{ => fbdev}/i740_reg.h (100%) rename drivers/video/{ => fbdev}/i740fb.c (100%) rename drivers/video/{ => fbdev}/i810/Makefile (100%) rename drivers/video/{ => fbdev}/i810/i810-i2c.c (100%) rename drivers/video/{ => fbdev}/i810/i810.h (100%) rename drivers/video/{ => fbdev}/i810/i810_accel.c (100%) rename drivers/video/{ => fbdev}/i810/i810_dvt.c (100%) rename drivers/video/{ => fbdev}/i810/i810_gtf.c (100%) rename drivers/video/{ => fbdev}/i810/i810_main.c (100%) rename drivers/video/{ => fbdev}/i810/i810_main.h (100%) rename drivers/video/{ => fbdev}/i810/i810_regs.h (100%) rename drivers/video/{ => fbdev}/igafb.c (100%) rename drivers/video/{ => fbdev}/imsttfb.c (100%) rename drivers/video/{ => fbdev}/imxfb.c (81%) rename drivers/video/{ => fbdev}/intelfb/Makefile (100%) rename drivers/video/{ => fbdev}/intelfb/intelfb.h (100%) rename drivers/video/{ => fbdev}/intelfb/intelfb_i2c.c (100%) rename drivers/video/{ => fbdev}/intelfb/intelfbdrv.c (100%) rename drivers/video/{ => fbdev}/intelfb/intelfbhw.c (100%) rename drivers/video/{ => fbdev}/intelfb/intelfbhw.h (100%) rename drivers/video/{ => fbdev}/jz4740_fb.c (100%) rename drivers/video/{ => fbdev}/kyro/Makefile (100%) rename drivers/video/{ => fbdev}/kyro/STG4000InitDevice.c (100%) rename drivers/video/{ => fbdev}/kyro/STG4000Interface.h (100%) rename drivers/video/{ => fbdev}/kyro/STG4000OverlayDevice.c (100%) rename drivers/video/{ => fbdev}/kyro/STG4000Ramdac.c (100%) rename drivers/video/{ => fbdev}/kyro/STG4000Reg.h (100%) rename drivers/video/{ => fbdev}/kyro/STG4000VTG.c (100%) rename drivers/video/{ => fbdev}/kyro/fbdev.c (100%) rename drivers/video/{ => fbdev}/leo.c (100%) rename drivers/video/{ => fbdev}/macfb.c (100%) rename drivers/video/{ => fbdev}/macmodes.c (100%) rename drivers/video/{ => fbdev}/macmodes.h (100%) rename drivers/video/{ => fbdev}/matrox/Makefile (100%) rename drivers/video/{ => fbdev}/matrox/g450_pll.c (100%) rename drivers/video/{ => fbdev}/matrox/g450_pll.h (100%) rename drivers/video/{ => fbdev}/matrox/i2c-matroxfb.c (100%) rename drivers/video/{ => fbdev}/matrox/matroxfb_DAC1064.c (100%) rename drivers/video/{ => fbdev}/matrox/matroxfb_DAC1064.h (100%) rename drivers/video/{ => fbdev}/matrox/matroxfb_Ti3026.c (100%) rename drivers/video/{ => fbdev}/matrox/matroxfb_Ti3026.h (100%) rename drivers/video/{ => fbdev}/matrox/matroxfb_accel.c (95%) rename drivers/video/{ => fbdev}/matrox/matroxfb_accel.h (100%) rename drivers/video/{ => fbdev}/matrox/matroxfb_base.c (99%) rename drivers/video/{ => fbdev}/matrox/matroxfb_base.h (99%) rename drivers/video/{ => fbdev}/matrox/matroxfb_crtc2.c (100%) rename drivers/video/{ => fbdev}/matrox/matroxfb_crtc2.h (100%) rename drivers/video/{ => fbdev}/matrox/matroxfb_g450.c (100%) rename drivers/video/{ => fbdev}/matrox/matroxfb_g450.h (100%) rename drivers/video/{ => fbdev}/matrox/matroxfb_maven.c (100%) rename drivers/video/{ => fbdev}/matrox/matroxfb_maven.h (100%) rename drivers/video/{ => fbdev}/matrox/matroxfb_misc.c (100%) rename drivers/video/{ => fbdev}/matrox/matroxfb_misc.h (100%) rename drivers/video/{ => fbdev}/maxinefb.c (100%) rename drivers/video/{ => fbdev}/mb862xx/Makefile (100%) rename drivers/video/{ => fbdev}/mb862xx/mb862xx-i2c.c (100%) rename drivers/video/{ => fbdev}/mb862xx/mb862xx_reg.h (100%) rename drivers/video/{ => fbdev}/mb862xx/mb862xxfb.h (100%) rename drivers/video/{ => fbdev}/mb862xx/mb862xxfb_accel.c (100%) rename drivers/video/{ => fbdev}/mb862xx/mb862xxfb_accel.h (100%) rename drivers/video/{ => fbdev}/mb862xx/mb862xxfbdrv.c (100%) rename drivers/video/{ => fbdev}/mbx/Makefile (100%) rename drivers/video/{ => fbdev}/mbx/mbxdebugfs.c (100%) rename drivers/video/{ => fbdev}/mbx/mbxfb.c (100%) rename drivers/video/{ => fbdev}/mbx/reg_bits.h (100%) rename drivers/video/{ => fbdev}/mbx/regs.h (100%) rename drivers/video/{ => fbdev}/metronomefb.c (100%) rename drivers/video/{ => fbdev}/mmp/Kconfig (61%) rename drivers/video/{ => fbdev}/mmp/Makefile (100%) rename drivers/video/{ => fbdev}/mmp/core.c (100%) rename drivers/video/{ => fbdev}/mmp/fb/Kconfig (100%) rename drivers/video/{ => fbdev}/mmp/fb/Makefile (100%) rename drivers/video/{ => fbdev}/mmp/fb/mmpfb.c (100%) rename drivers/video/{ => fbdev}/mmp/fb/mmpfb.h (100%) rename drivers/video/{ => fbdev}/mmp/hw/Kconfig (100%) rename drivers/video/{ => fbdev}/mmp/hw/Makefile (100%) rename drivers/video/{ => fbdev}/mmp/hw/mmp_ctrl.c (100%) rename drivers/video/{ => fbdev}/mmp/hw/mmp_ctrl.h (100%) rename drivers/video/{ => fbdev}/mmp/hw/mmp_spi.c (100%) rename drivers/video/{ => fbdev}/mmp/panel/Kconfig (100%) rename drivers/video/{ => fbdev}/mmp/panel/Makefile (100%) rename drivers/video/{ => fbdev}/mmp/panel/tpo_tj032md01bw.c (100%) rename drivers/video/{ => fbdev}/msm/Makefile (100%) rename drivers/video/{ => fbdev}/msm/mddi.c (100%) rename drivers/video/{ => fbdev}/msm/mddi_client_dummy.c (100%) rename drivers/video/{ => fbdev}/msm/mddi_client_nt35399.c (100%) rename drivers/video/{ => fbdev}/msm/mddi_client_toshiba.c (100%) rename drivers/video/{ => fbdev}/msm/mddi_hw.h (100%) rename drivers/video/{ => fbdev}/msm/mdp.c (100%) rename drivers/video/{ => fbdev}/msm/mdp_csc_table.h (100%) rename drivers/video/{ => fbdev}/msm/mdp_hw.h (100%) rename drivers/video/{ => fbdev}/msm/mdp_ppp.c (100%) rename drivers/video/{ => fbdev}/msm/mdp_scale_tables.c (100%) rename drivers/video/{ => fbdev}/msm/mdp_scale_tables.h (100%) rename drivers/video/{ => fbdev}/msm/msm_fb.c (100%) rename drivers/video/{ => fbdev}/mx3fb.c (100%) rename drivers/video/{ => fbdev}/mxsfb.c (100%) rename drivers/video/{ => fbdev}/n411.c (100%) rename drivers/video/{ => fbdev}/neofb.c (100%) rename drivers/video/{ => fbdev}/nuc900fb.c (100%) rename drivers/video/{ => fbdev}/nuc900fb.h (100%) rename drivers/video/{ => fbdev}/nvidia/Makefile (100%) rename drivers/video/{ => fbdev}/nvidia/nv_accel.c (100%) rename drivers/video/{ => fbdev}/nvidia/nv_backlight.c (100%) rename drivers/video/{ => fbdev}/nvidia/nv_dma.h (100%) rename drivers/video/{ => fbdev}/nvidia/nv_hw.c (100%) rename drivers/video/{ => fbdev}/nvidia/nv_i2c.c (100%) rename drivers/video/{ => fbdev}/nvidia/nv_local.h (100%) rename drivers/video/{ => fbdev}/nvidia/nv_of.c (100%) rename drivers/video/{ => fbdev}/nvidia/nv_proto.h (100%) rename drivers/video/{ => fbdev}/nvidia/nv_setup.c (100%) rename drivers/video/{ => fbdev}/nvidia/nv_type.h (100%) rename drivers/video/{ => fbdev}/nvidia/nvidia.c (100%) rename drivers/video/{ => fbdev}/ocfb.c (100%) rename drivers/video/{ => fbdev}/offb.c (100%) rename drivers/video/{ => fbdev}/omap/Kconfig (100%) rename drivers/video/{ => fbdev}/omap/Makefile (100%) rename drivers/video/{ => fbdev}/omap/hwa742.c (100%) rename drivers/video/{ => fbdev}/omap/lcd_ams_delta.c (100%) rename drivers/video/{ => fbdev}/omap/lcd_h3.c (100%) rename drivers/video/{ => fbdev}/omap/lcd_htcherald.c (100%) rename drivers/video/{ => fbdev}/omap/lcd_inn1510.c (100%) rename drivers/video/{ => fbdev}/omap/lcd_inn1610.c (100%) rename drivers/video/{ => fbdev}/omap/lcd_mipid.c (100%) rename drivers/video/{ => fbdev}/omap/lcd_osk.c (100%) rename drivers/video/{ => fbdev}/omap/lcd_palmte.c (100%) rename drivers/video/{ => fbdev}/omap/lcd_palmtt.c (100%) rename drivers/video/{ => fbdev}/omap/lcd_palmz71.c (100%) rename drivers/video/{ => fbdev}/omap/lcdc.c (100%) rename drivers/video/{ => fbdev}/omap/lcdc.h (100%) rename drivers/video/{ => fbdev}/omap/omapfb.h (100%) rename drivers/video/{ => fbdev}/omap/omapfb_main.c (100%) rename drivers/video/{ => fbdev}/omap/sossi.c (100%) create mode 100644 drivers/video/fbdev/omap2/Kconfig rename drivers/video/{ => fbdev}/omap2/Makefile (100%) rename drivers/video/{ => fbdev}/omap2/displays-new/Kconfig (100%) rename drivers/video/{ => fbdev}/omap2/displays-new/Makefile (100%) rename drivers/video/{ => fbdev}/omap2/displays-new/connector-analog-tv.c (85%) rename drivers/video/{ => fbdev}/omap2/displays-new/connector-dvi.c (87%) rename drivers/video/{ => fbdev}/omap2/displays-new/connector-hdmi.c (92%) rename drivers/video/{ => fbdev}/omap2/displays-new/encoder-tfp410.c (86%) rename drivers/video/{ => fbdev}/omap2/displays-new/encoder-tpd12s015.c (88%) rename drivers/video/{ => fbdev}/omap2/displays-new/panel-dpi.c (100%) rename drivers/video/{ => fbdev}/omap2/displays-new/panel-dsi-cm.c (95%) rename drivers/video/{ => fbdev}/omap2/displays-new/panel-lgphilips-lb035q02.c (99%) rename drivers/video/{ => fbdev}/omap2/displays-new/panel-nec-nl8048hl11.c (99%) rename drivers/video/{ => fbdev}/omap2/displays-new/panel-sharp-ls037v7dw01.c (99%) rename drivers/video/{ => fbdev}/omap2/displays-new/panel-sony-acx565akm.c (96%) rename drivers/video/{ => fbdev}/omap2/displays-new/panel-tpo-td028ttec1.c (99%) rename drivers/video/{ => fbdev}/omap2/displays-new/panel-tpo-td043mtea1.c (99%) rename drivers/video/{ => fbdev}/omap2/dss/Kconfig (100%) rename drivers/video/{ => fbdev}/omap2/dss/Makefile (97%) rename drivers/video/{ => fbdev}/omap2/dss/apply.c (100%) rename drivers/video/{ => fbdev}/omap2/dss/core.c (100%) rename drivers/video/{ => fbdev}/omap2/dss/dispc-compat.c (100%) rename drivers/video/{ => fbdev}/omap2/dss/dispc-compat.h (100%) rename drivers/video/{ => fbdev}/omap2/dss/dispc.c (99%) rename drivers/video/{ => fbdev}/omap2/dss/dispc.h (100%) rename drivers/video/{ => fbdev}/omap2/dss/dispc_coefs.c (100%) rename drivers/video/{ => fbdev}/omap2/dss/display-sysfs.c (99%) rename drivers/video/{ => fbdev}/omap2/dss/display.c (90%) rename drivers/video/{ => fbdev}/omap2/dss/dpi.c (92%) rename drivers/video/{ => fbdev}/omap2/dss/dsi.c (97%) create mode 100644 drivers/video/fbdev/omap2/dss/dss-of.c rename drivers/video/{ => fbdev}/omap2/dss/dss.c (94%) rename drivers/video/{ => fbdev}/omap2/dss/dss.h (98%) rename drivers/video/{ => fbdev}/omap2/dss/dss_features.c (100%) rename drivers/video/{ => fbdev}/omap2/dss/dss_features.h (100%) rename drivers/video/{ => fbdev}/omap2/dss/hdmi.h (100%) rename drivers/video/{ => fbdev}/omap2/dss/hdmi4.c (96%) rename drivers/video/{ => fbdev}/omap2/dss/hdmi4_core.c (100%) rename drivers/video/{ => fbdev}/omap2/dss/hdmi4_core.h (100%) rename drivers/video/{ => fbdev}/omap2/dss/hdmi_common.c (81%) rename drivers/video/{ => fbdev}/omap2/dss/hdmi_phy.c (100%) rename drivers/video/{ => fbdev}/omap2/dss/hdmi_pll.c (100%) rename drivers/video/{ => fbdev}/omap2/dss/hdmi_wp.c (100%) rename drivers/video/{ => fbdev}/omap2/dss/manager-sysfs.c (100%) rename drivers/video/{ => fbdev}/omap2/dss/manager.c (100%) rename drivers/video/{ => fbdev}/omap2/dss/output.c (100%) rename drivers/video/{ => fbdev}/omap2/dss/overlay-sysfs.c (100%) rename drivers/video/{ => fbdev}/omap2/dss/overlay.c (100%) rename drivers/video/{ => fbdev}/omap2/dss/rfbi.c (100%) rename drivers/video/{ => fbdev}/omap2/dss/sdi.c (89%) rename drivers/video/{ => fbdev}/omap2/dss/venc.c (94%) rename drivers/video/{ => fbdev}/omap2/dss/venc_panel.c (99%) rename drivers/video/{ => fbdev}/omap2/omapfb/Kconfig (100%) rename drivers/video/{ => fbdev}/omap2/omapfb/Makefile (100%) rename drivers/video/{ => fbdev}/omap2/omapfb/omapfb-ioctl.c (100%) rename drivers/video/{ => fbdev}/omap2/omapfb/omapfb-main.c (98%) rename drivers/video/{ => fbdev}/omap2/omapfb/omapfb-sysfs.c (100%) rename drivers/video/{ => fbdev}/omap2/omapfb/omapfb.h (100%) rename drivers/video/{ => fbdev}/omap2/vrfb.c (100%) rename drivers/video/{ => fbdev}/p9100.c (100%) rename drivers/video/{ => fbdev}/platinumfb.c (100%) rename drivers/video/{ => fbdev}/platinumfb.h (100%) rename drivers/video/{ => fbdev}/pm2fb.c (100%) rename drivers/video/{ => fbdev}/pm3fb.c (100%) rename drivers/video/{ => fbdev}/pmag-aa-fb.c (100%) rename drivers/video/{ => fbdev}/pmag-ba-fb.c (100%) rename drivers/video/{ => fbdev}/pmagb-b-fb.c (100%) rename drivers/video/{ => fbdev}/ps3fb.c (100%) rename drivers/video/{ => fbdev}/pvr2fb.c (100%) rename drivers/video/{ => fbdev}/pxa168fb.c (100%) rename drivers/video/{ => fbdev}/pxa168fb.h (100%) rename drivers/video/{ => fbdev}/pxa3xx-gcu.c (82%) rename drivers/video/{ => fbdev}/pxa3xx-gcu.h (100%) rename drivers/video/{ => fbdev}/pxafb.c (100%) rename drivers/video/{ => fbdev}/pxafb.h (100%) rename drivers/video/{ => fbdev}/q40fb.c (100%) rename drivers/video/{ => fbdev}/riva/Makefile (100%) rename drivers/video/{ => fbdev}/riva/fbdev.c (100%) rename drivers/video/{ => fbdev}/riva/nv_driver.c (100%) rename drivers/video/{ => fbdev}/riva/nv_type.h (100%) rename drivers/video/{ => fbdev}/riva/nvreg.h (100%) rename drivers/video/{ => fbdev}/riva/riva_hw.c (100%) rename drivers/video/{ => fbdev}/riva/riva_hw.h (100%) rename drivers/video/{ => fbdev}/riva/riva_tbl.h (100%) rename drivers/video/{ => fbdev}/riva/rivafb-i2c.c (100%) rename drivers/video/{ => fbdev}/riva/rivafb.h (100%) rename drivers/video/{ => fbdev}/s1d13xxxfb.c (100%) rename drivers/video/{ => fbdev}/s3c-fb.c (100%) rename drivers/video/{ => fbdev}/s3c2410fb.c (100%) rename drivers/video/{ => fbdev}/s3c2410fb.h (100%) rename drivers/video/{ => fbdev}/s3fb.c (100%) rename drivers/video/{ => fbdev}/sa1100fb.c (100%) rename drivers/video/{ => fbdev}/sa1100fb.h (100%) rename drivers/video/{ => fbdev}/savage/Makefile (100%) rename drivers/video/{ => fbdev}/savage/savagefb-i2c.c (100%) rename drivers/video/{ => fbdev}/savage/savagefb.h (100%) rename drivers/video/{ => fbdev}/savage/savagefb_accel.c (100%) rename drivers/video/{ => fbdev}/savage/savagefb_driver.c (100%) rename drivers/video/{ => fbdev}/sbuslib.c (100%) rename drivers/video/{ => fbdev}/sbuslib.h (100%) rename drivers/video/{ => fbdev}/sgivwfb.c (100%) rename drivers/video/{ => fbdev}/sh7760fb.c (100%) rename drivers/video/{ => fbdev}/sh_mipi_dsi.c (100%) rename drivers/video/{ => fbdev}/sh_mobile_hdmi.c (100%) rename drivers/video/{ => fbdev}/sh_mobile_lcdcfb.c (100%) rename drivers/video/{ => fbdev}/sh_mobile_lcdcfb.h (100%) rename drivers/video/{ => fbdev}/sh_mobile_meram.c (100%) rename drivers/video/{ => fbdev}/simplefb.c (100%) rename drivers/video/{ => fbdev}/sis/300vtbl.h (100%) rename drivers/video/{ => fbdev}/sis/310vtbl.h (100%) rename drivers/video/{ => fbdev}/sis/Makefile (100%) rename drivers/video/{ => fbdev}/sis/init.c (99%) rename drivers/video/{ => fbdev}/sis/init.h (100%) rename drivers/video/{ => fbdev}/sis/init301.c (100%) rename drivers/video/{ => fbdev}/sis/init301.h (100%) rename drivers/video/{ => fbdev}/sis/initdef.h (100%) rename drivers/video/{ => fbdev}/sis/initextlfb.c (100%) rename drivers/video/{ => fbdev}/sis/oem300.h (100%) rename drivers/video/{ => fbdev}/sis/oem310.h (100%) rename drivers/video/{ => fbdev}/sis/sis.h (100%) rename drivers/video/{ => fbdev}/sis/sis_accel.c (100%) rename drivers/video/{ => fbdev}/sis/sis_accel.h (100%) rename drivers/video/{ => fbdev}/sis/sis_main.c (100%) rename drivers/video/{ => fbdev}/sis/sis_main.h (100%) rename drivers/video/{ => fbdev}/sis/vgatypes.h (100%) rename drivers/video/{ => fbdev}/sis/vstruct.h (100%) rename drivers/video/{ => fbdev}/skeletonfb.c (100%) rename drivers/video/{ => fbdev}/sm501fb.c (100%) rename drivers/video/{ => fbdev}/smscufx.c (100%) rename drivers/video/{ => fbdev}/ssd1307fb.c (100%) rename drivers/video/{ => fbdev}/sstfb.c (100%) rename drivers/video/{ => fbdev}/sticore.h (100%) rename drivers/video/{ => fbdev}/stifb.c (100%) rename drivers/video/{ => fbdev}/sunxvr1000.c (100%) rename drivers/video/{ => fbdev}/sunxvr2500.c (100%) rename drivers/video/{ => fbdev}/sunxvr500.c (100%) rename drivers/video/{ => fbdev}/tcx.c (100%) rename drivers/video/{ => fbdev}/tdfxfb.c (100%) rename drivers/video/{ => fbdev}/tgafb.c (87%) rename drivers/video/{ => fbdev}/tmiofb.c (100%) rename drivers/video/{ => fbdev}/tridentfb.c (100%) rename drivers/video/{ => fbdev}/udlfb.c (100%) rename drivers/video/{ => fbdev}/uvesafb.c (99%) rename drivers/video/{ => fbdev}/valkyriefb.c (100%) rename drivers/video/{ => fbdev}/valkyriefb.h (100%) rename drivers/video/{ => fbdev}/vermilion/Makefile (100%) rename drivers/video/{ => fbdev}/vermilion/cr_pll.c (100%) rename drivers/video/{ => fbdev}/vermilion/vermilion.c (100%) rename drivers/video/{ => fbdev}/vermilion/vermilion.h (100%) rename drivers/video/{ => fbdev}/vesafb.c (98%) rename drivers/video/{ => fbdev}/vfb.c (100%) rename drivers/video/{ => fbdev}/vga16fb.c (100%) rename drivers/video/{ => fbdev}/via/Makefile (100%) rename drivers/video/{ => fbdev}/via/accel.c (100%) rename drivers/video/{ => fbdev}/via/accel.h (100%) rename drivers/video/{ => fbdev}/via/chip.h (100%) rename drivers/video/{ => fbdev}/via/debug.h (100%) rename drivers/video/{ => fbdev}/via/dvi.c (100%) rename drivers/video/{ => fbdev}/via/dvi.h (100%) rename drivers/video/{ => fbdev}/via/global.c (100%) rename drivers/video/{ => fbdev}/via/global.h (100%) rename drivers/video/{ => fbdev}/via/hw.c (100%) rename drivers/video/{ => fbdev}/via/hw.h (100%) rename drivers/video/{ => fbdev}/via/ioctl.c (100%) rename drivers/video/{ => fbdev}/via/ioctl.h (100%) rename drivers/video/{ => fbdev}/via/lcd.c (100%) rename drivers/video/{ => fbdev}/via/lcd.h (100%) rename drivers/video/{ => fbdev}/via/share.h (100%) rename drivers/video/{ => fbdev}/via/tblDPASetting.c (100%) rename drivers/video/{ => fbdev}/via/tblDPASetting.h (100%) rename drivers/video/{ => fbdev}/via/via-core.c (100%) rename drivers/video/{ => fbdev}/via/via-gpio.c (100%) rename drivers/video/{ => fbdev}/via/via_aux.c (100%) rename drivers/video/{ => fbdev}/via/via_aux.h (100%) rename drivers/video/{ => fbdev}/via/via_aux_ch7301.c (100%) rename drivers/video/{ => fbdev}/via/via_aux_edid.c (100%) rename drivers/video/{ => fbdev}/via/via_aux_sii164.c (100%) rename drivers/video/{ => fbdev}/via/via_aux_vt1621.c (100%) rename drivers/video/{ => fbdev}/via/via_aux_vt1622.c (100%) rename drivers/video/{ => fbdev}/via/via_aux_vt1625.c (100%) rename drivers/video/{ => fbdev}/via/via_aux_vt1631.c (100%) rename drivers/video/{ => fbdev}/via/via_aux_vt1632.c (100%) rename drivers/video/{ => fbdev}/via/via_aux_vt1636.c (100%) rename drivers/video/{ => fbdev}/via/via_clock.c (100%) rename drivers/video/{ => fbdev}/via/via_clock.h (100%) rename drivers/video/{ => fbdev}/via/via_i2c.c (100%) rename drivers/video/{ => fbdev}/via/via_modesetting.c (100%) rename drivers/video/{ => fbdev}/via/via_modesetting.h (100%) rename drivers/video/{ => fbdev}/via/via_utility.c (100%) rename drivers/video/{ => fbdev}/via/via_utility.h (100%) rename drivers/video/{ => fbdev}/via/viafbdev.c (100%) rename drivers/video/{ => fbdev}/via/viafbdev.h (100%) rename drivers/video/{ => fbdev}/via/viamode.c (100%) rename drivers/video/{ => fbdev}/via/viamode.h (100%) rename drivers/video/{ => fbdev}/via/vt1636.c (100%) rename drivers/video/{ => fbdev}/via/vt1636.h (100%) rename drivers/video/{ => fbdev}/vt8500lcdfb.c (100%) rename drivers/video/{ => fbdev}/vt8500lcdfb.h (100%) rename drivers/video/{ => fbdev}/vt8623fb.c (100%) rename drivers/video/{ => fbdev}/w100fb.c (100%) rename drivers/video/{ => fbdev}/w100fb.h (100%) rename drivers/video/{ => fbdev}/wm8505fb.c (100%) rename drivers/video/{ => fbdev}/wm8505fb_regs.h (100%) rename drivers/video/{ => fbdev}/wmt_ge_rops.c (99%) rename drivers/video/{ => fbdev}/wmt_ge_rops.h (100%) rename drivers/video/{ => fbdev}/xen-fbfront.c (100%) rename drivers/video/{ => fbdev}/xilinxfb.c (96%) delete mode 100644 drivers/video/omap2/Kconfig delete mode 100644 include/linux/xilinxfb.h Merging regulator/for-next (df5e84401a7f Merge remote-tracking branches 'regulator/topic/tps65910', 'regulator/topic/tps80031', 'regulator/topic/wm831x', 'regulator/topic/wm8350' and 'regulator/topic/wm8994' into regulator-next) $ git merge regulator/for-next Auto-merging drivers/regulator/Makefile Auto-merging drivers/regulator/Kconfig Auto-merging Documentation/devicetree/bindings/mfd/s2mps11.txt Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/mfd/s2mps11.txt | 12 +- Documentation/devicetree/bindings/mfd/tps65910.txt | 2 +- .../bindings/regulator/gpio-regulator.txt | 4 + .../devicetree/bindings/regulator/pfuze100.txt | 96 ++++- .../bindings/regulator/s5m8767-regulator.txt | 13 +- .../bindings/regulator/ti-abb-regulator.txt | 6 +- drivers/base/devres.c | 26 ++ drivers/of/base.c | 32 ++ drivers/regulator/88pm800.c | 4 +- drivers/regulator/88pm8607.c | 8 +- drivers/regulator/Kconfig | 32 +- drivers/regulator/Makefile | 2 + drivers/regulator/act8865-regulator.c | 21 +- drivers/regulator/anatop-regulator.c | 124 ++++++- drivers/regulator/arizona-ldo1.c | 11 +- drivers/regulator/arizona-micsupp.c | 4 +- drivers/regulator/as3711-regulator.c | 15 +- drivers/regulator/as3722-regulator.c | 1 + drivers/regulator/bcm590xx-regulator.c | 413 +++++++++++++++++++++ drivers/regulator/core.c | 14 + drivers/regulator/da9052-regulator.c | 29 +- drivers/regulator/da9055-regulator.c | 69 +++- drivers/regulator/da9063-regulator.c | 13 +- drivers/regulator/da9210-regulator.c | 5 +- drivers/regulator/dbx500-prcmu.c | 16 +- drivers/regulator/dummy.c | 6 +- drivers/regulator/fan53555.c | 13 +- drivers/regulator/fixed.c | 46 +-- drivers/regulator/gpio-regulator.c | 34 +- drivers/regulator/helpers.c | 48 ++- drivers/regulator/lp3971.c | 2 +- drivers/regulator/lp872x.c | 4 +- drivers/regulator/max14577.c | 8 +- drivers/regulator/max1586.c | 15 +- drivers/regulator/max77686.c | 15 +- drivers/regulator/max77693.c | 44 +-- drivers/regulator/max8649.c | 8 +- drivers/regulator/max8660.c | 35 +- drivers/regulator/max8907-regulator.c | 16 +- drivers/regulator/max8925-regulator.c | 8 +- drivers/regulator/max8952.c | 26 +- drivers/regulator/max8973-regulator.c | 6 +- drivers/regulator/max8997.c | 22 +- drivers/regulator/max8998.c | 27 +- drivers/regulator/mc13xxx-regulator-core.c | 12 +- drivers/regulator/pfuze100-regulator.c | 204 +++++++--- drivers/regulator/rc5t583-regulator.c | 13 +- drivers/regulator/s2mps11.c | 364 ++++++++++++++---- drivers/regulator/s5m8767.c | 97 ++++- drivers/regulator/ti-abb-regulator.c | 140 ++++--- drivers/regulator/tps51632-regulator.c | 8 +- drivers/regulator/tps62360-regulator.c | 9 +- drivers/regulator/tps6507x-regulator.c | 29 +- drivers/regulator/tps65090-regulator.c | 13 +- drivers/regulator/tps65217-regulator.c | 17 +- drivers/regulator/tps65218-regulator.c | 285 ++++++++++++++ drivers/regulator/tps6524x-regulator.c | 5 +- drivers/regulator/tps6586x-regulator.c | 20 +- drivers/regulator/tps65910-regulator.c | 21 +- drivers/regulator/tps80031-regulator.c | 6 +- drivers/regulator/wm831x-dcdc.c | 16 +- drivers/regulator/wm831x-isink.c | 4 +- drivers/regulator/wm831x-ldo.c | 12 +- drivers/regulator/wm8350-regulator.c | 4 +- drivers/regulator/wm8994-regulator.c | 4 +- include/linux/device.h | 1 + include/linux/mfd/samsung/core.h | 3 +- include/linux/mfd/samsung/s2mps14.h | 2 + include/linux/mfd/samsung/s5m8767.h | 7 + include/linux/of.h | 76 ++++ include/linux/regulator/driver.h | 8 + include/linux/regulator/pfuze100.h | 14 + 72 files changed, 2089 insertions(+), 660 deletions(-) create mode 100644 drivers/regulator/bcm590xx-regulator.c create mode 100644 drivers/regulator/tps65218-regulator.c Merging security/next (f64410ec6654 selinux: correctly label /proc inodes in use before the policy is loaded) $ git merge security/next Auto-merging security/selinux/selinuxfs.c Auto-merging security/selinux/hooks.c Auto-merging security/capability.c Auto-merging kernel/capability.c Auto-merging include/linux/fs.h Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 22 +++++---- include/linux/fs.h | 6 +-- kernel/capability.c | 29 ++++-------- kernel/seccomp.c | 2 +- security/Makefile | 12 ++--- security/apparmor/lsm.c | 2 +- security/capability.c | 2 +- security/integrity/Makefile | 4 +- security/integrity/evm/Kconfig | 6 +-- security/integrity/evm/evm.h | 28 +++++------ security/integrity/evm/evm_crypto.c | 8 ++-- security/integrity/evm/evm_main.c | 6 ++- security/integrity/evm/evm_secfs.c | 6 ++- security/integrity/iint.c | 2 +- security/integrity/ima/ima.h | 2 +- security/integrity/ima/ima_api.c | 20 ++++---- security/integrity/ima/ima_appraise.c | 4 +- security/integrity/ima/ima_crypto.c | 37 ++++++++++----- security/integrity/ima/ima_fs.c | 8 ++-- security/integrity/ima/ima_init.c | 9 ++-- security/integrity/ima/ima_main.c | 11 ++--- security/integrity/ima/ima_policy.c | 79 ++++++++++++++++--------------- security/integrity/ima/ima_queue.c | 12 +++-- security/integrity/ima/ima_template.c | 19 ++++---- security/integrity/ima/ima_template_lib.c | 29 +++++------- security/integrity/integrity_audit.c | 7 +-- security/keys/encrypted-keys/encrypted.c | 2 +- security/keys/trusted.c | 6 +-- security/selinux/hooks.c | 60 ++++++++++++++--------- security/selinux/selinuxfs.c | 2 +- 30 files changed, 235 insertions(+), 207 deletions(-) Merging selinux/next (eee3094683fb selinux: correctly label /proc inodes in use before the policy is loaded) $ git merge selinux/next Merge made by the 'recursive' strategy. Merging lblnet/next (d8ec26d7f828 Linux 3.13) $ git merge lblnet/next Already up-to-date. Merging watchdog/master (fa62c102a75e watchdog: Fix Elan SC520 dependencies) $ git merge watchdog/master Resolved 'drivers/watchdog/Kconfig' using previous resolution. Resolved 'drivers/watchdog/orion_wdt.c' using previous resolution. Auto-merging drivers/watchdog/orion_wdt.c CONFLICT (content): Merge conflict in drivers/watchdog/orion_wdt.c Auto-merging drivers/watchdog/iTCO_wdt.c Auto-merging drivers/watchdog/Kconfig CONFLICT (content): Merge conflict in drivers/watchdog/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master e6fc997bfbdd] Merge remote-tracking branch 'watchdog/master' $ git diff -M --stat --summary HEAD^.. .../devicetree/bindings/watchdog/of-xilinx-wdt.txt | 23 ++ .../devicetree/bindings/watchdog/sunxi-wdt.txt | 6 +- Documentation/watchdog/watchdog-parameters.txt | 7 + drivers/watchdog/Kconfig | 38 +- drivers/watchdog/Makefile | 1 + drivers/watchdog/acquirewdt.c | 21 +- drivers/watchdog/advantechwdt.c | 21 +- drivers/watchdog/ar7_wdt.c | 1 - drivers/watchdog/at32ap700x_wdt.c | 4 +- drivers/watchdog/ath79_wdt.c | 1 - drivers/watchdog/bcm2835_wdt.c | 4 +- drivers/watchdog/bcm47xx_wdt.c | 1 - drivers/watchdog/bcm63xx_wdt.c | 2 - drivers/watchdog/cpu5wdt.c | 1 - drivers/watchdog/cpwd.c | 1 - drivers/watchdog/da9052_wdt.c | 1 - drivers/watchdog/da9055_wdt.c | 4 +- drivers/watchdog/davinci_wdt.c | 1 - drivers/watchdog/ep93xx_wdt.c | 19 +- drivers/watchdog/geodewdt.c | 17 +- drivers/watchdog/hpwdt.c | 1 - drivers/watchdog/i6300esb.c | 1 - drivers/watchdog/iTCO_wdt.c | 8 +- drivers/watchdog/ib700wdt.c | 21 +- drivers/watchdog/ibmasr.c | 2 +- drivers/watchdog/indydog.c | 13 +- drivers/watchdog/intel_scu_watchdog.c | 4 +- drivers/watchdog/it87_wdt.c | 41 ++- drivers/watchdog/jz4740_wdt.c | 1 - drivers/watchdog/max63xx_wdt.c | 1 - drivers/watchdog/mpc8xxx_wdt.c | 1 + drivers/watchdog/mtx-1_wdt.c | 1 - drivers/watchdog/nuc900_wdt.c | 1 - drivers/watchdog/of_xilinx_wdt.c | 390 ++++++--------------- drivers/watchdog/omap_wdt.c | 23 +- drivers/watchdog/orion_wdt.c | 1 - drivers/watchdog/pc87413_wdt.c | 7 +- drivers/watchdog/pcwd_usb.c | 4 +- drivers/watchdog/pnx4008_wdt.c | 1 - drivers/watchdog/rdc321x_wdt.c | 1 - drivers/watchdog/retu_wdt.c | 1 - drivers/watchdog/riowd.c | 1 - drivers/watchdog/s3c2410_wdt.c | 9 +- drivers/watchdog/sc520_wdt.c | 3 +- drivers/watchdog/shwdt.c | 2 - drivers/watchdog/softdog.c | 2 +- drivers/watchdog/sp805_wdt.c | 19 +- drivers/watchdog/stmp3xxx_rtc_wdt.c | 1 - drivers/watchdog/sunxi_wdt.c | 2 +- drivers/watchdog/tegra_wdt.c | 302 ++++++++++++++++ drivers/watchdog/ts72xx_wdt.c | 6 +- drivers/watchdog/w83697hf_wdt.c | 4 +- drivers/watchdog/wdt285.c | 3 +- drivers/watchdog/wdt_pci.c | 1 - drivers/watchdog/wm831x_wdt.c | 1 - 55 files changed, 584 insertions(+), 470 deletions(-) create mode 100644 Documentation/devicetree/bindings/watchdog/of-xilinx-wdt.txt create mode 100644 drivers/watchdog/tegra_wdt.c Merging dwmw2-iommu/master (e5d0c874391a Merge tag 'iommu-updates-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu) $ git merge dwmw2-iommu/master Already up-to-date. Merging iommu/next (db6659a7ad28 Merge branches 'iommu/fixes', 'arm/smmu', 'x86/amd', 'arm/omap', 'arm/shmobile' and 'x86/vt-d' into next) $ git merge iommu/next Merge made by the 'recursive' strategy. .../devicetree/bindings/iommu/arm,smmu.txt | 6 + .../devicetree/bindings/iommu/ti,omap-iommu.txt | 26 + arch/arm/mach-omap2/omap-iommu.c | 5 + drivers/iommu/Kconfig | 2 +- drivers/iommu/amd_iommu.c | 4 +- drivers/iommu/arm-smmu.c | 105 ++- drivers/iommu/dmar.c | 412 +++++++---- drivers/iommu/intel-iommu.c | 750 +++++++++++---------- drivers/iommu/intel_irq_remapping.c | 108 ++- drivers/iommu/iova.c | 64 +- drivers/iommu/omap-iommu.c | 162 +++-- drivers/iommu/omap-iommu.h | 5 + drivers/iommu/omap-iommu2.c | 3 + include/linux/dmar.h | 74 +- include/linux/iova.h | 2 + 15 files changed, 1071 insertions(+), 657 deletions(-) create mode 100644 Documentation/devicetree/bindings/iommu/ti,omap-iommu.txt Merging vfio/next (9d830d47c7a7 kvm/vfio: Support for DMA coherent IOMMUs) $ git merge vfio/next Auto-merging drivers/vfio/vfio_iommu_type1.c Merge made by the 'recursive' strategy. drivers/vfio/vfio.c | 6 + drivers/vfio/vfio_iommu_type1.c | 656 ++++++++++++++++++++++------------------ include/linux/vfio.h | 2 + include/uapi/linux/vfio.h | 6 + virt/kvm/vfio.c | 27 +- 5 files changed, 389 insertions(+), 308 deletions(-) Merging osd/linux-next (19350e7627a6 exofs: Print less in r4w) $ git merge osd/linux-next Already up-to-date. Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document) $ git merge jc_docs/docs-next Already up-to-date. Merging trivial/for-next (2509671dcf63 isdn: capi: fix "CAPI_VERSION" comment) $ git merge trivial/for-next Auto-merging net/core/net-sysfs.c Auto-merging net/core/dev.c Auto-merging include/net/mac80211.h Auto-merging include/linux/skbuff.h Auto-merging include/linux/idr.h Auto-merging include/drm/drm_fb_helper.h Auto-merging fs/debugfs/inode.c Auto-merging drivers/regulator/core.c Auto-merging drivers/mmc/core/host.c Auto-merging drivers/gpu/drm/drm_crtc_helper.c Auto-merging drivers/ata/libata-core.c Auto-merging block/blk-core.c Auto-merging arch/arm/mach-spear/Kconfig Auto-merging Documentation/module-signing.txt Auto-merging CREDITS Merge made by the 'recursive' strategy. CREDITS | 4 ++-- Documentation/filesystems/hfsplus.txt | 2 +- Documentation/module-signing.txt | 10 +++++----- arch/arc/Kconfig | 1 - arch/arm/mach-spear/Kconfig | 2 +- arch/cris/arch-v32/drivers/Kconfig | 2 -- arch/s390/include/asm/cio.h | 2 +- block/blk-core.c | 2 +- block/blk-map.c | 2 +- drivers/ata/libata-core.c | 4 ++-- drivers/base/bus.c | 2 +- drivers/base/core.c | 1 - drivers/bluetooth/Kconfig | 3 ++- drivers/gpu/drm/drm_crtc_helper.c | 2 +- drivers/input/sparse-keymap.c | 2 +- drivers/misc/mic/Kconfig | 2 -- drivers/mmc/core/host.c | 2 +- drivers/regulator/core.c | 2 +- drivers/scsi/scsi_transport_iscsi.c | 6 +++--- drivers/staging/android/Kconfig | 2 -- drivers/staging/bcm/Kconfig | 1 - drivers/staging/frontier/Kconfig | 1 - drivers/staging/media/go7007/Kconfig | 3 --- drivers/staging/rtl8187se/Kconfig | 1 - drivers/staging/rtl8188eu/Kconfig | 1 - drivers/staging/rtl8192e/rtl8192e/Kconfig | 1 - drivers/staging/rtl8192u/Kconfig | 1 - drivers/staging/rtl8712/Kconfig | 2 -- drivers/staging/usbip/Kconfig | 4 ---- drivers/usb/core/Kconfig | 1 - drivers/usb/core/message.c | 2 +- drivers/usb/core/urb.c | 2 +- drivers/usb/host/Kconfig | 3 --- fs/buffer.c | 2 +- fs/debugfs/inode.c | 6 +++--- include/drm/drm_fb_helper.h | 2 +- include/linux/gpio.h | 2 +- include/linux/hsi/hsi.h | 2 +- include/linux/idr.h | 1 - include/linux/kfifo.h | 2 +- include/linux/pipe_fs_i.h | 2 +- include/linux/platform_data/ata-samsung_cf.h | 9 ++++----- include/linux/skbuff.h | 2 +- include/linux/spi/spi.h | 8 ++++---- include/linux/usb/composite.h | 2 +- include/net/mac80211.h | 6 +++--- include/uapi/linux/capi.h | 2 +- kernel/relay.c | 2 +- kernel/signal.c | 2 +- net/core/dev.c | 2 +- net/core/net-sysfs.c | 2 +- 51 files changed, 53 insertions(+), 81 deletions(-) Merging audit/master (80e0b6e8a001 sched: declare pid_alive as inline) $ git merge audit/master Resolved 'arch/mips/include/asm/syscall.h' using previous resolution. Resolved 'arch/mips/kernel/ptrace.c' using previous resolution. Resolved 'arch/powerpc/Kconfig' using previous resolution. Resolved 'arch/x86/Kconfig' using previous resolution. Resolved 'init/Kconfig' using previous resolution. Resolved 'kernel/audit.c' using previous resolution. Auto-merging security/integrity/integrity_audit.c Auto-merging mm/util.c Auto-merging lib/Makefile Auto-merging kernel/seccomp.c Auto-merging kernel/auditsc.c Auto-merging kernel/auditfilter.c Auto-merging kernel/audit.h Auto-merging kernel/audit.c CONFLICT (content): Merge conflict in kernel/audit.c Auto-merging init/Kconfig CONFLICT (content): Merge conflict in init/Kconfig Auto-merging include/linux/sched.h Auto-merging include/linux/mm.h Auto-merging include/linux/audit.h Auto-merging fs/proc/base.c Auto-merging arch/x86/Kconfig CONFLICT (content): Merge conflict in arch/x86/Kconfig Auto-merging arch/sparc/Kconfig Auto-merging arch/sh/Kconfig Auto-merging arch/s390/Kconfig Auto-merging arch/powerpc/Kconfig CONFLICT (content): Merge conflict in arch/powerpc/Kconfig Auto-merging arch/parisc/Kconfig Auto-merging arch/mips/kernel/ptrace.c CONFLICT (content): Merge conflict in arch/mips/kernel/ptrace.c Auto-merging arch/mips/include/asm/syscall.h CONFLICT (content): Merge conflict in arch/mips/include/asm/syscall.h Auto-merging arch/ia64/Kconfig Auto-merging arch/arm/Kconfig Auto-merging arch/alpha/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master a11193b2e161] Merge remote-tracking branch 'audit/master' $ git diff -M --stat --summary HEAD^.. arch/alpha/Kconfig | 1 + arch/arm/Kconfig | 1 + arch/arm/include/asm/syscall.h | 5 +- arch/ia64/Kconfig | 1 + arch/mips/include/asm/syscall.h | 7 +- arch/mips/kernel/ptrace.c | 2 +- arch/parisc/Kconfig | 1 + arch/powerpc/Kconfig | 1 + arch/s390/Kconfig | 1 + arch/s390/include/asm/syscall.h | 7 +- arch/sh/Kconfig | 1 + arch/sparc/Kconfig | 1 + arch/um/Kconfig.common | 1 + arch/x86/Kconfig | 1 + arch/x86/include/asm/syscall.h | 10 ++- drivers/tty/tty_audit.c | 3 +- fs/proc/base.c | 36 +--------- include/asm-generic/syscall.h | 4 +- include/linux/audit.h | 8 +++ include/linux/mm.h | 1 + include/linux/sched.h | 20 +++++- include/uapi/linux/audit.h | 7 ++ include/uapi/linux/capability.h | 4 ++ init/Kconfig | 5 +- kernel/audit.c | 25 ++++--- kernel/audit.h | 6 ++ kernel/auditfilter.c | 29 ++++++-- kernel/auditsc.c | 133 ++++++++++++++++++++++++++--------- kernel/seccomp.c | 4 +- lib/Kconfig | 9 +++ lib/Makefile | 1 + lib/audit.c | 15 +++- lib/compat_audit.c | 50 +++++++++++++ mm/util.c | 48 +++++++++++++ security/integrity/integrity_audit.c | 2 +- security/lsm_audit.c | 11 +-- 36 files changed, 347 insertions(+), 115 deletions(-) create mode 100644 lib/compat_audit.c Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls) $ git merge fsnotify/for-next Already up-to-date. Merging devicetree/devicetree/next (ca3992bc0c12 Merge branch 'devicetree/next-reserved-mem' into devicetree/next) $ git merge devicetree/devicetree/next Resolved 'drivers/of/of_net.c' using previous resolution. Resolved 'include/asm-generic/vmlinux.lds.h' using previous resolution. Auto-merging include/linux/of.h Auto-merging include/asm-generic/vmlinux.lds.h CONFLICT (content): Merge conflict in include/asm-generic/vmlinux.lds.h Auto-merging fs/proc/root.c Removing fs/proc/proc_devtree.c Auto-merging drivers/of/of_net.c CONFLICT (content): Merge conflict in drivers/of/of_net.c Auto-merging drivers/of/base.c Auto-merging arch/powerpc/kernel/prom.c Auto-merging arch/powerpc/Kconfig Auto-merging arch/arm64/mm/init.c Auto-merging arch/arm64/Kconfig Auto-merging arch/arm/mach-mvebu/Kconfig Auto-merging arch/arm/boot/dts/Makefile Auto-merging arch/arm/Makefile Auto-merging arch/arm/Kconfig Auto-merging Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 23db540f9e06] Merge remote-tracking branch 'devicetree/devicetree/next' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/sysfs-firmware-ofw | 28 ++ .../bindings/reserved-memory/reserved-memory.txt | 133 ++++++ Makefile | 7 + arch/arm/Kconfig | 1 + arch/arm/Makefile | 7 +- arch/arm/boot/dts/Makefile | 4 +- arch/arm/mach-mvebu/Kconfig | 1 + arch/arm/mm/init.c | 2 + arch/arm64/Kconfig | 1 + arch/arm64/mm/init.c | 1 + arch/powerpc/Kconfig | 1 + arch/powerpc/kernel/prom.c | 3 + arch/powerpc/platforms/pseries/dlpar.c | 2 - arch/powerpc/platforms/pseries/reconfig.c | 2 - arch/powerpc/sysdev/msi_bitmap.c | 2 +- drivers/of/Kconfig | 18 +- drivers/of/Makefile | 1 + drivers/of/address.c | 8 +- drivers/of/base.c | 268 +++++++++--- drivers/of/fdt.c | 145 ++++++- drivers/of/of_net.c | 7 +- drivers/of/of_reserved_mem.c | 217 ++++++++++ drivers/of/pdt.c | 3 +- drivers/of/selftest.c | 62 +++ drivers/of/testcase-data/tests-phandle.dtsi | 3 + fs/proc/Makefile | 1 - fs/proc/internal.h | 7 - fs/proc/proc_devtree.c | 241 ----------- fs/proc/root.c | 3 - include/asm-generic/vmlinux.lds.h | 11 + include/linux/of.h | 61 ++- include/linux/of_fdt.h | 4 + include/linux/of_reserved_mem.h | 53 +++ scripts/Makefile.lib | 12 + scripts/dtc/dtc-parser.tab.c_shipped | 469 +++++++++------------ scripts/dtc/dtc-parser.tab.h_shipped | 36 +- scripts/dtc/dtc.c | 119 +++--- scripts/dtc/dtc.h | 1 - scripts/dtc/srcpos.c | 6 +- scripts/dtc/update-dtc-source.sh | 54 +++ scripts/dtc/util.c | 141 ++++++- scripts/dtc/util.h | 107 ++++- scripts/dtc/version_gen.h | 2 +- 43 files changed, 1533 insertions(+), 722 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-firmware-ofw create mode 100644 Documentation/devicetree/bindings/reserved-memory/reserved-memory.txt create mode 100644 drivers/of/of_reserved_mem.c delete mode 100644 fs/proc/proc_devtree.c create mode 100644 include/linux/of_reserved_mem.h create mode 100755 scripts/dtc/update-dtc-source.sh Merging dt-rh/for-next (6f976267da0e of: add missing major vendors) $ git merge dt-rh/for-next Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/vendor-prefixes.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) Merging spi/for-next (a5c9bf7d831e Merge remote-tracking branches 'spi/topic/topcliff-pch', 'spi/topic/txx9', 'spi/topic/xcomm', 'spi/topic/xfer', 'spi/topic/xilinx' and 'spi/topic/xtfpga' into spi-next) $ git merge spi/for-next Auto-merging include/linux/spi/spi.h Removing drivers/spi/spi-ti-ssp.c Auto-merging drivers/spi/spi-au1550.c Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. .../devicetree/bindings/spi/efm32-spi.txt | 4 +- .../devicetree/bindings/spi/qcom,spi-qup.txt | 85 +++ Documentation/devicetree/bindings/spi/sh-hspi.txt | 28 +- Documentation/devicetree/bindings/spi/sh-msiof.txt | 42 +- .../devicetree/bindings/spi/spi-fsl-dspi.txt | 2 + Documentation/devicetree/bindings/spi/spi-rspi.txt | 61 ++ .../devicetree/bindings/spi/spi-sun4i.txt | 24 + .../devicetree/bindings/spi/spi-sun6i.txt | 24 + .../devicetree/bindings/spi/spi-xtensa-xtfpga.txt | 9 + Documentation/spi/spidev | 6 + Documentation/spi/spidev_fdx.c | 8 +- Documentation/spi/spidev_test.c | 45 +- MAINTAINERS | 6 + drivers/spi/Kconfig | 53 +- drivers/spi/Makefile | 5 +- drivers/spi/spi-altera.c | 2 +- drivers/spi/spi-ath79.c | 1 - drivers/spi/spi-atmel.c | 28 +- drivers/spi/spi-au1550.c | 30 +- drivers/spi/spi-bcm2835.c | 1 - drivers/spi/spi-bcm63xx-hsspi.c | 8 +- drivers/spi/spi-bcm63xx.c | 4 +- drivers/spi/spi-bfin-sport.c | 1 - drivers/spi/spi-bfin-v3.c | 3 +- drivers/spi/spi-bfin5xx.c | 8 - drivers/spi/spi-bitbang.c | 1 - drivers/spi/spi-clps711x.c | 155 ++-- drivers/spi/spi-coldfire-qspi.c | 113 ++- drivers/spi/spi-davinci.c | 14 +- drivers/spi/spi-dw-mmio.c | 2 +- drivers/spi/spi-dw.c | 10 +- drivers/spi/spi-efm32.c | 43 +- drivers/spi/spi-ep93xx.c | 21 +- drivers/spi/spi-falcon.c | 5 - drivers/spi/spi-fsl-dspi.c | 90 ++- drivers/spi/spi-fsl-spi.c | 30 +- drivers/spi/spi-gpio.c | 3 +- drivers/spi/spi-imx.c | 7 +- drivers/spi/spi-mpc512x-psc.c | 17 +- drivers/spi/spi-mpc52xx-psc.c | 1 - drivers/spi/spi-mpc52xx.c | 4 - drivers/spi/spi-mxs.c | 7 +- drivers/spi/spi-nuc900.c | 10 +- drivers/spi/spi-oc-tiny.c | 3 - drivers/spi/spi-octeon.c | 80 +- drivers/spi/spi-omap-100k.c | 52 +- drivers/spi/spi-omap-uwire.c | 24 +- drivers/spi/spi-omap2-mcspi.c | 65 +- drivers/spi/spi-orion.c | 80 +- drivers/spi/spi-pl022.c | 80 +- drivers/spi/spi-ppc4xx.c | 1 - drivers/spi/spi-pxa2xx-dma.c | 1 - drivers/spi/spi-pxa2xx-pxadma.c | 1 - drivers/spi/spi-pxa2xx.c | 3 +- drivers/spi/spi-qup.c | 779 +++++++++++++++++++ drivers/spi/spi-rspi.c | 842 ++++++++++++++------- drivers/spi/spi-s3c24xx.c | 19 +- drivers/spi/spi-s3c64xx.c | 424 +++-------- drivers/spi/spi-sc18is602.c | 29 +- drivers/spi/spi-sh-hspi.c | 43 +- drivers/spi/spi-sh-msiof.c | 385 +++++----- drivers/spi/spi-sh-sci.c | 8 +- drivers/spi/spi-sirf.c | 116 +-- drivers/spi/spi-sun4i.c | 478 ++++++++++++ drivers/spi/spi-sun6i.c | 484 ++++++++++++ drivers/spi/spi-tegra114.c | 27 +- drivers/spi/spi-tegra20-sflash.c | 26 +- drivers/spi/spi-tegra20-slink.c | 20 +- drivers/spi/spi-ti-qspi.c | 5 +- drivers/spi/spi-ti-ssp.c | 378 --------- drivers/spi/spi-topcliff-pch.c | 40 +- drivers/spi/spi-txx9.c | 25 +- drivers/spi/spi-xcomm.c | 13 +- drivers/spi/spi-xilinx.c | 27 +- drivers/spi/spi-xtensa-xtfpga.c | 170 +++++ drivers/spi/spi.c | 239 +++++- drivers/spi/spidev.c | 23 +- include/linux/platform_data/spi-s3c64xx.h | 9 +- include/linux/spi/spi.h | 31 + include/uapi/linux/spi/spidev.h | 14 +- 80 files changed, 3913 insertions(+), 2152 deletions(-) create mode 100644 Documentation/devicetree/bindings/spi/qcom,spi-qup.txt create mode 100644 Documentation/devicetree/bindings/spi/spi-rspi.txt create mode 100644 Documentation/devicetree/bindings/spi/spi-sun4i.txt create mode 100644 Documentation/devicetree/bindings/spi/spi-sun6i.txt create mode 100644 Documentation/devicetree/bindings/spi/spi-xtensa-xtfpga.txt create mode 100644 drivers/spi/spi-qup.c create mode 100644 drivers/spi/spi-sun4i.c create mode 100644 drivers/spi/spi-sun6i.c delete mode 100644 drivers/spi/spi-ti-ssp.c create mode 100644 drivers/spi/spi-xtensa-xtfpga.c Merging tip/auto-latest (e2c479cc9dca Merge branch 'x86/x32') $ git merge tip/auto-latest Auto-merging tools/testing/selftests/rcutorture/configs/rcu/ver_functions.sh Auto-merging tools/testing/selftests/rcutorture/configs/rcu/v3.5/ver_functions.sh Auto-merging tools/testing/selftests/rcutorture/configs/rcu/v3.3/ver_functions.sh Auto-merging tools/testing/selftests/rcutorture/configs/rcu/v0.0/ver_functions.sh Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE09 Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE08-T Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE08 Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE07 Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE06 Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE05 Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE04 Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE03 Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE02 Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE01 Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TINY02 Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TINY01 Auto-merging tools/testing/selftests/rcutorture/configs/rcu/SRCU-P Auto-merging tools/testing/selftests/rcutorture/configs/rcu/SRCU-N Auto-merging tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh Auto-merging tools/perf/util/unwind-libunwind.c Removing tools/perf/util/include/linux/prefetch.h Removing tools/perf/util/include/linux/hash.h Removing tools/perf/util/fs.h Auto-merging tools/perf/perf.h Auto-merging tools/perf/arch/x86/util/unwind-libunwind.c Auto-merging tools/perf/arch/arm/util/unwind-libunwind.c Auto-merging tools/lib/api/fs/fs.h Auto-merging tools/lib/api/fs/fs.c Removing sound/oss/vwsnd.c Auto-merging mm/mmap.c Auto-merging kernel/sysctl.c Auto-merging kernel/sched/core.c Auto-merging kernel/rcu/rcutorture.c Auto-merging kernel/panic.c Auto-merging kernel/module.c Removing kernel/cpu/idle.c Removing kernel/cpu/Makefile Auto-merging init/Kconfig Removing include/video/sgivw.h Auto-merging include/linux/sched.h Auto-merging include/linux/mm.h Auto-merging fs/compat.c CONFLICT (rename/delete): drivers/video/fbdev/sgivwfb.c deleted in tip/auto-latest and renamed in HEAD. Version HEAD of drivers/video/fbdev/sgivwfb.c left in tree. Auto-merging drivers/video/fbdev/gbefb.c Auto-merging drivers/video/Makefile CONFLICT (content): Merge conflict in drivers/video/Makefile Auto-merging drivers/video/Kconfig CONFLICT (content): Merge conflict in drivers/video/Kconfig Auto-merging drivers/s390/cio/cio.c Auto-merging drivers/pci/host/pcie-designware.c Auto-merging drivers/pci/Makefile CONFLICT (content): Merge conflict in drivers/pci/Makefile Auto-merging drivers/media/v4l2-core/v4l2-compat-ioctl32.c Auto-merging drivers/irqchip/irq-vic.c Auto-merging drivers/irqchip/irq-mmp.c Auto-merging drivers/irqchip/irq-gic.c Auto-merging drivers/cpuidle/cpuidle.c Auto-merging drivers/cpufreq/cpufreq_stats.c Auto-merging drivers/clocksource/timer-u300.c Auto-merging drivers/clocksource/exynos_mct.c Removing drivers/clocksource/cyclone.c Auto-merging drivers/clocksource/Makefile Auto-merging drivers/clocksource/Kconfig CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig Removing arch/x86/platform/visws/visws_quirks.c Removing arch/x86/platform/visws/Makefile CONFLICT (modify/delete): arch/x86/pci/visws.c deleted in tip/auto-latest and modified in HEAD. Version HEAD of arch/x86/pci/visws.c left in tree. CONFLICT (modify/delete): arch/x86/pci/numaq_32.c deleted in tip/auto-latest and modified in HEAD. Version HEAD of arch/x86/pci/numaq_32.c left in tree. Auto-merging arch/x86/pci/common.c Auto-merging arch/x86/kernel/vsyscall_64.c Auto-merging arch/x86/kernel/tsc.c Auto-merging arch/x86/kernel/hpet.c Auto-merging arch/x86/kernel/cpu/perf_event_intel_uncore.c CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/perf_event_intel_uncore.c Removing arch/x86/kernel/apic/summit_32.c Removing arch/x86/kernel/apic/numaq_32.c Removing arch/x86/kernel/apic/es7000_32.c Removing arch/x86/include/asm/visws/sgivw.Recorded preimage for 'arch/x86/kernel/cpu/perf_event_intel_uncore.c' Resolved 'arch/arm/mach-shmobile/Kconfig' using previous resolution. Resolved 'arch/arm/mach-zynq/Kconfig' using previous resolution. Resolved 'arch/x86/include/asm/topology.h' using previous resolution. Resolved 'drivers/clocksource/Kconfig' using previous resolution. Resolved 'drivers/pci/Makefile' using previous resolution. Resolved 'drivers/video/Kconfig' using previous resolution. Resolved 'drivers/video/Makefile' using previous resolution. h Removing arch/x86/include/asm/visws/piix4.h Removing arch/x86/include/asm/visws/lithium.h Removing arch/x86/include/asm/visws/cobalt.h Auto-merging arch/x86/include/asm/topology.h CONFLICT (content): Merge conflict in arch/x86/include/asm/topology.h Removing arch/x86/include/asm/numaq.h Removing arch/x86/include/asm/cputime.h Auto-merging arch/x86/Kconfig Auto-merging arch/sparc/kernel/time_64.c Auto-merging arch/sh/Kconfig Removing arch/score/include/asm/cputime.h Auto-merging arch/s390/Kconfig Auto-merging arch/powerpc/platforms/powernv/setup.c Removing arch/mn10300/include/asm/cputime.h Removing arch/microblaze/include/asm/cputime.h Removing arch/m32r/include/asm/cputime.h Auto-merging arch/hexagon/include/asm/Kbuild Removing arch/frv/include/asm/cputime.h Removing arch/cris/include/asm/cputime.h Auto-merging arch/arm64/kernel/process.c Auto-merging arch/arm64/include/asm/Kbuild Auto-merging arch/arm/mach-zynq/Kconfig CONFLICT (content): Merge conflict in arch/arm/mach-zynq/Kconfig Auto-merging arch/arm/mach-shmobile/Kconfig CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Kconfig CONFLICT (modify/delete): arch/arm/mach-imx/pm-imx6q.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of arch/arm/mach-imx/pm-imx6q.c left in tree. Auto-merging arch/arm/kernel/process.c Auto-merging arch/arm/boot/dts/zynq-7000.dtsi Auto-merging arch/arm/boot/dts/sun7i-a20.dtsi Auto-merging arch/arm/boot/dts/sun6i-a31.dtsi Auto-merging arch/arm/boot/dts/sun5i-a13.dtsi Auto-merging arch/arm/boot/dts/sun5i-a10s.dtsi Auto-merging arch/arm/boot/dts/sun4i-a10.dtsi Removing arch/alpha/include/asm/cputime.h Auto-merging MAINTAINERS Auto-merging Documentation/sysctl/kernel.txt Removing Documentation/sound/oss/vwsnd Removing Documentation/sgi-visws.txt Auto-merging Documentation/kernel-parameters.txt Automatic merge failed; fix conflicts and then commit the result. $ git rm -f arch/x86/pci/numaq_32.c arch/x86/pci/visws.c drivers/video/fbdev/sgivwfb.c arch/arm/mach-imx/pm-imx6q.c arch/arm/mach-imx/pm-imx6q.c: needs merge arch/x86/pci/numaq_32.c: needs merge arch/x86/pci/visws.c: needs merge drivers/video/fbdev/sgivwfb.c: needs merge rm 'arch/arm/mach-imx/pm-imx6q.c' rm 'arch/x86/pci/numaq_32.c' rm 'arch/x86/pci/visws.c' rm 'drivers/video/fbdev/sgivwfb.c' $ git commit -v -a Recorded resolution for 'arch/x86/kernel/cpu/perf_event_intel_uncore.c'. [master 392f19f1c49c] Merge remote-tracking branch 'tip/auto-latest' $ git diff -M --stat --summary HEAD^.. Documentation/00-INDEX | 2 - Documentation/RCU/RTFP.txt | 149 +- Documentation/RCU/checklist.txt | 18 +- .../interrupt-controller/allwinner,sun4i-ic.txt | 4 +- .../bindings/timer/allwinner,sun4i-timer.txt | 4 +- .../bindings/timer/ti,keystone-timer.txt | 29 + Documentation/kernel-parameters.txt | 26 +- Documentation/kernel-per-CPU-kthreads.txt | 13 +- Documentation/memory-barriers.txt | 137 +- Documentation/sgi-visws.txt | 13 - Documentation/sound/oss/vwsnd | 293 -- Documentation/sysctl/kernel.txt | 15 +- Documentation/x86/boot.txt | 4 +- MAINTAINERS | 8 +- arch/alpha/include/asm/Kbuild | 8 +- arch/alpha/include/asm/cputime.h | 6 - arch/arc/include/asm/Kbuild | 7 +- arch/arm/boot/dts/sun4i-a10.dtsi | 4 +- arch/arm/boot/dts/sun5i-a10s.dtsi | 4 +- arch/arm/boot/dts/sun5i-a13.dtsi | 4 +- arch/arm/boot/dts/sun6i-a31.dtsi | 2 +- arch/arm/boot/dts/sun7i-a20.dtsi | 2 +- arch/arm/boot/dts/zynq-7000.dtsi | 6 + arch/arm/include/asm/Kbuild | 5 +- arch/arm/include/asm/topology.h | 3 - arch/arm/kernel/process.c | 16 +- arch/arm/mach-mmp/pm-mmp2.c | 16 +- arch/arm/mach-mmp/pm-pxa910.c | 20 +- arch/arm/mach-omap1/ams-delta-fiq.c | 7 +- arch/arm/mach-shmobile/Kconfig | 36 +- arch/arm/mach-u300/Makefile | 2 +- arch/arm/mach-zynq/Kconfig | 4 +- arch/arm/mach-zynq/common.c | 3 + arch/arm64/include/asm/Kbuild | 7 +- arch/arm64/kernel/process.c | 7 +- arch/avr32/include/asm/Kbuild | 41 +- arch/blackfin/include/asm/Kbuild | 7 +- arch/c6x/include/asm/Kbuild | 5 +- arch/cris/include/asm/Kbuild | 4 +- arch/cris/include/asm/cputime.h | 6 - arch/frv/include/asm/Kbuild | 6 +- arch/frv/include/asm/cputime.h | 6 - arch/hexagon/include/asm/Kbuild | 5 +- arch/ia64/include/asm/Kbuild | 5 +- arch/ia64/include/asm/topology.h | 1 - arch/ia64/kernel/efi.c | 7 + arch/ia64/kernel/irq_ia64.c | 14 +- arch/ia64/kernel/mca.c | 6 - arch/ia64/kernel/msi_ia64.c | 10 +- arch/ia64/kernel/perfmon.c | 1 - arch/ia64/kernel/time.c | 2 +- arch/ia64/sn/kernel/irq.c | 4 +- arch/ia64/sn/kernel/msi_sn.c | 2 +- arch/m32r/include/asm/Kbuild | 6 +- arch/m32r/include/asm/cputime.h | 6 - arch/m68k/Kconfig | 1 + arch/m68k/amiga/cia.c | 1 + arch/m68k/atari/ataints.c | 1 + arch/m68k/include/asm/Kbuild | 3 +- arch/m68k/kernel/ints.c | 2 +- arch/metag/include/asm/Kbuild | 5 +- arch/microblaze/include/asm/Kbuild | 6 +- arch/microblaze/include/asm/cputime.h | 1 - arch/mips/include/asm/Kbuild | 5 +- arch/mips/include/asm/topology.h | 4 - arch/mips/kernel/smtc.c | 2 +- arch/mips/sgi-ip22/ip22-int.c | 2 +- arch/mips/sgi-ip22/ip22-time.c | 2 +- arch/mips/sibyte/bcm1480/irq.c | 2 +- arch/mips/sibyte/bcm1480/smp.c | 2 +- arch/mips/sibyte/sb1250/irq.c | 2 +- arch/mips/sibyte/sb1250/smp.c | 2 +- arch/mn10300/include/asm/Kbuild | 4 +- arch/mn10300/include/asm/cputime.h | 1 - arch/mn10300/kernel/cevt-mn10300.c | 2 +- arch/mn10300/kernel/mn10300-serial.c | 6 +- arch/mn10300/kernel/mn10300-watchdog.c | 2 +- arch/mn10300/kernel/smp.c | 2 +- arch/mn10300/unit-asb2364/irq-fpga.c | 2 +- arch/openrisc/include/asm/Kbuild | 11 +- arch/parisc/include/asm/Kbuild | 32 +- arch/parisc/kernel/irq.c | 2 +- arch/powerpc/include/asm/Kbuild | 5 +- arch/powerpc/include/asm/topology.h | 1 - arch/powerpc/kernel/eeh_driver.c | 25 +- arch/powerpc/kernel/irq.c | 8 +- arch/powerpc/platforms/cell/spufs/sched.c | 1 - arch/powerpc/platforms/powernv/setup.c | 13 +- arch/powerpc/platforms/pseries/setup.c | 34 +- arch/powerpc/sysdev/ehv_pic.c | 10 +- arch/s390/Kconfig | 1 + arch/s390/include/asm/Kbuild | 5 +- arch/s390/kernel/irq.c | 1 + arch/score/include/asm/Kbuild | 6 +- arch/score/include/asm/cputime.h | 6 - arch/sh/Kconfig | 76 +- arch/sh/include/asm/Kbuild | 9 +- arch/sh/kernel/idle.c | 4 +- arch/sh/kernel/irq.c | 18 +- arch/sparc/include/asm/Kbuild | 11 +- arch/sparc/include/asm/smp_64.h | 1 - arch/sparc/include/asm/topology_64.h | 2 - arch/sparc/kernel/mdesc.c | 4 - arch/sparc/kernel/prom_64.c | 3 - arch/sparc/kernel/smp_64.c | 2 - arch/sparc/kernel/time_64.c | 2 +- arch/tile/include/asm/Kbuild | 5 +- arch/um/include/asm/Kbuild | 34 +- arch/unicore32/include/asm/Kbuild | 5 +- arch/x86/Kconfig | 131 +- arch/x86/Kconfig.cpu | 2 +- arch/x86/Kconfig.debug | 9 + arch/x86/Makefile | 5 +- arch/x86/boot/Makefile | 2 +- arch/x86/boot/boot.h | 13 - arch/x86/boot/compressed/eboot.c | 1018 ++++-- arch/x86/boot/compressed/eboot.h | 60 + arch/x86/boot/compressed/efi_stub_64.S | 29 + arch/x86/boot/compressed/head_32.S | 52 +- arch/x86/boot/compressed/head_64.S | 111 +- arch/x86/boot/compressed/misc.c | 51 +- arch/x86/boot/compressed/string.c | 46 +- arch/x86/boot/cpucheck.c | 1 + arch/x86/boot/edd.c | 1 + arch/x86/boot/header.S | 25 +- arch/x86/boot/main.c | 1 + arch/x86/boot/regs.c | 1 + arch/x86/boot/string.c | 14 + arch/x86/boot/string.h | 21 + arch/x86/boot/tools/build.c | 77 +- arch/x86/boot/video-vesa.c | 1 + arch/x86/include/asm/Kbuild | 2 + arch/x86/include/asm/apic.h | 14 +- arch/x86/include/asm/clocksource.h | 4 - arch/x86/include/asm/cpufeature.h | 9 +- arch/x86/include/asm/cputime.h | 1 - arch/x86/include/asm/efi.h | 43 +- arch/x86/include/asm/elf.h | 4 - arch/x86/include/asm/fixmap.h | 14 - arch/x86/include/asm/floppy.h | 4 +- arch/x86/include/asm/hardirq.h | 3 + arch/x86/include/asm/hw_irq.h | 1 - arch/x86/include/asm/iosf_mbi.h | 33 + arch/x86/include/asm/mmzone_32.h | 3 - arch/x86/include/asm/mpspec.h | 6 - arch/x86/include/asm/mshyperv.h | 4 +- arch/x86/include/asm/msr.h | 2 + arch/x86/include/asm/nmi.h | 3 + arch/x86/include/asm/numaq.h | 171 - arch/x86/include/asm/pgtable.h | 3 +- arch/x86/include/asm/pgtable_types.h | 11 +- arch/x86/include/asm/processor.h | 9 + arch/x86/include/asm/setup.h | 6 - arch/x86/include/asm/special_insns.h | 8 + arch/x86/include/asm/thread_info.h | 53 +- arch/x86/include/asm/topology.h | 6 - arch/x86/include/asm/vdso.h | 8 +- arch/x86/include/asm/vdso32.h | 11 + arch/x86/include/asm/vgtod.h | 71 +- arch/x86/include/asm/visws/cobalt.h | 127 - arch/x86/include/asm/visws/lithium.h | 53 - arch/x86/include/asm/visws/piix4.h | 107 - arch/x86/include/asm/visws/sgivw.h | 5 - arch/x86/include/asm/vvar.h | 29 +- arch/x86/include/asm/xsave.h | 16 +- arch/x86/include/uapi/asm/msr-index.h | 75 +- arch/x86/kernel/Makefile | 2 +- arch/x86/kernel/acpi/boot.c | 20 +- arch/x86/kernel/apic/Makefile | 3 - arch/x86/kernel/apic/apic.c | 14 +- arch/x86/kernel/apic/apic_flat_64.c | 4 +- arch/x86/kernel/apic/apic_noop.c | 3 +- arch/x86/kernel/apic/apic_numachip.c | 2 +- arch/x86/kernel/apic/bigsmp_32.c | 3 +- arch/x86/kernel/apic/es7000_32.c | 746 ----- arch/x86/kernel/apic/numaq_32.c | 525 --- arch/x86/kernel/apic/probe_32.c | 3 +- arch/x86/kernel/apic/summit_32.c | 551 --- arch/x86/kernel/apic/x2apic_cluster.c | 2 +- arch/x86/kernel/apic/x2apic_phys.c | 2 +- arch/x86/kernel/apic/x2apic_uv_x.c | 2 +- arch/x86/kernel/cpu/amd.c | 48 +- arch/x86/kernel/cpu/common.c | 11 +- arch/x86/kernel/cpu/intel.c | 38 +- arch/x86/kernel/cpu/mshyperv.c | 78 +- arch/x86/kernel/cpu/perf_event.c | 47 +- arch/x86/kernel/cpu/perf_event.h | 8 +- arch/x86/kernel/cpu/perf_event_intel_uncore.c | 544 ++- arch/x86/kernel/cpu/perf_event_intel_uncore.h | 5 + arch/x86/kernel/cpu/perf_event_p4.c | 34 +- arch/x86/kernel/crash.c | 2 - arch/x86/kernel/dumpstack_32.c | 46 +- arch/x86/kernel/dumpstack_64.c | 117 +- arch/x86/kernel/early-quirks.c | 213 +- arch/x86/kernel/hpet.c | 4 +- arch/x86/kernel/iosf_mbi.c | 6 + arch/x86/kernel/irq.c | 6 + arch/x86/kernel/irq_32.c | 83 +- arch/x86/kernel/module.c | 43 +- arch/x86/kernel/nmi.c | 37 +- arch/x86/kernel/process.c | 5 +- arch/x86/kernel/process_32.c | 4 + arch/x86/kernel/ptrace.c | 8 +- arch/x86/kernel/reboot.c | 15 +- arch/x86/kernel/setup.c | 7 +- arch/x86/kernel/smpboot.c | 20 +- arch/x86/kernel/time.c | 4 +- arch/x86/kernel/tsc.c | 2 - arch/x86/kernel/vmlinux.lds.S | 8 +- arch/x86/kernel/vsyscall_64.c | 45 - arch/x86/kernel/vsyscall_gtod.c | 69 + arch/x86/kvm/cpuid.c | 2 +- arch/x86/lib/hash.c | 22 +- arch/x86/lib/memcpy_32.c | 6 +- arch/x86/lib/msr.c | 89 +- arch/x86/mm/dump_pagetables.c | 84 +- arch/x86/mm/fault.c | 7 +- arch/x86/mm/numa.c | 4 - arch/x86/mm/pageattr.c | 70 +- arch/x86/mm/srat.c | 12 +- arch/x86/pci/Makefile | 3 - arch/x86/pci/common.c | 5 +- arch/x86/pci/numaq_32.c | 165 - arch/x86/pci/visws.c | 87 - arch/x86/platform/Makefile | 1 - arch/x86/platform/efi/Makefile | 1 + arch/x86/platform/efi/efi.c | 415 ++- arch/x86/platform/efi/efi_32.c | 7 +- arch/x86/platform/efi/efi_64.c | 368 +- arch/x86/platform/efi/efi_stub_64.S | 166 + arch/x86/platform/efi/efi_thunk_64.S | 65 + arch/x86/platform/ts5500/ts5500.c | 2 +- arch/x86/platform/visws/Makefile | 1 - arch/x86/platform/visws/visws_quirks.c | 608 ---- arch/x86/tools/relocs.c | 2 +- arch/x86/vdso/Makefile | 24 +- arch/x86/vdso/vclock_gettime.c | 256 +- arch/x86/vdso/vdso-layout.lds.S | 24 +- arch/x86/vdso/vdso32-setup.c | 296 +- arch/x86/vdso/vdso32/vclock_gettime.c | 30 + arch/x86/vdso/vdso32/vdso32.lds.S | 11 +- arch/x86/vdso/vma.c | 13 +- arch/x86/xen/Kconfig | 2 +- arch/x86/xen/mmu.c | 1 - arch/x86/xen/spinlock.c | 2 +- arch/xtensa/include/asm/Kbuild | 5 +- arch/xtensa/kernel/irq.c | 22 +- drivers/clocksource/Kconfig | 44 + drivers/clocksource/Makefile | 3 +- drivers/clocksource/arm_arch_timer.c | 1 + drivers/clocksource/cadence_ttc_timer.c | 121 +- drivers/clocksource/cyclone.c | 113 - drivers/clocksource/exynos_mct.c | 2 +- drivers/clocksource/sun4i_timer.c | 2 +- drivers/clocksource/time-armada-370-xp.c | 12 +- drivers/clocksource/time-orion.c | 28 +- drivers/clocksource/timer-keystone.c | 241 ++ .../timer.c => drivers/clocksource/timer-u300.c | 4 - drivers/cpufreq/cpufreq_stats.c | 2 +- drivers/cpuidle/cpuidle-powernv.c | 5 + drivers/cpuidle/cpuidle-pseries.c | 6 + drivers/cpuidle/cpuidle.c | 105 +- drivers/firmware/dcdbas.c | 2 +- drivers/firmware/efi/efi-stub-helper.c | 148 +- drivers/firmware/efi/efi.c | 5 +- drivers/firmware/efi/efivars.c | 2 +- drivers/gpu/drm/drm_cache.c | 10 +- drivers/gpu/drm/gma500/mmu.c | 2 +- drivers/hv/vmbus_drv.c | 57 +- drivers/irqchip/irq-armada-370-xp.c | 2 +- drivers/irqchip/irq-bcm2835.c | 4 +- drivers/irqchip/irq-gic.c | 11 +- drivers/irqchip/irq-mmp.c | 6 +- drivers/irqchip/irq-moxart.c | 2 +- drivers/irqchip/irq-orion.c | 2 +- drivers/irqchip/irq-sirfsoc.c | 2 +- drivers/irqchip/irq-sun4i.c | 42 +- drivers/irqchip/irq-vic.c | 2 +- drivers/irqchip/irq-vt8500.c | 3 +- drivers/irqchip/irq-xtensa-mx.c | 2 +- drivers/irqchip/irq-zevio.c | 2 +- drivers/irqchip/irqchip.c | 3 +- drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 2 +- drivers/pci/Makefile | 1 - drivers/pci/host/pcie-designware.c | 4 +- drivers/pnp/pnpbios/bioscalls.c | 9 +- drivers/s390/cio/cio.c | 8 +- drivers/scsi/qla1280.c | 7 - drivers/tty/tty_ldsem.c | 15 +- drivers/video/fbdev/gbefb.c | 4 - drivers/video/fbdev/sgivwfb.c | 889 ----- drivers/video/logo/Kconfig | 2 +- drivers/video/logo/logo.c | 2 +- drivers/xen/events/events_2l.c | 15 +- drivers/xen/events/events_base.c | 25 +- drivers/xen/events/events_fifo.c | 8 +- fs/compat.c | 6 +- fs/efivarfs/file.c | 13 +- fs/file.c | 2 +- fs/proc/stat.c | 2 +- fs/proc/uptime.c | 2 +- fs/timerfd.c | 1 + include/asm-generic/bitops/const_hweight.h | 17 +- include/asm-generic/cputime_jiffies.h | 4 +- include/asm-generic/cputime_nsecs.h | 5 +- include/asm-generic/mcs_spinlock.h | 13 + include/drm/i915_drm.h | 20 + include/linux/clockchips.h | 16 +- include/linux/compat.h | 23 +- include/linux/cpuidle.h | 23 +- include/linux/cputime.h | 16 + include/linux/efi.h | 268 +- include/linux/futex.h | 4 + include/linux/hardirq.h | 1 + include/linux/hrtimer.h | 4 +- include/linux/init.h | 20 +- include/linux/interrupt.h | 1 + include/linux/io.h | 2 +- include/linux/irq.h | 9 + include/linux/irq_work.h | 4 +- include/linux/kernel_stat.h | 10 +- include/linux/linkage.h | 4 +- include/linux/lockdep.h | 29 +- include/linux/mm.h | 3 + include/linux/mutex.h | 5 +- include/linux/pci_ids.h | 3 + include/linux/rculist.h | 17 +- include/linux/rcupdate.h | 96 +- include/linux/rcutiny.h | 10 +- include/linux/rcutree.h | 6 +- include/linux/sched.h | 52 +- include/linux/sched/prio.h | 44 + include/linux/sched/rt.h | 26 +- include/linux/srcu.h | 4 +- include/linux/torture.h | 100 + include/video/sgivw.h | 681 ---- init/Kconfig | 7 + ipc/compat.c | 12 +- ipc/compat_mq.c | 19 +- kernel/Makefile | 5 +- kernel/compat.c | 112 +- kernel/cpu/Makefile | 1 - kernel/cpu/idle.c | 144 - kernel/events/core.c | 39 +- kernel/extable.c | 2 +- kernel/fork.c | 1 + kernel/futex.c | 37 +- kernel/futex_compat.c | 2 +- kernel/hrtimer.c | 15 +- kernel/irq/chip.c | 48 +- kernel/irq/handle.c | 4 +- kernel/irq/internals.h | 9 + kernel/irq/irqdesc.c | 5 + kernel/irq/manage.c | 129 +- kernel/irq/proc.c | 8 +- kernel/irq_work.c | 6 +- kernel/ksysfs.c | 2 + kernel/locking/Makefile | 3 +- kernel/locking/lockdep.c | 23 +- kernel/locking/locktorture.c | 452 +++ kernel/locking/mcs_spinlock.c | 178 + kernel/locking/mcs_spinlock.h | 129 + kernel/locking/mutex-debug.c | 6 + kernel/locking/mutex.c | 104 +- kernel/locking/rtmutex.c | 12 + kernel/locking/rwsem-xadd.c | 4 + kernel/module.c | 4 + kernel/notifier.c | 2 +- kernel/panic.c | 2 +- kernel/rcu/Makefile | 2 +- kernel/rcu/rcu.h | 7 +- kernel/rcu/{torture.c => rcutorture.c} | 1004 ++---- kernel/rcu/srcu.c | 11 +- kernel/rcu/tiny.c | 8 +- kernel/rcu/tiny_plugin.h | 4 +- kernel/rcu/tree.c | 18 +- kernel/rcu/tree.h | 4 +- kernel/rcu/tree_plugin.h | 19 +- kernel/rcu/tree_trace.c | 6 +- kernel/rcu/update.c | 5 +- kernel/sched/Makefile | 2 +- kernel/sched/auto_group.c | 2 +- kernel/sched/core.c | 218 +- kernel/sched/cputime.c | 20 +- kernel/sched/deadline.c | 56 +- kernel/sched/debug.c | 7 +- kernel/sched/fair.c | 600 +++- kernel/sched/idle.c | 265 ++ kernel/sched/idle_task.c | 25 +- kernel/sched/rt.c | 102 +- kernel/sched/sched.h | 75 +- kernel/sched/stop_task.c | 15 +- kernel/softirq.c | 1 + kernel/sys.c | 8 +- kernel/sysctl.c | 7 - kernel/time/Kconfig | 2 +- kernel/time/Makefile | 5 +- kernel/time/clockevents.c | 40 +- kernel/time/ntp.c | 5 +- kernel/time/tick-broadcast-hrtimer.c | 106 + kernel/time/tick-broadcast.c | 85 +- kernel/time/tick-internal.h | 11 +- kernel/time/timekeeping_debug.c | 2 + kernel/timer.c | 59 +- kernel/torture.c | 719 ++++ kernel/trace/ring_buffer_benchmark.c | 6 +- kernel/trace/trace_event_perf.c | 22 +- kernel/trace/trace_irqsoff.c | 4 +- kernel/workqueue.c | 2 +- lib/Kconfig.debug | 20 + lib/string.c | 2 +- mm/mempolicy.c | 74 +- mm/mmap.c | 20 +- scripts/Kbuild.include | 9 + scripts/Makefile.build | 2 +- scripts/gcc-ld | 29 + scripts/ld-version.sh | 8 + scripts/mod/modpost.c | 25 +- scripts/mod/modpost.h | 2 +- sound/oss/Kconfig | 9 - sound/oss/Makefile | 1 - sound/oss/vwsnd.c | 3506 -------------------- tools/include/linux/hash.h | 5 + tools/lib/api/Makefile | 2 + tools/{perf/util => lib/api/fs}/fs.c | 11 +- .../util/include/linux/magic.h => lib/api/fs/fs.h} | 12 +- tools/perf/Documentation/perf-mem.txt | 4 + tools/perf/Documentation/perf-probe.txt | 2 + tools/perf/MANIFEST | 1 + tools/perf/Makefile.perf | 42 +- tools/perf/arch/arm/Makefile | 2 +- .../arch/arm/util/{unwind.c => unwind-libunwind.c} | 2 +- tools/perf/arch/x86/Makefile | 9 +- tools/perf/arch/x86/include/perf_regs.h | 6 + tools/perf/arch/x86/tests/dwarf-unwind.c | 59 + tools/perf/arch/x86/tests/regs_load.S | 92 + tools/perf/arch/x86/util/unwind-libdw.c | 51 + .../arch/x86/util/{unwind.c => unwind-libunwind.c} | 4 +- tools/perf/bench/bench.h | 3 + tools/perf/bench/futex-hash.c | 212 ++ tools/perf/bench/futex-requeue.c | 211 ++ tools/perf/bench/futex-wake.c | 201 ++ tools/perf/bench/futex.h | 71 + tools/perf/bench/numa.c | 1 + tools/perf/builtin-bench.c | 14 +- tools/perf/builtin-diff.c | 7 +- tools/perf/builtin-inject.c | 1 - tools/perf/builtin-kvm.c | 12 +- tools/perf/builtin-probe.c | 12 +- tools/perf/builtin-record.c | 30 +- tools/perf/builtin-report.c | 28 +- tools/perf/builtin-sched.c | 10 +- tools/perf/builtin-timechart.c | 4 +- tools/perf/builtin-top.c | 12 + tools/perf/config/Makefile | 232 +- tools/perf/config/feature-checks/Makefile | 6 +- tools/perf/config/feature-checks/test-all.c | 5 + .../feature-checks/test-libdw-dwarf-unwind.c | 13 + tools/perf/design.txt | 12 +- tools/perf/perf-completion.sh | 2 +- tools/perf/perf.h | 10 +- tools/perf/tests/builtin-test.c | 8 + tools/perf/tests/dwarf-unwind.c | 144 + tools/perf/tests/hists_link.c | 1 + tools/perf/tests/make | 25 +- tools/perf/tests/parse-events.c | 2 +- tools/perf/tests/sample-parsing.c | 17 +- tools/perf/tests/tests.h | 9 + tools/perf/ui/browsers/hists.c | 122 +- tools/perf/ui/gtk/hists.c | 78 +- tools/perf/ui/hist.c | 138 +- tools/perf/ui/stdio/hist.c | 11 +- tools/perf/util/annotate.c | 14 +- tools/perf/util/cpumap.c | 2 +- tools/perf/util/dso.c | 4 +- tools/perf/util/dso.h | 10 + tools/perf/util/event.c | 188 +- tools/perf/util/event.h | 5 +- tools/perf/util/evsel.c | 60 +- tools/perf/util/evsel.h | 18 + tools/perf/util/fs.h | 7 - tools/perf/util/hist.c | 13 +- tools/perf/util/hist.h | 29 +- tools/perf/util/include/linux/hash.h | 5 - tools/perf/util/include/linux/kernel.h | 6 - tools/perf/util/include/linux/list.h | 1 - tools/perf/util/include/linux/prefetch.h | 6 - tools/perf/util/machine.c | 79 +- tools/perf/util/machine.h | 13 +- tools/perf/util/map.h | 10 + tools/perf/util/parse-options.c | 37 +- tools/perf/util/parse-options.h | 8 +- tools/perf/util/perf_regs.c | 19 + tools/perf/util/perf_regs.h | 13 + tools/perf/util/pmu.c | 2 +- tools/perf/util/probe-event.c | 863 ++--- tools/perf/util/probe-event.h | 12 +- tools/perf/util/probe-finder.c | 198 +- tools/perf/util/probe-finder.h | 5 +- tools/perf/util/python-ext-sources | 2 +- tools/perf/util/record.c | 2 +- tools/perf/util/session.c | 7 +- tools/perf/util/symbol-elf.c | 2 + tools/perf/util/symbol.c | 63 +- tools/perf/util/symbol.h | 14 +- tools/perf/util/thread.c | 21 + tools/perf/util/thread.h | 11 +- tools/perf/util/trace-event-parse.c | 1 + tools/perf/util/unwind-libdw.c | 210 ++ tools/perf/util/unwind-libdw.h | 21 + tools/perf/util/{unwind.c => unwind-libunwind.c} | 50 +- tools/perf/util/unwind.h | 11 +- tools/perf/util/util.c | 2 +- .../testing/selftests/rcutorture/bin/functions.sh | 1 + .../selftests/rcutorture/bin/kvm-recheck-lock.sh | 51 + .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 51 + .../selftests/rcutorture/bin/kvm-recheck.sh | 13 +- .../bin/{kvm-test-1-rcu.sh => kvm-test-1-run.sh} | 53 +- tools/testing/selftests/rcutorture/bin/kvm.sh | 276 +- .../selftests/rcutorture/configs/lock/BUSTED | 6 + .../selftests/rcutorture/configs/lock/BUSTED.boot | 1 + .../selftests/rcutorture/configs/lock/CFLIST | 1 + .../selftests/rcutorture/configs/lock/CFcommon | 2 + .../selftests/rcutorture/configs/lock/LOCK01 | 6 + .../rcutorture/configs/lock/ver_functions.sh | 43 + .../selftests/rcutorture/configs/rcu/BUSTED | 7 + .../selftests/rcutorture/configs/rcu/BUSTED.boot | 1 + .../selftests/rcutorture/configs/{ => rcu}/CFLIST | 0 .../selftests/rcutorture/configs/rcu/CFcommon | 2 + .../selftests/rcutorture/configs/{ => rcu}/SRCU-N | 3 +- .../rcutorture/configs/{ => rcu}/SRCU-N.boot | 0 .../selftests/rcutorture/configs/{ => rcu}/SRCU-P | 1 - .../rcutorture/configs/{ => rcu}/SRCU-P.boot | 0 .../selftests/rcutorture/configs/{ => rcu}/TINY01 | 1 - .../selftests/rcutorture/configs/{ => rcu}/TINY02 | 1 - .../selftests/rcutorture/configs/{ => rcu}/TREE01 | 1 - .../rcutorture/configs/{ => rcu}/TREE01.boot | 0 .../selftests/rcutorture/configs/{ => rcu}/TREE02 | 3 +- .../selftests/rcutorture/configs/{ => rcu}/TREE03 | 1 - .../selftests/rcutorture/configs/{ => rcu}/TREE04 | 1 - .../rcutorture/configs/{ => rcu}/TREE04.boot | 0 .../selftests/rcutorture/configs/{ => rcu}/TREE05 | 1 - .../rcutorture/configs/{ => rcu}/TREE05.boot | 0 .../selftests/rcutorture/configs/{ => rcu}/TREE06 | 1 - .../selftests/rcutorture/configs/{ => rcu}/TREE07 | 1 - .../selftests/rcutorture/configs/{ => rcu}/TREE08 | 1 - .../rcutorture/configs/{ => rcu}/TREE08-T | 1 - .../selftests/rcutorture/configs/{ => rcu}/TREE09 | 1 - .../rcutorture/configs/{ => rcu}/v0.0/CFLIST | 0 .../configs/{ => rcu}/v0.0/N1-S-T-NH-SD-SMP-HP | 0 .../configs/{ => rcu}/v0.0/N2-2-t-nh-sd-SMP-hp | 0 .../configs/{ => rcu}/v0.0/N3-3-T-nh-SD-SMP-hp | 0 .../configs/{ => rcu}/v0.0/N4-A-t-NH-sd-SMP-HP | 0 .../configs/{ => rcu}/v0.0/N5-U-T-NH-sd-SMP-hp | 0 .../rcutorture/configs/{ => rcu}/v0.0/NT1-nh | 0 .../rcutorture/configs/{ => rcu}/v0.0/NT3-NH | 0 .../configs/{ => rcu}/v0.0/P1-S-T-NH-SD-SMP-HP | 0 .../configs/{ => rcu}/v0.0/P2-2-t-nh-sd-SMP-hp | 0 .../configs/{ => rcu}/v0.0/P3-3-T-nh-SD-SMP-hp | 0 .../configs/{ => rcu}/v0.0/P4-A-t-NH-sd-SMP-HP | 0 .../configs/{ => rcu}/v0.0/P5-U-T-NH-sd-SMP-hp | 0 .../rcutorture/configs/{ => rcu}/v0.0/PT1-nh | 0 .../rcutorture/configs/{ => rcu}/v0.0/PT2-NH | 0 .../configs/{ => rcu}/v0.0/ver_functions.sh | 22 +- .../rcutorture/configs/{ => rcu}/v3.12/CFLIST | 0 .../configs/{ => rcu}/v3.12/N1-S-T-NH-SD-SMP-HP | 0 .../configs/{ => rcu}/v3.12/N2-2-t-nh-sd-SMP-hp | 0 .../configs/{ => rcu}/v3.12/N3-3-T-nh-SD-SMP-hp | 0 .../configs/{ => rcu}/v3.12/N4-A-t-NH-sd-SMP-HP | 0 .../configs/{ => rcu}/v3.12/N5-U-T-NH-sd-SMP-hp | 0 .../configs/{ => rcu}/v3.12/N6---t-nh-SD-smp-hp | 0 .../configs/{ => rcu}/v3.12/N7-4-T-NH-SD-SMP-HP | 0 .../configs/{ => rcu}/v3.12/N8-2-T-NH-SD-SMP-HP | 0 .../rcutorture/configs/{ => rcu}/v3.12/NT1-nh | 0 .../rcutorture/configs/{ => rcu}/v3.12/NT3-NH | 0 .../configs/{ => rcu}/v3.12/P1-S-T-NH-SD-SMP-HP | 0 .../configs/{ => rcu}/v3.12/P2-2-t-nh-sd-SMP-hp | 0 .../configs/{ => rcu}/v3.12/P3-3-T-nh-SD-SMP-hp | 0 .../configs/{ => rcu}/v3.12/P4-A-t-NH-sd-SMP-HP | 0 .../configs/{ => rcu}/v3.12/P5-U-T-NH-sd-SMP-hp | 0 .../configs/{ => rcu}/v3.12/P6---t-nh-SD-smp-hp | 0 .../configs/{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-HP | 0 .../{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-HP-all | 0 .../{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-HP-none | 0 .../configs/{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-hp | 0 .../rcutorture/configs/{ => rcu}/v3.12/PT1-nh | 0 .../rcutorture/configs/{ => rcu}/v3.12/PT2-NH | 0 .../rcutorture/configs/{ => rcu}/v3.3/CFLIST | 0 .../configs/{ => rcu}/v3.3/N1-S-T-NH-SD-SMP-HP | 0 .../configs/{ => rcu}/v3.3/N2-2-t-nh-sd-SMP-hp | 0 .../configs/{ => rcu}/v3.3/N3-3-T-nh-SD-SMP-hp | 0 .../configs/{ => rcu}/v3.3/N4-A-t-NH-sd-SMP-HP | 0 .../configs/{ => rcu}/v3.3/N5-U-T-NH-sd-SMP-hp | 0 .../rcutorture/configs/{ => rcu}/v3.3/NT1-nh | 0 .../rcutorture/configs/{ => rcu}/v3.3/NT3-NH | 0 .../configs/{ => rcu}/v3.3/P1-S-T-NH-SD-SMP-HP | 0 .../configs/{ => rcu}/v3.3/P2-2-t-nh-sd-SMP-hp | 0 .../configs/{ => rcu}/v3.3/P3-3-T-nh-SD-SMP-hp | 0 .../configs/{ => rcu}/v3.3/P4-A-t-NH-sd-SMP-HP | 0 .../configs/{ => rcu}/v3.3/P5-U-T-NH-sd-SMP-hp | 0 .../rcutorture/configs/{ => rcu}/v3.3/PT1-nh | 0 .../rcutorture/configs/{ => rcu}/v3.3/PT2-NH | 0 .../configs/{ => rcu/v3.3}/ver_functions.sh | 28 +- .../rcutorture/configs/{ => rcu}/v3.5/CFLIST | 0 .../configs/{ => rcu}/v3.5/N1-S-T-NH-SD-SMP-HP | 0 .../configs/{ => rcu}/v3.5/N2-2-t-nh-sd-SMP-hp | 0 .../configs/{ => rcu}/v3.5/N3-3-T-nh-SD-SMP-hp | 0 .../configs/{ => rcu}/v3.5/N4-A-t-NH-sd-SMP-HP | 0 .../configs/{ => rcu}/v3.5/N5-U-T-NH-sd-SMP-hp | 0 .../rcutorture/configs/{ => rcu}/v3.5/NT1-nh | 0 .../rcutorture/configs/{ => rcu}/v3.5/NT3-NH | 0 .../configs/{ => rcu}/v3.5/P1-S-T-NH-SD-SMP-HP | 0 .../configs/{ => rcu}/v3.5/P2-2-t-nh-sd-SMP-hp | 0 .../configs/{ => rcu}/v3.5/P3-3-T-nh-SD-SMP-hp | 0 .../configs/{ => rcu}/v3.5/P4-A-t-NH-sd-SMP-HP | 0 .../configs/{ => rcu}/v3.5/P5-U-T-NH-sd-SMP-hp | 0 .../rcutorture/configs/{ => rcu}/v3.5/PT1-nh | 0 .../rcutorture/configs/{ => rcu}/v3.5/PT2-NH | 0 .../configs/{ => rcu}/v3.5/ver_functions.sh | 23 +- .../configs/{v3.3 => rcu}/ver_functions.sh | 26 +- .../{TREE_RCU-Kconfig.txt => TREE_RCU-kconfig.txt} | 0 virt/kvm/kvm_main.c | 2 +- 622 files changed, 12993 insertions(+), 14333 deletions(-) create mode 100644 Documentation/devicetree/bindings/timer/ti,keystone-timer.txt delete mode 100644 Documentation/sgi-visws.txt delete mode 100644 Documentation/sound/oss/vwsnd delete mode 100644 arch/alpha/include/asm/cputime.h delete mode 100644 arch/cris/include/asm/cputime.h delete mode 100644 arch/frv/include/asm/cputime.h delete mode 100644 arch/m32r/include/asm/cputime.h delete mode 100644 arch/microblaze/include/asm/cputime.h delete mode 100644 arch/mn10300/include/asm/cputime.h delete mode 100644 arch/score/include/asm/cputime.h create mode 100644 arch/x86/boot/string.h delete mode 100644 arch/x86/include/asm/cputime.h delete mode 100644 arch/x86/include/asm/numaq.h create mode 100644 arch/x86/include/asm/vdso32.h delete mode 100644 arch/x86/include/asm/visws/cobalt.h delete mode 100644 arch/x86/include/asm/visws/lithium.h delete mode 100644 arch/x86/include/asm/visws/piix4.h delete mode 100644 arch/x86/include/asm/visws/sgivw.h delete mode 100644 arch/x86/kernel/apic/es7000_32.c delete mode 100644 arch/x86/kernel/apic/numaq_32.c delete mode 100644 arch/x86/kernel/apic/summit_32.c create mode 100644 arch/x86/kernel/vsyscall_gtod.c delete mode 100644 arch/x86/pci/numaq_32.c delete mode 100644 arch/x86/pci/visws.c create mode 100644 arch/x86/platform/efi/efi_thunk_64.S delete mode 100644 arch/x86/platform/visws/Makefile delete mode 100644 arch/x86/platform/visws/visws_quirks.c create mode 100644 arch/x86/vdso/vdso32/vclock_gettime.c delete mode 100644 drivers/clocksource/cyclone.c create mode 100644 drivers/clocksource/timer-keystone.c rename arch/arm/mach-u300/timer.c => drivers/clocksource/timer-u300.c (99%) delete mode 100644 drivers/video/fbdev/sgivwfb.c create mode 100644 include/asm-generic/mcs_spinlock.h create mode 100644 include/linux/cputime.h create mode 100644 include/linux/sched/prio.h create mode 100644 include/linux/torture.h delete mode 100644 include/video/sgivw.h delete mode 100644 kernel/cpu/Makefile delete mode 100644 kernel/cpu/idle.c create mode 100644 kernel/locking/locktorture.c create mode 100644 kernel/locking/mcs_spinlock.c create mode 100644 kernel/locking/mcs_spinlock.h rename kernel/rcu/{torture.c => rcutorture.c} (58%) create mode 100644 kernel/sched/idle.c create mode 100644 kernel/time/tick-broadcast-hrtimer.c create mode 100644 kernel/torture.c create mode 100644 scripts/gcc-ld create mode 100755 scripts/ld-version.sh delete mode 100644 sound/oss/vwsnd.c create mode 100644 tools/include/linux/hash.h rename tools/{perf/util => lib/api/fs}/fs.c (91%) rename tools/{perf/util/include/linux/magic.h => lib/api/fs/fs.h} (50%) rename tools/perf/arch/arm/util/{unwind.c => unwind-libunwind.c} (95%) create mode 100644 tools/perf/arch/x86/tests/dwarf-unwind.c create mode 100644 tools/perf/arch/x86/tests/regs_load.S create mode 100644 tools/perf/arch/x86/util/unwind-libdw.c rename tools/perf/arch/x86/util/{unwind.c => unwind-libunwind.c} (95%) create mode 100644 tools/perf/bench/futex-hash.c create mode 100644 tools/perf/bench/futex-requeue.c create mode 100644 tools/perf/bench/futex-wake.c create mode 100644 tools/perf/bench/futex.h create mode 100644 tools/perf/config/feature-checks/test-libdw-dwarf-unwind.c create mode 100644 tools/perf/tests/dwarf-unwind.c delete mode 100644 tools/perf/util/fs.h delete mode 100644 tools/perf/util/include/linux/hash.h delete mode 100644 tools/perf/util/include/linux/prefetch.h create mode 100644 tools/perf/util/perf_regs.c create mode 100644 tools/perf/util/unwind-libdw.c create mode 100644 tools/perf/util/unwind-libdw.h rename tools/perf/util/{unwind.c => unwind-libunwind.c} (92%) create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-lock.sh create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh rename tools/testing/selftests/rcutorture/bin/{kvm-test-1-rcu.sh => kvm-test-1-run.sh} (79%) create mode 100644 tools/testing/selftests/rcutorture/configs/lock/BUSTED create mode 100644 tools/testing/selftests/rcutorture/configs/lock/BUSTED.boot create mode 100644 tools/testing/selftests/rcutorture/configs/lock/CFLIST create mode 100644 tools/testing/selftests/rcutorture/configs/lock/CFcommon create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK01 create mode 100644 tools/testing/selftests/rcutorture/configs/lock/ver_functions.sh create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/BUSTED create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/BUSTED.boot rename tools/testing/selftests/rcutorture/configs/{ => rcu}/CFLIST (100%) create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/CFcommon rename tools/testing/selftests/rcutorture/configs/{ => rcu}/SRCU-N (75%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/SRCU-N.boot (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/SRCU-P (86%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/SRCU-P.boot (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TINY01 (92%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TINY02 (92%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE01 (96%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE01.boot (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE02 (92%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE03 (96%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE04 (96%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE04.boot (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE05 (96%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE05.boot (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE06 (96%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE07 (96%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE08 (96%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE08-T (96%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE09 (95%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/CFLIST (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/N1-S-T-NH-SD-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/N2-2-t-nh-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/N3-3-T-nh-SD-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/N4-A-t-NH-sd-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/N5-U-T-NH-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/NT1-nh (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/NT3-NH (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/P1-S-T-NH-SD-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/P2-2-t-nh-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/P3-3-T-nh-SD-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/P4-A-t-NH-sd-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/P5-U-T-NH-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/PT1-nh (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/PT2-NH (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/ver_functions.sh (70%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/CFLIST (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N1-S-T-NH-SD-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N2-2-t-nh-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N3-3-T-nh-SD-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N4-A-t-NH-sd-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N5-U-T-NH-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N6---t-nh-SD-smp-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N7-4-T-NH-SD-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N8-2-T-NH-SD-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/NT1-nh (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/NT3-NH (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P1-S-T-NH-SD-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P2-2-t-nh-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P3-3-T-nh-SD-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P4-A-t-NH-sd-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P5-U-T-NH-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P6---t-nh-SD-smp-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-HP-all (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-HP-none (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/PT1-nh (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/PT2-NH (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/CFLIST (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/N1-S-T-NH-SD-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/N2-2-t-nh-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/N3-3-T-nh-SD-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/N4-A-t-NH-sd-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/N5-U-T-NH-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/NT1-nh (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/NT3-NH (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/P1-S-T-NH-SD-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/P2-2-t-nh-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/P3-3-T-nh-SD-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/P4-A-t-NH-sd-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/P5-U-T-NH-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/PT1-nh (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/PT2-NH (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu/v3.3}/ver_functions.sh (72%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/CFLIST (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/N1-S-T-NH-SD-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/N2-2-t-nh-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/N3-3-T-nh-SD-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/N4-A-t-NH-sd-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/N5-U-T-NH-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/NT1-nh (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/NT3-NH (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/P1-S-T-NH-SD-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/P2-2-t-nh-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/P3-3-T-nh-SD-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/P4-A-t-NH-sd-SMP-HP (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/P5-U-T-NH-sd-SMP-hp (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/PT1-nh (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/PT2-NH (100%) rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/ver_functions.sh (69%) rename tools/testing/selftests/rcutorture/configs/{v3.3 => rcu}/ver_functions.sh (66%) rename tools/testing/selftests/rcutorture/doc/{TREE_RCU-Kconfig.txt => TREE_RCU-kconfig.txt} (100%) $ git am -3 ../patches/0001-video-fbdev-fix-up-fro-removal-of-SGI-Visual-Worksta.patch Applying: video: fbdev: fix up fro removal of SGI Visual Workstation $ git reset HEAD^ Unstaged changes after reset: M drivers/video/fbdev/Kconfig M drivers/video/fbdev/Makefile $ git add -A . $ git commit -v -a --amend [master 87edc0746e18] Merge remote-tracking branch 'tip/auto-latest' $ git am -3 ../patches/0001-arm-Replace-various-irq_desc-accesses-fix-for-file-m.patch Applying: arm: Replace various irq_desc accesses fix for file move $ git reset HEAD^ Unstaged changes after reset: M arch/arm/mach-imx/pm-imx6.c $ git add -A . $ git commit -v -a --amend [master 67ae3b36794d] Merge remote-tracking branch 'tip/auto-latest' Merging clockevents/clockevents/next (09e15176ded1 clocksource: exynos_mct: silence a static checker warning) $ git merge clockevents/clockevents/next Already up-to-date. Merging edac/linux_next (49856dc973cd sb_edac: mark MCE messages as KERN_DEBUG) $ git merge edac/linux_next Auto-merging drivers/edac/sb_edac.c Merge made by the 'recursive' strategy. drivers/edac/sb_edac.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) Merging edac-amd/for-next (c045ebdf6079 Merge branch 'edac-for-3.15' into for-next) $ git merge edac-amd/for-next Auto-merging include/linux/pci_ids.h Auto-merging drivers/edac/sb_edac.c Auto-merging drivers/edac/i7core_edac.c Auto-merging drivers/edac/i5400_edac.c Merge made by the 'recursive' strategy. arch/x86/kernel/amd_nb.c | 2 ++ drivers/edac/amd64_edac.c | 38 +++++++++++++++++++++++--- drivers/edac/amd64_edac.h | 3 +++ drivers/edac/amd8111_edac.c | 44 ++++++++++++++++++++---------- drivers/edac/e752x_edac.c | 30 ++++++++------------- drivers/edac/i3200_edac.c | 2 ++ drivers/edac/i5100_edac.c | 17 +++++------- drivers/edac/i5400_edac.c | 2 ++ drivers/edac/i7core_edac.c | 10 +++---- drivers/edac/i82875p_edac.c | 2 -- drivers/edac/mce_amd.c | 65 +++++++++++++++++++++++---------------------- drivers/edac/mpc85xx_edac.c | 6 ++--- drivers/edac/sb_edac.c | 2 +- include/linux/pci_ids.h | 2 ++ 14 files changed, 134 insertions(+), 91 deletions(-) Merging ftrace/for-next (cb1deb5fc1fd Merge branch 'trace/ftrace/core' into trace/for-next) $ git merge ftrace/for-next Auto-merging kernel/tracepoint.c Auto-merging kernel/trace/trace_irqsoff.c Auto-merging kernel/trace/blktrace.c Auto-merging include/linux/module.h Auto-merging arch/mips/kernel/ftrace.c Merge made by the 'recursive' strategy. Documentation/trace/ftrace-design.txt | 5 +- arch/arm/kernel/ftrace.c | 4 +- arch/blackfin/kernel/ftrace.c | 5 +- arch/ia64/kernel/ftrace.c | 4 +- arch/metag/kernel/ftrace.c | 5 +- arch/microblaze/kernel/ftrace.c | 5 +- arch/mips/kernel/ftrace.c | 5 +- arch/powerpc/kernel/ftrace.c | 7 +- arch/s390/kernel/ftrace.c | 3 +- arch/sh/kernel/ftrace.c | 5 +- arch/sparc/kernel/ftrace.c | 6 +- arch/tile/kernel/ftrace.c | 4 +- arch/x86/kernel/ftrace.c | 55 +++++----- include/linux/ftrace.h | 27 +++-- include/linux/ftrace_event.h | 28 ++++- include/linux/module.h | 2 +- include/trace/events/migrate.h | 2 + include/trace/ftrace.h | 50 +++------ kernel/trace/blktrace.c | 3 +- kernel/trace/ftrace.c | 162 +++++++++++++++------------- kernel/trace/trace.c | 187 +++++++++++++++++++++++++-------- kernel/trace/trace.h | 38 ++++++- kernel/trace/trace_events.c | 36 +++++-- kernel/trace/trace_export.c | 12 +-- kernel/trace/trace_functions.c | 143 +++++++++++++++++-------- kernel/trace/trace_functions_graph.c | 3 +- kernel/trace/trace_irqsoff.c | 10 +- kernel/trace/trace_kprobe.c | 17 --- kernel/trace/trace_nop.c | 5 +- kernel/trace/trace_output.c | 52 +++++++++ kernel/trace/trace_probe.h | 17 +++ kernel/trace/trace_sched_wakeup.c | 10 +- kernel/trace/trace_uprobe.c | 191 ++++++++++++++++++++++++---------- kernel/tracepoint.c | 33 +++++- 34 files changed, 757 insertions(+), 384 deletions(-) Merging rcu/rcu/next (f5604f67fe8c Merge branch 'torture.2014.02.23a' into HEAD) $ git merge rcu/rcu/next Already up-to-date. Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions) $ git merge uprobes/for-next Already up-to-date. Merging kvm/linux-next (94b3ffcd41a9 Merge tag 'kvm-s390-20140317' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) $ git merge kvm/linux-next Resolved 'arch/s390/include/asm/kvm_host.h' using previous resolution. Auto-merging virt/kvm/kvm_main.c Auto-merging arch/x86/kvm/x86.c Auto-merging arch/x86/kvm/svm.c Auto-merging arch/x86/kvm/cpuid.c Auto-merging arch/x86/include/uapi/asm/msr-index.h Auto-merging arch/x86/include/asm/xsave.h Auto-merging arch/s390/kvm/priv.c Auto-merging arch/s390/kvm/kvm-s390.h Auto-merging arch/s390/kvm/kvm-s390.c Auto-merging arch/s390/kvm/diag.c Auto-merging arch/s390/kernel/irq.c Auto-merging arch/s390/include/asm/pgtable.h Auto-merging arch/s390/include/asm/kvm_host.h CONFLICT (content): Merge conflict in arch/s390/include/asm/kvm_host.h Auto-merging arch/arm64/include/asm/kvm_arm.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master fdf6a216fe39] Merge remote-tracking branch 'kvm/linux-next' $ git diff -M --stat --summary HEAD^.. Documentation/virtual/kvm/api.txt | 16 +- Documentation/virtual/kvm/devices/s390_flic.txt | 46 +++ arch/arm/include/asm/kvm_arm.h | 4 +- arch/arm/include/asm/kvm_asm.h | 4 +- arch/arm/include/asm/kvm_host.h | 9 +- arch/arm/include/asm/kvm_mmu.h | 30 +- arch/arm/kernel/asm-offsets.c | 1 + arch/arm/kvm/coproc.c | 84 +++-- arch/arm/kvm/coproc.h | 14 +- arch/arm/kvm/coproc_a15.c | 2 +- arch/arm/kvm/coproc_a7.c | 2 +- arch/arm/kvm/guest.c | 1 + arch/arm/kvm/interrupts_head.S | 21 +- arch/arm/kvm/mmu.c | 110 ++++++- arch/arm64/include/asm/kvm_arm.h | 3 +- arch/arm64/include/asm/kvm_asm.h | 3 +- arch/arm64/include/asm/kvm_mmu.h | 22 +- arch/arm64/kvm/sys_regs.c | 99 +++++- arch/arm64/kvm/sys_regs.h | 2 + arch/ia64/kvm/kvm-ia64.c | 1 + arch/s390/include/asm/irq.h | 1 + arch/s390/include/asm/kvm_host.h | 63 ++-- arch/s390/include/asm/pgtable.h | 2 + arch/s390/include/asm/processor.h | 1 + arch/s390/include/uapi/asm/kvm.h | 21 ++ arch/s390/kernel/irq.c | 1 + arch/s390/kvm/Kconfig | 2 + arch/s390/kvm/Makefile | 2 +- arch/s390/kvm/diag.c | 84 +++++ arch/s390/kvm/interrupt.c | 396 ++++++++++++++++++++---- arch/s390/kvm/kvm-s390.c | 164 +++++++++- arch/s390/kvm/kvm-s390.h | 4 + arch/s390/kvm/priv.c | 7 +- arch/s390/kvm/sigp.c | 155 ++++------ arch/s390/kvm/trace.h | 46 +++ arch/s390/mm/fault.c | 26 +- arch/x86/include/asm/kvm_host.h | 18 +- arch/x86/include/asm/vmx.h | 4 + arch/x86/include/asm/xsave.h | 2 + arch/x86/include/uapi/asm/msr-index.h | 1 + arch/x86/kernel/kvm.c | 1 - arch/x86/kernel/kvmclock.c | 2 +- arch/x86/kvm/cpuid.c | 11 +- arch/x86/kvm/emulate.c | 8 +- arch/x86/kvm/mmu.c | 2 +- arch/x86/kvm/paging_tmpl.h | 7 +- arch/x86/kvm/svm.c | 78 +++-- arch/x86/kvm/vmx.c | 312 ++++++++++++------- arch/x86/kvm/x86.c | 121 ++++++-- arch/x86/kvm/x86.h | 3 +- drivers/s390/kvm/virtio_ccw.c | 323 ++++++++++++++++++- include/linux/kvm_host.h | 7 +- include/uapi/linux/kvm.h | 67 ++++ virt/kvm/Kconfig | 4 + virt/kvm/async_pf.c | 27 +- virt/kvm/ioapic.c | 1 - virt/kvm/kvm_main.c | 12 +- 57 files changed, 1985 insertions(+), 475 deletions(-) create mode 100644 Documentation/virtual/kvm/devices/s390_flic.txt Merging kvm-arm/kvm-arm-next (b73117c49364 Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue) $ git merge kvm-arm/kvm-arm-next Already up-to-date. Merging kvm-ppc/kvm-ppc-next (b73117c49364 Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue) $ git merge kvm-ppc/kvm-ppc-next Already up-to-date. Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1) $ git merge oprofile/for-next Already up-to-date. Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work) $ git merge fw-nohz/nohz/next Already up-to-date. Merging xen-tip/linux-next (d511ede4c7bb Merge branch 'devel/for-linus-3.15' into linux-next) $ git merge xen-tip/linux-next Resolved 'drivers/xen/events/events_base.c' using previous resolution. Auto-merging drivers/xen/events/events_base.c CONFLICT (content): Merge conflict in drivers/xen/events/events_base.c Auto-merging arch/x86/xen/mmu.c Auto-merging arch/x86/xen/Kconfig Auto-merging arch/x86/include/asm/pgtable_types.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 7ce2c1f5e988] Merge remote-tracking branch 'xen-tip/linux-next' $ git diff -M --stat --summary HEAD^.. arch/arm/include/asm/xen/page.h | 15 +- arch/arm/xen/p2m.c | 32 ++++ arch/x86/include/asm/pgtable_types.h | 12 +- arch/x86/include/asm/xen/page.h | 11 +- arch/x86/kernel/entry_32.S | 23 +++ arch/x86/kernel/entry_64.S | 19 +++ arch/x86/mm/init_32.c | 2 +- arch/x86/mm/init_64.c | 2 +- arch/x86/pci/i386.c | 2 - arch/x86/pci/xen.c | 29 ++-- arch/x86/xen/Kconfig | 5 - arch/x86/xen/enlighten.c | 2 - arch/x86/xen/mmu.c | 52 +----- arch/x86/xen/p2m.c | 295 +++++++++++++++++++++++++--------- arch/x86/xen/setup.c | 15 +- drivers/xen/Makefile | 2 +- drivers/xen/events/events_base.c | 83 +++++----- drivers/xen/events/events_internal.h | 1 + drivers/xen/grant-table.c | 73 +-------- drivers/xen/manage.c | 17 ++ drivers/xen/pcpu.c | 1 + drivers/xen/platform-pci.c | 2 +- drivers/xen/preempt.c | 17 ++ drivers/xen/privcmd.c | 2 + drivers/xen/xen-acpi-processor.c | 15 +- drivers/xen/xen-pciback/pciback_ops.c | 3 +- drivers/xen/xen-selfballoon.c | 1 + drivers/xen/xenbus/xenbus_client.c | 27 ---- include/xen/events.h | 3 +- include/xen/interface/physdev.h | 10 +- include/xen/xen-ops.h | 30 ++++ include/xen/xenbus.h | 1 - 32 files changed, 492 insertions(+), 312 deletions(-) create mode 100644 drivers/xen/preempt.c Merging percpu/for-next (2f69fa829cb4 percpu: allocation size should be even) $ git merge percpu/for-next Merge made by the 'recursive' strategy. mm/percpu.c | 206 ++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 110 insertions(+), 96 deletions(-) Merging workqueues/for-next (a54b24be0cf1 Merge branch 'for-3.15' into for-next) $ git merge workqueues/for-next Auto-merging drivers/block/nvme-core.c Merge made by the 'recursive' strategy. drivers/block/floppy.c | 42 ++++++++++++++++++++++++------------- drivers/block/nvme-core.c | 18 ++++++++++------ drivers/ps3/ps3-vuart.c | 4 +--- drivers/staging/fwserial/fwserial.c | 13 +++++++++--- drivers/staging/fwserial/fwserial.h | 1 + drivers/usb/core/hub.c | 4 ++-- fs/afs/internal.h | 1 + fs/afs/rxrpc.c | 12 +++++++++-- include/linux/nvme.h | 1 + include/linux/workqueue.h | 30 ++------------------------ 10 files changed, 68 insertions(+), 58 deletions(-) Merging drivers-x86/linux-next (b4b0b4a9e039 ipc: add intel-mid's pci id macros) $ git merge drivers-x86/linux-next Already up-to-date. Merging chrome-platform/for-next (2b8454a75b90 platform/chrome: unregister platform driver/device when module exit) $ git merge chrome-platform/for-next Already up-to-date. Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away) $ git merge sysctl/master Already up-to-date. Merging regmap/for-next (f18efdf2f70e Merge remote-tracking branches 'regmap/topic/cache', 'regmap/topic/irq', 'regmap/topic/lock', 'regmap/topic/nodev', 'regmap/topic/parse-val' and 'regmap/topic/patch' into regmap-next) $ git merge regmap/for-next Auto-merging drivers/mfd/wm5102-tables.c Merge made by the 'recursive' strategy. drivers/base/regmap/internal.h | 2 + drivers/base/regmap/regcache.c | 13 +- drivers/base/regmap/regmap-debugfs.c | 2 +- drivers/base/regmap/regmap-irq.c | 6 +- drivers/base/regmap/regmap.c | 341 +++++++++++++++++++++++++++++------ drivers/mfd/arizona-core.c | 4 - drivers/mfd/wm5102-tables.c | 21 +-- include/linux/regmap.h | 11 +- 8 files changed, 306 insertions(+), 94 deletions(-) Merging hsi/for-next (43139a61fc68 HSI: hsi_char: Update ioctl-number.txt) $ git merge hsi/for-next Already up-to-date. Merging leds/for-next (0016db26c093 leds: clevo-mail: Make probe function __init) $ git merge leds/for-next Auto-merging drivers/leds/Kconfig Merge made by the 'recursive' strategy. .../devicetree/bindings/leds/leds-gpio.txt | 12 ++ Documentation/devicetree/bindings/mfd/mc13xxx.txt | 47 +++++ drivers/leds/Kconfig | 4 +- drivers/leds/led-core.c | 6 +- drivers/leds/led-triggers.c | 1 - drivers/leds/leds-88pm860x.c | 1 - drivers/leds/leds-adp5520.c | 1 - drivers/leds/leds-asic3.c | 1 - drivers/leds/leds-blinkm.c | 3 +- drivers/leds/leds-clevo-mail.c | 5 +- drivers/leds/leds-cobalt-qube.c | 1 - drivers/leds/leds-da903x.c | 1 - drivers/leds/leds-da9052.c | 1 - drivers/leds/leds-fsg.c | 1 - drivers/leds/leds-gpio.c | 6 +- drivers/leds/leds-hp6xx.c | 1 - drivers/leds/leds-lm3533.c | 1 - drivers/leds/leds-lp5521.c | 1 - drivers/leds/leds-lp5523.c | 1 - drivers/leds/leds-lp5562.c | 7 +- drivers/leds/leds-lt3593.c | 1 - drivers/leds/leds-mc13783.c | 223 ++++++++++++++------- drivers/leds/leds-netxbig.c | 1 - drivers/leds/leds-ns2.c | 1 - drivers/leds/leds-ot200.c | 1 - drivers/leds/leds-pwm.c | 1 - drivers/leds/leds-s3c24xx.c | 1 - drivers/leds/leds-ss4200.c | 4 +- drivers/leds/leds-wm831x-status.c | 1 - drivers/leds/leds-wm8350.c | 1 - drivers/leds/trigger/ledtrig-cpu.c | 24 +++ include/linux/mfd/mc13xxx.h | 6 + include/linux/platform_data/leds-s3c24xx.h | 9 +- 33 files changed, 258 insertions(+), 118 deletions(-) Merging driver-core/driver-core-next (b7ce40cff0b9 kernfs: cache atomic_write_len in kernfs_open_file) $ git merge driver-core/driver-core-next Resolved 'arch/x86/Kconfig' using previous resolution. Auto-merging scripts/mod/file2alias.c Auto-merging include/linux/device.h Auto-merging include/linux/cpu.h Auto-merging drivers/gpu/drm/drm_prime.c Auto-merging drivers/base/topology.c Auto-merging drivers/base/power/domain.c Auto-merging drivers/base/core.c Auto-merging arch/x86/include/asm/cpufeature.h Auto-merging arch/x86/Kconfig CONFLICT (content): Merge conflict in arch/x86/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 1b2a1541bd11] Merge remote-tracking branch 'driver-core/driver-core-next' $ git diff -M --stat --summary HEAD^.. arch/s390/include/asm/ccwgroup.h | 1 + arch/s390/pci/pci_sysfs.c | 18 +- arch/x86/Kconfig | 4 +- arch/x86/include/asm/cpufeature.h | 7 + arch/x86/kernel/cpu/match.c | 42 -- drivers/base/Kconfig | 3 + drivers/base/attribute_container.c | 1 - drivers/base/core.c | 52 +- drivers/base/cpu.c | 46 +- drivers/base/dma-buf.c | 18 +- drivers/base/firmware_class.c | 13 +- drivers/base/node.c | 4 + drivers/base/platform.c | 11 +- drivers/base/power/clock_ops.c | 1 - drivers/base/power/common.c | 1 - drivers/base/power/domain.c | 1 - drivers/base/power/domain_governor.c | 1 - drivers/base/power/opp.c | 1 - drivers/base/regmap/regmap-i2c.c | 1 - drivers/base/regmap/regmap-mmio.c | 1 - drivers/base/regmap/regmap-spi.c | 1 - drivers/base/topology.c | 1 - drivers/firmware/google/gsmi.c | 7 - drivers/firmware/google/memconsole.c | 47 +- drivers/gpu/drm/drm_prime.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_dmabuf.c | 2 +- drivers/media/v4l2-core/videobuf2-dma-contig.c | 2 +- drivers/pci/pci-sysfs.c | 17 +- drivers/s390/block/dcssblk.c | 14 +- drivers/s390/cio/ccwgroup.c | 26 +- drivers/scsi/scsi_sysfs.c | 15 +- fs/Kconfig | 1 + fs/Makefile | 3 +- fs/kernfs/Kconfig | 7 + fs/kernfs/dir.c | 752 ++++++++++++++++++------- fs/kernfs/file.c | 22 +- fs/kernfs/kernfs-internal.h | 15 +- fs/kernfs/mount.c | 39 +- fs/kernfs/symlink.c | 6 +- fs/sysfs/Kconfig | 1 + fs/sysfs/dir.c | 44 +- fs/sysfs/file.c | 115 +--- fs/sysfs/group.c | 7 +- fs/sysfs/mount.c | 2 +- include/linux/cpu.h | 7 - include/linux/cpufeature.h | 60 ++ include/linux/device.h | 13 +- include/linux/kernfs.h | 109 +++- include/linux/mod_devicetable.h | 9 + include/linux/sysfs.h | 23 +- lib/kobject.c | 2 +- scripts/mod/devicetable-offsets.c | 3 + scripts/mod/file2alias.c | 20 +- 53 files changed, 1018 insertions(+), 603 deletions(-) create mode 100644 fs/kernfs/Kconfig create mode 100644 include/linux/cpufeature.h $ git am -3 ../patches/0001-Revert-sysfs-driver-core-remove-unused-sysfs-device-.patch Applying: Revert "sysfs, driver-core: remove unused {sysfs|device}_schedule_callback_owner()" $ git reset HEAD^ Unstaged changes after reset: M drivers/base/core.c M fs/sysfs/file.c M include/linux/device.h M include/linux/sysfs.h $ git add -A . $ git commit -v -a --amend [master 3e0fe1e4430d] Merge remote-tracking branch 'driver-core/driver-core-next' Merging tty/tty-next (3a13884abea0 tty/serial: omap: empty the RX FIFO at the end of half-duplex TX) $ git merge tty/tty-next Auto-merging include/linux/tty.h Removing include/linux/platform_data/max310x.h Auto-merging drivers/tty/serial/sh-sci.c Auto-merging drivers/tty/serial/atmel_serial.c Auto-merging drivers/tty/serial/Kconfig Auto-merging arch/arm/boot/dts/prima2.dtsi Auto-merging arch/arm/boot/dts/atlas6.dtsi Merge made by the 'recursive' strategy. .../devicetree/bindings/serial/efm32-uart.txt | 4 +- .../devicetree/bindings/serial/fsl-lpuart.txt | 21 +- .../devicetree/bindings/serial/maxim,max310x.txt | 36 ++ .../bindings/serial/renesas,sci-serial.txt | 2 +- arch/arm/boot/dts/atlas6.dtsi | 17 +- arch/arm/boot/dts/prima2.dtsi | 20 +- arch/arm/mach-imx/mach-mx31moboard.c | 21 +- drivers/tty/hvc/hvc_console.c | 6 +- drivers/tty/ipwireless/tty.c | 3 - drivers/tty/n_tty.c | 11 +- drivers/tty/serial/8250/8250_core.c | 19 +- drivers/tty/serial/8250/8250_pci.c | 43 ++- drivers/tty/serial/Kconfig | 4 +- drivers/tty/serial/amba-pl011.c | 21 +- drivers/tty/serial/atmel_serial.c | 28 +- drivers/tty/serial/bcm63xx_uart.c | 16 +- drivers/tty/serial/clps711x.c | 21 +- drivers/tty/serial/crisv10.c | 112 ------ drivers/tty/serial/efm32-uart.c | 5 +- drivers/tty/serial/fsl_lpuart.c | 430 ++++++++++++++++++++- drivers/tty/serial/imx.c | 82 +--- drivers/tty/serial/max310x.c | 417 +++++++++++--------- drivers/tty/serial/msm_serial.c | 140 ++++++- drivers/tty/serial/msm_serial.h | 9 + drivers/tty/serial/omap-serial.c | 11 +- drivers/tty/serial/pch_uart.c | 2 + drivers/tty/serial/samsung.c | 40 +- drivers/tty/serial/serial_core.c | 20 +- drivers/tty/serial/sh-sci.c | 86 ++--- drivers/tty/serial/sirfsoc_uart.c | 195 +++------- drivers/tty/serial/sirfsoc_uart.h | 5 - drivers/tty/synclink.c | 1 + drivers/tty/synclinkmp.c | 1 + drivers/tty/tty_buffer.c | 20 +- drivers/tty/tty_io.c | 23 +- drivers/tty/vt/vt.c | 20 +- drivers/usb/gadget/u_serial.c | 4 +- include/linux/platform_data/max310x.h | 64 --- include/linux/platform_data/serial-imx.h | 2 - include/linux/serial_bcm63xx.h | 2 + include/linux/serial_sci.h | 93 +++-- include/linux/tty.h | 2 +- include/linux/tty_ldisc.h | 1 - 43 files changed, 1233 insertions(+), 847 deletions(-) create mode 100644 Documentation/devicetree/bindings/serial/maxim,max310x.txt delete mode 100644 include/linux/platform_data/max310x.h Merging usb/usb-next (1d10255c1c49 USB: disable reset-resume when USB_QUIRK_RESET is set) $ git merge usb/usb-next Resolved 'Documentation/devicetree/bindings/phy/samsung-phy.txt' using previous resolution. Resolved 'arch/arm/mach-shmobile/Kconfig' using previous resolution. Resolved 'arch/arm/mach-tegra/Kconfig' using previous resolution. Resolved 'arch/sh/Kconfig' using previous resolution. Resolved 'drivers/phy/Kconfig' using previous resolution. Resolved 'drivers/usb/core/hub.c' using previous resolution. Auto-merging include/linux/phy/omap_usb.h Auto-merging include/linux/phy/omap_control_phy.h Removing drivers/usb/phy/phy-omap-usb3.c Auto-merging drivers/usb/musb/musb_cppi41.c Auto-merging drivers/usb/host/Kconfig Auto-merging drivers/usb/gadget/lpc32xx_udc.c Auto-merging drivers/usb/core/message.c Auto-merging drivers/usb/core/hub.c CONFLICT (content): Merge conflict in drivers/usb/core/hub.c Auto-merging drivers/phy/phy-omap-control.c Auto-merging drivers/phy/Kconfig CONFLICT (content): Merge conflict in drivers/phy/Kconfig Auto-merging drivers/hid/hid-ids.h Auto-merging drivers/hid/hid-core.c Auto-merging arch/sh/Kconfig CONFLICT (content): Merge conflict in arch/sh/Kconfig Auto-merging arch/mips/Kconfig Auto-merging arch/arm/mach-tegra/Kconfig CONFLICT (content): Merge conflict in arch/arm/mach-tegra/Kconfig Auto-merging arch/arm/mach-shmobile/Kconfig CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Kconfig Auto-merging arch/arm/mach-omap2/Kconfig Auto-merging arch/arm/mach-exynos/Kconfig Auto-merging arch/arm/Kconfig Auto-merging MAINTAINERS Removing Documentation/devicetree/bindings/usb/vt8500-ehci.txt Removing Documentation/devicetree/bindings/usb/via,vt8500-ehci.txt Auto-merging Documentation/devicetree/bindings/usb/usb-uhci.txt Removing Documentation/devicetree/bindings/usb/usb-phy.txt Auto-merging Documentation/devicetree/bindings/phy/samsung-phy.txt CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/phy/samsung-phy.txt Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 33fffab58712] Merge remote-tracking branch 'usb/usb-next' $ git diff -M --stat --summary HEAD^.. .../devicetree/bindings/phy/apm-xgene-phy.txt | 79 + .../devicetree/bindings/phy/samsung-phy.txt | 54 + .../devicetree/bindings/phy/sun4i-usb-phy.txt | 26 + Documentation/devicetree/bindings/phy/ti-phy.txt | 86 + .../devicetree/bindings/usb/ci-hdrc-imx.txt | 2 + .../devicetree/bindings/usb/ci-hdrc-zevio.txt | 17 + Documentation/devicetree/bindings/usb/dwc3.txt | 6 +- Documentation/devicetree/bindings/usb/mxs-phy.txt | 8 +- Documentation/devicetree/bindings/usb/omap-usb.txt | 24 - Documentation/devicetree/bindings/usb/usb-ehci.txt | 27 +- Documentation/devicetree/bindings/usb/usb-ohci.txt | 25 + Documentation/devicetree/bindings/usb/usb-phy.txt | 48 - .../usb/{platform-uhci.txt => usb-uhci.txt} | 4 +- Documentation/devicetree/bindings/usb/usb-xhci.txt | 4 +- .../devicetree/bindings/usb/via,vt8500-ehci.txt | 15 - .../devicetree/bindings/usb/vt8500-ehci.txt | 12 - Documentation/phy/samsung-usb2.txt | 135 ++ MAINTAINERS | 3 +- arch/arm/Kconfig | 3 - arch/arm/mach-exynos/Kconfig | 1 - arch/arm/mach-omap2/Kconfig | 2 - arch/arm/mach-shmobile/Kconfig | 4 - arch/arm/mach-tegra/Kconfig | 1 - arch/mips/Kconfig | 7 - arch/mips/ath79/Kconfig | 8 - arch/mips/ralink/Kconfig | 6 - arch/powerpc/platforms/44x/Kconfig | 1 - arch/powerpc/platforms/ps3/Kconfig | 2 - arch/sh/Kconfig | 9 - drivers/hid/hid-core.c | 1 + drivers/hid/hid-ids.h | 3 + drivers/phy/Kconfig | 107 +- drivers/phy/Makefile | 9 + drivers/phy/phy-bcm-kona-usb2.c | 4 +- drivers/phy/phy-core.c | 76 +- drivers/phy/phy-exynos4210-usb2.c | 261 +++ drivers/phy/phy-exynos4x12-usb2.c | 328 ++++ drivers/phy/phy-exynos5250-sata.c | 251 +++ drivers/phy/phy-exynos5250-usb2.c | 404 +++++ drivers/{usb => }/phy/phy-omap-control.c | 169 +- drivers/phy/phy-omap-usb2.c | 131 +- drivers/phy/phy-samsung-usb2.c | 228 +++ drivers/phy/phy-samsung-usb2.h | 67 + drivers/phy/phy-sun4i-usb.c | 331 ++++ drivers/phy/phy-ti-pipe3.c | 470 ++++++ drivers/phy/phy-twl4030-usb.c | 6 +- drivers/phy/phy-xgene.c | 1750 ++++++++++++++++++++ drivers/usb/Kconfig | 10 - drivers/usb/chipidea/Makefile | 1 + drivers/usb/chipidea/bits.h | 2 + drivers/usb/chipidea/ci.h | 2 - drivers/usb/chipidea/ci_hdrc_imx.c | 2 +- drivers/usb/chipidea/ci_hdrc_zevio.c | 72 + drivers/usb/chipidea/core.c | 87 +- drivers/usb/chipidea/udc.c | 324 ++-- drivers/usb/core/config.c | 1 - drivers/usb/core/devio.c | 174 +- drivers/usb/core/driver.c | 121 +- drivers/usb/core/hcd.c | 37 +- drivers/usb/core/hub.c | 97 +- drivers/usb/core/message.c | 7 +- drivers/usb/core/usb.h | 2 +- drivers/usb/dwc2/core_intr.c | 25 +- drivers/usb/dwc2/hcd_intr.c | 14 +- drivers/usb/dwc3/core.c | 251 ++- drivers/usb/dwc3/core.h | 105 +- drivers/usb/dwc3/dwc3-omap.c | 5 - drivers/usb/dwc3/gadget.c | 183 +- drivers/usb/dwc3/gadget.h | 12 - drivers/usb/gadget/Kconfig | 3 +- drivers/usb/gadget/at91_udc.c | 14 +- drivers/usb/gadget/atmel_usba_udc.c | 16 +- drivers/usb/gadget/atmel_usba_udc.h | 2 +- drivers/usb/gadget/composite.c | 2 +- drivers/usb/gadget/f_fs.c | 616 +++++-- drivers/usb/gadget/f_subset.c | 2 +- drivers/usb/gadget/gr_udc.c | 10 +- drivers/usb/gadget/inode.c | 9 +- drivers/usb/gadget/lpc32xx_udc.c | 4 +- drivers/usb/gadget/printer.c | 8 +- drivers/usb/gadget/s3c-hsotg.c | 143 +- drivers/usb/gadget/s3c-hsudc.c | 1 - drivers/usb/gadget/tcm_usb_gadget.c | 2 +- drivers/usb/gadget/u_ether.c | 101 +- drivers/usb/gadget/u_fs.h | 30 +- drivers/usb/host/Kconfig | 1 - drivers/usb/host/ehci-platform.c | 182 +- drivers/usb/host/ehci-tegra.c | 4 - drivers/usb/host/hwa-hc.c | 42 +- drivers/usb/host/ohci-platform.c | 199 ++- drivers/usb/host/uhci-platform.c | 1 + drivers/usb/host/xhci-hub.c | 8 +- drivers/usb/host/xhci-mem.c | 212 ++- drivers/usb/host/xhci-pci.c | 18 +- drivers/usb/host/xhci-plat.c | 4 + drivers/usb/host/xhci-ring.c | 146 +- drivers/usb/host/xhci.c | 33 +- drivers/usb/host/xhci.h | 5 +- drivers/usb/misc/Kconfig | 1 - drivers/usb/misc/sisusbvga/sisusb.c | 10 +- drivers/usb/misc/usbled.c | 34 + drivers/usb/musb/Kconfig | 2 + drivers/usb/musb/musb_core.c | 5 +- drivers/usb/musb/musb_cppi41.c | 66 + drivers/usb/musb/musb_dsps.c | 58 +- drivers/usb/musb/musb_host.c | 30 +- drivers/usb/musb/omap2430.c | 2 +- drivers/usb/phy/Kconfig | 21 - drivers/usb/phy/Makefile | 2 - drivers/usb/phy/phy-fsm-usb.c | 9 +- drivers/usb/phy/phy-msm-usb.c | 3 +- drivers/usb/phy/phy-mxs-usb.c | 310 +++- drivers/usb/phy/phy-omap-usb3.c | 361 ---- drivers/usb/phy/phy-rcar-gen2-usb.c | 6 +- drivers/usb/phy/phy-twl6030-usb.c | 2 +- drivers/usb/phy/phy-ulpi.c | 2 + drivers/usb/serial/ch341.c | 6 +- drivers/usb/serial/cyberjack.c | 2 +- drivers/usb/serial/cypress_m8.c | 21 +- drivers/usb/serial/generic.c | 61 +- drivers/usb/serial/iuu_phoenix.c | 2 +- drivers/usb/serial/keyspan.c | 30 - drivers/usb/serial/keyspan_pda.c | 2 +- drivers/usb/serial/kl5kusb105.c | 4 +- drivers/usb/serial/kobil_sct.c | 3 +- drivers/usb/serial/mos7720.c | 12 +- drivers/usb/serial/mos7840.c | 4 +- drivers/usb/serial/quatech2.c | 2 +- drivers/usb/serial/spcp8x5.c | 7 +- drivers/usb/serial/symbolserial.c | 4 +- drivers/usb/serial/ti_usb_3410_5052.c | 4 +- drivers/usb/serial/usb-serial.c | 17 +- drivers/usb/storage/Kconfig | 2 +- drivers/usb/storage/uas-detect.h | 96 ++ drivers/usb/storage/uas.c | 687 +++++--- drivers/usb/storage/unusual_devs.h | 5 + drivers/usb/storage/unusual_uas.h | 52 + drivers/usb/storage/usb.c | 26 +- drivers/usb/storage/usb.h | 3 + drivers/usb/wusbcore/devconnect.c | 4 +- drivers/usb/wusbcore/wa-hc.c | 2 - drivers/usb/wusbcore/wa-hc.h | 26 +- drivers/usb/wusbcore/wa-rpipe.c | 2 +- drivers/usb/wusbcore/wa-xfer.c | 583 +++++-- .../omap_control_usb.h => phy/omap_control_phy.h} | 36 +- include/linux/{usb => phy}/omap_usb.h | 14 +- include/linux/phy/phy.h | 15 + include/linux/usb.h | 4 + include/linux/usb/chipidea.h | 1 + include/linux/usb/hcd.h | 1 + include/linux/usb/phy.h | 16 + include/linux/usb/serial.h | 3 +- include/linux/usb/uas.h | 14 +- include/linux/usb_usual.h | 6 +- include/uapi/linux/usb/functionfs.h | 44 +- include/uapi/linux/usbdevice_fs.h | 12 +- 156 files changed, 9145 insertions(+), 2181 deletions(-) create mode 100644 Documentation/devicetree/bindings/phy/apm-xgene-phy.txt create mode 100644 Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt create mode 100644 Documentation/devicetree/bindings/phy/ti-phy.txt create mode 100644 Documentation/devicetree/bindings/usb/ci-hdrc-zevio.txt create mode 100644 Documentation/devicetree/bindings/usb/usb-ohci.txt delete mode 100644 Documentation/devicetree/bindings/usb/usb-phy.txt rename Documentation/devicetree/bindings/usb/{platform-uhci.txt => usb-uhci.txt} (76%) delete mode 100644 Documentation/devicetree/bindings/usb/via,vt8500-ehci.txt delete mode 100644 Documentation/devicetree/bindings/usb/vt8500-ehci.txt create mode 100644 Documentation/phy/samsung-usb2.txt create mode 100644 drivers/phy/phy-exynos4210-usb2.c create mode 100644 drivers/phy/phy-exynos4x12-usb2.c create mode 100644 drivers/phy/phy-exynos5250-sata.c create mode 100644 drivers/phy/phy-exynos5250-usb2.c rename drivers/{usb => }/phy/phy-omap-control.c (53%) create mode 100644 drivers/phy/phy-samsung-usb2.c create mode 100644 drivers/phy/phy-samsung-usb2.h create mode 100644 drivers/phy/phy-sun4i-usb.c create mode 100644 drivers/phy/phy-ti-pipe3.c create mode 100644 drivers/phy/phy-xgene.c create mode 100644 drivers/usb/chipidea/ci_hdrc_zevio.c delete mode 100644 drivers/usb/phy/phy-omap-usb3.c create mode 100644 drivers/usb/storage/uas-detect.h create mode 100644 drivers/usb/storage/unusual_uas.h rename include/linux/{usb/omap_control_usb.h => phy/omap_control_phy.h} (68%) rename include/linux/{usb => phy}/omap_usb.h (86%) Merging usb-gadget/next (4b76e14d95f7 phy: ti-pipe3: Add SATA compatible to Documentation binding) $ git merge usb-gadget/next Already up-to-date. Merging staging/staging-next (b6512cfcd279 staging: comedi: poc: remove obsolete driver) $ git merge staging/staging-next Auto-merging include/linux/usb.h Auto-merging include/linux/hid-sensor-ids.h Auto-merging drivers/usb/core/usb.h Auto-merging drivers/usb/core/message.c Auto-merging drivers/usb/core/hub.c Auto-merging drivers/usb/core/devio.c CONFLICT (content): Merge conflict in drivers/usb/core/devio.c Auto-merging drivers/staging/wlan-ng/cfg80211.c CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/cfg80211.c Removing drivers/staging/sm7xxfb/sm7xxfb.c Removing drivers/staging/sm7xxfb/sm7xx.h Removing drivers/staging/sm7xxfb/TODO Removing drivers/staging/sm7xxfb/Makefile Removing drivers/staging/sm7xxfb/Kconfig Removing drivers/staging/sb105x/sb_ser_core.h Removing drivers/staging/sb105x/sb_pci_mp.h Removing drivers/staging/sb105x/sb_pci_mp.c Removing drivers/staging/sb105x/sb_mp_register.h Removing drivers/staging/sb105x/Makefile Removing drivers/staging/sb105x/Kconfig Auto-merging drivers/staging/rtl8821ae/rtl8821ae/trx.c Removing drivers/staging/rtl8192u/r819xU_HTType.h Removing drivers/staging/rtl8192u/r819xU_HTGen.h Removing drivers/staging/rtl8192u/ieee80211/scatterwalk.h Removing drivers/staging/rtl8192u/ieee80211/scatterwalk.c Removing drivers/staging/rtl8192u/ieee80211/rtl_crypto.h Removing drivers/staging/rtl8192u/ieee80211/proc.c Removing drivers/staging/rtl8192u/ieee80211/michael_mic.c Removing drivers/staging/rtl8192u/ieee80211/internal.h Removing drivers/staging/rtl8192u/ieee80211/digest.c Removing drivers/staging/rtl8192u/ieee80211/crypto_compat.h Removing drivers/staging/rtl8192u/ieee80211/compress.c Removing drivers/staging/rtl8192u/ieee80211/cipher.c Removing drivers/staging/rtl8192u/ieee80211/autoload.c Removing drivers/staging/rtl8192u/ieee80211/arc4.c Removing drivers/staging/rtl8192u/ieee80211/aes.c Removing drivers/staging/rtl8192u/ieee80211/EndianFree.h Removing drivers/staging/rtl8188eu/include/nic_spec.h Removing drivers/staging/rtl8188eu/include/ip.h Removing drivers/staging/rtl8188eu/include/ioctl_cfg80211.h Removing drivers/staging/rtl8188eu/include/if_ether.h Removing drivers/staging/rtl8188eu/include/h2clbk.h Removing drivers/staging/rtl8188eu/include/ethernet.h Removing drivers/staging/rtl8188eu/hal/odm_interface.c Auto-merging drivers/staging/rtl8188eu/Kconfig Auto-merging drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c Auto-merging drivers/staging/media/msi3101/sdr-msi3101.c CONFLICT (content): Merge conflict in drivers/staging/media/msi3101/sdr-msi3101.c Auto-merging drivers/staging/media/go7007/go7007-v4l2.c Auto-merging drivers/staging/media/dt3155v4l/dt3155v4l.c Auto-merging drivers/staging/line6/midi.c Auto-merging drivers/staging/imx-drm/parallel-display.c CONFLICT (content): Merge conflict in drivers/staging/imx-drm/parallel-display.c Auto-merging drivers/staging/imx-drm/imx-tve.c CONFLICT (content): Merge conflict in drivers/staging/imx-drm/imx-tve.c Auto-merging drivers/staging/imx-drm/imx-ldb.c CONFLICT (content): Merge conflict in drivers/staging/imx-drm/imx-ldb.c Auto-merging drivers/staging/imx-drm/imx-hdmi.c CONFLICT (content): Merge conflict in drivers/staging/imx-drm/imx-hdmi.c Removing drivers/staging/imx-drm/imx-fbdev.c Removing drivers/staging/imx-drm/imx-fb.c Removing drivers/staging/echo/TODO Removing drivers/staging/dgap/downld.c Removing drivers/staging/dgap/digi.h Removing drivers/staging/dgap/dgap_types.h Removing drivers/staging/dgap/dgap_tty.h Removing drivers/staging/dgap/dgap_tty.c Removing drivers/staging/dgap/dgap_trace.h Removing drivers/staging/dgap/dgap_trace.c Removing drivers/staging/dgap/dgap_sysfs.h Removing drivers/staging/dgap/dgap_sysfs.c Removing drivers/staging/dgap/dgap_pci.h Removing drivers/staging/dgap/dgap_parse.h Removing drivers/staging/dgap/dgap_parse.c Removing drivers/staging/dgap/dgap_kcompat.h Removing drivers/staging/dgap/dgap_fep5.h Removing drivers/staging/dgap/dgap_fep5.c Removing drivers/staging/dgap/dgap_driver.h Removing drivers/staging/dgap/dgap_driver.c Removing drivers/staging/dgap/dgap_downld.h Removing drivers/staging/dgap/dgap_conf.h Removing drivers/staging/cxt1e1/ossiRelease.c Removing drivers/staging/comedi/drivers/poResolved 'Documentation/devicetree/bindings/iio/adc/at91_adc.txt' using previous resolution. Resolved 'arch/arm/boot/dts/imx53-qsb.dts' using previous resolution. Resolved 'drivers/media/platform/exynos4-is/fimc-is.c' using previous resolution. Resolved 'drivers/media/v4l2-core/v4l2-of.c' using previous resolution. Resolved 'drivers/staging/imx-drm/imx-hdmi.c' using previous resolution. Resolved 'drivers/staging/imx-drm/imx-ldb.c' using previous resolution. Resolved 'drivers/staging/imx-drm/imx-tve.c' using previous resolution. Resolved 'drivers/staging/imx-drm/parallel-display.c' using previous resolution. Resolved 'drivers/staging/media/msi3101/sdr-msi3101.c' using previous resolution. Resolved 'drivers/staging/wlan-ng/cfg80211.c' using previous resolution. Resolved 'drivers/usb/core/devio.c' using previous resolution. c.c Auto-merging drivers/staging/android/Kconfig Auto-merging drivers/of/base.c Auto-merging drivers/media/v4l2-core/v4l2-of.c CONFLICT (content): Merge conflict in drivers/media/v4l2-core/v4l2-of.c Auto-merging drivers/media/platform/exynos4-is/media-dev.c Auto-merging drivers/media/platform/exynos4-is/fimc-is.c CONFLICT (content): Merge conflict in drivers/media/platform/exynos4-is/fimc-is.c Auto-merging drivers/media/i2c/mt9p031.c Auto-merging drivers/iio/adc/Makefile Auto-merging drivers/iio/adc/Kconfig Auto-merging arch/arm/boot/dts/imx6qdl.dtsi Auto-merging arch/arm/boot/dts/imx6q.dtsi Auto-merging arch/arm/boot/dts/imx6dl.dtsi Auto-merging arch/arm/boot/dts/imx53.dtsi Auto-merging arch/arm/boot/dts/imx53-qsb.dts CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx53-qsb.dts Auto-merging arch/arm/boot/dts/imx53-mba53.dts Auto-merging arch/arm/boot/dts/imx53-m53evk.dts Auto-merging arch/arm/boot/dts/imx51.dtsi Auto-merging arch/arm/boot/dts/imx51-babbage.dts Auto-merging arch/arm/boot/dts/imx51-apf51dev.dts Auto-merging MAINTAINERS Auto-merging Documentation/devicetree/bindings/iio/adc/at91_adc.txt CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/iio/adc/at91_adc.txt Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 88f8d1cf45f2] Merge remote-tracking branch 'staging/staging-next' $ git diff -M --stat --summary HEAD^.. Documentation/devicetree/bindings/graph.txt | 129 + .../devicetree/bindings/iio/adc/at91_adc.txt | 5 + .../devicetree/bindings/iio/adc/vf610-adc.txt | 22 + .../devicetree/bindings/iio/adc/xilinx-xadc.txt | 113 + .../bindings/staging/imx-drm/fsl-imx-drm.txt | 48 +- .../devicetree/bindings/staging/imx-drm/hdmi.txt | 58 + .../devicetree/bindings/staging/imx-drm/ldb.txt | 20 +- MAINTAINERS | 13 + arch/arm/boot/dts/imx51-apf51dev.dts | 11 +- arch/arm/boot/dts/imx51-babbage.dts | 26 +- arch/arm/boot/dts/imx51.dtsi | 22 +- arch/arm/boot/dts/imx53-m53evk.dts | 13 +- arch/arm/boot/dts/imx53-mba53.dts | 13 +- arch/arm/boot/dts/imx53.dtsi | 64 +- arch/arm/boot/dts/imx6dl.dtsi | 17 +- arch/arm/boot/dts/imx6q.dtsi | 123 +- arch/arm/boot/dts/imx6qdl.dtsi | 137 +- drivers/iio/accel/bma180.c | 4 +- drivers/iio/adc/Kconfig | 23 + drivers/iio/adc/Makefile | 3 + drivers/iio/adc/max1363.c | 16 +- drivers/iio/adc/ti_am335x_adc.c | 1 - drivers/iio/adc/twl6030-gpadc.c | 1 - drivers/iio/adc/vf610_adc.c | 711 ++ drivers/iio/adc/viperboard_adc.c | 2 - drivers/iio/adc/xilinx-xadc-core.c | 1333 ++++ drivers/iio/adc/xilinx-xadc-events.c | 254 + drivers/iio/adc/xilinx-xadc.h | 209 + drivers/iio/buffer_cb.c | 7 +- drivers/iio/dac/ad7303.c | 2 +- drivers/iio/dac/max517.c | 1 - drivers/iio/dac/mcp4725.c | 1 - drivers/iio/humidity/Kconfig | 10 + drivers/iio/humidity/Makefile | 1 + drivers/iio/humidity/si7005.c | 189 + drivers/iio/imu/Kconfig | 4 +- drivers/iio/imu/adis16400_core.c | 2 +- drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 3 +- drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 38 +- drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c | 1 - drivers/iio/industrialio-buffer.c | 16 +- drivers/iio/industrialio-core.c | 51 +- drivers/iio/industrialio-event.c | 100 +- drivers/iio/industrialio-trigger.c | 11 +- drivers/iio/light/Kconfig | 26 + drivers/iio/light/Makefile | 2 + drivers/iio/light/adjd_s311.c | 3 - drivers/iio/light/hid-sensor-prox.c | 375 + drivers/iio/light/ltr501.c | 445 ++ drivers/iio/light/tcs3472.c | 2 - drivers/iio/magnetometer/ak8975.c | 1 + drivers/iio/magnetometer/mag3110.c | 17 +- drivers/iio/pressure/Kconfig | 16 +- drivers/iio/pressure/Makefile | 1 + drivers/iio/pressure/hid-sensor-press.c | 376 + drivers/iio/pressure/mpl3115.c | 2 +- drivers/iio/pressure/st_pressure.h | 1 + drivers/iio/pressure/st_pressure_core.c | 87 +- drivers/iio/pressure/st_pressure_i2c.c | 1 + drivers/iio/pressure/st_pressure_spi.c | 1 + drivers/media/i2c/adv7343.c | 4 +- drivers/media/i2c/mt9p031.c | 4 +- drivers/media/i2c/s5k5baf.c | 3 +- drivers/media/i2c/tvp514x.c | 3 +- drivers/media/i2c/tvp7002.c | 3 +- drivers/media/platform/exynos4-is/fimc-is.c | 6 +- drivers/media/platform/exynos4-is/media-dev.c | 13 +- drivers/media/platform/exynos4-is/mipi-csis.c | 5 +- drivers/media/v4l2-core/v4l2-of.c | 137 +- drivers/misc/Kconfig | 1 + drivers/misc/Makefile | 1 + drivers/{staging => misc}/echo/Kconfig | 0 drivers/{staging => misc}/echo/Makefile | 0 drivers/{staging => misc}/echo/echo.c | 0 drivers/{staging => misc}/echo/echo.h | 0 drivers/{staging => misc}/echo/fir.h | 0 drivers/{staging => misc}/echo/oslec.h | 0 drivers/of/base.c | 151 + drivers/staging/Kconfig | 12 +- drivers/staging/Makefile | 6 +- drivers/staging/android/Kconfig | 13 + drivers/staging/android/android_alarm.h | 44 +- drivers/staging/android/ashmem.h | 30 +- drivers/staging/android/binder.c | 268 +- drivers/staging/android/binder.h | 308 +- drivers/staging/android/binder_trace.h | 14 +- drivers/staging/android/ion/ion.c | 156 +- drivers/staging/android/ion/ion_cma_heap.c | 2 +- drivers/staging/android/ion/ion_dummy_driver.c | 12 +- drivers/staging/android/ion/ion_heap.c | 67 +- drivers/staging/android/ion/ion_page_pool.c | 8 +- drivers/staging/android/ion/ion_priv.h | 89 +- drivers/staging/android/ion/ion_system_heap.c | 84 +- drivers/staging/android/ion/tegra/tegra_ion.c | 10 +- drivers/staging/android/lowmemorykiller.c | 5 +- drivers/staging/android/sw_sync.h | 20 +- drivers/staging/android/sync.h | 88 +- drivers/staging/android/timed_gpio.c | 8 +- drivers/staging/android/timed_output.h | 4 +- drivers/staging/android/uapi/android_alarm.h | 62 + drivers/staging/android/uapi/ashmem.h | 47 + drivers/staging/android/uapi/binder.h | 351 + drivers/staging/android/uapi/sw_sync.h | 32 + drivers/staging/android/uapi/sync.h | 97 + drivers/staging/bcm/Adapter.h | 6 +- drivers/staging/bcm/Bcmchar.c | 3503 +++++---- drivers/staging/bcm/CmHost.c | 61 +- drivers/staging/bcm/DDRInit.c | 32 +- drivers/staging/bcm/InterfaceInit.c | 416 +- drivers/staging/bcm/InterfaceIsr.c | 223 +- drivers/staging/bcm/Qos.c | 35 +- drivers/staging/bcm/Typedefs.h | 22 +- drivers/staging/bcm/headers.h | 2 +- drivers/staging/bcm/hostmibs.c | 8 +- drivers/staging/bcm/nvm.c | 30 +- drivers/staging/ced1401/ced_ioc.c | 163 +- drivers/staging/ced1401/ced_ioctl.h | 31 +- drivers/staging/ced1401/usb1401.c | 195 +- drivers/staging/ced1401/usb1401.h | 6 +- drivers/staging/ced1401/use14_ioc.h | 5 +- drivers/staging/ced1401/userspace/use1401.c | 10 +- drivers/staging/comedi/Kconfig | 24 +- drivers/staging/comedi/comedi_fops.c | 191 +- drivers/staging/comedi/comedidev.h | 56 +- drivers/staging/comedi/drivers.c | 30 + drivers/staging/comedi/drivers/8255_pci.c | 37 +- drivers/staging/comedi/drivers/Makefile | 2 +- .../comedi/drivers/addi-data/hwdrv_apci035.c | 597 +- .../comedi/drivers/addi-data/hwdrv_apci1500.c | 1187 +-- .../comedi/drivers/addi-data/hwdrv_apci1564.c | 857 +-- .../comedi/drivers/addi-data/hwdrv_apci3120.c | 106 +- .../comedi/drivers/addi-data/hwdrv_apci3200.c | 73 +- .../comedi/drivers/addi-data/hwdrv_apci3501.c | 24 +- drivers/staging/comedi/drivers/addi_apci_035.c | 14 +- drivers/staging/comedi/drivers/addi_apci_1500.c | 24 +- drivers/staging/comedi/drivers/addi_apci_1564.c | 16 +- drivers/staging/comedi/drivers/addi_apci_3120.c | 26 +- drivers/staging/comedi/drivers/addi_apci_3200.c | 36 +- drivers/staging/comedi/drivers/addi_apci_3501.c | 6 +- drivers/staging/comedi/drivers/addi_apci_3xxx.c | 57 +- drivers/staging/comedi/drivers/adl_pci6208.c | 22 +- drivers/staging/comedi/drivers/adl_pci7x3x.c | 3 - drivers/staging/comedi/drivers/adl_pci9111.c | 73 +- drivers/staging/comedi/drivers/adl_pci9118.c | 92 +- drivers/staging/comedi/drivers/adq12b.c | 31 +- drivers/staging/comedi/drivers/adv_pci1710.c | 67 +- drivers/staging/comedi/drivers/adv_pci1723.c | 2 - drivers/staging/comedi/drivers/adv_pci_dio.c | 10 +- drivers/staging/comedi/drivers/aio_aio12_8.c | 31 +- drivers/staging/comedi/drivers/aio_iiro_16.c | 2 +- .../staging/comedi/drivers/amplc_dio200_common.c | 2 +- drivers/staging/comedi/drivers/amplc_pc236.c | 35 +- drivers/staging/comedi/drivers/amplc_pc263.c | 2 - drivers/staging/comedi/drivers/amplc_pci224.c | 29 +- drivers/staging/comedi/drivers/amplc_pci230.c | 42 +- drivers/staging/comedi/drivers/amplc_pci263.c | 2 - drivers/staging/comedi/drivers/c6xdigio.c | 491 +- drivers/staging/comedi/drivers/cb_das16_cs.c | 150 +- drivers/staging/comedi/drivers/cb_pcidas.c | 51 +- drivers/staging/comedi/drivers/cb_pcidas64.c | 59 +- drivers/staging/comedi/drivers/cb_pcidda.c | 2 - drivers/staging/comedi/drivers/cb_pcimdas.c | 41 +- drivers/staging/comedi/drivers/cb_pcimdda.c | 4 +- drivers/staging/comedi/drivers/comedi_bond.c | 5 +- drivers/staging/comedi/drivers/comedi_fc.c | 99 +- drivers/staging/comedi/drivers/comedi_fc.h | 84 +- drivers/staging/comedi/drivers/comedi_test.c | 7 +- drivers/staging/comedi/drivers/contec_pci_dio.c | 2 - drivers/staging/comedi/drivers/dac02.c | 172 + drivers/staging/comedi/drivers/daqboard2000.c | 85 +- drivers/staging/comedi/drivers/das08.c | 35 +- drivers/staging/comedi/drivers/das16.c | 19 +- drivers/staging/comedi/drivers/das16m1.c | 38 +- drivers/staging/comedi/drivers/das1800.c | 10 +- drivers/staging/comedi/drivers/das6402.c | 672 +- drivers/staging/comedi/drivers/das800.c | 43 +- drivers/staging/comedi/drivers/dmm32at.c | 83 +- drivers/staging/comedi/drivers/dt2811.c | 23 +- drivers/staging/comedi/drivers/dt2814.c | 29 +- drivers/staging/comedi/drivers/dt2815.c | 39 +- drivers/staging/comedi/drivers/dt282x.c | 73 +- drivers/staging/comedi/drivers/dt3000.c | 8 +- drivers/staging/comedi/drivers/dyna_pci10xx.c | 40 +- drivers/staging/comedi/drivers/fl512.c | 207 +- drivers/staging/comedi/drivers/gsc_hpdi.c | 1099 ++- drivers/staging/comedi/drivers/icp_multi.c | 109 +- drivers/staging/comedi/drivers/ii_pci20kc.c | 20 +- drivers/staging/comedi/drivers/jr3_pci.c | 891 ++- drivers/staging/comedi/drivers/jr3_pci.h | 6 +- drivers/staging/comedi/drivers/ke_counter.c | 209 +- drivers/staging/comedi/drivers/me4000.c | 3 - drivers/staging/comedi/drivers/me_daq.c | 36 +- drivers/staging/comedi/drivers/mf6x4.c | 23 +- drivers/staging/comedi/drivers/mite.c | 11 +- drivers/staging/comedi/drivers/mite.h | 6 +- drivers/staging/comedi/drivers/mpc624.c | 30 +- drivers/staging/comedi/drivers/multiq3.c | 38 +- drivers/staging/comedi/drivers/ni_660x.c | 11 +- drivers/staging/comedi/drivers/ni_670x.c | 3 - drivers/staging/comedi/drivers/ni_at_a2150.c | 55 +- drivers/staging/comedi/drivers/ni_atmio16d.c | 61 +- drivers/staging/comedi/drivers/ni_daq_700.c | 56 +- drivers/staging/comedi/drivers/ni_daq_dio24.c | 4 +- drivers/staging/comedi/drivers/ni_labpc.c | 33 +- drivers/staging/comedi/drivers/ni_mio_common.c | 78 +- drivers/staging/comedi/drivers/ni_pcidio.c | 16 +- drivers/staging/comedi/drivers/ni_pcimio.c | 2 +- drivers/staging/comedi/drivers/ni_tio.h | 8 +- drivers/staging/comedi/drivers/pcl711.c | 26 +- drivers/staging/comedi/drivers/pcl812.c | 1484 ++-- drivers/staging/comedi/drivers/pcl816.c | 1045 ++- drivers/staging/comedi/drivers/pcl818.c | 1523 ++-- drivers/staging/comedi/drivers/pcm3724.c | 6 +- drivers/staging/comedi/drivers/pcmad.c | 21 +- drivers/staging/comedi/drivers/pcmmio.c | 42 +- drivers/staging/comedi/drivers/plx9080.h | 8 +- drivers/staging/comedi/drivers/poc.c | 157 - drivers/staging/comedi/drivers/quatech_daqp_cs.c | 5 +- drivers/staging/comedi/drivers/rtd520.c | 86 +- drivers/staging/comedi/drivers/rti800.c | 29 +- drivers/staging/comedi/drivers/rti802.c | 127 +- drivers/staging/comedi/drivers/s526.c | 34 +- drivers/staging/comedi/drivers/s626.c | 174 +- drivers/staging/comedi/drivers/skel.c | 43 +- drivers/staging/comedi/drivers/ssv_dnp.c | 3 +- drivers/staging/comedi/drivers/usbduxfast.c | 51 +- .../staging/comedi/kcomedilib/kcomedilib_main.c | 3 +- drivers/staging/comedi/proc.c | 48 +- drivers/staging/comedi/range.c | 37 +- drivers/staging/crystalhd/bcm_70012_regs.h | 3 +- drivers/staging/crystalhd/crystalhd_hw.c | 8 +- drivers/staging/crystalhd/crystalhd_lnx.c | 21 +- drivers/staging/crystalhd/crystalhd_lnx.h | 4 +- drivers/staging/crystalhd/crystalhd_misc.c | 2 +- drivers/staging/crystalhd/crystalhd_misc.h | 2 +- drivers/staging/cxt1e1/Makefile | 1 - drivers/staging/cxt1e1/comet.c | 44 +- drivers/staging/cxt1e1/comet_tables.c | 1 + drivers/staging/cxt1e1/functions.c | 373 +- drivers/staging/cxt1e1/hwprobe.c | 598 +- drivers/staging/cxt1e1/libsbew.h | 56 +- drivers/staging/cxt1e1/linux.c | 1643 +++-- drivers/staging/cxt1e1/musycc.c | 43 +- drivers/staging/cxt1e1/ossiRelease.c | 29 - drivers/staging/cxt1e1/pmc93x6_eeprom.c | 6 +- drivers/staging/cxt1e1/pmcc4.h | 1 - drivers/staging/cxt1e1/pmcc4_drv.c | 116 +- drivers/staging/cxt1e1/pmcc4_private.h | 1 - drivers/staging/cxt1e1/pmcc4_sysdep.h | 1 + drivers/staging/cxt1e1/sbeproc.c | 4 +- drivers/staging/dgap/Makefile | 6 - drivers/staging/dgap/dgap.c | 7675 ++++++++++++++++++++ drivers/staging/dgap/dgap.h | 1322 ++++ drivers/staging/dgap/dgap_conf.h | 290 - drivers/staging/dgap/dgap_downld.h | 69 - drivers/staging/dgap/dgap_driver.c | 1030 --- drivers/staging/dgap/dgap_driver.h | 620 -- drivers/staging/dgap/dgap_fep5.c | 1938 ----- drivers/staging/dgap/dgap_fep5.h | 253 - drivers/staging/dgap/dgap_kcompat.h | 64 - drivers/staging/dgap/dgap_parse.c | 1374 ---- drivers/staging/dgap/dgap_parse.h | 35 - drivers/staging/dgap/dgap_pci.h | 92 - drivers/staging/dgap/dgap_sysfs.c | 793 -- drivers/staging/dgap/dgap_sysfs.h | 48 - drivers/staging/dgap/dgap_trace.c | 186 - drivers/staging/dgap/dgap_trace.h | 36 - drivers/staging/dgap/dgap_tty.c | 3580 --------- drivers/staging/dgap/dgap_tty.h | 39 - drivers/staging/dgap/dgap_types.h | 36 - drivers/staging/dgap/digi.h | 376 - drivers/staging/dgap/downld.c | 798 -- drivers/staging/dgnc/dgnc_cls.c | 11 +- drivers/staging/dgnc/dgnc_driver.c | 4 +- drivers/staging/dgnc/dgnc_mgmt.c | 27 +- drivers/staging/dgnc/dgnc_neo.c | 3 +- drivers/staging/dgnc/dgnc_tty.c | 53 +- drivers/staging/dgrp/dgrp_sysfs.c | 4 +- drivers/staging/dgrp/dgrp_tty.c | 22 +- drivers/staging/echo/TODO | 5 - drivers/staging/et131x/et131x.c | 23 +- drivers/staging/frontier/alphatrack.c | 11 +- drivers/staging/frontier/tranzport.c | 12 +- drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 2 +- drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h | 8 +- drivers/staging/ft1000/ft1000.h | 156 +- drivers/staging/gdm724x/gdm_lte.c | 187 +- drivers/staging/gdm724x/gdm_lte.h | 2 +- drivers/staging/gdm724x/gdm_mux.c | 26 +- drivers/staging/gdm724x/gdm_usb.c | 56 +- drivers/staging/gdm724x/netlink_k.c | 3 +- drivers/staging/gdm72xx/TODO | 2 - drivers/staging/gdm72xx/gdm_sdio.c | 50 +- drivers/staging/gdm72xx/gdm_usb.c | 37 +- drivers/staging/gdm72xx/gdm_wimax.c | 77 +- drivers/staging/gdm72xx/gdm_wimax.h | 20 - drivers/staging/gs_fpgaboot/Kconfig | 8 + drivers/staging/gs_fpgaboot/Makefile | 4 + drivers/staging/gs_fpgaboot/README | 71 + drivers/staging/gs_fpgaboot/TODO | 7 + drivers/staging/gs_fpgaboot/gs_fpgaboot.c | 422 ++ drivers/staging/gs_fpgaboot/gs_fpgaboot.h | 56 + drivers/staging/gs_fpgaboot/io.c | 294 + drivers/staging/gs_fpgaboot/io.h | 90 + drivers/staging/iio/Documentation/iio_utils.h | 22 + drivers/staging/iio/Documentation/lsiio.c | 157 + drivers/staging/iio/accel/sca3000.h | 26 +- drivers/staging/iio/accel/sca3000_core.c | 172 +- drivers/staging/iio/accel/sca3000_ring.c | 2 +- drivers/staging/iio/adc/ad799x.h | 10 +- drivers/staging/iio/adc/ad799x_core.c | 56 +- drivers/staging/iio/adc/mxs-lradc.c | 15 +- drivers/staging/iio/addac/adt7316.c | 21 +- drivers/staging/iio/addac/adt7316.h | 8 +- drivers/staging/iio/light/tsl2583.c | 6 +- drivers/staging/iio/light/tsl2x7x_core.c | 8 +- drivers/staging/iio/resolver/ad2s1210.c | 4 +- drivers/staging/imx-drm/Kconfig | 1 + drivers/staging/imx-drm/Makefile | 3 +- drivers/staging/imx-drm/TODO | 5 - drivers/staging/imx-drm/imx-drm-core.c | 859 +-- drivers/staging/imx-drm/imx-drm.h | 44 +- drivers/staging/imx-drm/imx-fb.c | 47 - drivers/staging/imx-drm/imx-fbdev.c | 74 - drivers/staging/imx-drm/imx-hdmi.c | 694 +- drivers/staging/imx-drm/imx-ldb.c | 148 +- drivers/staging/imx-drm/imx-tve.c | 135 +- drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h | 2 + drivers/staging/imx-drm/ipu-v3/ipu-dc.c | 2 +- drivers/staging/imx-drm/ipu-v3/ipu-di.c | 317 +- drivers/staging/imx-drm/ipu-v3/ipu-dmfc.c | 3 - drivers/staging/imx-drm/ipuv3-crtc.c | 93 +- drivers/staging/imx-drm/ipuv3-plane.c | 4 +- drivers/staging/imx-drm/parallel-display.c | 127 +- drivers/staging/keucr/common.h | 8 - drivers/staging/keucr/init.c | 16 +- drivers/staging/keucr/init.h | 6 +- drivers/staging/keucr/smil.h | 112 +- drivers/staging/keucr/smilecc.c | 58 +- drivers/staging/keucr/smilmain.c | 82 +- drivers/staging/keucr/smilsub.c | 170 +- drivers/staging/keucr/smscsi.c | 28 +- drivers/staging/keucr/transport.c | 8 +- drivers/staging/keucr/transport.h | 6 +- drivers/staging/keucr/usb.c | 6 +- drivers/staging/keucr/usb.h | 86 +- drivers/staging/line6/capture.c | 1 + drivers/staging/line6/driver.c | 56 +- drivers/staging/line6/driver.h | 2 +- drivers/staging/line6/midi.c | 5 +- drivers/staging/line6/usbdefs.h | 8 +- .../staging/lustre/include/linux/libcfs/curproc.h | 9 - .../lustre/include/linux/libcfs/libcfs_hash.h | 2 - .../lustre/include/linux/libcfs/libcfs_ioctl.h | 8 +- .../lustre/include/linux/libcfs/libcfs_prim.h | 9 - .../lustre/include/linux/libcfs/libcfs_string.h | 30 - .../staging/lustre/include/linux/lnet/lib-lnet.h | 2 +- .../staging/lustre/include/linux/lnet/lib-types.h | 16 +- .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 132 +- .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 10 +- .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 6 +- .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 15 +- .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.c | 3 +- .../lustre/lnet/klnds/socklnd/socklnd_proto.c | 6 +- drivers/staging/lustre/lnet/lnet/acceptor.c | 3 +- drivers/staging/lustre/lnet/lnet/api-ni.c | 5 +- drivers/staging/lustre/lnet/lnet/config.c | 12 +- drivers/staging/lustre/lnet/lnet/lib-eq.c | 7 +- drivers/staging/lustre/lnet/lnet/lib-ptl.c | 2 +- drivers/staging/lustre/lnet/lnet/peer.c | 3 +- drivers/staging/lustre/lnet/lnet/router.c | 12 +- drivers/staging/lustre/lnet/lnet/router_proc.c | 4 +- drivers/staging/lustre/lnet/selftest/conrpc.c | 3 +- drivers/staging/lustre/lnet/selftest/console.c | 24 +- drivers/staging/lustre/lnet/selftest/rpc.c | 3 +- drivers/staging/lustre/lnet/selftest/selftest.h | 6 +- drivers/staging/lustre/lustre/fid/fid_request.c | 34 +- drivers/staging/lustre/lustre/fld/fld_cache.c | 6 +- drivers/staging/lustre/lustre/fld/fld_internal.h | 2 +- drivers/staging/lustre/lustre/fld/fld_request.c | 15 +- drivers/staging/lustre/lustre/include/cl_object.h | 14 +- drivers/staging/lustre/lustre/include/ioctl.h | 2 +- drivers/staging/lustre/lustre/include/lclient.h | 4 +- .../lustre/lustre/include/linux/lustre_acl.h | 2 +- drivers/staging/lustre/lustre/include/linux/obd.h | 3 +- .../lustre/lustre/include/lustre/lustre_idl.h | 85 +- .../lustre/lustre/include/lustre/lustre_user.h | 22 +- drivers/staging/lustre/lustre/include/lustre_cfg.h | 2 + .../staging/lustre/lustre/include/lustre_disk.h | 2 + drivers/staging/lustre/lustre/include/lustre_dlm.h | 4 +- .../lustre/lustre/include/lustre_dlm_flags.h | 18 +- .../staging/lustre/lustre/include/lustre_export.h | 21 +- drivers/staging/lustre/lustre/include/lustre_fid.h | 12 +- .../staging/lustre/lustre/include/lustre_import.h | 21 +- drivers/staging/lustre/lustre/include/lustre_lib.h | 8 +- .../staging/lustre/lustre/include/lustre_linkea.h | 2 +- drivers/staging/lustre/lustre/include/lustre_mdc.h | 11 + drivers/staging/lustre/lustre/include/lustre_net.h | 26 +- .../staging/lustre/lustre/include/lustre_quota.h | 2 +- drivers/staging/lustre/lustre/include/lustre_sec.h | 4 +- drivers/staging/lustre/lustre/include/md_object.h | 2 +- drivers/staging/lustre/lustre/include/obd.h | 11 +- drivers/staging/lustre/lustre/include/obd_class.h | 15 +- .../staging/lustre/lustre/include/obd_support.h | 2 +- drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 4 +- drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 41 +- drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 2 - drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 5 +- drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 2 +- drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 4 +- drivers/staging/lustre/lustre/libcfs/debug.c | 4 +- drivers/staging/lustre/lustre/libcfs/fail.c | 4 +- .../lustre/lustre/libcfs/kernel_user_comm.c | 102 - .../staging/lustre/lustre/libcfs/libcfs_string.c | 54 +- .../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 19 +- .../lustre/lustre/libcfs/linux/linux-curproc.c | 65 +- .../lustre/lustre/libcfs/linux/linux-module.c | 4 +- .../lustre/lustre/libcfs/linux/linux-prim.c | 38 - drivers/staging/lustre/lustre/libcfs/nidstrings.c | 7 +- drivers/staging/lustre/lustre/libcfs/tracefile.c | 5 +- .../staging/lustre/lustre/libcfs/upcall_cache.c | 5 +- drivers/staging/lustre/lustre/libcfs/workitem.c | 10 +- drivers/staging/lustre/lustre/llite/dcache.c | 328 +- drivers/staging/lustre/lustre/llite/dir.c | 35 +- drivers/staging/lustre/lustre/llite/file.c | 105 +- drivers/staging/lustre/lustre/llite/llite_close.c | 2 +- .../staging/lustre/lustre/llite/llite_internal.h | 42 +- drivers/staging/lustre/lustre/llite/llite_lib.c | 30 +- drivers/staging/lustre/lustre/llite/llite_mmap.c | 4 +- drivers/staging/lustre/lustre/llite/llite_nfs.c | 6 +- drivers/staging/lustre/lustre/llite/lloop.c | 6 +- drivers/staging/lustre/lustre/llite/namei.c | 124 +- drivers/staging/lustre/lustre/llite/rw.c | 10 +- drivers/staging/lustre/lustre/llite/statahead.c | 14 +- drivers/staging/lustre/lustre/llite/vvp_io.c | 37 +- drivers/staging/lustre/lustre/llite/xattr.c | 31 +- drivers/staging/lustre/lustre/llite/xattr_cache.c | 125 +- drivers/staging/lustre/lustre/lmv/lmv_intent.c | 1 - drivers/staging/lustre/lustre/lmv/lmv_obd.c | 5 +- drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 5 +- drivers/staging/lustre/lustre/lov/lov_ea.c | 2 +- drivers/staging/lustre/lustre/lov/lov_io.c | 1 + drivers/staging/lustre/lustre/lov/lov_obd.c | 6 +- drivers/staging/lustre/lustre/lov/lov_object.c | 16 +- drivers/staging/lustre/lustre/lov/lov_pack.c | 3 +- drivers/staging/lustre/lustre/lov/lov_request.c | 2 +- drivers/staging/lustre/lustre/lov/lovsub_dev.c | 4 + drivers/staging/lustre/lustre/lvfs/lvfs_linux.c | 2 +- drivers/staging/lustre/lustre/mdc/mdc_internal.h | 4 +- drivers/staging/lustre/lustre/mdc/mdc_lib.c | 2 +- drivers/staging/lustre/lustre/mdc/mdc_locks.c | 117 +- drivers/staging/lustre/lustre/mdc/mdc_reint.c | 3 +- drivers/staging/lustre/lustre/mdc/mdc_request.c | 74 +- drivers/staging/lustre/lustre/mgc/mgc_request.c | 92 +- drivers/staging/lustre/lustre/obdclass/cl_io.c | 2 +- drivers/staging/lustre/lustre/obdclass/cl_lock.c | 4 +- drivers/staging/lustre/lustre/obdclass/cl_object.c | 2 +- drivers/staging/lustre/lustre/obdclass/genops.c | 12 +- .../lustre/lustre/obdclass/linux/linux-module.c | 2 +- drivers/staging/lustre/lustre/obdclass/llog_cat.c | 6 +- drivers/staging/lustre/lustre/obdclass/llog_lvfs.c | 2 +- drivers/staging/lustre/lustre/obdclass/llog_osd.c | 6 +- .../staging/lustre/lustre/obdclass/local_storage.c | 2 +- .../lustre/lustre/obdclass/lprocfs_status.c | 2 + drivers/staging/lustre/lustre/obdclass/lu_object.c | 10 +- drivers/staging/lustre/lustre/obdclass/md_attrs.c | 6 +- .../staging/lustre/lustre/obdclass/obd_config.c | 54 +- drivers/staging/lustre/lustre/obdclass/obd_mount.c | 4 +- drivers/staging/lustre/lustre/obdclass/obdo.c | 6 +- drivers/staging/lustre/lustre/obdecho/echo.c | 3 +- .../staging/lustre/lustre/obdecho/echo_client.c | 20 +- drivers/staging/lustre/lustre/osc/osc_cache.c | 12 +- drivers/staging/lustre/lustre/osc/osc_io.c | 16 +- drivers/staging/lustre/lustre/osc/osc_page.c | 2 +- drivers/staging/lustre/lustre/osc/osc_quota.c | 20 +- drivers/staging/lustre/lustre/ptlrpc/client.c | 187 +- drivers/staging/lustre/lustre/ptlrpc/events.c | 2 +- .../lustre/lustre/ptlrpc/gss/gss_cli_upcall.c | 2 +- .../lustre/lustre/ptlrpc/gss/gss_generic_token.c | 36 +- .../staging/lustre/lustre/ptlrpc/gss/gss_keyring.c | 2 +- .../lustre/lustre/ptlrpc/gss/gss_krb5_mech.c | 4 +- .../staging/lustre/lustre/ptlrpc/gss/gss_pipefs.c | 4 +- .../lustre/lustre/ptlrpc/gss/gss_svc_upcall.c | 8 +- drivers/staging/lustre/lustre/ptlrpc/gss/sec_gss.c | 14 +- drivers/staging/lustre/lustre/ptlrpc/import.c | 37 +- drivers/staging/lustre/lustre/ptlrpc/layout.c | 5 +- .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 4 +- drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 8 +- drivers/staging/lustre/lustre/ptlrpc/nrs.c | 4 +- .../staging/lustre/lustre/ptlrpc/pack_generic.c | 14 +- drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 4 +- drivers/staging/lustre/lustre/ptlrpc/recover.c | 57 +- drivers/staging/lustre/lustre/ptlrpc/sec.c | 18 +- drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 6 +- drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 2 +- drivers/staging/lustre/lustre/ptlrpc/service.c | 12 +- drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 2 + drivers/staging/media/as102/as10x_handle.h | 14 +- drivers/staging/media/cxd2099/cxd2099.c | 12 +- drivers/staging/media/davinci_vpfe/vpfe_video.h | 2 +- drivers/staging/media/dt3155v4l/dt3155v4l.c | 2 +- drivers/staging/media/go7007/go7007-loader.c | 2 +- drivers/staging/media/go7007/go7007-v4l2.c | 20 +- drivers/staging/media/lirc/lirc_igorplugusb.c | 2 +- drivers/staging/media/lirc/lirc_imon.c | 4 + drivers/staging/media/lirc/lirc_parallel.c | 26 +- drivers/staging/media/lirc/lirc_sasem.c | 13 +- drivers/staging/media/msi3101/sdr-msi3101.c | 2 +- drivers/staging/media/omap24xx/tcm825x.c | 8 +- drivers/staging/media/omap24xx/tcm825x.h | 2 +- drivers/staging/media/sn9c102/sn9c102_core.c | 85 +- drivers/staging/media/sn9c102/sn9c102_hv7131d.c | 15 +- drivers/staging/media/sn9c102/sn9c102_hv7131r.c | 15 +- drivers/staging/media/sn9c102/sn9c102_ov7630.c | 24 +- drivers/staging/media/sn9c102/sn9c102_ov7660.c | 24 +- drivers/staging/media/sn9c102/sn9c102_pas106b.c | 18 +- drivers/staging/media/sn9c102/sn9c102_pas202bcb.c | 15 +- drivers/staging/media/solo6x10/solo6x10-core.c | 2 +- drivers/staging/media/solo6x10/solo6x10-tw28.c | 2 +- drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c | 44 +- drivers/staging/netlogic/xlr_net.c | 5 +- drivers/staging/nokia_h4p/Kconfig | 9 + drivers/staging/nokia_h4p/Makefile | 6 + drivers/staging/nokia_h4p/TODO | 132 + drivers/staging/nokia_h4p/hci_h4p.h | 222 + drivers/staging/nokia_h4p/nokia_core.c | 1206 +++ drivers/staging/nokia_h4p/nokia_fw-bcm.c | 148 + drivers/staging/nokia_h4p/nokia_fw-csr.c | 149 + drivers/staging/nokia_h4p/nokia_fw-ti1273.c | 110 + drivers/staging/nokia_h4p/nokia_fw.c | 208 + drivers/staging/nokia_h4p/nokia_uart.c | 199 + drivers/staging/nvec/nvec.c | 3 +- drivers/staging/nvec/nvec_ps2.c | 2 +- drivers/staging/octeon-usb/octeon-hcd.c | 752 +- drivers/staging/octeon/ethernet-defines.h | 4 - drivers/staging/octeon/ethernet-mdio.c | 20 +- drivers/staging/octeon/ethernet-mem.c | 11 +- drivers/staging/octeon/ethernet-rgmii.c | 23 +- drivers/staging/octeon/ethernet-tx.c | 2 +- drivers/staging/octeon/ethernet.c | 10 +- drivers/staging/octeon/octeon-ethernet.h | 2 +- drivers/staging/olpc_dcon/olpc_dcon.h | 2 +- drivers/staging/ozwpan/ozcdev.c | 4 +- drivers/staging/ozwpan/ozhcd.c | 8 +- drivers/staging/ozwpan/ozpd.c | 31 +- drivers/staging/ozwpan/ozpd.h | 5 + drivers/staging/ozwpan/ozproto.c | 57 +- drivers/staging/ozwpan/ozproto.h | 2 - drivers/staging/ozwpan/ozprotocol.h | 6 +- drivers/staging/ozwpan/ozusbif.h | 2 +- drivers/staging/ozwpan/ozusbsvc1.c | 2 +- drivers/staging/panel/panel.c | 41 +- drivers/staging/rtl8187se/Module.symvers | 0 drivers/staging/rtl8187se/ieee80211/dot11d.h | 11 +- drivers/staging/rtl8187se/ieee80211/ieee80211.h | 12 +- .../rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 2 +- .../rtl8187se/ieee80211/ieee80211_crypt_tkip.c | 14 +- .../rtl8187se/ieee80211/ieee80211_crypt_wep.c | 15 - .../rtl8187se/ieee80211/ieee80211_softmac.c | 1203 ++- drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 151 +- drivers/staging/rtl8187se/r8180.h | 750 +- drivers/staging/rtl8187se/r8180_core.c | 894 +-- drivers/staging/rtl8187se/r8180_dm.c | 6 +- drivers/staging/rtl8187se/r8180_rtl8225.h | 21 +- drivers/staging/rtl8187se/r8180_rtl8225z2.c | 59 +- drivers/staging/rtl8187se/r8180_wx.c | 10 +- drivers/staging/rtl8187se/r8185b_init.c | 62 +- drivers/staging/rtl8188eu/Kconfig | 4 +- drivers/staging/rtl8188eu/Makefile | 1 - drivers/staging/rtl8188eu/TODO | 5 + drivers/staging/rtl8188eu/core/rtw_ap.c | 81 +- drivers/staging/rtl8188eu/core/rtw_br_ext.c | 13 +- drivers/staging/rtl8188eu/core/rtw_cmd.c | 220 +- drivers/staging/rtl8188eu/core/rtw_debug.c | 12 +- drivers/staging/rtl8188eu/core/rtw_efuse.c | 59 +- drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 58 +- drivers/staging/rtl8188eu/core/rtw_io.c | 28 - drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 52 +- drivers/staging/rtl8188eu/core/rtw_led.c | 4 +- drivers/staging/rtl8188eu/core/rtw_mlme.c | 303 +- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 302 +- drivers/staging/rtl8188eu/core/rtw_mp.c | 16 +- drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c | 78 - drivers/staging/rtl8188eu/core/rtw_p2p.c | 50 +- drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 27 +- drivers/staging/rtl8188eu/core/rtw_recv.c | 502 +- drivers/staging/rtl8188eu/core/rtw_security.c | 93 +- drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 87 +- drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 46 +- drivers/staging/rtl8188eu/core/rtw_xmit.c | 129 +- .../staging/rtl8188eu/hal/Hal8188ERateAdaptive.c | 13 +- drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c | 37 +- drivers/staging/rtl8188eu/hal/hal_intf.c | 4 - drivers/staging/rtl8188eu/hal/odm.c | 15 +- drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c | 4 +- drivers/staging/rtl8188eu/hal/odm_interface.c | 101 - drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 12 - drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 2 - drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 87 +- drivers/staging/rtl8188eu/hal/rtl8188e_mp.c | 10 +- drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c | 37 +- drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 3 - drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 6 +- drivers/staging/rtl8188eu/hal/usb_halinit.c | 10 - drivers/staging/rtl8188eu/hal/usb_ops_linux.c | 63 +- drivers/staging/rtl8188eu/include/drv_types.h | 6 + drivers/staging/rtl8188eu/include/ethernet.h | 42 - drivers/staging/rtl8188eu/include/h2clbk.h | 35 - drivers/staging/rtl8188eu/include/if_ether.h | 111 - drivers/staging/rtl8188eu/include/ioctl_cfg80211.h | 107 - drivers/staging/rtl8188eu/include/ip.h | 126 - drivers/staging/rtl8188eu/include/nic_spec.h | 44 - drivers/staging/rtl8188eu/include/odm_interface.h | 23 - drivers/staging/rtl8188eu/include/osdep_service.h | 34 - drivers/staging/rtl8188eu/include/recv_osdep.h | 10 +- drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 11 - drivers/staging/rtl8188eu/include/rtl8188e_recv.h | 7 +- drivers/staging/rtl8188eu/include/rtw_debug.h | 24 - drivers/staging/rtl8188eu/include/rtw_io.h | 44 - drivers/staging/rtl8188eu/include/rtw_ioctl.h | 2 - drivers/staging/rtl8188eu/include/rtw_mlme.h | 32 - drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 49 +- drivers/staging/rtl8188eu/include/rtw_pwrctrl.h | 4 - drivers/staging/rtl8188eu/include/rtw_recv.h | 139 +- drivers/staging/rtl8188eu/include/rtw_xmit.h | 5 - drivers/staging/rtl8188eu/include/wifi.h | 2 +- drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 242 +- drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 9 +- drivers/staging/rtl8188eu/os_dep/os_intfs.c | 10 +- drivers/staging/rtl8188eu/os_dep/osdep_service.c | 35 +- drivers/staging/rtl8188eu/os_dep/recv_linux.c | 44 +- drivers/staging/rtl8188eu/os_dep/rtw_android.c | 1 - drivers/staging/rtl8188eu/os_dep/usb_intf.c | 19 +- drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 5 - drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 17 +- drivers/staging/rtl8192e/dot11d.c | 9 +- drivers/staging/rtl8192e/rtl8192e/rtl_pci.h | 52 - drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 2 +- drivers/staging/rtl8192e/rtllib_tx.c | 4 +- drivers/staging/rtl8192u/ieee80211/EndianFree.h | 194 - drivers/staging/rtl8192u/ieee80211/aes.c | 468 -- drivers/staging/rtl8192u/ieee80211/arc4.c | 103 - drivers/staging/rtl8192u/ieee80211/autoload.c | 40 - drivers/staging/rtl8192u/ieee80211/cipher.c | 298 - drivers/staging/rtl8192u/ieee80211/compress.c | 64 - drivers/staging/rtl8192u/ieee80211/crypto_compat.h | 58 - drivers/staging/rtl8192u/ieee80211/digest.c | 108 - drivers/staging/rtl8192u/ieee80211/dot11d.c | 173 +- drivers/staging/rtl8192u/ieee80211/ieee80211.h | 2 +- drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 22 +- .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 107 +- drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 5 +- drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 2 +- drivers/staging/rtl8192u/ieee80211/internal.h | 81 - drivers/staging/rtl8192u/ieee80211/michael_mic.c | 194 - drivers/staging/rtl8192u/ieee80211/proc.c | 112 - .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 12 +- .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 70 +- .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 39 +- drivers/staging/rtl8192u/ieee80211/rtl_crypto.h | 398 - drivers/staging/rtl8192u/ieee80211/scatterwalk.c | 117 - drivers/staging/rtl8192u/ieee80211/scatterwalk.h | 51 - drivers/staging/rtl8192u/r8180_93cx6.c | 10 +- drivers/staging/rtl8192u/r8192U_core.c | 138 +- drivers/staging/rtl8192u/r8192U_dm.c | 99 +- drivers/staging/rtl8192u/r8192U_dm.h | 40 +- drivers/staging/rtl8192u/r819xU_HTGen.h | 12 - drivers/staging/rtl8192u/r819xU_HTType.h | 379 - drivers/staging/rtl8192u/r819xU_cmdpkt.c | 2 +- drivers/staging/rtl8192u/r819xU_firmware.c | 50 +- drivers/staging/rtl8192u/r819xU_firmware_img.c | 1 + drivers/staging/rtl8192u/r819xU_phy.c | 29 +- drivers/staging/rtl8712/drv_types.h | 2 +- drivers/staging/rtl8712/ieee80211.c | 6 +- drivers/staging/rtl8712/os_intfs.c | 2 +- drivers/staging/rtl8712/osdep_service.h | 5 +- drivers/staging/rtl8712/rtl8712_recv.c | 2 - drivers/staging/rtl8712/rtl871x_cmd.c | 11 +- drivers/staging/rtl8712/rtl871x_security.c | 13 +- drivers/staging/rtl8821ae/base.c | 199 +- .../staging/rtl8821ae/btcoexist/HalBtc8812a1Ant.c | 2 +- .../staging/rtl8821ae/btcoexist/habtc8723a1ant.c | 2 +- .../staging/rtl8821ae/btcoexist/halbtc8192e1ant.c | 2 +- .../staging/rtl8821ae/btcoexist/halbtc8192e2ant.c | 2 +- .../staging/rtl8821ae/btcoexist/halbtc8723a2ant.c | 2 +- .../staging/rtl8821ae/btcoexist/halbtc8723b1ant.c | 2 +- .../staging/rtl8821ae/btcoexist/halbtc8723b2ant.c | 2 +- drivers/staging/rtl8821ae/btcoexist/halbtcoutsrc.c | 12 +- drivers/staging/rtl8821ae/core.c | 12 +- drivers/staging/rtl8821ae/core.h | 8 +- drivers/staging/rtl8821ae/debug.c | 10 +- drivers/staging/rtl8821ae/debug.h | 12 +- drivers/staging/rtl8821ae/efuse.c | 26 +- drivers/staging/rtl8821ae/pci.c | 274 +- drivers/staging/rtl8821ae/pci.h | 8 +- drivers/staging/rtl8821ae/ps.c | 2 +- drivers/staging/rtl8821ae/regd.c | 4 +- drivers/staging/rtl8821ae/regd.h | 4 +- drivers/staging/rtl8821ae/rtl8821ae/dm.c | 24 +- drivers/staging/rtl8821ae/rtl8821ae/fw.c | 8 +- .../staging/rtl8821ae/rtl8821ae/hal_bt_coexist.h | 2 +- drivers/staging/rtl8821ae/rtl8821ae/hal_btc.c | 6 +- drivers/staging/rtl8821ae/rtl8821ae/hw.c | 13 +- drivers/staging/rtl8821ae/rtl8821ae/phy.c | 8 +- drivers/staging/rtl8821ae/rtl8821ae/phy.h | 2 +- drivers/staging/rtl8821ae/rtl8821ae/pwrseq.h | 10 +- drivers/staging/rtl8821ae/rtl8821ae/pwrseqcmd.c | 2 +- drivers/staging/rtl8821ae/rtl8821ae/reg.h | 28 +- drivers/staging/rtl8821ae/rtl8821ae/sw.c | 4 +- drivers/staging/rtl8821ae/rtl8821ae/trx.c | 10 +- drivers/staging/rtl8821ae/wifi.h | 486 +- drivers/staging/rts5139/ms.c | 21 +- drivers/staging/rts5139/ms_mg.c | 1 + drivers/staging/rts5139/rts51x.c | 6 +- drivers/staging/rts5139/rts51x_fop.c | 10 +- drivers/staging/rts5139/rts51x_fop.h | 4 +- drivers/staging/rts5139/rts51x_scsi.c | 4 +- drivers/staging/rts5139/rts51x_transport.c | 4 +- drivers/staging/rts5139/sd.c | 4 +- drivers/staging/rts5139/sd_cprm.c | 1 + drivers/staging/rts5139/xd.c | 18 +- drivers/staging/rts5208/ms.c | 2 +- drivers/staging/rts5208/rtsx.c | 6 +- drivers/staging/rts5208/rtsx_card.c | 71 +- drivers/staging/rts5208/rtsx_scsi.c | 8 +- drivers/staging/rts5208/rtsx_transport.c | 4 +- drivers/staging/sb105x/Kconfig | 9 - drivers/staging/sb105x/Makefile | 3 - drivers/staging/sb105x/sb_mp_register.h | 295 - drivers/staging/sb105x/sb_pci_mp.c | 3189 -------- drivers/staging/sb105x/sb_pci_mp.h | 291 - drivers/staging/sb105x/sb_ser_core.h | 368 - drivers/staging/sbe-2t3e3/2t3e3.h | 21 +- drivers/staging/sbe-2t3e3/ctrl.c | 17 +- drivers/staging/sbe-2t3e3/ctrl.h | 16 +- drivers/staging/sbe-2t3e3/dc.c | 7 +- drivers/staging/sbe-2t3e3/intr.c | 4 +- drivers/staging/sbe-2t3e3/maps.c | 9 +- drivers/staging/sbe-2t3e3/module.c | 2 +- drivers/staging/sbe-2t3e3/netdev.c | 6 +- drivers/staging/sep/sep_crypto.c | 2 +- drivers/staging/sep/sep_main.c | 94 +- drivers/staging/serqt_usb2/serqt_usb2.c | 18 +- drivers/staging/silicom/bp_mod.h | 25 +- drivers/staging/silicom/bpctl_mod.c | 629 +- drivers/staging/silicom/bypasslib/bp_ioctl.h | 8 +- drivers/staging/silicom/bypasslib/libbp_sd.h | 313 +- drivers/staging/slicoss/README | 40 - drivers/staging/slicoss/TODO | 38 + drivers/staging/slicoss/slic.h | 9 +- drivers/staging/slicoss/slicoss.c | 73 +- drivers/staging/sm7xxfb/Kconfig | 13 - drivers/staging/sm7xxfb/Makefile | 1 - drivers/staging/sm7xxfb/TODO | 9 - drivers/staging/sm7xxfb/sm7xx.h | 779 -- drivers/staging/sm7xxfb/sm7xxfb.c | 1028 --- drivers/staging/speakup/serialio.c | 4 +- drivers/staging/speakup/speakup_dectlk.c | 6 +- drivers/staging/tidspbridge/Kconfig | 2 +- drivers/staging/tidspbridge/core/io_sm.c | 2 +- drivers/staging/tidspbridge/core/tiomap3430.c | 23 +- drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 15 +- drivers/staging/tidspbridge/dynload/tramp.c | 2 +- drivers/staging/tidspbridge/rmgr/dbdcd.c | 4 +- drivers/staging/tidspbridge/rmgr/drv.c | 2 +- drivers/staging/tidspbridge/rmgr/mgr.c | 8 +- drivers/staging/tidspbridge/rmgr/nldr.c | 5 +- drivers/staging/tidspbridge/rmgr/node.c | 20 +- drivers/staging/unisys/Documentation/overview.txt | 174 + .../staging/unisys/Documentation/proc-entries.txt | 93 + drivers/staging/unisys/Kconfig | 20 + drivers/staging/unisys/MAINTAINERS | 6 + drivers/staging/unisys/Makefile | 10 + drivers/staging/unisys/TODO | 21 + drivers/staging/unisys/channels/Kconfig | 10 + drivers/staging/unisys/channels/Makefile | 13 + drivers/staging/unisys/channels/channel.c | 219 + drivers/staging/unisys/channels/chanstub.c | 70 + drivers/staging/unisys/channels/chanstub.h | 23 + .../unisys/common-spar/include/channels/channel.h | 661 ++ .../common-spar/include/channels/channel_guid.h | 64 + .../include/channels/controlframework.h | 77 + .../include/channels/controlvmchannel.h | 619 ++ .../common-spar/include/channels/diagchannel.h | 427 ++ .../common-spar/include/channels/iochannel.h | 933 +++ .../common-spar/include/channels/vbuschannel.h | 135 + .../include/controlvmcompletionstatus.h | 92 + .../include/diagnostics/appos_subsystems.h | 310 + .../unisys/common-spar/include/iovmcall_gnuc.h | 53 + .../unisys/common-spar/include/vbusdeviceinfo.h | 209 + .../staging/unisys/common-spar/include/version.h | 46 + .../unisys/common-spar/include/vmcallinterface.h | 167 + drivers/staging/unisys/include/commontypes.h | 170 + drivers/staging/unisys/include/guestlinuxdebug.h | 182 + drivers/staging/unisys/include/guidutils.h | 203 + drivers/staging/unisys/include/periodic_work.h | 40 + drivers/staging/unisys/include/procobjecttree.h | 48 + drivers/staging/unisys/include/sparstop.h | 30 + drivers/staging/unisys/include/timskmod.h | 324 + drivers/staging/unisys/include/timskmodutils.h | 75 + drivers/staging/unisys/include/uisqueue.h | 440 ++ drivers/staging/unisys/include/uisthread.h | 46 + drivers/staging/unisys/include/uisutils.h | 348 + drivers/staging/unisys/include/uniklog.h | 193 + drivers/staging/unisys/include/vbushelper.h | 47 + drivers/staging/unisys/uislib/Kconfig | 10 + drivers/staging/unisys/uislib/Makefile | 17 + drivers/staging/unisys/uislib/uislib.c | 2421 ++++++ drivers/staging/unisys/uislib/uisqueue.c | 160 + drivers/staging/unisys/uislib/uisthread.c | 85 + drivers/staging/unisys/uislib/uisutils.c | 350 + drivers/staging/unisys/virthba/Kconfig | 10 + drivers/staging/unisys/virthba/Makefile | 16 + drivers/staging/unisys/virthba/virthba.c | 1823 +++++ drivers/staging/unisys/virthba/virthba.h | 31 + drivers/staging/unisys/virtpci/Kconfig | 10 + drivers/staging/unisys/virtpci/Makefile | 13 + drivers/staging/unisys/virtpci/virtpci.c | 1771 +++++ drivers/staging/unisys/virtpci/virtpci.h | 104 + drivers/staging/unisys/visorchannel/Kconfig | 10 + drivers/staging/unisys/visorchannel/Makefile | 14 + drivers/staging/unisys/visorchannel/globals.h | 29 + drivers/staging/unisys/visorchannel/visorchannel.h | 106 + .../unisys/visorchannel/visorchannel_funcs.c | 674 ++ .../unisys/visorchannel/visorchannel_main.c | 49 + drivers/staging/unisys/visorchipset/Kconfig | 10 + drivers/staging/unisys/visorchipset/Makefile | 18 + drivers/staging/unisys/visorchipset/controlvm.h | 27 + .../staging/unisys/visorchipset/controlvm_direct.c | 62 + drivers/staging/unisys/visorchipset/file.c | 226 + drivers/staging/unisys/visorchipset/file.h | 26 + drivers/staging/unisys/visorchipset/filexfer.c | 506 ++ drivers/staging/unisys/visorchipset/filexfer.h | 147 + drivers/staging/unisys/visorchipset/globals.h | 45 + drivers/staging/unisys/visorchipset/parser.c | 474 ++ drivers/staging/unisys/visorchipset/parser.h | 45 + drivers/staging/unisys/visorchipset/testing.h | 41 + drivers/staging/unisys/visorchipset/visorchipset.h | 307 + .../unisys/visorchipset/visorchipset_main.c | 2945 ++++++++ .../unisys/visorchipset/visorchipset_umode.h | 37 + drivers/staging/unisys/visorutil/Kconfig | 10 + drivers/staging/unisys/visorutil/Makefile | 11 + drivers/staging/unisys/visorutil/charqueue.c | 141 + drivers/staging/unisys/visorutil/charqueue.h | 37 + drivers/staging/unisys/visorutil/easyproc.c | 371 + drivers/staging/unisys/visorutil/easyproc.h | 92 + drivers/staging/unisys/visorutil/memregion.h | 43 + .../staging/unisys/visorutil/memregion_direct.c | 223 + drivers/staging/unisys/visorutil/periodic_work.c | 236 + drivers/staging/unisys/visorutil/procobjecttree.c | 348 + drivers/staging/unisys/visorutil/visorkmodutils.c | 71 + drivers/staging/usbip/stub.h | 3 +- drivers/staging/usbip/stub_dev.c | 164 +- drivers/staging/usbip/stub_main.c | 45 +- drivers/staging/usbip/stub_rx.c | 28 +- drivers/staging/usbip/stub_tx.c | 16 +- drivers/staging/usbip/uapi/usbip.h | 26 + drivers/staging/usbip/usbip_common.c | 35 +- drivers/staging/usbip/usbip_common.h | 19 +- drivers/staging/usbip/userspace/README | 8 +- drivers/staging/usbip/userspace/configure.ac | 12 +- drivers/staging/usbip/userspace/libsrc/Makefile.am | 3 +- drivers/staging/usbip/userspace/libsrc/list.h | 136 + .../staging/usbip/userspace/libsrc/sysfs_utils.c | 31 + .../staging/usbip/userspace/libsrc/sysfs_utils.h | 8 + .../staging/usbip/userspace/libsrc/usbip_common.c | 93 +- .../staging/usbip/userspace/libsrc/usbip_common.h | 41 +- .../usbip/userspace/libsrc/usbip_host_driver.c | 303 +- .../usbip/userspace/libsrc/usbip_host_driver.h | 7 +- .../staging/usbip/userspace/libsrc/vhci_driver.c | 397 +- .../staging/usbip/userspace/libsrc/vhci_driver.h | 14 +- drivers/staging/usbip/userspace/src/Makefile.am | 1 - drivers/staging/usbip/userspace/src/usbip_attach.c | 1 - drivers/staging/usbip/userspace/src/usbip_bind.c | 195 +- drivers/staging/usbip/userspace/src/usbip_detach.c | 2 - drivers/staging/usbip/userspace/src/usbip_list.c | 146 +- .../staging/usbip/userspace/src/usbip_network.h | 1 - drivers/staging/usbip/userspace/src/usbip_unbind.c | 129 +- drivers/staging/usbip/userspace/src/usbipd.c | 21 +- drivers/staging/usbip/userspace/src/utils.c | 48 +- drivers/staging/usbip/vhci_hcd.c | 44 +- drivers/staging/usbip/vhci_sysfs.c | 15 +- drivers/staging/vt6655/80211mgr.c | 331 +- drivers/staging/vt6655/aes_ccmp.c | 36 +- drivers/staging/vt6655/desc.h | 15 +- drivers/staging/vt6655/dpc.c | 36 +- drivers/staging/vt6655/key.c | 8 +- drivers/staging/vt6655/mac.c | 10 +- drivers/staging/vt6655/mac.h | 2 +- drivers/staging/vt6655/michael.c | 14 +- drivers/staging/vt6655/michael.h | 6 +- drivers/staging/vt6655/rxtx.c | 62 +- drivers/staging/vt6655/wmgr.c | 30 +- drivers/staging/vt6656/80211hdr.h | 2 +- drivers/staging/vt6656/aes_ccmp.c | 6 +- drivers/staging/vt6656/card.h | 7 - drivers/staging/vt6656/device.h | 85 +- drivers/staging/vt6656/dpc.c | 92 +- drivers/staging/vt6656/int.c | 150 +- drivers/staging/vt6656/int.h | 45 +- drivers/staging/vt6656/iwctl.c | 10 +- drivers/staging/vt6656/mac.c | 16 +- drivers/staging/vt6656/mac.h | 2 +- drivers/staging/vt6656/main_usb.c | 350 +- drivers/staging/vt6656/power.c | 50 +- drivers/staging/vt6656/rxtx.c | 185 +- drivers/staging/vt6656/rxtx.h | 92 +- drivers/staging/vt6656/usbpipe.c | 451 +- drivers/staging/vt6656/wcmd.c | 77 +- drivers/staging/vt6656/wcmd.h | 4 +- drivers/staging/vt6656/wmgr.c | 8 +- drivers/staging/winbond/localpara.h | 84 +- drivers/staging/winbond/wb35reg.c | 140 +- drivers/staging/winbond/wb35rx.c | 27 +- drivers/staging/wlags49_h2/dhf.c | 10 +- drivers/staging/wlags49_h2/hcf.c | 16 +- drivers/staging/wlags49_h2/sta_h2.c | 2 +- drivers/staging/wlags49_h2/wl_main.c | 311 +- drivers/staging/wlags49_h2/wl_netdev.c | 1992 ++--- drivers/staging/wlags49_h2/wl_util.c | 37 - drivers/staging/wlags49_h2/wl_wext.c | 6 +- drivers/staging/wlan-ng/cfg80211.c | 11 +- drivers/staging/wlan-ng/hfa384x.h | 4 +- drivers/staging/wlan-ng/p80211mgmt.h | 172 +- drivers/staging/wlan-ng/p80211netdev.c | 4 +- drivers/staging/wlan-ng/prism2fw.c | 2 +- drivers/staging/wlan-ng/prism2sta.c | 100 +- drivers/staging/xgifb/XGI_main_26.c | 15 +- drivers/staging/xillybus/xillybus_core.c | 6 +- drivers/usb/core/devio.c | 118 +- drivers/usb/core/generic.c | 1 + drivers/usb/core/hub.c | 14 +- drivers/usb/core/hub.h | 2 +- drivers/usb/core/message.c | 1 + drivers/usb/core/usb.h | 8 +- include/linux/hid-sensor-ids.h | 10 + include/linux/iio/iio.h | 16 +- include/linux/of_graph.h | 66 + include/linux/platform_data/bt-nokia-h4p.h | 38 + include/linux/usb.h | 11 + include/media/v4l2-of.h | 33 +- 941 files changed, 61720 insertions(+), 47871 deletions(-) create mode 100644 Documentation/devicetree/bindings/graph.txt create mode 100644 Documentation/devicetree/bindings/iio/adc/vf610-adc.txt create mode 100644 Documentation/devicetree/bindings/iio/adc/xilinx-xadc.txt create mode 100644 Documentation/devicetree/bindings/staging/imx-drm/hdmi.txt create mode 100644 drivers/iio/adc/vf610_adc.c create mode 100644 drivers/iio/adc/xilinx-xadc-core.c create mode 100644 drivers/iio/adc/xilinx-xadc-events.c create mode 100644 drivers/iio/adc/xilinx-xadc.h create mode 100644 drivers/iio/humidity/si7005.c create mode 100644 drivers/iio/light/hid-sensor-prox.c create mode 100644 drivers/iio/light/ltr501.c create mode 100644 drivers/iio/pressure/hid-sensor-press.c rename drivers/{staging => misc}/echo/Kconfig (100%) rename drivers/{staging => misc}/echo/Makefile (100%) rename drivers/{staging => misc}/echo/echo.c (100%) rename drivers/{staging => misc}/echo/echo.h (100%) rename drivers/{staging => misc}/echo/fir.h (100%) rename drivers/{staging => misc}/echo/oslec.h (100%) create mode 100644 drivers/staging/android/uapi/android_alarm.h create mode 100644 drivers/staging/android/uapi/ashmem.h create mode 100644 drivers/staging/android/uapi/binder.h create mode 100644 drivers/staging/android/uapi/sw_sync.h create mode 100644 drivers/staging/android/uapi/sync.h create mode 100644 drivers/staging/comedi/drivers/dac02.c delete mode 100644 drivers/staging/comedi/drivers/poc.c delete mode 100644 drivers/staging/cxt1e1/ossiRelease.c create mode 100644 drivers/staging/dgap/dgap.c create mode 100644 drivers/staging/dgap/dgap.h delete mode 100644 drivers/staging/dgap/dgap_conf.h delete mode 100644 drivers/staging/dgap/dgap_downld.h delete mode 100644 drivers/staging/dgap/dgap_driver.c delete mode 100644 drivers/staging/dgap/dgap_driver.h delete mode 100644 drivers/staging/dgap/dgap_fep5.c delete mode 100644 drivers/staging/dgap/dgap_fep5.h delete mode 100644 drivers/staging/dgap/dgap_kcompat.h delete mode 100644 drivers/staging/dgap/dgap_parse.c delete mode 100644 drivers/staging/dgap/dgap_parse.h delete mode 100644 drivers/staging/dgap/dgap_pci.h delete mode 100644 drivers/staging/dgap/dgap_sysfs.c delete mode 100644 drivers/staging/dgap/dgap_sysfs.h delete mode 100644 drivers/staging/dgap/dgap_trace.c delete mode 100644 drivers/staging/dgap/dgap_trace.h delete mode 100644 drivers/staging/dgap/dgap_tty.c delete mode 100644 drivers/staging/dgap/dgap_tty.h delete mode 100644 drivers/staging/dgap/dgap_types.h delete mode 100644 drivers/staging/dgap/digi.h delete mode 100644 drivers/staging/dgap/downld.c delete mode 100644 drivers/staging/echo/TODO create mode 100644 drivers/staging/gs_fpgaboot/Kconfig create mode 100644 drivers/staging/gs_fpgaboot/Makefile create mode 100644 drivers/staging/gs_fpgaboot/README create mode 100644 drivers/staging/gs_fpgaboot/TODO create mode 100644 drivers/staging/gs_fpgaboot/gs_fpgaboot.c create mode 100644 drivers/staging/gs_fpgaboot/gs_fpgaboot.h create mode 100644 drivers/staging/gs_fpgaboot/io.c create mode 100644 drivers/staging/gs_fpgaboot/io.h create mode 100644 drivers/staging/iio/Documentation/lsiio.c delete mode 100644 drivers/staging/imx-drm/imx-fb.c delete mode 100644 drivers/staging/imx-drm/imx-fbdev.c create mode 100644 drivers/staging/nokia_h4p/Kconfig create mode 100644 drivers/staging/nokia_h4p/Makefile create mode 100644 drivers/staging/nokia_h4p/TODO create mode 100644 drivers/staging/nokia_h4p/hci_h4p.h create mode 100644 drivers/staging/nokia_h4p/nokia_core.c create mode 100644 drivers/staging/nokia_h4p/nokia_fw-bcm.c create mode 100644 drivers/staging/nokia_h4p/nokia_fw-csr.c create mode 100644 drivers/staging/nokia_h4p/nokia_fw-ti1273.c create mode 100644 drivers/staging/nokia_h4p/nokia_fw.c create mode 100644 drivers/staging/nokia_h4p/nokia_uart.c create mode 100644 drivers/staging/rtl8187se/Module.symvers delete mode 100644 drivers/staging/rtl8188eu/hal/odm_interface.c delete mode 100644 drivers/staging/rtl8188eu/include/ethernet.h delete mode 100644 drivers/staging/rtl8188eu/include/h2clbk.h delete mode 100644 drivers/staging/rtl8188eu/include/if_ether.h delete mode 100644 drivers/staging/rtl8188eu/include/ioctl_cfg80211.h delete mode 100644 drivers/staging/rtl8188eu/include/ip.h delete mode 100644 drivers/staging/rtl8188eu/include/nic_spec.h delete mode 100644 drivers/staging/rtl8192u/ieee80211/EndianFree.h delete mode 100644 drivers/staging/rtl8192u/ieee80211/aes.c delete mode 100644 drivers/staging/rtl8192u/ieee80211/arc4.c delete mode 100644 drivers/staging/rtl8192u/ieee80211/autoload.c delete mode 100644 drivers/staging/rtl8192u/ieee80211/cipher.c delete mode 100644 drivers/staging/rtl8192u/ieee80211/compress.c delete mode 100644 drivers/staging/rtl8192u/ieee80211/crypto_compat.h delete mode 100644 drivers/staging/rtl8192u/ieee80211/digest.c delete mode 100644 drivers/staging/rtl8192u/ieee80211/internal.h delete mode 100644 drivers/staging/rtl8192u/ieee80211/michael_mic.c delete mode 100644 drivers/staging/rtl8192u/ieee80211/proc.c delete mode 100644 drivers/staging/rtl8192u/ieee80211/rtl_crypto.h delete mode 100644 drivers/staging/rtl8192u/ieee80211/scatterwalk.c delete mode 100644 drivers/staging/rtl8192u/ieee80211/scatterwalk.h delete mode 100644 drivers/staging/rtl8192u/r819xU_HTGen.h delete mode 100644 drivers/staging/rtl8192u/r819xU_HTType.h delete mode 100644 drivers/staging/sb105x/Kconfig delete mode 100644 drivers/staging/sb105x/Makefile delete mode 100644 drivers/staging/sb105x/sb_mp_register.h delete mode 100644 drivers/staging/sb105x/sb_pci_mp.c delete mode 100644 drivers/staging/sb105x/sb_pci_mp.h delete mode 100644 drivers/staging/sb105x/sb_ser_core.h create mode 100644 drivers/staging/slicoss/TODO delete mode 100644 drivers/staging/sm7xxfb/Kconfig delete mode 100644 drivers/staging/sm7xxfb/Makefile delete mode 100644 drivers/staging/sm7xxfb/TODO delete mode 100644 drivers/staging/sm7xxfb/sm7xx.h delete mode 100644 drivers/staging/sm7xxfb/sm7xxfb.c create mode 100644 drivers/staging/unisys/Documentation/overview.txt create mode 100644 drivers/staging/unisys/Documentation/proc-entries.txt create mode 100644 drivers/staging/unisys/Kconfig create mode 100644 drivers/staging/unisys/MAINTAINERS create mode 100644 drivers/staging/unisys/Makefile create mode 100644 drivers/staging/unisys/TODO create mode 100644 drivers/staging/unisys/channels/Kconfig create mode 100644 drivers/staging/unisys/channels/Makefile create mode 100644 drivers/staging/unisys/channels/channel.c create mode 100644 drivers/staging/unisys/channels/chanstub.c create mode 100644 drivers/staging/unisys/channels/chanstub.h create mode 100644 drivers/staging/unisys/common-spar/include/channels/channel.h create mode 100644 drivers/staging/unisys/common-spar/include/channels/channel_guid.h create mode 100644 drivers/staging/unisys/common-spar/include/channels/controlframework.h create mode 100644 drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h create mode 100644 drivers/staging/unisys/common-spar/include/channels/diagchannel.h create mode 100644 drivers/staging/unisys/common-spar/include/channels/iochannel.h create mode 100644 drivers/staging/unisys/common-spar/include/channels/vbuschannel.h create mode 100644 drivers/staging/unisys/common-spar/include/controlvmcompletionstatus.h create mode 100644 drivers/staging/unisys/common-spar/include/diagnostics/appos_subsystems.h create mode 100644 drivers/staging/unisys/common-spar/include/iovmcall_gnuc.h create mode 100644 drivers/staging/unisys/common-spar/include/vbusdeviceinfo.h create mode 100644 drivers/staging/unisys/common-spar/include/version.h create mode 100644 drivers/staging/unisys/common-spar/include/vmcallinterface.h create mode 100644 drivers/staging/unisys/include/commontypes.h create mode 100644 drivers/staging/unisys/include/guestlinuxdebug.h create mode 100644 drivers/staging/unisys/include/guidutils.h create mode 100644 drivers/staging/unisys/include/periodic_work.h create mode 100644 drivers/staging/unisys/include/procobjecttree.h create mode 100644 drivers/staging/unisys/include/sparstop.h create mode 100644 drivers/staging/unisys/include/timskmod.h create mode 100644 drivers/staging/unisys/include/timskmodutils.h create mode 100644 drivers/staging/unisys/include/uisqueue.h create mode 100644 drivers/staging/unisys/include/uisthread.h create mode 100644 drivers/staging/unisys/include/uisutils.h create mode 100644 drivers/staging/unisys/include/uniklog.h create mode 100644 drivers/staging/unisys/include/vbushelper.h create mode 100644 drivers/staging/unisys/uislib/Kconfig create mode 100644 drivers/staging/unisys/uislib/Makefile create mode 100644 drivers/staging/unisys/uislib/uislib.c create mode 100644 drivers/staging/unisys/uislib/uisqueue.c create mode 100644 drivers/staging/unisys/uislib/uisthread.c create mode 100644 drivers/staging/unisys/uislib/uisutils.c create mode 100644 drivers/staging/unisys/virthba/Kconfig create mode 100644 drivers/staging/unisys/virthba/Makefile create mode 100644 drivers/staging/unisys/virthba/virthba.c create mode 100644 drivers/staging/unisys/virthba/virthba.h create mode 100644 drivers/staging/unisys/virtpci/Kconfig create mode 100644 drivers/staging/unisys/virtpci/Makefile create mode 100644 drivers/staging/unisys/virtpci/virtpci.c create mode 100644 drivers/staging/unisys/virtpci/virtpci.h create mode 100644 drivers/staging/unisys/visorchannel/Kconfig create mode 100644 drivers/staging/unisys/visorchannel/Makefile create mode 100644 drivers/staging/unisys/visorchannel/globals.h create mode 100644 drivers/staging/unisys/visorchannel/visorchannel.h create mode 100644 drivers/staging/unisys/visorchannel/visorchannel_funcs.c create mode 100644 drivers/staging/unisys/visorchannel/visorchannel_main.c create mode 100644 drivers/staging/unisys/visorchipset/Kconfig create mode 100644 drivers/staging/unisys/visorchipset/Makefile create mode 100644 drivers/staging/unisys/visorchipset/controlvm.h create mode 100644 drivers/staging/unisys/visorchipset/controlvm_direct.c create mode 100644 drivers/staging/unisys/visorchipset/file.c create mode 100644 drivers/staging/unisys/visorchipset/file.h create mode 100644 drivers/staging/unisys/visorchipset/filexfer.c create mode 100644 drivers/staging/unisys/visorchipset/filexfer.h create mode 100644 drivers/staging/unisys/visorchipset/globals.h create mode 100644 drivers/staging/unisys/visorchipset/parser.c create mode 100644 drivers/staging/unisys/visorchipset/parser.h create mode 100644 drivers/staging/unisys/visorchipset/testing.h create mode 100644 drivers/staging/unisys/visorchipset/visorchipset.h create mode 100644 drivers/staging/unisys/visorchipset/visorchipset_main.c create mode 100644 drivers/staging/unisys/visorchipset/visorchipset_umode.h create mode 100644 drivers/staging/unisys/visorutil/Kconfig create mode 100644 drivers/staging/unisys/visorutil/Makefile create mode 100644 drivers/staging/unisys/visorutil/charqueue.c create mode 100644 drivers/staging/unisys/visorutil/charqueue.h create mode 100644 drivers/staging/unisys/visorutil/easyproc.c create mode 100644 drivers/staging/unisys/visorutil/easyproc.h create mode 100644 drivers/staging/unisys/visorutil/memregion.h create mode 100644 drivers/staging/unisys/visorutil/memregion_direct.c create mode 100644 drivers/staging/unisys/visorutil/periodic_work.c create mode 100644 drivers/staging/unisys/visorutil/procobjecttree.c create mode 100644 drivers/staging/unisys/visorutil/visorkmodutils.c create mode 100644 drivers/staging/usbip/uapi/usbip.h create mode 100644 drivers/staging/usbip/userspace/libsrc/list.h create mode 100644 drivers/staging/usbip/userspace/libsrc/sysfs_utils.c create mode 100644 drivers/staging/usbip/userspace/libsrc/sysfs_utils.h create mode 100644 include/linux/of_graph.h create mode 100644 include/linux/platform_data/bt-nokia-h4p.h $ git am -3 ../patches/0001-ARM-dts-i.MX53-merge-fix-patch.patch Applying: ARM: dts: i.MX53: merge fix patch $ git reset HEAD^ Unstaged changes after reset: M arch/arm/boot/dts/imx53-qsb-common.dtsi $ git add -A . $ git commit -v -a --amend [master 632f787e745f] Merge remote-tracking branch 'staging/staging-next' Merging char-misc/char-misc-next (1b3fa22e0234 Merge tag 'extcon-next-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next) $ git merge char-misc/char-misc-next Auto-merging include/linux/regmap.h Auto-merging include/linux/mod_devicetable.h Auto-merging include/linux/miscdevice.h Removing include/linux/extcon/of_extcon.h Auto-merging drivers/video/fbdev/uvesafb.c Auto-merging drivers/video/fbdev/hyperv_fb.c Auto-merging drivers/usb/dwc3/dwc3-omap.c Auto-merging drivers/mtd/nand/fsl_ifc_nand.c Auto-merging drivers/mtd/nand/Kconfig Auto-merging drivers/misc/Kconfig Auto-merging drivers/memory/fsl_ifc.c Auto-merging drivers/iio/adc/Makefile Auto-merging drivers/iio/adc/Kconfig Auto-merging drivers/hv/vmbus_drv.c Removing drivers/extcon/of_extcon.c Auto-merging drivers/connector/connector.c Auto-merging drivers/char/hw_random/nomadik-rng.c Auto-merging drivers/char/hw_random/core.c Auto-merging drivers/Makefile Auto-merging arch/powerpc/Kconfig Removing arch/avr32/boards/mimc200/fram.c Auto-merging arch/arm/boot/dts/sun5i-a13.dtsi Auto-merging arch/arm/boot/dts/sun5i-a10s.dtsi Auto-merging arch/arm/boot/dts/sun4i-a10.dtsi Auto-merging MAINTAINERS Auto-merging Documentation/devices.txt Auto-merging Documentation/DocBook/Makefile Merge made by the 'recursive' strategy. Documentation/DocBook/Makefile | 2 +- Documentation/DocBook/w1.tmpl | 101 ++ Documentation/connector/cn_test.c | 2 +- Documentation/devices.txt | 2 + .../{powerpc => memory-controllers}/fsl/ifc.txt | 0 .../bindings/memory-controllers/ti-aemif.txt | 210 ++++ .../bindings/misc/allwinner,sunxi-sid.txt | 4 +- Documentation/devicetree/bindings/misc/sram.txt | 35 + .../bindings/spmi/qcom,spmi-pmic-arb.txt | 61 ++ Documentation/devicetree/bindings/spmi/spmi.txt | 41 + Documentation/fmc/fmc-write-eeprom.txt | 77 +- Documentation/w1/masters/ds2490 | 2 - Documentation/w1/w1.netlink | 8 +- MAINTAINERS | 6 + arch/arm/boot/dts/sun4i-a10.dtsi | 2 +- arch/arm/boot/dts/sun5i-a10s.dtsi | 2 +- arch/arm/boot/dts/sun5i-a13.dtsi | 2 +- arch/avr32/boards/mimc200/Makefile | 2 +- arch/avr32/boards/mimc200/fram.c | 82 -- arch/powerpc/Kconfig | 4 - arch/powerpc/sysdev/Makefile | 1 - drivers/Kconfig | 4 + drivers/Makefile | 2 + drivers/base/regmap/regmap-spmi.c | 228 +++- drivers/char/agp/frontend.c | 1 - drivers/char/agp/generic.c | 1 - drivers/char/agp/intel-gtt.c | 1 - drivers/char/agp/sgi-agp.c | 1 - drivers/char/hw_random/bcm2835-rng.c | 1 - drivers/char/hw_random/core.c | 1 - drivers/char/hw_random/exynos-rng.c | 1 - drivers/char/hw_random/n2-drv.c | 1 - drivers/char/hw_random/nomadik-rng.c | 1 - drivers/char/hw_random/octeon-rng.c | 1 - drivers/char/ipmi/ipmi_si_intf.c | 1 - drivers/char/mem.c | 6 + drivers/char/mwave/3780i.c | 1 - drivers/char/tile-srom.c | 1 - drivers/char/tpm/tpm_i2c_infineon.c | 1 - drivers/char/tpm/tpm_i2c_stm_st33.c | 1 - drivers/connector/cn_proc.c | 18 +- drivers/connector/connector.c | 20 +- drivers/extcon/Kconfig | 4 - drivers/extcon/Makefile | 2 - drivers/extcon/extcon-class.c | 42 + drivers/extcon/extcon-gpio.c | 4 +- drivers/extcon/extcon-palmas.c | 5 +- drivers/extcon/of_extcon.c | 64 -- drivers/fmc/fmc-core.c | 22 +- drivers/fmc/fmc-sdb.c | 41 +- drivers/hv/Makefile | 2 +- drivers/hv/channel.c | 42 +- drivers/hv/hv_balloon.c | 3 +- drivers/hv/hv_fcopy.c | 414 ++++++++ drivers/hv/hv_kvp.c | 4 +- drivers/hv/hv_snapshot.c | 2 +- drivers/hv/hv_util.c | 11 + drivers/hv/hyperv_vmbus.h | 8 +- drivers/hv/ring_buffer.c | 17 +- drivers/hv/vmbus_drv.c | 51 +- drivers/iio/adc/Kconfig | 10 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/men_z188_adc.c | 172 +++ drivers/mcb/Kconfig | 31 + drivers/mcb/Makefile | 7 + drivers/mcb/mcb-core.c | 414 ++++++++ drivers/mcb/mcb-internal.h | 118 +++ drivers/mcb/mcb-parse.c | 159 +++ drivers/mcb/mcb-pci.c | 114 ++ drivers/md/dm-log-userspace-transfer.c | 2 +- drivers/memory/Kconfig | 15 + drivers/memory/Makefile | 2 + {arch/powerpc/sysdev => drivers/memory}/fsl_ifc.c | 8 +- drivers/memory/ti-aemif.c | 427 ++++++++ drivers/misc/Kconfig | 2 +- drivers/misc/ad525x_dpot.c | 1 - drivers/misc/apds9802als.c | 1 - drivers/misc/bmp085.c | 1 - drivers/misc/carma/carma-fpga.c | 1 - drivers/misc/ds1682.c | 1 - drivers/misc/eeprom/at25.c | 1 - drivers/misc/eeprom/eeprom.c | 1 - drivers/misc/eeprom/eeprom_93xx46.c | 1 - drivers/misc/eeprom/max6875.c | 1 - drivers/misc/eeprom/sunxi_sid.c | 3 +- drivers/misc/genwqe/card_debugfs.c | 1 - drivers/misc/hmc6352.c | 1 - drivers/misc/isl29003.c | 1 - drivers/misc/isl29020.c | 1 - drivers/misc/lattice-ecp3-config.c | 1 - drivers/misc/lis3lv02d/lis3lv02d.c | 1 - drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 1 - drivers/misc/lis3lv02d/lis3lv02d_spi.c | 1 - drivers/misc/lkdtm.c | 74 +- drivers/misc/mei/Kconfig | 9 + drivers/misc/mei/Makefile | 6 +- drivers/misc/mei/amthif.c | 72 +- drivers/misc/mei/bus.c | 21 +- drivers/misc/mei/client.c | 300 +++--- drivers/misc/mei/client.h | 30 +- drivers/misc/mei/debugfs.c | 54 + drivers/misc/mei/hbm.c | 281 ++--- drivers/misc/mei/hbm.h | 1 + drivers/misc/mei/hw-me.c | 30 +- drivers/misc/mei/hw-txe-regs.h | 294 ++++++ drivers/misc/mei/hw-txe.c | 1107 ++++++++++++++++++++ drivers/misc/mei/hw-txe.h | 74 ++ drivers/misc/mei/hw.h | 20 +- drivers/misc/mei/init.c | 43 +- drivers/misc/mei/interrupt.c | 159 +-- drivers/misc/mei/main.c | 23 +- drivers/misc/mei/mei_dev.h | 54 +- drivers/misc/mei/nfc.c | 14 +- drivers/misc/mei/pci-me.c | 14 +- drivers/misc/mei/pci-txe.c | 293 ++++++ drivers/misc/mei/wd.c | 136 +-- drivers/misc/mic/host/mic_intr.c | 2 +- drivers/misc/pch_phub.c | 5 +- drivers/misc/sram.c | 127 ++- drivers/misc/ti-st/st_core.c | 1 - drivers/misc/ti_dac7512.c | 1 - drivers/misc/tsl2550.c | 1 - drivers/misc/vmw_vmci/vmci_guest.c | 7 +- drivers/mtd/nand/Kconfig | 1 + drivers/mtd/nand/fsl_ifc_nand.c | 2 +- drivers/parport/share.c | 3 +- drivers/spmi/Kconfig | 27 + drivers/spmi/Makefile | 6 + drivers/spmi/spmi-pmic-arb.c | 778 ++++++++++++++ drivers/spmi/spmi.c | 574 ++++++++++ drivers/usb/dwc3/dwc3-omap.c | 3 +- drivers/video/fbdev/hyperv_fb.c | 88 +- drivers/video/fbdev/uvesafb.c | 4 +- drivers/vme/bridges/vme_ca91cx42.c | 29 +- drivers/vme/bridges/vme_tsi148.c | 18 +- drivers/w1/masters/Kconfig | 3 +- drivers/w1/masters/ds2490.c | 155 ++- drivers/w1/masters/mxc_w1.c | 43 +- drivers/w1/masters/w1-gpio.c | 19 +- drivers/w1/slaves/Kconfig | 5 - drivers/w1/slaves/w1_therm.c | 21 +- drivers/w1/w1.c | 269 +++-- drivers/w1/w1.h | 186 +++- drivers/w1/w1_family.c | 8 + drivers/w1/w1_family.h | 13 + drivers/w1/w1_int.c | 25 +- drivers/w1/w1_io.c | 102 +- drivers/w1/w1_netlink.c | 359 +++++-- drivers/w1/w1_netlink.h | 33 +- include/dt-bindings/spmi/spmi.h | 18 + include/linux/connector.h | 2 +- include/linux/extcon.h | 12 + include/linux/extcon/of_extcon.h | 31 - include/linux/fmc-sdb.h | 2 + .../include/asm => include/linux}/fsl_ifc.h | 0 include/linux/hyperv.h | 353 +------ include/linux/mcb.h | 119 +++ include/linux/miscdevice.h | 16 +- include/linux/mod_devicetable.h | 13 + include/linux/regmap.h | 12 +- include/linux/spmi.h | 191 ++++ include/uapi/linux/Kbuild | 1 + include/uapi/linux/hyperv.h | 390 +++++++ tools/Makefile | 11 +- tools/hv/Makefile | 13 + tools/hv/hv_fcopy_daemon.c | 195 ++++ tools/hv/hv_vss_daemon.c | 2 + 167 files changed, 8865 insertions(+), 1722 deletions(-) create mode 100644 Documentation/DocBook/w1.tmpl rename Documentation/devicetree/bindings/{powerpc => memory-controllers}/fsl/ifc.txt (100%) create mode 100644 Documentation/devicetree/bindings/memory-controllers/ti-aemif.txt create mode 100644 Documentation/devicetree/bindings/spmi/qcom,spmi-pmic-arb.txt create mode 100644 Documentation/devicetree/bindings/spmi/spmi.txt delete mode 100644 arch/avr32/boards/mimc200/fram.c delete mode 100644 drivers/extcon/of_extcon.c create mode 100644 drivers/hv/hv_fcopy.c create mode 100644 drivers/iio/adc/men_z188_adc.c create mode 100644 drivers/mcb/Kconfig create mode 100644 drivers/mcb/Makefile create mode 100644 drivers/mcb/mcb-core.c create mode 100644 drivers/mcb/mcb-internal.h create mode 100644 drivers/mcb/mcb-parse.c create mode 100644 drivers/mcb/mcb-pci.c rename {arch/powerpc/sysdev => drivers/memory}/fsl_ifc.c (98%) create mode 100644 drivers/memory/ti-aemif.c create mode 100644 drivers/misc/mei/hw-txe-regs.h create mode 100644 drivers/misc/mei/hw-txe.c create mode 100644 drivers/misc/mei/hw-txe.h create mode 100644 drivers/misc/mei/pci-txe.c create mode 100644 drivers/spmi/Kconfig create mode 100644 drivers/spmi/Makefile create mode 100644 drivers/spmi/spmi-pmic-arb.c create mode 100644 drivers/spmi/spmi.c create mode 100644 include/dt-bindings/spmi/spmi.h delete mode 100644 include/linux/extcon/of_extcon.h rename {arch/powerpc/include/asm => include/linux}/fsl_ifc.h (100%) create mode 100644 include/linux/mcb.h create mode 100644 include/linux/spmi.h create mode 100644 include/uapi/linux/hyperv.h create mode 100644 tools/hv/Makefile create mode 100644 tools/hv/hv_fcopy_daemon.c Merging cgroup/for-next (7a7fc4540679 Merge branch 'for-3.15' into for-next) $ git merge cgroup/for-next Resolved 'mm/memcontrol.c' using previous resolution. Auto-merging mm/memory-failure.c Auto-merging mm/memcontrol.c CONFLICT (content): Merge conflict in mm/memcontrol.c Auto-merging kernel/sched/debug.c Auto-merging kernel/sched/core.c Auto-merging kernel/events/core.c Auto-merging init/Kconfig Auto-merging fs/kernfs/dir.c Auto-merging fs/bio.c Auto-merging block/cfq-iosched.c Auto-merging block/blk-cgroup.h Auto-merging block/blk-cgroup.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master ab0e9774b6a7] Merge remote-tracking branch 'cgroup/for-next' $ git diff -M --stat --summary HEAD^.. arch/sparc/kernel/leon_pci_grpci2.c | 1 + arch/sparc/kernel/sun4m_irq.c | 2 + block/blk-cgroup.c | 11 +- block/blk-cgroup.h | 14 +- block/blk-throttle.c | 8 +- block/cfq-iosched.c | 7 +- fs/bio.c | 2 +- fs/kernfs/dir.c | 1 + include/linux/cgroup.h | 271 ++- include/linux/cgroup_subsys.h | 30 +- include/linux/hugetlb_cgroup.h | 2 +- include/linux/memcontrol.h | 2 +- include/net/cls_cgroup.h | 2 +- include/net/netprio_cgroup.h | 17 +- init/Kconfig | 1 + kernel/cgroup.c | 3731 +++++++++++++++-------------------- kernel/cgroup_freezer.c | 40 +- kernel/cpuset.c | 262 +-- kernel/events/core.c | 25 +- kernel/sched/core.c | 10 +- kernel/sched/cpuacct.c | 6 +- kernel/sched/debug.c | 3 +- mm/hugetlb_cgroup.c | 11 +- mm/memcontrol.c | 110 +- mm/memory-failure.c | 8 +- net/Kconfig | 2 +- net/core/netclassid_cgroup.c | 15 +- net/core/netprio_cgroup.c | 41 +- net/ipv4/tcp_memcontrol.c | 4 +- security/device_cgroup.c | 12 +- 30 files changed, 1914 insertions(+), 2737 deletions(-) $ git am -3 ../patches/0001-cgroup-fix-up-for-kernfs_mount-API-change.patch Applying: cgroup: fix up for kernfs_mount API change Using index info to reconstruct a base tree... M kernel/cgroup.c Falling back to patching base and 3-way merge... Auto-merging kernel/cgroup.c $ git reset HEAD^ Unstaged changes after reset: M kernel/cgroup.c $ git add -A . $ git commit -v -a --amend [master 64e6e54a1ca3] Merge remote-tracking branch 'cgroup/for-next' Merging scsi/for-next (1de14f4f2984 [SCSI] ses: Use vpd information from scsi_device) $ git merge scsi/for-next Auto-merging include/scsi/libiscsi.h Auto-merging include/linux/pci_ids.h Auto-merging drivers/scsi/scsi_sysfs.c Auto-merging drivers/scsi/libiscsi.c Auto-merging drivers/scsi/ipr.c Auto-merging drivers/scsi/bnx2i/bnx2i_iscsi.c Auto-merging drivers/scsi/bnx2i/bnx2i_hwi.c Auto-merging drivers/scsi/bnx2fc/bnx2fc_tgt.c Auto-merging drivers/scsi/bnx2fc/bnx2fc_io.c Auto-merging drivers/scsi/bnx2fc/bnx2fc_fcoe.c Auto-merging drivers/scsi/be2iscsi/be_main.c Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. Documentation/ABI/testing/sysfs-class-scsi_host | 16 + Documentation/scsi/ChangeLog.megaraid_sas | 13 + MAINTAINERS | 4 +- drivers/scsi/NCR5380.c | 2 +- drivers/scsi/aacraid/aacraid.h | 2 +- drivers/scsi/aacraid/rx.c | 9 +- drivers/scsi/aacraid/sa.c | 3 +- drivers/scsi/aacraid/src.c | 4 +- drivers/scsi/aha152x.c | 4 +- drivers/scsi/aic7xxx/aicasm/aicasm_insformat.h | 1 - drivers/scsi/arcmsr/arcmsr_hba.c | 7 +- drivers/scsi/be2iscsi/be.h | 11 + drivers/scsi/be2iscsi/be_cmds.c | 121 +- drivers/scsi/be2iscsi/be_cmds.h | 10 +- drivers/scsi/be2iscsi/be_iscsi.c | 13 +- drivers/scsi/be2iscsi/be_main.c | 105 +- drivers/scsi/be2iscsi/be_main.h | 23 +- drivers/scsi/be2iscsi/be_mgmt.c | 22 +- drivers/scsi/bfa/bfa_ioc.c | 11 +- drivers/scsi/bfa/bfad_bsg.c | 4 +- drivers/scsi/bfa/bfad_im.c | 7 +- drivers/scsi/bnx2fc/bnx2fc.h | 3 +- drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 8 +- drivers/scsi/bnx2fc/bnx2fc_io.c | 19 +- drivers/scsi/bnx2fc/bnx2fc_tgt.c | 1 + drivers/scsi/bnx2i/bnx2i_hwi.c | 46 +- drivers/scsi/bnx2i/bnx2i_iscsi.c | 8 +- drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 59 +- drivers/scsi/dtc.c | 2 +- drivers/scsi/eata.c | 2 +- drivers/scsi/eata_pio.c | 4 +- drivers/scsi/esas2r/esas2r_init.c | 2 +- drivers/scsi/esas2r/esas2r_log.c | 8 +- drivers/scsi/g_NCR5380.c | 2 +- drivers/scsi/gdth.c | 6 +- drivers/scsi/hosts.c | 2 +- drivers/scsi/hpsa.c | 2686 +++++++++++++++++++++-- drivers/scsi/hpsa.h | 171 +- drivers/scsi/hpsa_cmd.h | 270 ++- drivers/scsi/ibmvscsi/ibmvstgt.c | 2 +- drivers/scsi/in2000.c | 2 +- drivers/scsi/initio.c | 2 +- drivers/scsi/ipr.c | 367 +++- drivers/scsi/ipr.h | 22 + drivers/scsi/isci/init.c | 2 +- drivers/scsi/isci/request.c | 8 +- drivers/scsi/iscsi_boot_sysfs.c | 1 + drivers/scsi/iscsi_tcp.c | 25 +- drivers/scsi/libiscsi.c | 232 +- drivers/scsi/libiscsi_tcp.c | 71 +- drivers/scsi/libsas/sas_scsi_host.c | 2 +- drivers/scsi/lpfc/lpfc.h | 22 +- drivers/scsi/lpfc/lpfc_attr.c | 628 +++++- drivers/scsi/lpfc/lpfc_bsg.c | 3 + drivers/scsi/lpfc/lpfc_bsg.h | 2 + drivers/scsi/lpfc/lpfc_crtn.h | 24 +- drivers/scsi/lpfc/lpfc_debugfs.c | 108 + drivers/scsi/lpfc/lpfc_disc.h | 2 +- drivers/scsi/lpfc/lpfc_els.c | 200 +- drivers/scsi/lpfc/lpfc_hbadisc.c | 39 +- drivers/scsi/lpfc/lpfc_hw.h | 1 + drivers/scsi/lpfc/lpfc_hw4.h | 6 + drivers/scsi/lpfc/lpfc_init.c | 277 ++- drivers/scsi/lpfc/lpfc_mem.c | 47 + drivers/scsi/lpfc/lpfc_nportdisc.c | 56 +- drivers/scsi/lpfc/lpfc_scsi.c | 552 ++++- drivers/scsi/lpfc/lpfc_scsi.h | 18 + drivers/scsi/lpfc/lpfc_sli.c | 267 ++- drivers/scsi/lpfc/lpfc_sli.h | 2 + drivers/scsi/lpfc/lpfc_sli4.h | 21 +- drivers/scsi/lpfc/lpfc_version.h | 2 +- drivers/scsi/megaraid/megaraid_mm.c | 2 + drivers/scsi/megaraid/megaraid_sas.h | 114 +- drivers/scsi/megaraid/megaraid_sas_base.c | 815 +++++-- drivers/scsi/megaraid/megaraid_sas_fp.c | 11 +- drivers/scsi/megaraid/megaraid_sas_fusion.c | 272 ++- drivers/scsi/megaraid/megaraid_sas_fusion.h | 3 + drivers/scsi/pas16.c | 2 +- drivers/scsi/pm8001/pm8001_ctl.c | 38 +- drivers/scsi/pm8001/pm8001_hwi.c | 105 +- drivers/scsi/pm8001/pm8001_init.c | 12 +- drivers/scsi/pm8001/pm8001_sas.c | 3 +- drivers/scsi/pm8001/pm8001_sas.h | 12 + drivers/scsi/pm8001/pm80xx_hwi.c | 97 +- drivers/scsi/qla2xxx/Makefile | 2 +- drivers/scsi/qla2xxx/qla_attr.c | 193 +- drivers/scsi/qla2xxx/qla_bsg.c | 12 +- drivers/scsi/qla2xxx/qla_dbg.c | 134 +- drivers/scsi/qla2xxx/qla_dbg.h | 7 + drivers/scsi/qla2xxx/qla_def.h | 65 +- drivers/scsi/qla2xxx/qla_dfs.c | 3 +- drivers/scsi/qla2xxx/qla_fw.h | 4 + drivers/scsi/qla2xxx/qla_gbl.h | 12 +- drivers/scsi/qla2xxx/qla_gs.c | 11 + drivers/scsi/qla2xxx/qla_init.c | 426 +++- drivers/scsi/qla2xxx/qla_iocb.c | 44 +- drivers/scsi/qla2xxx/qla_isr.c | 93 +- drivers/scsi/qla2xxx/qla_mbx.c | 50 +- drivers/scsi/qla2xxx/qla_mid.c | 4 +- drivers/scsi/qla2xxx/qla_mr.c | 252 +-- drivers/scsi/qla2xxx/qla_mr.h | 57 +- drivers/scsi/qla2xxx/qla_nx.c | 21 +- drivers/scsi/qla2xxx/qla_nx2.c | 22 +- drivers/scsi/qla2xxx/qla_os.c | 171 +- drivers/scsi/qla2xxx/qla_sup.c | 65 +- drivers/scsi/qla2xxx/qla_tmpl.c | 909 ++++++++ drivers/scsi/qla2xxx/qla_tmpl.h | 205 ++ drivers/scsi/qla2xxx/qla_version.h | 4 +- drivers/scsi/qla4xxx/ql4_83xx.c | 36 +- drivers/scsi/qla4xxx/ql4_bsg.c | 4 +- drivers/scsi/qla4xxx/ql4_def.h | 17 +- drivers/scsi/qla4xxx/ql4_fw.h | 31 +- drivers/scsi/qla4xxx/ql4_glbl.h | 2 + drivers/scsi/qla4xxx/ql4_init.c | 7 +- drivers/scsi/qla4xxx/ql4_isr.c | 69 +- drivers/scsi/qla4xxx/ql4_mbx.c | 25 +- drivers/scsi/qla4xxx/ql4_nx.c | 89 +- drivers/scsi/qla4xxx/ql4_os.c | 232 +- drivers/scsi/qla4xxx/ql4_version.h | 2 +- drivers/scsi/scsi.c | 152 +- drivers/scsi/scsi_debug.c | 141 +- drivers/scsi/scsi_error.c | 6 + drivers/scsi/scsi_lib.c | 112 +- drivers/scsi/scsi_scan.c | 115 +- drivers/scsi/scsi_sysfs.c | 242 +- drivers/scsi/scsi_tgt_lib.c | 3 +- drivers/scsi/scsi_transport_fc.c | 1 + drivers/scsi/sd.c | 4 +- drivers/scsi/ses.c | 38 +- drivers/scsi/st.c | 11 +- drivers/scsi/t128.c | 2 +- drivers/scsi/u14-34f.c | 2 +- drivers/scsi/vmw_pvscsi.c | 242 +- drivers/scsi/vmw_pvscsi.h | 19 +- drivers/scsi/wd7000.c | 2 +- include/linux/pci_ids.h | 1 + include/scsi/libiscsi.h | 17 +- include/scsi/libiscsi_tcp.h | 2 + include/scsi/scsi_cmnd.h | 3 +- include/scsi/scsi_device.h | 22 +- include/scsi/scsi_transport_fc.h | 1 + 141 files changed, 10144 insertions(+), 2464 deletions(-) create mode 100644 drivers/scsi/qla2xxx/qla_tmpl.c create mode 100644 drivers/scsi/qla2xxx/qla_tmpl.h Merging target-updates/for-next (7c934004b64f Target/iser: Fail SCSI WRITE command if device detected integrity error) $ git merge target-updates/for-next Merge made by the 'recursive' strategy. drivers/infiniband/ulp/isert/ib_isert.c | 724 +++++++++++++++++++++------ drivers/infiniband/ulp/isert/ib_isert.h | 38 +- drivers/target/iscsi/iscsi_target.c | 10 + drivers/target/iscsi/iscsi_target_configfs.c | 6 + drivers/target/iscsi/iscsi_target_core.h | 5 +- drivers/target/iscsi/iscsi_target_tpg.c | 21 + drivers/target/iscsi/iscsi_target_tpg.h | 1 + drivers/target/loopback/tcm_loop.c | 4 + drivers/target/target_core_alua.c | 95 ++-- drivers/target/target_core_file.c | 40 +- drivers/target/target_core_sbc.c | 93 +++- drivers/target/target_core_transport.c | 24 +- include/target/target_core_base.h | 14 +- 13 files changed, 785 insertions(+), 290 deletions(-) Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) $ git merge target-merge/for-next-merge Already up-to-date. Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS) $ git merge writeback/writeback-for-next Already up-to-date. Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries) $ git merge hwspinlock/linux-next Already up-to-date. Merging pinctrl/for-next (43f23a0660fa pinctrl: tegra: add some missing Tegra114 entries) $ git merge pinctrl/for-next Auto-merging drivers/pinctrl/sirf/pinctrl-sirf.c Auto-merging drivers/pinctrl/sh-pfc/pfc-r8a7791.c Auto-merging drivers/pinctrl/Kconfig Auto-merging arch/arm/boot/dts/r8a7791.dtsi Merge made by the 'recursive' strategy. .../devicetree/bindings/pinctrl/pinctrl-single.txt | 7 + .../devicetree/bindings/pinctrl/pinctrl-st.txt | 73 +- .../bindings/pinctrl/qcom,msm8974-pinctrl.txt | 14 +- .../bindings/pinctrl/samsung-pinctrl.txt | 1 + arch/arm/boot/dts/r8a7791.dtsi | 2 +- arch/blackfin/include/asm/irq.h | 9 - drivers/pinctrl/Kconfig | 2 +- drivers/pinctrl/devicetree.c | 4 +- drivers/pinctrl/mvebu/pinctrl-dove.c | 3 +- drivers/pinctrl/pinctrl-adi2-bf54x.c | 138 +-- drivers/pinctrl/pinctrl-adi2-bf60x.c | 128 +- drivers/pinctrl/pinctrl-adi2.c | 31 +- drivers/pinctrl/pinctrl-adi2.h | 8 +- drivers/pinctrl/pinctrl-at91.c | 39 + drivers/pinctrl/pinctrl-baytrail.c | 42 +- drivers/pinctrl/pinctrl-exynos.c | 82 ++ drivers/pinctrl/pinctrl-imx.c | 2 +- drivers/pinctrl/pinctrl-msm.c | 113 +- drivers/pinctrl/pinctrl-msm.h | 5 +- drivers/pinctrl/pinctrl-msm8x74.c | 14 +- drivers/pinctrl/pinctrl-nomadik.c | 19 +- drivers/pinctrl/pinctrl-samsung.c | 2 + drivers/pinctrl/pinctrl-samsung.h | 1 + drivers/pinctrl/pinctrl-single.c | 3 + drivers/pinctrl/pinctrl-st.c | 462 ++++++- drivers/pinctrl/pinctrl-sunxi-pins.h | 12 +- drivers/pinctrl/pinctrl-tegra.c | 38 + drivers/pinctrl/pinctrl-tegra.h | 4 +- drivers/pinctrl/pinctrl-tegra114.c | 1100 ++--------------- drivers/pinctrl/pinctrl-tegra124.c | 1243 ++----------------- drivers/pinctrl/pinctrl-tegra20.c | 640 +--------- drivers/pinctrl/pinctrl-tegra30.c | 1287 +------------------- drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 171 +++ drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 596 +++++++++ drivers/pinctrl/sirf/pinctrl-atlas6.c | 46 +- drivers/pinctrl/sirf/pinctrl-prima2.c | 3 +- drivers/pinctrl/sirf/pinctrl-sirf.c | 3 +- 37 files changed, 1960 insertions(+), 4387 deletions(-) Merging vhost/linux-next (d3d665a654a3 vhost-scsi: whitespace tweak) $ git merge vhost/linux-next Already up-to-date. Merging remoteproc/for-next (bd88acba5f98 remoteproc/ste_modem: staticize local symbols) $ git merge remoteproc/for-next Merge made by the 'recursive' strategy. drivers/remoteproc/da8xx_remoteproc.c | 16 +--------------- drivers/remoteproc/ste_modem_rproc.c | 4 ++-- 2 files changed, 3 insertions(+), 17 deletions(-) Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO) $ git merge rpmsg/for-next Already up-to-date. Merging gpio/for-next (2ba933eddc3b Merge branch 'devel' into for-next) $ git merge gpio/for-next Resolved 'drivers/gpio/gpio-ich.c' using previous resolution. Auto-merging drivers/pinctrl/sirf/pinctrl-sirf.c Auto-merging drivers/pinctrl/pinctrl-nomadik.c Auto-merging drivers/pinctrl/pinctrl-msm.c Auto-merging drivers/pinctrl/pinctrl-baytrail.c Auto-merging drivers/pinctrl/pinctrl-adi2.c Removing drivers/gpio/gpio-tnetv107x.c Auto-merging drivers/gpio/gpio-ich.c CONFLICT (content): Merge conflict in drivers/gpio/gpio-ich.c Auto-merging drivers/gpio/Kconfig Auto-merging MAINTAINERS Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 64a6cbe84b9d] Merge remote-tracking branch 'gpio/for-next' $ git diff -M --stat --summary HEAD^.. .../bindings/gpio/cirrus,clps711x-mctrl-gpio.txt | 17 + .../devicetree/bindings/gpio/gpio-davinci.txt | 25 +- .../devicetree/bindings/gpio/gpio-zevio.txt | 16 + Documentation/devicetree/bindings/gpio/gpio.txt | 60 ++- .../devicetree/bindings/gpio/snps-dwapb-gpio.txt | 60 +++ Documentation/gpio/consumer.txt | 1 + Documentation/gpio/driver.txt | 35 ++ MAINTAINERS | 7 + drivers/gpio/Kconfig | 36 +- drivers/gpio/Makefile | 4 +- drivers/gpio/gpio-adnp.c | 15 +- drivers/gpio/gpio-adp5588.c | 16 +- drivers/gpio/gpio-bcm-kona.c | 109 +++-- drivers/gpio/gpio-clps711x.c | 1 + drivers/gpio/gpio-davinci.c | 75 +++- drivers/gpio/gpio-dwapb.c | 438 +++++++++++++++++++ drivers/gpio/gpio-em.c | 14 +- drivers/gpio/gpio-generic.c | 20 +- drivers/gpio/gpio-intel-mid.c | 22 +- drivers/gpio/gpio-lynxpoint.c | 14 +- drivers/gpio/gpio-max732x.c | 9 + drivers/gpio/gpio-mcp23s08.c | 36 +- drivers/gpio/gpio-mvebu.c | 7 + drivers/gpio/gpio-omap.c | 20 +- drivers/gpio/gpio-pca953x.c | 10 +- drivers/gpio/gpio-pl061.c | 78 ++-- drivers/gpio/gpio-rc5t583.c | 2 +- drivers/gpio/gpio-syscon.c | 191 +++++++++ drivers/gpio/gpio-tnetv107x.c | 206 --------- drivers/gpio/gpio-tz1090.c | 28 +- drivers/gpio/gpio-zevio.c | 220 ++++++++++ drivers/gpio/gpiolib-acpi.c | 474 +++++++++++++++------ drivers/gpio/gpiolib-of.c | 3 +- drivers/gpio/gpiolib.c | 204 ++++++--- drivers/gpio/gpiolib.h | 3 + drivers/pinctrl/pinctrl-adi2.c | 1 + drivers/pinctrl/pinctrl-baytrail.c | 14 +- drivers/pinctrl/pinctrl-coh901.c | 28 +- drivers/pinctrl/pinctrl-msm.c | 11 +- drivers/pinctrl/pinctrl-nomadik.c | 25 +- drivers/pinctrl/sirf/pinctrl-sirf.c | 14 +- include/asm-generic/gpio.h | 2 +- include/linux/basic_mmio_gpio.h | 1 + include/linux/gpio/consumer.h | 15 +- include/linux/gpio/driver.h | 18 + include/linux/i2c/adp5588.h | 4 +- include/linux/platform_data/gpio-davinci.h | 4 - 47 files changed, 1981 insertions(+), 632 deletions(-) create mode 100644 Documentation/devicetree/bindings/gpio/cirrus,clps711x-mctrl-gpio.txt create mode 100644 Documentation/devicetree/bindings/gpio/gpio-zevio.txt create mode 100644 Documentation/devicetree/bindings/gpio/snps-dwapb-gpio.txt create mode 100644 drivers/gpio/gpio-dwapb.c create mode 100644 drivers/gpio/gpio-syscon.c delete mode 100644 drivers/gpio/gpio-tnetv107x.c create mode 100644 drivers/gpio/gpio-zevio.c Merging dma-mapping/dma-mapping-next (68efd7d2fb32 arm: dma-mapping: remove order parameter from arm_iommu_create_mapping()) $ git merge dma-mapping/dma-mapping-next Auto-merging arch/arm/mm/dma-mapping.c Merge made by the 'recursive' strategy. arch/arm/include/asm/dma-iommu.h | 12 +-- arch/arm/mm/dma-mapping.c | 144 +++++++++++++++++++++++------- drivers/gpu/drm/exynos/exynos_drm_drv.h | 2 - drivers/gpu/drm/exynos/exynos_drm_iommu.c | 6 +- drivers/gpu/drm/exynos/exynos_drm_iommu.h | 1 - drivers/iommu/shmobile-iommu.c | 2 +- 6 files changed, 124 insertions(+), 43 deletions(-) Merging pwm/for-next (7eb3f6ffb5c3 pwm: Add CLPS711X PWM support) $ git merge pwm/for-next Resolved 'arch/arm/Kconfig' using previous resolution. Auto-merging arch/arm/Kconfig CONFLICT (content): Merge conflict in arch/arm/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 21382174cefc] Merge remote-tracking branch 'pwm/for-next' $ git diff -M --stat --summary HEAD^.. .../bindings/pwm/cirrus,clps711x-pwm.txt | 16 + .../devicetree/bindings/pwm/pwm-fsl-ftm.txt | 35 ++ arch/arm/Kconfig | 4 - arch/arm/mach-pxa/Kconfig | 15 - drivers/input/misc/Kconfig | 4 +- drivers/pwm/Kconfig | 20 + drivers/pwm/Makefile | 2 + drivers/pwm/pwm-atmel.c | 9 +- drivers/pwm/pwm-clps711x.c | 176 ++++++++ drivers/pwm/pwm-fsl-ftm.c | 495 +++++++++++++++++++++ drivers/pwm/pwm-pxa.c | 4 +- drivers/pwm/pwm-samsung.c | 5 +- include/linux/pwm.h | 2 +- 13 files changed, 757 insertions(+), 30 deletions(-) create mode 100644 Documentation/devicetree/bindings/pwm/cirrus,clps711x-pwm.txt create mode 100644 Documentation/devicetree/bindings/pwm/pwm-fsl-ftm.txt create mode 100644 drivers/pwm/pwm-clps711x.c create mode 100644 drivers/pwm/pwm-fsl-ftm.c Merging dma-buf/for-next (dcb99fd9b08c Linux 3.14-rc7) $ git merge dma-buf/for-next Already up-to-date. Merging userns/for-next (d211f177b28e audit: Update kdoc for audit_send_reply and audit_list_rules_send) $ git merge userns/for-next Already up-to-date. Merging ktest/for-next (62183dcac539 ktest: Set CLOSE_CONSOLE_SIGNAL in the kvm.conf) $ git merge ktest/for-next Merge made by the 'recursive' strategy. tools/testing/ktest/examples/kvm.conf | 4 ++++ 1 file changed, 4 insertions(+) Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) $ git merge signal/for-next Already up-to-date. Merging clk/clk-next (35c1983ef79f MAINTAINERS: use LKML for common clk framework) $ git merge clk/clk-next Auto-merging drivers/clk/Makefile Auto-merging drivers/clk/Kconfig Auto-merging arch/arm/boot/dts/socfpga.dtsi Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. Documentation/clk.txt | 34 +++ .../bindings/arm/hisilicon/hisilicon.txt | 14 + .../devicetree/bindings/clock/altr_socfpga.txt | 5 + .../devicetree/bindings/clock/axi-clkgen.txt | 2 +- .../devicetree/bindings/clock/clock-bindings.txt | 17 ++ .../devicetree/bindings/clock/hi3620-clock.txt | 1 + .../bindings/clock/moxa,moxart-clock.txt | 48 +++ Documentation/devicetree/bindings/clock/sunxi.txt | 102 +++++-- MAINTAINERS | 2 +- arch/arm/boot/dts/socfpga.dtsi | 1 + arch/arm/mach-socfpga/socfpga.c | 5 - drivers/clk/Kconfig | 6 +- drivers/clk/Makefile | 2 + drivers/clk/at91/clk-programmable.c | 202 ++++--------- drivers/clk/at91/clk-system.c | 76 ++++- drivers/clk/clk-axi-clkgen.c | 312 +++++++++++++++++--- drivers/clk/clk-divider.c | 10 +- drivers/clk/clk-moxart.c | 97 ++++++ drivers/clk/clk-ppc-corenet.c | 70 +++-- drivers/clk/clk-s2mps11.c | 25 +- drivers/clk/clk.c | 125 ++++++-- drivers/clk/clkdev.c | 2 + drivers/clk/hisilicon/Makefile | 5 +- drivers/clk/hisilicon/clk-hi3620.c | 299 +++++++++++++++++-- drivers/clk/hisilicon/clk-hip04.c | 58 ++++ drivers/clk/hisilicon/clk.c | 62 +++- drivers/clk/hisilicon/clk.h | 17 +- drivers/clk/shmobile/clk-div6.c | 2 +- drivers/clk/socfpga/Makefile | 3 + drivers/clk/socfpga/clk-gate.c | 263 +++++++++++++++++ drivers/clk/socfpga/clk-periph.c | 94 ++++++ drivers/clk/socfpga/clk-pll.c | 131 +++++++++ drivers/clk/socfpga/clk.c | 326 +-------------------- drivers/clk/socfpga/clk.h | 57 ++++ drivers/clk/sunxi/clk-sunxi.c | 305 +++++++++++++++++-- drivers/clk/tegra/clk-periph.c | 2 +- drivers/clk/ti/clk-33xx.c | 1 - drivers/clk/ti/divider.c | 8 +- drivers/clk/ux500/u8500_of_clk.c | 3 +- drivers/clk/zynq/clkc.c | 4 +- drivers/clk/zynq/pll.c | 18 +- include/dt-bindings/clock/hi3620-clock.h | 5 + include/dt-bindings/clock/hip04-clock.h | 35 +++ include/linux/clk.h | 14 + 44 files changed, 2192 insertions(+), 678 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/moxa,moxart-clock.txt create mode 100644 drivers/clk/clk-moxart.c create mode 100644 drivers/clk/hisilicon/clk-hip04.c create mode 100644 drivers/clk/socfpga/clk-gate.c create mode 100644 drivers/clk/socfpga/clk-periph.c create mode 100644 drivers/clk/socfpga/clk-pll.c create mode 100644 drivers/clk/socfpga/clk.h create mode 100644 include/dt-bindings/clock/hip04-clock.h Merging random/dev (91a60dc7aa88 random: Add arch_has_random[_seed]()) $ git merge random/dev Resolved 'arch/x86/include/asm/archrandom.h' using previous resolution. Auto-merging include/linux/random.h Auto-merging arch/x86/include/asm/archrandom.h CONFLICT (content): Merge conflict in arch/x86/include/asm/archrandom.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master faa752241536] Merge remote-tracking branch 'random/dev' $ git diff -M --stat --summary HEAD^.. arch/powerpc/include/asm/archrandom.h | 18 +++ arch/x86/include/asm/archrandom.h | 37 +++++- drivers/char/random.c | 244 +++++++++++++++++++--------------- include/linux/random.h | 16 +++ 4 files changed, 206 insertions(+), 109 deletions(-) Merging lzo-update/lzo-update (42b775abafaf 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 arm64-hugepages/for-next/hugepages (af07484863e0 ARM64: mm: THP support.) $ git merge arm64-hugepages/for-next/hugepages Already up-to-date. Merging aio/master (e0f5e0add36d aio, mem-hotplug: Add memory barrier to aio ring page migration.) $ git merge aio/master Merge made by the 'recursive' strategy. fs/aio.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) Merging llvmlinux/for-next (bd01eebf365a x86, acpi: LLVMLinux: Remove nested functions from Thinkpad ACPI) $ git merge llvmlinux/for-next Auto-merging drivers/platform/x86/thinkpad_acpi.c Merge made by the 'recursive' strategy. drivers/platform/x86/thinkpad_acpi.c | 86 +++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 41 deletions(-) Merging powernv-cpuidle/powernv-cpuidle (0888839c5b62 cpuidle/powernv: Parse device tree to setup idle states) $ git merge powernv-cpuidle/powernv-cpuidle Resolved 'arch/powerpc/include/asm/opal.h' using previous resolution. Resolved 'arch/powerpc/platforms/powernv/opal-wrappers.S' using previous resolution. Auto-merging drivers/cpuidle/cpuidle-powernv.c Auto-merging arch/powerpc/platforms/powernv/opal-wrappers.S CONFLICT (content): Merge conflict in arch/powerpc/platforms/powernv/opal-wrappers.S Auto-merging arch/powerpc/include/asm/opal.h CONFLICT (content): Merge conflict in arch/powerpc/include/asm/opal.h Auto-merging arch/powerpc/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master a25d17b14096] Merge remote-tracking branch 'powernv-cpuidle/powernv-cpuidle' $ git diff -M --stat --summary HEAD^.. arch/powerpc/Kconfig | 2 + arch/powerpc/include/asm/opal.h | 2 + arch/powerpc/include/asm/processor.h | 1 + arch/powerpc/include/asm/smp.h | 2 +- arch/powerpc/include/asm/time.h | 1 + arch/powerpc/kernel/exceptions-64s.S | 10 ++- arch/powerpc/kernel/idle_power7.S | 90 +++++++++++++++++----- arch/powerpc/kernel/smp.c | 25 ++++-- arch/powerpc/kernel/time.c | 90 +++++++++++++--------- arch/powerpc/platforms/cell/interrupt.c | 2 +- arch/powerpc/platforms/powernv/opal-wrappers.S | 1 + arch/powerpc/platforms/ps3/smp.c | 2 +- drivers/cpuidle/cpuidle-powernv.c | 102 ++++++++++++++++++++++--- 13 files changed, 253 insertions(+), 77 deletions(-) Merging compat/compat (f5b972e9fbd2 compat: include linux/unistd.h within linux/compat.h) $ git merge compat/compat Resolved 'fs/compat.c' using previous resolution. Resolved 'ipc/compat_mq.c' using previous resolution. Auto-merging mm/mempolicy.c Auto-merging kernel/compat.c Auto-merging ipc/compat_mq.c CONFLICT (content): Merge conflict in ipc/compat_mq.c Auto-merging ipc/compat.c Auto-merging include/linux/compat.h Auto-merging fs/read_write.c Auto-merging fs/compat.c CONFLICT (content): Merge conflict in fs/compat.c Removing arch/s390/kernel/compat_wrapper.S Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 3b55c3c0ec2e] Merge remote-tracking branch 'compat/compat' $ git diff -M --stat --summary HEAD^.. arch/arm64/include/asm/unistd.h | 1 + arch/mips/include/asm/unistd.h | 1 - arch/s390/include/asm/compat.h | 6 +- arch/s390/kernel/compat_linux.c | 116 +-- arch/s390/kernel/compat_linux.h | 81 +-- arch/s390/kernel/compat_signal.c | 4 +- arch/s390/kernel/compat_wrapper.S | 1425 ------------------------------------- arch/s390/kernel/compat_wrapper.c | 209 ++++++ arch/s390/kernel/entry.h | 6 +- arch/s390/kernel/syscalls.S | 504 ++++++------- arch/x86/include/asm/unistd.h | 3 + fs/compat.c | 121 ++-- fs/compat_ioctl.c | 5 +- fs/exec.c | 6 +- fs/read_write.c | 36 +- include/linux/compat.h | 63 +- include/linux/kexec.h | 6 - include/linux/syscalls.h | 2 + include/uapi/asm-generic/unistd.h | 1 + ipc/compat.c | 13 +- ipc/compat_mq.c | 32 +- kernel/compat.c | 100 +-- kernel/kexec.c | 8 +- kernel/ptrace.c | 4 +- mm/mempolicy.c | 18 +- mm/process_vm_access.c | 26 +- net/compat.c | 32 +- security/keys/compat.c | 4 +- 28 files changed, 829 insertions(+), 2004 deletions(-) delete mode 100644 arch/s390/kernel/compat_wrapper.S create mode 100644 arch/s390/kernel/compat_wrapper.c Merging akpm-current/current (3611f0abb13d ipc: use device_initcall) $ git merge --no-ff akpm-current/current Resolved 'fs/fs-writeback.c' using previous resolution. Auto-merging net/core/rtnetlink.c Auto-merging mm/zswap.c Auto-merging mm/vmstat.c Auto-merging mm/util.c Auto-merging mm/rmap.c Auto-merging mm/process_vm_access.c Auto-merging mm/nommu.c Auto-merging mm/mmap.c Auto-merging mm/mempolicy.c Auto-merging mm/memory-failure.c Auto-merging mm/memcontrol.c Auto-merging lib/vsprintf.c Auto-merging lib/idr.c Auto-merging lib/Makefile Auto-merging lib/Kconfig Auto-merging kernel/watchdog.c Auto-merging kernel/sysctl.c Auto-merging kernel/sys.c Auto-merging kernel/resource.c Auto-merging kernel/profile.c Auto-merging kernel/panic.c Auto-merging kernel/kexec.c Auto-merging kernel/fork.c Auto-merging kernel/debug/debug_core.c Auto-merging kernel/cpuset.c Auto-merging ipc/compat.c Auto-merging init/Kconfig Auto-merging include/linux/syscalls.h Auto-merging include/linux/sched.h Auto-merging include/linux/mm.h Removing include/linux/mfd/pm8xxx/rtc.h Auto-merging include/linux/memcontrol.h Auto-merging include/linux/idr.h Auto-merging include/linux/fs.h Auto-merging fs/xfs/xfs_super.c Auto-merging fs/xfs/xfs_file.c Auto-merging fs/ubifs/super.c Auto-merging fs/sysv/inode.c Auto-merging fs/reiserfs/super.c Auto-merging fs/proc/base.c Auto-merging fs/ocfs2/super.c Auto-merging fs/nfs/inode.c Auto-merging fs/ncpfs/inode.c Auto-merging fs/minix/inode.c Auto-merging fs/jffs2/fs.c Auto-merging fs/hfsplus/super.c Auto-merging fs/gfs2/super.c Auto-merging fs/gfs2/file.c Auto-merging fs/fuse/inode.c Auto-merging fs/fuse/file.c Auto-merging fs/fs-writeback.c CONFLICT (content): Merge conflict in fs/fs-writeback.c Auto-merging fs/fat/inode.c Auto-merging fs/f2fs/inode.c Auto-merging fs/f2fs/file.c Auto-merging fs/ext4/inode.c Auto-merging fs/ext3/inode.c Auto-merging fs/exec.c Auto-merging fs/efs/super.c Auto-merging fs/direct-io.c Auto-merging fs/cramfs/inode.c Auto-merging fs/coda/inode.c Auto-merging fs/cifs/cifsfs.c Auto-merging fs/befs/linuxvfs.c Auto-merging fs/affs/super.c Auto-merging fs/adfs/super.c Auto-merging drivers/staging/lustre/lustre/llite/llite_lib.c Auto-merging drivers/rtc/rtc-isl12057.c Auto-merging drivers/misc/ti-st/st_core.c Auto-merging drivers/leds/Kconfig Auto-merging arch/s390/mm/pgtable.c Auto-merging arch/ia64/Kconfig Auto-merging arch/arm/mm/init.c Auto-merging arch/arm/boot/dts/sun4i-a10.dtsi Auto-merging MAINTAINERS Auto-merging CREDITS Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 75226119c77a] Merge branch 'akpm-current/current' $ git diff -M --stat --summary HEAD^.. CREDITS | 11 + Documentation/ABI/testing/sysfs-block-zram | 39 +- Documentation/SubmittingPatches | 46 +- Documentation/blockdev/zram.txt | 54 +- Documentation/cgroups/memcg_test.txt | 4 +- Documentation/cgroups/resource_counter.txt | 12 +- .../devicetree/bindings/rtc/qcom,pm8xxx-rtc.txt | 21 + .../devicetree/bindings/rtc/sunxi-rtc.txt | 4 +- Documentation/filesystems/Locking | 10 + Documentation/filesystems/affs.txt | 9 +- Documentation/filesystems/nilfs2.txt | 12 +- Documentation/filesystems/ntfs.txt | 2 - Documentation/filesystems/porting | 6 +- Documentation/filesystems/vfat.txt | 10 + Documentation/kbuild/kconfig-language.txt | 4 + Documentation/kmemleak.txt | 8 +- Documentation/leds/leds-class.txt | 3 - Documentation/printk-formats.txt | 6 + Documentation/rapidio/sysfs.txt | 66 ++- Documentation/sysctl/vm.txt | 33 +- MAINTAINERS | 22 +- arch/arm/boot/dts/sun4i-a10.dtsi | 2 +- arch/arm/include/asm/fixmap.h | 29 +- arch/arm/mm/init.c | 2 +- arch/cris/Kconfig | 1 + arch/cris/kernel/setup.c | 2 + arch/ia64/Kconfig | 1 + arch/powerpc/include/asm/fadump.h | 1 - arch/powerpc/mm/subpage-prot.c | 6 +- arch/powerpc/platforms/Kconfig.cputype | 1 + arch/powerpc/sysdev/fsl_rio.c | 1 + arch/s390/mm/pgtable.c | 3 + arch/score/Kconfig | 6 - arch/sh/boards/board-sh7757lcr.c | 2 +- arch/sh/include/asm/syscalls_32.h | 12 +- arch/sh/include/asm/traps_32.h | 16 +- arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 2 +- arch/sh/kernel/dumpstack.c | 2 +- arch/sh/kernel/entry-common.S | 15 +- arch/sh/kernel/signal_32.c | 12 +- arch/sh/kernel/sys_sh32.c | 7 +- arch/sh/kernel/traps_32.c | 23 +- arch/sh/math-emu/math.c | 18 - arch/unicore32/include/asm/mmu_context.h | 4 +- arch/x86/include/asm/bug.h | 3 - arch/x86/mm/kmemcheck/kmemcheck.c | 8 +- block/genhd.c | 2 +- drivers/block/zram/Kconfig | 10 + drivers/block/zram/Makefile | 4 +- drivers/block/zram/zcomp.c | 352 ++++++++++++ drivers/block/zram/zcomp.h | 68 +++ drivers/block/zram/zcomp_lz4.c | 47 ++ drivers/block/zram/zcomp_lz4.h | 17 + drivers/block/zram/zcomp_lzo.c | 47 ++ drivers/block/zram/zcomp_lzo.h | 17 + drivers/block/zram/zram_drv.c | 382 +++++++------ drivers/block/zram/zram_drv.h | 21 +- drivers/input/Kconfig | 9 + drivers/input/Makefile | 3 + drivers/input/input.c | 6 + drivers/input/leds.c | 249 +++++++++ drivers/leds/Kconfig | 3 - drivers/lguest/page_tables.c | 6 +- drivers/misc/sgi-gru/grukdump.c | 6 +- drivers/misc/ti-st/st_core.c | 2 +- drivers/net/irda/donauboe.c | 15 +- drivers/net/rionet.c | 1 + drivers/pps/pps.c | 57 +- drivers/rapidio/devices/tsi721.c | 1 + drivers/rapidio/devices/tsi721.h | 4 + drivers/rapidio/devices/tsi721_dma.c | 111 ++-- drivers/rapidio/rio-driver.c | 22 +- drivers/rapidio/rio-scan.c | 1 + drivers/rapidio/rio-sysfs.c | 40 ++ drivers/rapidio/rio.c | 11 + drivers/rapidio/rio.h | 1 + drivers/rtc/interface.c | 3 + drivers/rtc/rtc-as3722.c | 5 +- drivers/rtc/rtc-at32ap700x.c | 4 +- drivers/rtc/rtc-cmos.c | 8 +- drivers/rtc/rtc-coh901331.c | 18 +- drivers/rtc/rtc-da9052.c | 4 +- drivers/rtc/rtc-davinci.c | 33 +- drivers/rtc/rtc-ds1307.c | 185 ++++++- drivers/rtc/rtc-ds1390.c | 5 +- drivers/rtc/rtc-ds3232.c | 99 +++- drivers/rtc/rtc-imxdi.c | 4 +- drivers/rtc/rtc-isl12057.c | 1 - drivers/rtc/rtc-jz4740.c | 25 +- drivers/rtc/rtc-lpc32xx.c | 5 +- drivers/rtc/rtc-mc13xxx.c | 139 ++--- drivers/rtc/rtc-moxart.c | 4 +- drivers/rtc/rtc-nuc900.c | 5 +- drivers/rtc/rtc-palmas.c | 5 +- drivers/rtc/rtc-pm8xxx.c | 288 +++++----- drivers/rtc/rtc-rx8025.c | 1 - drivers/rtc/rtc-sirfsoc.c | 68 +-- drivers/rtc/rtc-spear.c | 4 +- drivers/rtc/rtc-sunxi.c | 2 +- drivers/rtc/rtc-vt8500.c | 28 +- drivers/staging/lustre/lustre/llite/llite_lib.c | 2 +- drivers/tty/Kconfig | 4 + drivers/tty/vt/keyboard.c | 110 +++- drivers/video/backlight/aat2870_bl.c | 2 - drivers/video/backlight/adp8860_bl.c | 4 +- drivers/video/backlight/adp8870_bl.c | 4 +- drivers/video/backlight/backlight.c | 30 +- drivers/video/backlight/corgi_lcd.c | 4 +- drivers/video/backlight/hx8357.c | 4 +- drivers/video/backlight/ili922x.c | 4 +- drivers/video/backlight/ili9320.c | 4 +- drivers/video/backlight/l4f00242t03.c | 5 +- drivers/video/backlight/lm3533_bl.c | 5 +- drivers/video/backlight/lms283gf05.c | 4 +- drivers/video/backlight/platform_lcd.c | 4 +- drivers/video/backlight/tps65217_bl.c | 5 +- fs/9p/vfs_file.c | 2 + fs/9p/vfs_inode.c | 2 +- fs/adfs/super.c | 2 +- fs/affs/affs.h | 20 +- fs/affs/amigaffs.c | 23 +- fs/affs/dir.c | 28 +- fs/affs/inode.c | 2 +- fs/affs/namei.c | 32 +- fs/affs/super.c | 8 +- fs/afs/inode.c | 2 +- fs/befs/Makefile | 2 +- fs/befs/befs.h | 3 + fs/befs/btree.c | 93 ++-- fs/befs/datastream.c | 87 +-- fs/befs/debug.c | 74 +-- fs/befs/inode.c | 10 +- fs/befs/io.c | 24 +- fs/befs/linuxvfs.c | 112 ++-- fs/bfs/inode.c | 4 +- fs/binfmt_elf.c | 34 +- fs/block_dev.c | 6 +- fs/btrfs/compression.c | 2 +- fs/btrfs/file.c | 3 +- fs/btrfs/inode.c | 2 +- fs/cachefiles/rdwr.c | 33 +- fs/cifs/cifsfs.c | 4 +- fs/cifs/file.c | 1 + fs/coda/coda_int.h | 2 +- fs/coda/inode.c | 4 +- fs/cramfs/inode.c | 3 +- fs/direct-io.c | 1 - fs/drop_caches.c | 16 +- fs/ecryptfs/super.c | 2 +- fs/efs/super.c | 2 +- fs/exec.c | 7 +- fs/exofs/inode.c | 2 +- fs/ext2/inode.c | 2 +- fs/ext3/inode.c | 2 +- fs/ext4/file.c | 3 +- fs/ext4/inode.c | 4 +- fs/f2fs/file.c | 1 + fs/f2fs/inode.c | 2 +- fs/fat/cache.c | 70 ++- fs/fat/fat.h | 6 +- fs/fat/file.c | 78 ++- fs/fat/inode.c | 89 ++- fs/filesystems.c | 2 + fs/freevxfs/vxfs_inode.c | 2 +- fs/freevxfs/vxfs_lookup.c | 2 +- fs/fs-writeback.c | 31 +- fs/fuse/file.c | 1 + fs/fuse/inode.c | 2 +- fs/gfs2/file.c | 1 + fs/gfs2/super.c | 2 +- fs/hfs/inode.c | 2 +- fs/hfsplus/attributes.c | 2 +- fs/hfsplus/catalog.c | 89 ++- fs/hfsplus/dir.c | 11 +- fs/hfsplus/extents.c | 16 +- fs/hfsplus/hfsplus_fs.h | 6 +- fs/hfsplus/super.c | 6 +- fs/hostfs/hostfs_kern.c | 2 +- fs/hpfs/inode.c | 2 +- fs/hugetlbfs/inode.c | 17 +- fs/inode.c | 8 +- fs/jffs2/fs.c | 4 +- fs/jfs/inode.c | 4 +- fs/kernfs/inode.c | 2 +- fs/logfs/readwrite.c | 2 +- fs/minix/inode.c | 4 +- fs/mpage.c | 23 +- fs/ncpfs/dir.c | 69 ++- fs/ncpfs/file.c | 24 +- fs/ncpfs/getopt.c | 12 +- fs/ncpfs/inode.c | 34 +- fs/ncpfs/ioctl.c | 17 +- fs/ncpfs/mmap.c | 2 +- fs/ncpfs/ncp_fs.h | 30 +- fs/ncpfs/ncplib_kernel.c | 28 +- fs/ncpfs/sock.c | 49 +- fs/ncpfs/symlink.c | 2 +- fs/nfs/blocklayout/blocklayout.c | 2 +- fs/nfs/file.c | 1 + fs/nfs/inode.c | 2 +- fs/nfs/nfs4super.c | 2 +- fs/nfsd/auth.c | 5 +- fs/nilfs2/cpfile.c | 12 + fs/nilfs2/dat.c | 12 + fs/nilfs2/file.c | 1 + fs/nilfs2/inode.c | 6 +- fs/nilfs2/ioctl.c | 137 +++++ fs/nilfs2/sufile.c | 295 ++++++++++ fs/nilfs2/sufile.h | 2 + fs/nilfs2/the_nilfs.c | 10 + fs/notify/fanotify/fanotify.c | 63 ++- fs/notify/fanotify/fanotify.h | 34 +- fs/notify/fanotify/fanotify_user.c | 197 +++---- fs/ntfs/inode.c | 2 +- fs/ocfs2/acl.c | 1 + fs/ocfs2/alloc.c | 3 + fs/ocfs2/aops.c | 7 +- fs/ocfs2/aops.h | 5 - fs/ocfs2/cluster/tcp.c | 35 +- fs/ocfs2/dcache.c | 61 +-- fs/ocfs2/dcache.h | 12 +- fs/ocfs2/dir.c | 6 + fs/ocfs2/dlm/dlmdomain.c | 6 +- fs/ocfs2/dlm/dlmmaster.c | 14 +- fs/ocfs2/dlm/dlmrecovery.c | 29 +- fs/ocfs2/dlmglue.c | 44 +- fs/ocfs2/dlmglue.h | 3 +- fs/ocfs2/file.c | 69 +-- fs/ocfs2/inode.c | 61 ++- fs/ocfs2/inode.h | 17 +- fs/ocfs2/journal.c | 6 - fs/ocfs2/journal.h | 11 + fs/ocfs2/locks.c | 2 + fs/ocfs2/move_extents.c | 13 +- fs/ocfs2/namei.c | 140 ++++- fs/ocfs2/ocfs2.h | 31 +- fs/ocfs2/ocfs2_trace.h | 2 +- fs/ocfs2/quota.h | 2 + fs/ocfs2/quota_global.c | 35 ++ fs/ocfs2/stackglue.c | 14 + fs/ocfs2/suballoc.c | 158 +++--- fs/ocfs2/suballoc.h | 21 +- fs/ocfs2/super.c | 51 +- fs/ocfs2/xattr.c | 3 + fs/omfs/inode.c | 2 +- fs/proc/array.c | 4 +- fs/proc/base.c | 3 + fs/proc/inode.c | 2 +- fs/proc/meminfo.c | 2 +- fs/proc/task_mmu.c | 274 ++++------ fs/proc/vmcore.c | 1 - fs/quota/dquot.c | 4 +- fs/reiserfs/inode.c | 2 +- fs/reiserfs/reiserfs.h | 1 + fs/reiserfs/super.c | 1 - fs/sysv/inode.c | 2 +- fs/ubifs/file.c | 1 + fs/ubifs/super.c | 2 +- fs/udf/inode.c | 4 +- fs/ufs/inode.c | 2 +- fs/xfs/xfs_file.c | 1 + fs/xfs/xfs_super.c | 2 +- include/asm-generic/bug.h | 60 +- include/linux/backing-dev.h | 2 +- include/linux/backlight.h | 6 + include/linux/cpuset.h | 27 +- include/linux/crash_dump.h | 1 + include/linux/crc64_ecma.h | 56 ++ include/linux/cred.h | 2 +- include/linux/decompress/inflate.h | 4 +- include/linux/err.h | 7 +- include/linux/fs.h | 1 + include/linux/fsnotify_backend.h | 2 +- include/linux/hugetlb.h | 17 +- include/linux/hugetlb_inline.h | 7 + include/linux/idr.h | 63 --- include/linux/input.h | 21 + include/linux/kobject.h | 1 + include/linux/kthread.h | 1 + include/linux/list_lru.h | 8 +- include/linux/memcontrol.h | 8 +- include/linux/mempolicy.h | 3 +- include/linux/mfd/pm8xxx/rtc.h | 25 - include/linux/mm.h | 47 +- include/linux/mm_types.h | 7 +- include/linux/mmdebug.h | 4 +- include/linux/mmzone.h | 6 + include/linux/nilfs2_fs.h | 52 ++ include/linux/pagemap.h | 71 ++- include/linux/pagevec.h | 5 + include/linux/printk.h | 10 +- include/linux/quotaops.h | 8 + include/linux/radix-tree.h | 55 +- include/linux/res_counter.h | 6 +- include/linux/rio.h | 5 +- include/linux/sched.h | 13 +- include/linux/shmem_fs.h | 1 + include/linux/string.h | 1 + include/linux/swap.h | 36 ++ include/linux/syscalls.h | 2 + include/linux/vm_event_item.h | 1 + include/linux/vmacache.h | 38 ++ include/linux/vmstat.h | 17 +- include/uapi/linux/prctl.h | 3 + init/Kconfig | 21 + init/do_mounts.c | 4 +- init/initramfs.c | 1 + ipc/compat.c | 3 - ipc/ipc_sysctl.c | 2 +- ipc/mqueue.c | 2 +- ipc/util.c | 2 +- kernel/cpuset.c | 2 +- kernel/debug/debug_core.c | 14 +- kernel/exit.c | 110 ++-- kernel/fork.c | 31 +- kernel/groups.c | 14 +- kernel/hung_task.c | 3 +- kernel/kexec.c | 4 +- kernel/kmod.c | 11 +- kernel/kthread.c | 13 +- kernel/panic.c | 13 +- kernel/printk/printk.c | 13 +- kernel/profile.c | 2 +- kernel/res_counter.c | 23 +- kernel/resource.c | 2 +- kernel/sched/stats.c | 2 +- kernel/sys.c | 15 + kernel/sys_ni.c | 2 + kernel/sysctl.c | 4 +- kernel/time/sched_clock.c | 4 + kernel/user.c | 3 +- kernel/user_namespace.c | 2 +- kernel/watchdog.c | 26 +- lib/Kconfig | 7 + lib/Makefile | 1 + lib/clz_ctz.c | 7 + lib/crc64_ecma.c | 341 ++++++++++++ lib/decompress.c | 3 + lib/decompress_inflate.c | 1 + lib/devres.c | 12 +- lib/idr.c | 20 +- lib/kobject_uevent.c | 42 +- lib/radix-tree.c | 385 +++++++------ lib/random32.c | 76 +-- lib/vsprintf.c | 65 +-- lib/xz/Kconfig | 24 +- mm/Kconfig | 1 + mm/Makefile | 4 +- mm/backing-dev.c | 16 +- mm/compaction.c | 113 ++-- mm/filemap.c | 576 ++++++++++++++++--- mm/huge_memory.c | 102 +--- mm/hugetlb.c | 303 ++++++---- mm/list_lru.c | 16 +- mm/madvise.c | 43 +- mm/memcontrol.c | 415 ++++++-------- mm/memory-failure.c | 6 +- mm/memory.c | 539 +++++++++++------- mm/mempolicy.c | 313 ++++------- mm/mempool.c | 4 +- mm/mincore.c | 20 +- mm/mmap.c | 60 +- mm/mprotect.c | 34 +- mm/nobootmem.c | 2 +- mm/nommu.c | 49 +- mm/page_alloc.c | 25 +- mm/page_cgroup.c | 12 +- mm/pagewalk.c | 371 ++++++++----- mm/process_vm_access.c | 2 +- mm/readahead.c | 10 +- mm/rmap.c | 10 +- mm/shmem.c | 131 ++--- mm/slab.c | 16 +- mm/slob.c | 10 +- mm/slub.c | 31 +- mm/sparse.c | 4 +- mm/swap.c | 53 ++ mm/truncate.c | 148 ++++- mm/util.c | 35 +- mm/vmacache.c | 112 ++++ mm/vmalloc.c | 10 +- mm/vmscan.c | 134 ++--- mm/vmstat.c | 6 + mm/workingset.c | 414 ++++++++++++++ mm/zswap.c | 78 +-- net/core/rtnetlink.c | 2 +- samples/seccomp/Makefile | 14 +- scripts/checkpatch.pl | 194 +++++-- scripts/genksyms/keywords.gperf | 5 +- scripts/genksyms/keywords.hash.c_shipped | 133 ++--- scripts/genksyms/lex.l | 51 +- scripts/genksyms/lex.lex.c_shipped | 51 +- scripts/genksyms/parse.tab.c_shipped | 608 +++++++++++---------- scripts/genksyms/parse.tab.h_shipped | 29 +- scripts/genksyms/parse.y | 5 +- scripts/kconfig/confdata.c | 5 +- scripts/kconfig/expr.h | 3 + scripts/kconfig/lkc.h | 1 + scripts/kconfig/menu.c | 3 + scripts/kconfig/zconf.gperf | 1 + scripts/kconfig/zconf.hash.c_shipped | 13 +- tools/vm/page-types.c | 170 +++++- 402 files changed, 9283 insertions(+), 4865 deletions(-) create mode 100644 Documentation/devicetree/bindings/rtc/qcom,pm8xxx-rtc.txt create mode 100644 drivers/block/zram/zcomp.c create mode 100644 drivers/block/zram/zcomp.h create mode 100644 drivers/block/zram/zcomp_lz4.c create mode 100644 drivers/block/zram/zcomp_lz4.h create mode 100644 drivers/block/zram/zcomp_lzo.c create mode 100644 drivers/block/zram/zcomp_lzo.h create mode 100644 drivers/input/leds.c create mode 100644 include/linux/crc64_ecma.h delete mode 100644 include/linux/mfd/pm8xxx/rtc.h create mode 100644 include/linux/vmacache.h create mode 100644 lib/crc64_ecma.c create mode 100644 mm/vmacache.c create mode 100644 mm/workingset.c $ 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: drivers/gpio/gpio-zevio.c: fix build Applying: Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP Applying: kernel: use macros from compiler.h instead of __attribute__((...)) Applying: asm/system.h: clean asm/system.h from docs Applying: asm/system.h: um: arch_align_stack() moved to asm/exec.h Applying: memcg, slab: never try to merge memcg caches Applying: memcg, slab: cleanup memcg cache creation Applying: memcg, slab: separate memcg vs root cache creation paths Applying: memcg, slab: unregister cache from memcg before starting to destroy it Applying: memcg, slab: do not destroy children caches if parent has aliases Applying: slub: adjust memcg caches when creating cache alias Applying: slub: rework sysfs layout for memcg caches Applying: slub: fix leak of 'name' in sysfs_slab_add Applying: drivers/w1/w1_int.c: call put_device if device_register fails Applying: arm: move arm_dma_limit to setup_dma_zone Applying: percpu: add raw_cpu_ops Applying: mm: use raw_cpu ops for determining current NUMA node Applying: modules: use raw_cpu_write for initialization of per cpu refcount. Applying: net: replace __this_cpu_inc in route.c with raw_cpu_inc Applying: percpu: add preemption checks to __this_cpu ops Applying: preemption_checks: avoid snprintf before checking error conditions Applying: percpu-add-preemption-checks-to-__this_cpu-ops-fix-checkpatch-fixes Applying: lglock: map to spinlock when !CONFIG_SMP Applying: x86/mm: sparse warning fix for early_memremap Applying: mm: create generic early_ioremap() support Applying: x86: use generic early_ioremap Using index info to reconstruct a base tree... M arch/x86/include/asm/Kbuild Falling back to patching base and 3-way merge... Auto-merging arch/x86/include/asm/Kbuild CONFLICT (content): Merge conflict in arch/x86/include/asm/Kbuild Failed to merge in the changes. Patch failed at 0026 x86: use generic early_ioremap The copy of the patch that failed is found in: /home/sfr/kernels/next/rebase-tmp/.git/rebase-apply/patch When you have resolved this problem, run "git rebase --continue". If you prefer to skip this patch, run "git rebase --skip" instead. To check out the original branch and stop rebasing, run "git rebase --abort". $ git rebase --continue Applying: arm64: initialize pgprot info earlier in boot Applying: arm64: add early_ioremap support Applying: doc/kernel-parameters.txt: add early_ioremap_debug Applying: fs/ufs/super.c: add __init to init_inodecache() Applying: fs/ufs: remove unused ufs_super_block_first pointer Applying: fs/ufs: remove unused ufs_super_block_second pointer Applying: fs/ufs: remove unused ufs_super_block_third pointer Applying: ufs: sb mutex merge + mutex_destroy Applying: mm: add strictlimit knob $ cd ../next $ git fetch -f ../rebase-tmp akpm:akpm/master From ../rebase-tmp + 756782498dcf...9dd3774eed43 akpm -> akpm/master (forced update) $ rm -rf ../rebase-tmp Merging akpm/master (9dd3774eed43 mm: add strictlimit knob) $ git merge --no-ff akpm/master Merge made by the 'recursive' strategy. Documentation/ABI/testing/sysfs-class-bdi | 8 + Documentation/DocBook/kernel-hacking.tmpl | 2 +- Documentation/arm64/memory.txt | 4 +- Documentation/irqflags-tracing.txt | 7 - Documentation/kernel-parameters.txt | 5 + Documentation/scheduler/sched-arch.txt | 2 +- arch/arc/Kconfig | 2 +- arch/arm/Kconfig | 12 +- arch/arm/mach-picoxcell/Kconfig | 2 +- arch/arm/mach-prima2/Kconfig | 2 +- arch/arm/mach-s3c24xx/Kconfig | 2 +- arch/arm/mach-shmobile/Kconfig | 2 +- arch/arm/mach-vexpress/Kconfig | 2 +- arch/arm/mm/init.c | 6 +- arch/arm/mm/mm.h | 2 - arch/arm/plat-samsung/Kconfig | 4 +- arch/arm64/Kconfig | 3 +- arch/arm64/include/asm/Kbuild | 1 + arch/arm64/include/asm/fixmap.h | 67 ++++++ arch/arm64/include/asm/io.h | 1 + arch/arm64/include/asm/memory.h | 2 +- arch/arm64/include/asm/mmu.h | 1 + arch/arm64/kernel/early_printk.c | 8 +- arch/arm64/kernel/head.S | 9 +- arch/arm64/kernel/setup.c | 4 + arch/arm64/mm/ioremap.c | 85 ++++++++ arch/arm64/mm/mmu.c | 44 +--- arch/cris/Kconfig | 2 +- arch/hexagon/Kconfig | 2 +- arch/m32r/Kconfig | 2 +- arch/m68k/Kconfig | 2 +- arch/metag/Kconfig | 2 +- arch/mips/Kconfig | 4 +- arch/openrisc/Kconfig | 2 +- arch/s390/Kconfig | 2 +- arch/sh/Kconfig | 4 +- arch/sh/boards/Kconfig | 8 +- arch/sh/include/asm/io.h | 4 +- arch/sh/include/asm/io_trapped.h | 2 +- arch/sh/include/asm/machvec.h | 2 +- arch/sh/kernel/Makefile | 2 +- arch/sh/kernel/io_trapped.c | 4 +- arch/tile/Kconfig | 2 +- arch/um/kernel/process.c | 2 +- arch/unicore32/Kconfig | 2 +- arch/x86/Kconfig | 1 + arch/x86/include/asm/Kbuild | 1 + arch/x86/include/asm/fixmap.h | 6 + arch/x86/include/asm/io.h | 14 +- arch/x86/include/asm/percpu.h | 98 ++++----- arch/x86/include/asm/preempt.h | 16 +- arch/x86/mm/ioremap.c | 224 +------------------ arch/x86/mm/pgtable_32.c | 2 +- arch/xtensa/Kconfig | 4 +- arch/xtensa/configs/iss_defconfig | 2 +- arch/xtensa/configs/s6105_defconfig | 2 +- drivers/char/tpm/Kconfig | 2 +- drivers/gpio/gpio-zevio.c | 4 + drivers/i2c/busses/Kconfig | 2 +- drivers/net/can/sja1000/Kconfig | 2 +- drivers/net/ethernet/3com/Kconfig | 2 +- drivers/w1/w1_int.c | 5 +- fs/ufs/balloc.c | 42 ++-- fs/ufs/ialloc.c | 21 +- fs/ufs/super.c | 21 +- fs/ufs/ufs.h | 1 - include/asm-generic/early_ioremap.h | 42 ++++ include/asm-generic/io.h | 4 +- include/asm-generic/iomap.h | 2 +- include/asm-generic/percpu.h | 13 +- include/linux/io.h | 2 +- include/linux/lglock.h | 16 ++ include/linux/memcontrol.h | 9 +- include/linux/percpu.h | 350 ++++++++++++++++++------------ include/linux/slab.h | 6 +- include/linux/slub_def.h | 3 + include/linux/topology.h | 4 +- kernel/fork.c | 3 +- kernel/kallsyms.c | 11 +- kernel/kexec.c | 5 +- kernel/ksysfs.c | 5 +- kernel/locking/Makefile | 3 +- kernel/module.c | 2 +- kernel/power/power.h | 3 +- kernel/power/snapshot.c | 3 +- kernel/power/suspend.c | 5 +- kernel/power/swap.c | 2 +- kernel/sched/clock.c | 3 +- kernel/sched/core.c | 3 +- kernel/signal.c | 4 +- kernel/time/timekeeping.c | 5 +- kernel/trace/trace.h | 3 +- lib/Kconfig | 4 +- lib/devres.c | 4 +- lib/iomap.c | 4 +- lib/smp_processor_id.c | 18 +- mm/Kconfig | 3 + mm/Makefile | 1 + mm/backing-dev.c | 35 +++ mm/early_ioremap.c | 245 +++++++++++++++++++++ mm/memcontrol.c | 109 ++++------ mm/slab.h | 21 +- mm/slab_common.c | 250 +++++++++++++-------- mm/slub.c | 79 +++++-- net/ipv4/route.c | 2 +- sound/isa/Kconfig | 2 +- sound/pci/Kconfig | 2 +- 107 files changed, 1244 insertions(+), 857 deletions(-) create mode 100644 arch/arm64/include/asm/fixmap.h create mode 100644 include/asm-generic/early_ioremap.h create mode 100644 mm/early_ioremap.c