$ date Tuesday 3 February 09:11:14 AEDT 2015 $ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at 00845eb968ea sched: don't cause task state changes in nested sleep debugging Merging origin/master (e36f014edff7 Linux 3.19-rc7) $ git merge origin/master Updating 00845eb968ea..e36f014edff7 Fast-forward Makefile | 2 +- arch/arm/boot/dts/sun4i-a10.dtsi | 20 ++++----- arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 6 +++ arch/arm/boot/dts/sun5i-a10s.dtsi | 8 +--- arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 4 ++ arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 4 ++ arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 4 ++ arch/arm/boot/dts/sun5i-a13.dtsi | 9 +--- arch/arm/boot/dts/sun6i-a31.dtsi | 6 --- arch/arm/boot/dts/sun7i-a20-bananapi.dts | 6 +++ arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 8 ++++ arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 3 ++ arch/arm/boot/dts/sun7i-a20.dtsi | 8 ---- arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | 4 ++ arch/arm/boot/dts/sun8i-a23.dtsi | 9 ---- arch/arm/boot/dts/sun9i-a80-optimus.dts | 5 +++ arch/arm/boot/dts/sun9i-a80.dtsi | 10 ----- arch/arm/mach-mvebu/coherency.c | 7 ++++ arch/arm/mach-shmobile/board-ape6evm.c | 20 +++++++++ arch/arm/mach-shmobile/board-lager.c | 13 ++++++ arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 + arch/arm/mach-shmobile/timer.c | 12 ++++++ arch/arm/mm/dma-mapping.c | 53 +++++++++++++++++------- drivers/input/mouse/elantech.c | 16 +++++++ drivers/input/mouse/synaptics.c | 7 ++-- drivers/input/serio/i8042-x86ia64io.h | 8 ++++ 26 files changed, 179 insertions(+), 75 deletions(-) Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) $ git merge fixes/master Already up-to-date. Merging kbuild-current/rc-fixes (a16c5f99a28c kbuild: Fix removal of the debian/ directory) $ git merge kbuild-current/rc-fixes Already up-to-date. Merging arc-current/for-curr (2ce7598c9a45 Linux 3.17-rc4) $ git merge arc-current/for-curr Already up-to-date. Merging arm-current/fixes (fba289054f24 ARM: 8298/1: ARM_KERNMEM_PERMS only works with MMU enabled) $ git merge arm-current/fixes Resolved 'arch/arm/mm/dma-mapping.c' using previous resolution. Auto-merging arch/arm/mm/dma-mapping.c CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 4f910bd12eec] Merge remote-tracking branch 'arm-current/fixes' $ git diff -M --stat --summary HEAD^.. arch/arm/boot/compressed/head.S | 39 ++++++++++++++++++++++++++++++--------- arch/arm/kernel/entry-v7m.S | 2 ++ arch/arm/mm/Kconfig | 1 + arch/arm/mm/dma-mapping.c | 3 +++ 4 files changed, 36 insertions(+), 9 deletions(-) Merging m68k-current/for-linus (f27bd5bfeda5 m68k: Wire up execveat) $ git merge m68k-current/for-linus Already up-to-date. Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX) $ git merge metag-fixes/fixes Already up-to-date. Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) $ git merge mips-fixes/mips-fixes Already up-to-date. Merging powerpc-merge/merge (31345e1a071e powerpc/pci: Remove unused force_32bit_msi quirk) $ git merge powerpc-merge/merge Already up-to-date. Merging powerpc-merge-mpe/fixes (c59c961ca511 Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux) $ git merge powerpc-merge-mpe/fixes Already up-to-date. Merging sparc/master (66d0f7ec9f10 sparc32: destroy_context() and switch_mm() needs to disable interrupts.) $ git merge sparc/master Already up-to-date. Merging net/master (bdbbb8527b6f ipv4: tcp: get rid of ugly unicast_sock) $ git merge net/master Merge made by the 'recursive' strategy. drivers/net/caif/caif_hsi.c | 1 - drivers/net/ethernet/amd/Kconfig | 4 +- drivers/net/ethernet/amd/nmclan_cs.c | 2 + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 2 + drivers/net/ethernet/cirrus/Kconfig | 3 +- drivers/net/ethernet/intel/igbvf/netdev.c | 19 ++++--- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 4 +- drivers/net/hyperv/netvsc.c | 11 +++-- drivers/net/ppp/ppp_deflate.c | 2 +- drivers/net/vxlan.c | 10 ++-- drivers/net/wan/Kconfig | 6 +-- include/linux/if_vlan.h | 60 +++++++++++++++++------ include/net/ip.h | 2 +- include/net/netns/ipv4.h | 1 + include/net/sch_generic.h | 13 ++--- include/net/tcp.h | 4 +- lib/checksum.c | 12 ++++- net/caif/chnl_net.c | 1 - net/core/dev.c | 31 +----------- net/core/rtnetlink.c | 6 ++- net/ipv4/ip_output.c | 29 ++--------- net/ipv4/route.c | 3 ++ net/ipv4/tcp_bic.c | 2 +- net/ipv4/tcp_cong.c | 32 +++++++----- net/ipv4/tcp_cubic.c | 39 +++++++-------- net/ipv4/tcp_ipv4.c | 37 ++++++++++++-- net/ipv4/tcp_scalable.c | 3 +- net/ipv4/tcp_veno.c | 2 +- net/ipv4/tcp_yeah.c | 2 +- net/netlink/af_netlink.c | 4 +- net/sctp/sm_make_chunk.c | 2 +- 32 files changed, 193 insertions(+), 158 deletions(-) Merging ipsec/master (59343cd7c480 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) $ git merge ipsec/master Already up-to-date. Merging sound-current/for-linus (4161b4505f16 ALSA: ak411x: Fix stall in work callback) $ git merge sound-current/for-linus Merge made by the 'recursive' strategy. include/sound/ak4113.h | 2 +- include/sound/ak4114.h | 2 +- sound/i2c/other/ak4113.c | 17 ++++++++--------- sound/i2c/other/ak4114.c | 18 ++++++++---------- 4 files changed, 18 insertions(+), 21 deletions(-) Merging pci-current/for-linus (51ac3d2f0c50 PCI: Add NEC variants to Stratus ftServer PCIe DMI check) $ git merge pci-current/for-linus Merge made by the 'recursive' strategy. arch/x86/pci/common.c | 16 ++++++++++++++++ drivers/pci/host/pcie-designware.c | 3 +++ 2 files changed, 19 insertions(+) Merging wireless-drivers/master (e3f31175a3ee ath9k: fix race condition in irq processing during hardware reset) $ git merge wireless-drivers/master Already up-to-date. Merging driver-core.current/driver-core-linus (26bc420b59a3 Linux 3.19-rc6) $ git merge driver-core.current/driver-core-linus Already up-to-date. Merging tty.current/tty-linus (ec6f34e5b552 Linux 3.19-rc5) $ git merge tty.current/tty-linus Already up-to-date. Merging usb.current/usb-linus (e36f014edff7 Linux 3.19-rc7) $ git merge usb.current/usb-linus Already up-to-date. Merging usb-gadget-fixes/fixes (0df8fc37f6e4 usb: phy: never defer probe in non-OF case) $ git merge usb-gadget-fixes/fixes Already up-to-date. Merging usb-serial-fixes/usb-linus (a6f0331236fa USB: cp210x: add ID for RUGGEDCOM USB Serial Console) $ git merge usb-serial-fixes/usb-linus Merge made by the 'recursive' strategy. drivers/usb/serial/cp210x.c | 1 + 1 file changed, 1 insertion(+) Merging staging.current/staging-linus (e36f014edff7 Linux 3.19-rc7) $ git merge staging.current/staging-linus Already up-to-date. Merging char-misc.current/char-misc-linus (e36f014edff7 Linux 3.19-rc7) $ git merge char-misc.current/char-misc-linus Already up-to-date. Merging input-current/for-linus (47c1ffb2b6b6 Input: elantech - add more Fujtisu notebooks to force crc_enabled) $ git merge input-current/for-linus Already up-to-date. Merging crypto-current/master (3e14dcf7cb80 crypto: add missing crypto module aliases) $ git merge crypto-current/master Already up-to-date. Merging ide/master (f96fe225677b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) $ git merge ide/master Already up-to-date. Merging devicetree-current/devicetree/merge (6b1271de3723 of/unittest: Overlays with sub-devices tests) $ git merge devicetree-current/devicetree/merge Already up-to-date. Merging rr-fixes/fixes (d5db139ab376 module: make module_refcount() a signed integer.) $ git merge rr-fixes/fixes Already up-to-date. Merging vfio-fixes/for-linus (7c2e211f3c95 vfio-pci: Fix the check on pci device type in vfio_pci_probe()) $ git merge vfio-fixes/for-linus Already up-to-date. Merging kselftest-fixes/fixes (f5db310d77ef selftests/vm: fix link error for transhuge-stress test) $ git merge kselftest-fixes/fixes Already up-to-date. Merging drm-intel-fixes/for-linux-next-fixes (6b96d705f3cf drm/i915: BDW Fix Halo PCI IDs marked as ULT.) $ git merge drm-intel-fixes/for-linux-next-fixes Already up-to-date. Merging asm-generic/master (643165c8bbc8 Merge tag 'uaccess_for_upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost into asm-generic) $ git merge asm-generic/master Merge made by the 'recursive' strategy. arch/alpha/include/asm/uaccess.h | 86 ++++----- arch/arm/include/asm/uaccess.h | 96 +++++----- arch/arm64/include/asm/uaccess.h | 4 +- arch/avr32/include/asm/uaccess.h | 24 +-- arch/blackfin/include/asm/uaccess.h | 32 ++-- arch/cris/include/asm/uaccess.h | 117 +++++++------ arch/frv/include/asm/segment.h | 2 +- arch/ia64/include/asm/uaccess.h | 11 +- arch/m32r/include/asm/uaccess.h | 88 +++++----- arch/m68k/include/asm/segment.h | 2 +- arch/m68k/include/asm/uaccess_mm.h | 40 ++--- arch/metag/include/asm/uaccess.h | 25 +-- arch/openrisc/include/asm/uaccess.h | 4 +- arch/parisc/include/asm/uaccess.h | 116 ++++++------ arch/sh/include/asm/segment.h | 2 +- arch/sh/include/asm/uaccess.h | 4 +- arch/sh/include/asm/uaccess_64.h | 8 +- arch/sparc/include/asm/uaccess_32.h | 339 +++++++++++++++++++++--------------- arch/sparc/include/asm/uaccess_64.h | 222 ++++++++++++----------- arch/x86/include/asm/uaccess.h | 2 +- arch/xtensa/include/asm/uaccess.h | 90 +++++----- 21 files changed, 700 insertions(+), 614 deletions(-) Merging arc/for-next (bdc99b3c7694 ARC: [axs101] Fix HDMI frequency divider for v3 motherboard.) $ git merge arc/for-next Merge made by the 'recursive' strategy. arch/arc/Kconfig | 1 + arch/arc/Makefile | 1 + arch/arc/boot/dts/axc001.dtsi | 83 ++++++++++++++ arch/arc/boot/dts/axs101.dts | 21 ++++ arch/arc/boot/dts/axs10x_mb.dtsi | 222 +++++++++++++++++++++++++++++++++++++ arch/arc/configs/axs101_defconfig | 108 ++++++++++++++++++ arch/arc/include/asm/processor.h | 3 - arch/arc/include/asm/serial.h | 23 +--- arch/arc/include/asm/stacktrace.h | 37 +++++++ arch/arc/kernel/devtree.c | 24 ++++ arch/arc/kernel/entry.S | 14 ++- arch/arc/kernel/setup.c | 7 +- arch/arc/kernel/smp.c | 2 +- arch/arc/kernel/stacktrace.c | 15 ++- arch/arc/plat-axs10x/Kconfig | 34 ++++++ arch/arc/plat-axs10x/Makefile | 9 ++ arch/arc/plat-axs10x/axs101.c | 227 ++++++++++++++++++++++++++++++++++++++ 17 files changed, 802 insertions(+), 29 deletions(-) create mode 100644 arch/arc/boot/dts/axc001.dtsi create mode 100644 arch/arc/boot/dts/axs101.dts create mode 100644 arch/arc/boot/dts/axs10x_mb.dtsi create mode 100644 arch/arc/configs/axs101_defconfig create mode 100644 arch/arc/include/asm/stacktrace.h create mode 100644 arch/arc/plat-axs10x/Kconfig create mode 100644 arch/arc/plat-axs10x/Makefile create mode 100644 arch/arc/plat-axs10x/axs101.c Merging arm/for-next (389e831128b5 Merge branch 'devel-stable' into for-next) $ git merge arm/for-next Auto-merging kernel/kprobes.c Auto-merging arch/arm/probes/uprobes/core.c Auto-merging arch/arm/probes/uprobes/actions-arm.c Auto-merging arch/arm/probes/kprobes/test-thumb.c Auto-merging arch/arm/probes/kprobes/test-core.h Auto-merging arch/arm/probes/kprobes/test-core.c Auto-merging arch/arm/probes/kprobes/test-arm.c Auto-merging arch/arm/probes/kprobes/core.h Auto-merging arch/arm/probes/kprobes/core.c Auto-merging arch/arm/probes/kprobes/actions-thumb.c Auto-merging arch/arm/probes/kprobes/actions-common.c Auto-merging arch/arm/probes/kprobes/actions-arm.c Auto-merging arch/arm/probes/decode.h Auto-merging arch/arm/probes/decode.c Auto-merging arch/arm/probes/decode-thumb.h Auto-merging arch/arm/probes/decode-thumb.c Auto-merging arch/arm/probes/decode-arm.h Auto-merging arch/arm/probes/decode-arm.c Removing arch/arm/mach-sa1100/time.c Auto-merging arch/arm/mach-omap2/omap4-common.c Auto-merging arch/arm/mach-omap2/common.h Auto-merging arch/arm/mach-omap2/board-generic.c Removing arch/arm/mach-omap1/include/mach/debug-macro.S Removing arch/arm/lib/uaccess.S Auto-merging arch/arm/include/debug/netx.S Auto-merging arch/arm/include/debug/ks8695.S Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/arm/l2cc.txt | 10 + arch/arm/Kconfig | 2 + arch/arm/Kconfig.debug | 101 +++- arch/arm/Makefile | 1 + arch/arm/boot/compressed/head.S | 2 +- arch/arm/boot/dts/exynos4210.dtsi | 9 + arch/arm/boot/dts/exynos4x12.dtsi | 14 + arch/arm/configs/iop32x_defconfig | 1 + arch/arm/configs/iop33x_defconfig | 1 + arch/arm/configs/ixp4xx_defconfig | 1 + arch/arm/configs/lpc32xx_defconfig | 1 + arch/arm/configs/mv78xx0_defconfig | 1 + arch/arm/configs/orion5x_defconfig | 1 + arch/arm/configs/rpc_defconfig | 1 + arch/arm/include/asm/bitrev.h | 20 + arch/arm/{kernel => include/asm}/insn.h | 0 arch/arm/include/asm/kprobes.h | 33 +- arch/arm/include/asm/outercache.h | 3 + arch/arm/{kernel => include/asm}/patch.h | 0 arch/arm/include/asm/probes.h | 15 + .../mach/debug-macro.S => include/debug/ks8695.S} | 10 +- .../mach/debug-macro.S => include/debug/netx.S} | 22 +- arch/arm/kernel/Makefile | 16 +- arch/arm/kernel/entry-armv.S | 3 +- arch/arm/kernel/ftrace.c | 3 +- arch/arm/kernel/head.S | 2 +- arch/arm/kernel/irq.c | 3 +- arch/arm/kernel/jump_label.c | 5 +- arch/arm/kernel/kgdb.c | 3 +- arch/arm/kernel/patch.c | 3 +- arch/arm/kernel/suspend.c | 4 - arch/arm/lib/Makefile | 15 +- arch/arm/lib/uaccess.S | 564 --------------------- arch/arm/mach-exynos/firmware.c | 50 ++ arch/arm/mach-exynos/sleep.S | 46 ++ arch/arm/mach-omap1/include/mach/debug-macro.S | 101 ---- arch/arm/mach-omap2/board-generic.c | 6 + arch/arm/mach-omap2/common.h | 8 + arch/arm/mach-omap2/omap4-common.c | 16 +- arch/arm/mach-sa1100/Makefile | 2 +- arch/arm/mach-sa1100/clock.c | 12 + arch/arm/mach-sa1100/collie.c | 3 +- arch/arm/mach-sa1100/generic.c | 6 + arch/arm/mach-sa1100/include/mach/irqs.h | 73 +-- arch/arm/mach-sa1100/irq.c | 203 +------- arch/arm/mach-sa1100/pm.c | 1 + arch/arm/mach-sa1100/time.c | 139 ----- arch/arm/mm/cache-l2x0.c | 272 ++++++---- arch/arm/mm/init.c | 5 +- arch/arm/probes/Makefile | 7 + .../{kernel/probes-arm.c => probes/decode-arm.c} | 18 +- .../{kernel/probes-arm.h => probes/decode-arm.h} | 9 +- .../probes-thumb.c => probes/decode-thumb.c} | 16 +- .../probes-thumb.h => probes/decode-thumb.h} | 10 +- arch/arm/{kernel/probes.c => probes/decode.c} | 81 ++- arch/arm/{kernel/probes.h => probes/decode.h} | 13 +- arch/arm/probes/kprobes/Makefile | 12 + .../kprobes-arm.c => probes/kprobes/actions-arm.c} | 11 +- .../kprobes/actions-common.c} | 4 +- .../kprobes/actions-thumb.c} | 10 +- arch/arm/probes/kprobes/checkers-arm.c | 192 +++++++ arch/arm/probes/kprobes/checkers-common.c | 101 ++++ arch/arm/probes/kprobes/checkers-thumb.c | 110 ++++ arch/arm/probes/kprobes/checkers.h | 55 ++ .../{kernel/kprobes.c => probes/kprobes/core.c} | 49 +- .../{kernel/kprobes.h => probes/kprobes/core.h} | 12 +- arch/arm/probes/kprobes/opt-arm.c | 370 ++++++++++++++ .../kprobes/test-arm.c} | 40 +- .../kprobes-test.c => probes/kprobes/test-core.c} | 46 +- .../kprobes-test.h => probes/kprobes/test-core.h} | 35 +- .../kprobes/test-thumb.c} | 20 +- arch/arm/probes/uprobes/Makefile | 1 + .../uprobes-arm.c => probes/uprobes/actions-arm.c} | 8 +- .../{kernel/uprobes.c => probes/uprobes/core.c} | 8 +- .../{kernel/uprobes.h => probes/uprobes/core.h} | 0 arch/arm64/Kconfig | 1 + arch/arm64/include/asm/bitrev.h | 19 + arch/x86/kernel/kprobes/opt.c | 3 +- drivers/clocksource/Kconfig | 7 + drivers/clocksource/Makefile | 2 +- drivers/gpio/gpio-sa1100.c | 199 +++++++- include/linux/amba/bus.h | 12 +- include/linux/bitrev.h | 77 ++- include/linux/kprobes.h | 3 +- kernel/kprobes.c | 4 +- lib/Kconfig | 9 + lib/bitrev.c | 17 +- 87 files changed, 2042 insertions(+), 1362 deletions(-) create mode 100644 arch/arm/include/asm/bitrev.h rename arch/arm/{kernel => include/asm}/insn.h (100%) rename arch/arm/{kernel => include/asm}/patch.h (100%) rename arch/arm/{mach-ks8695/include/mach/debug-macro.S => include/debug/ks8695.S} (80%) rename arch/arm/{mach-netx/include/mach/debug-macro.S => include/debug/netx.S} (62%) delete mode 100644 arch/arm/lib/uaccess.S delete mode 100644 arch/arm/mach-omap1/include/mach/debug-macro.S delete mode 100644 arch/arm/mach-sa1100/time.c create mode 100644 arch/arm/probes/Makefile rename arch/arm/{kernel/probes-arm.c => probes/decode-arm.c} (98%) rename arch/arm/{kernel/probes-arm.h => probes/decode-arm.h} (92%) rename arch/arm/{kernel/probes-thumb.c => probes/decode-thumb.c} (98%) rename arch/arm/{kernel/probes-thumb.h => probes/decode-thumb.h} (90%) rename arch/arm/{kernel/probes.c => probes/decode.c} (84%) rename arch/arm/{kernel/probes.h => probes/decode.h} (97%) create mode 100644 arch/arm/probes/kprobes/Makefile rename arch/arm/{kernel/kprobes-arm.c => probes/kprobes/actions-arm.c} (98%) rename arch/arm/{kernel/kprobes-common.c => probes/kprobes/actions-common.c} (98%) rename arch/arm/{kernel/kprobes-thumb.c => probes/kprobes/actions-thumb.c} (98%) create mode 100644 arch/arm/probes/kprobes/checkers-arm.c create mode 100644 arch/arm/probes/kprobes/checkers-common.c create mode 100644 arch/arm/probes/kprobes/checkers-thumb.c create mode 100644 arch/arm/probes/kprobes/checkers.h rename arch/arm/{kernel/kprobes.c => probes/kprobes/core.c} (94%) rename arch/arm/{kernel/kprobes.h => probes/kprobes/core.h} (79%) create mode 100644 arch/arm/probes/kprobes/opt-arm.c rename arch/arm/{kernel/kprobes-test-arm.c => probes/kprobes/test-arm.c} (97%) rename arch/arm/{kernel/kprobes-test.c => probes/kprobes/test-core.c} (98%) rename arch/arm/{kernel/kprobes-test.h => probes/kprobes/test-core.h} (92%) rename arch/arm/{kernel/kprobes-test-thumb.c => probes/kprobes/test-thumb.c} (97%) create mode 100644 arch/arm/probes/uprobes/Makefile rename arch/arm/{kernel/uprobes-arm.c => probes/uprobes/actions-arm.c} (97%) rename arch/arm/{kernel/uprobes.c => probes/uprobes/core.c} (97%) rename arch/arm/{kernel/uprobes.h => probes/uprobes/core.h} (100%) create mode 100644 arch/arm64/include/asm/bitrev.h Merging arm-perf/for-next/perf (97bf6af1f928 Linux 3.19-rc1) $ git merge arm-perf/for-next/perf Already up-to-date. Merging arm-soc/for-next (f9db7e23d11f Merge branch 'fixes' into for-next) $ git merge arm-soc/for-next Resolved 'arch/arm/Kconfig.debug' using previous resolution. Auto-merging drivers/of/platform.c Auto-merging drivers/clocksource/Makefile Auto-merging drivers/clocksource/Kconfig Auto-merging arch/arm64/boot/dts/Makefile Auto-merging arch/arm64/Kconfig Removing arch/arm/plat-samsung/s3c-dma-ops.c Removing arch/arm/plat-samsung/include/plat/regs-dma.h Removing arch/arm/plat-samsung/include/plat/dma.h Removing arch/arm/plat-samsung/include/plat/dma-s3c24xx.h Removing arch/arm/plat-samsung/include/plat/dma-pl330.h Removing arch/arm/plat-samsung/include/plat/dma-ops.h Removing arch/arm/plat-samsung/include/plat/dma-core.h Removing arch/arm/plat-samsung/dma.c Removing arch/arm/plat-samsung/dma-ops.c Removing arch/arm/mach-shmobile/clock-r8a7790.c Removing arch/arm/mach-shmobile/board-lager.c Removing arch/arm/mach-shmobile/board-lager-reference.c Removing arch/arm/mach-s3c24xx/dma.c Removing arch/arm/mach-s3c24xx/dma-s3c2443.c Removing arch/arm/mach-s3c24xx/dma-s3c2440.c Removing arch/arm/mach-s3c24xx/dma-s3c2412.c Removing arch/arm/mach-s3c24xx/dma-s3c2410.c Removing arch/arm/mach-prima2/lluart.c Auto-merging arch/arm/mach-omap2/common.h Removing arch/arm/mach-omap2/clkt2xxx_apll.c Auto-merging arch/arm/mach-omap2/board-generic.c Removing arch/arm/mach-omap2/board-cm-t3517.c Removing arch/arm/mach-omap2/board-am3517evm.c Removing arch/arm/mach-omap2/board-am3517crane.c Removing arch/arm/mach-omap2/am35xx.h Removing arch/arm/mach-omap2/am35xx-emac.h Removing arch/arm/mach-omap2/am35xx-emac.c Removing arch/arm/mach-exynos/regs-sys.h Removing arch/arm/mach-exynos/include/mach/dma.h Removing arch/arm/mach-davinci/include/mach/cdce949.h Removing arch/arm/mach-davinci/cdce949.c Removing arch/arm/mach-at91/sysirq_mask.c Removing arch/arm/mach-at91/include/mach/system_rev.h Removing arch/arm/mach-at91/include/mach/memory.h Removing arch/arm/mach-at91/include/mach/at91_rtt.h Removing arch/arm/mach-at91/include/mach/at91_pio.h Auto-merging arch/arm/include/debug/at91.S Removing arch/arm/configs/lager_defconfig Auto-merging arch/arm/boot/dts/vf610-twr.dts Removing arch/arm/boot/dts/marco.dtsi Removing arch/arm/boot/dts/marco-evb.dts Auto-merging arch/arm/boot/dts/imx6sx-sdb.dts Auto-merging arch/arm/boot/dts/exynos4x12.dtsi Auto-merging arch/arm/boot/dts/exynos4210.dtsi Auto-merging arch/arm/boot/dts/armada-388-rd.dts Auto-merging arch/arm/boot/dts/armada-388-db.dts Auto-merging arch/arm/Kconfig.debug CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug Auto-merging arch/arm/Kconfig Auto-merging MAINTAINERS Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt Removing Documentation/arm/Samsung-S3C24XX/DMA.txt Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master de4505b864e8] Merge remote-tracking branch 'arm-soc/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/arm/Atmel/README | 124 ++ Documentation/arm/Samsung-S3C24XX/DMA.txt | 46 - Documentation/arm/sti/stih418-overview.txt | 20 + Documentation/arm/sunxi/README | 1 - .../devicetree/bindings/arm/armada-38x.txt | 7 + .../devicetree/bindings/arm/atmel-at91.txt | 17 + .../devicetree/bindings/arm/digicolor.txt | 6 + .../bindings/arm/exynos/power_domain.txt | 2 +- Documentation/devicetree/bindings/arm/fsl.txt | 20 + .../bindings/arm/hisilicon/hisilicon.txt | 25 + Documentation/devicetree/bindings/arm/mediatek.txt | 4 + .../bindings/arm/mediatek/mediatek,sysirq.txt | 2 + Documentation/devicetree/bindings/arm/rockchip.txt | 10 + .../devicetree/bindings/arm/rockchip/pmu-sram.txt | 16 + .../bindings/arm/samsung/exynos-chipid.txt | 12 + .../devicetree/bindings/arm/samsung/pmu.txt | 1 + Documentation/devicetree/bindings/arm/sirf.txt | 6 +- Documentation/devicetree/bindings/arm/sti.txt | 4 + .../bindings/arm/tegra/nvidia,tegra20-pmc.txt | 26 + .../devicetree/bindings/bus/mvebu-mbus.txt | 4 +- .../devicetree/bindings/clock/alphascale,acc.txt | 115 ++ .../bindings/clock/renesas,sh73a0-cpg-clocks.txt | 35 + .../devicetree/bindings/iommu/samsung,sysmmu.txt | 6 +- .../devicetree/bindings/media/s5p-mfc.txt | 4 +- .../renesas-memory-controllers.txt | 44 + .../devicetree/bindings/mfd/atmel-matrix.txt | 24 + .../devicetree/bindings/mfd/atmel-smc.txt | 19 + .../devicetree/bindings/misc/fsl,qoriq-mc.txt | 40 + .../bindings/power/renesas,sysc-rmobile.txt | 99 ++ .../devicetree/bindings/serial/mtk-uart.txt | 6 +- .../devicetree/bindings/serial/of-serial.txt | 12 + .../devicetree/bindings/sound/atmel_ac97c.txt | 20 + .../devicetree/bindings/usb/atmel-usb.txt | 10 +- .../devicetree/bindings/vendor-prefixes.txt | 4 + .../devicetree/bindings/video/exynos_dsim.txt | 4 +- .../devicetree/bindings/video/samsung-fimd.txt | 4 +- MAINTAINERS | 17 +- arch/arm/Kconfig | 4 +- arch/arm/Kconfig.debug | 119 +- arch/arm/arm-soc-for-next-contents.txt | 200 +++ arch/arm/boot/dts/Makefile | 357 +++-- arch/arm/boot/dts/alphascale-asm9260-devkit.dts | 13 + arch/arm/boot/dts/alphascale-asm9260.dtsi | 63 + arch/arm/boot/dts/am4372.dtsi | 16 + arch/arm/boot/dts/am437x-gp-evm.dts | 106 ++ arch/arm/boot/dts/am437x-idk-evm.dts | 405 ++++++ arch/arm/boot/dts/am437x-sk-evm.dts | 217 ++- arch/arm/boot/dts/am43x-epos-evm.dts | 53 + arch/arm/boot/dts/am57xx-beagle-x15.dts | 120 ++ arch/arm/boot/dts/armada-375.dtsi | 2 +- arch/arm/boot/dts/armada-380.dtsi | 3 +- arch/arm/boot/dts/armada-385-db-ap.dts | 178 +++ arch/arm/boot/dts/armada-385.dtsi | 3 +- .../dts/{armada-385-db.dts => armada-388-db.dts} | 9 +- arch/arm/boot/dts/armada-388-gp.dts | 414 ++++++ .../dts/{armada-385-rd.dts => armada-388-rd.dts} | 9 +- arch/arm/boot/dts/armada-388.dtsi | 70 + arch/arm/boot/dts/armada-38x.dtsi | 96 +- arch/arm/boot/dts/armada-xp-axpwifiap.dts | 6 +- arch/arm/boot/dts/at91rm9200.dtsi | 12 + arch/arm/boot/dts/at91rm9200ek.dts | 4 + arch/arm/boot/dts/at91sam9260.dtsi | 5 + arch/arm/boot/dts/at91sam9261.dtsi | 5 + arch/arm/boot/dts/at91sam9263.dtsi | 33 +- arch/arm/boot/dts/at91sam9g20.dtsi | 9 + arch/arm/boot/dts/at91sam9g45.dtsi | 7 +- arch/arm/boot/dts/at91sam9n12.dtsi | 12 + arch/arm/boot/dts/at91sam9n12ek.dts | 2 +- arch/arm/boot/dts/at91sam9rl.dtsi | 5 + arch/arm/boot/dts/at91sam9x5.dtsi | 5 + arch/arm/boot/dts/at91sam9x5ek.dtsi | 9 + arch/arm/boot/dts/at91sam9xe.dtsi | 60 + arch/arm/boot/dts/atlas7-evb.dts | 110 ++ arch/arm/boot/dts/atlas7.dtsi | 813 +++++++++++ arch/arm/boot/dts/axp209.dtsi | 97 ++ arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 68 +- arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 60 + arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 1 - arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 1 - arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 1 - arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 68 +- arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 37 + arch/arm/boot/dts/berlin2.dtsi | 2 +- arch/arm/boot/dts/berlin2cd.dtsi | 7 +- arch/arm/boot/dts/berlin2q.dtsi | 10 +- arch/arm/boot/dts/cx92755.dtsi | 113 ++ arch/arm/boot/dts/cx92755_equinox.dts | 74 + arch/arm/boot/dts/dm8168-evm.dts | 129 ++ arch/arm/boot/dts/dm816x-clocks.dtsi | 250 ++++ arch/arm/boot/dts/dm816x.dtsi | 387 ++++++ arch/arm/boot/dts/dra7.dtsi | 2 - arch/arm/boot/dts/dra72-evm.dts | 77 + arch/arm/boot/dts/ethernut5.dts | 2 +- arch/arm/boot/dts/exynos3250-monk.dts | 23 +- arch/arm/boot/dts/exynos3250-rinato.dts | 93 +- arch/arm/boot/dts/exynos3250.dtsi | 32 +- arch/arm/boot/dts/exynos4.dtsi | 25 +- arch/arm/boot/dts/exynos4210-trats.dts | 1 + arch/arm/boot/dts/exynos4210-universal_c210.dts | 1 + arch/arm/boot/dts/exynos4210.dtsi | 1 + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 1 + arch/arm/boot/dts/exynos4412-trats2.dts | 1 + arch/arm/boot/dts/exynos4415.dtsi | 7 + arch/arm/boot/dts/exynos4x12.dtsi | 7 +- arch/arm/boot/dts/exynos5250-snow.dts | 16 + arch/arm/boot/dts/exynos5250.dtsi | 12 +- arch/arm/boot/dts/exynos5420-peach-pit.dts | 100 +- arch/arm/boot/dts/exynos5420.dtsi | 27 +- arch/arm/boot/dts/exynos5422-odroidxu3.dts | 371 +++++ arch/arm/boot/dts/exynos5800-peach-pi.dts | 101 +- arch/arm/boot/dts/hip01-ca9x2.dts | 51 + arch/arm/boot/dts/hip01.dtsi | 110 ++ arch/arm/boot/dts/imx27-apf27dev.dts | 21 + arch/arm/boot/dts/imx27.dtsi | 2 +- arch/arm/boot/dts/imx28-evk.dts | 1 - arch/arm/boot/dts/imx51-apf51dev.dts | 14 + arch/arm/boot/dts/imx53.dtsi | 11 +- arch/arm/boot/dts/imx6dl-udoo.dts | 18 + arch/arm/boot/dts/imx6dl.dtsi | 2 +- arch/arm/boot/dts/imx6q-udoo.dts | 124 +- arch/arm/boot/dts/imx6q.dtsi | 4 +- arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 33 + arch/arm/boot/dts/imx6qdl-udoo.dtsi | 134 ++ arch/arm/boot/dts/imx6qdl.dtsi | 5 +- arch/arm/boot/dts/imx6sx-sabreauto.dts | 146 ++ arch/arm/boot/dts/imx6sx-sdb.dts | 39 + arch/arm/boot/dts/kirkwood-6192.dtsi | 2 + arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts | 173 +++ arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 8 +- arch/arm/boot/dts/kirkwood-pogo_e02.dts | 134 ++ arch/arm/boot/dts/marco-evb.dts | 54 - arch/arm/boot/dts/marco.dtsi | 757 ---------- arch/arm/boot/dts/mt6589-aquaris5.dts | 12 +- arch/arm/boot/dts/mt6589.dtsi | 52 +- arch/arm/boot/dts/mt6592.dtsi | 51 +- arch/arm/boot/dts/mt8127-moose.dts | 4 + arch/arm/boot/dts/mt8127.dtsi | 52 +- arch/arm/boot/dts/mt8135-evbp1.dts | 4 + arch/arm/boot/dts/mt8135.dtsi | 54 +- arch/arm/boot/dts/omap3-cm-t3x.dtsi | 58 + arch/arm/boot/dts/omap3-cm-t3x30.dtsi | 3 +- arch/arm/boot/dts/omap3-gta04.dtsi | 49 + arch/arm/boot/dts/omap3-n900.dts | 3 +- arch/arm/boot/dts/omap3-n950-n9.dtsi | 5 + arch/arm/boot/dts/omap3-sbc-t3517.dts | 4 + arch/arm/boot/dts/omap3-sbc-t3530.dts | 10 +- arch/arm/boot/dts/omap3-sbc-t3730.dts | 5 +- arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 12 + arch/arm/boot/dts/qcom-ipq8064.dtsi | 2 +- arch/arm/boot/dts/r7s72100-genmai.dts | 2 +- arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 2 +- arch/arm/boot/dts/r8a73a4-ape6evm.dts | 173 ++- arch/arm/boot/dts/r8a73a4.dtsi | 10 + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 4 +- arch/arm/boot/dts/r8a7740.dtsi | 115 +- arch/arm/boot/dts/r8a7779.dtsi | 39 +- arch/arm/boot/dts/r8a7790-lager.dts | 21 +- arch/arm/boot/dts/r8a7790.dtsi | 62 +- arch/arm/boot/dts/r8a7791-henninger.dts | 4 +- arch/arm/boot/dts/r8a7791-koelsch.dts | 23 +- arch/arm/boot/dts/r8a7791.dtsi | 69 +- arch/arm/boot/dts/r8a7794-alt.dts | 4 +- arch/arm/boot/dts/r8a7794.dtsi | 82 +- arch/arm/boot/dts/rk3066a-rayeager.dts | 468 +++++++ arch/arm/boot/dts/rk3288-evb-rk808.dts | 53 +- arch/arm/boot/dts/rk3288-firefly-beta.dts | 71 + arch/arm/boot/dts/rk3288-firefly.dts | 71 + arch/arm/boot/dts/rk3288-firefly.dtsi | 467 +++++++ arch/arm/boot/dts/rk3288.dtsi | 111 ++ arch/arm/boot/dts/s5pv210-aquila.dts | 1 + arch/arm/boot/dts/s5pv210-goni.dts | 1 + arch/arm/boot/dts/s5pv210-smdkv210.dts | 1 + arch/arm/boot/dts/sama5d3.dtsi | 34 +- arch/arm/boot/dts/sama5d3xcm.dtsi | 1 + arch/arm/boot/dts/sama5d3xmb.dtsi | 42 +- arch/arm/boot/dts/sama5d4.dtsi | 25 +- arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 6 +- arch/arm/boot/dts/sh73a0.dtsi | 376 ++++- arch/arm/boot/dts/stih407-b2120.dts | 3 +- arch/arm/boot/dts/stih407-family.dtsi | 62 + arch/arm/boot/dts/stih407.dtsi | 151 ++ arch/arm/boot/dts/stih410.dtsi | 208 +++ arch/arm/boot/dts/stih418-b2199.dts | 78 ++ arch/arm/boot/dts/stih418-clock.dtsi | 348 +++++ arch/arm/boot/dts/stih418.dtsi | 99 ++ arch/arm/boot/dts/stihxxx-b2120.dtsi | 13 +- arch/arm/boot/dts/sun4i-a10-a1000.dts | 23 +- arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 10 +- arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 100 ++ arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 58 +- arch/arm/boot/dts/sun4i-a10-hackberry.dts | 21 +- arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 105 ++ arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 8 +- arch/arm/boot/dts/sun4i-a10-marsboard.dts | 183 +++ arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 11 +- arch/arm/boot/dts/sun4i-a10-mk802.dts | 109 ++ arch/arm/boot/dts/sun4i-a10-mk802ii.dts | 113 ++ arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 21 +- arch/arm/boot/dts/sun4i-a10-pcduino.dts | 68 +- arch/arm/boot/dts/sun4i-a10.dtsi | 204 ++- arch/arm/boot/dts/sun5i-a10s-mk802.dts | 125 ++ arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 72 +- arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 25 +- arch/arm/boot/dts/sun5i-a10s.dtsi | 68 +- arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 59 +- arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 25 +- arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 75 +- arch/arm/boot/dts/sun5i-a13.dtsi | 112 +- arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | 13 +- arch/arm/boot/dts/sun6i-a31-colombus.dts | 21 +- arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 185 +-- arch/arm/boot/dts/sun6i-a31-m9.dts | 31 +- arch/arm/boot/dts/sun6i-a31.dtsi | 182 ++- arch/arm/boot/dts/sun6i-a31s-cs908.dts | 104 ++ arch/arm/boot/dts/sun6i-a31s.dtsi | 58 + arch/arm/boot/dts/sun7i-a20-bananapi.dts | 28 +- arch/arm/boot/dts/sun7i-a20-bananapro.dts | 262 ++++ arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 101 +- arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 125 +- arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 38 +- arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 40 +- arch/arm/boot/dts/sun7i-a20-m3.dts | 18 +- arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 24 +- arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 24 +- arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 79 +- arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 21 +- arch/arm/boot/dts/sun7i-a20.dtsi | 347 +++-- arch/arm/boot/dts/sun8i-a23-ippo-q8h-v1.2.dts | 59 + arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | 33 +- arch/arm/boot/dts/sun8i-a23.dtsi | 100 +- arch/arm/boot/dts/sun9i-a80-optimus.dts | 112 +- arch/arm/boot/dts/sun9i-a80.dtsi | 192 ++- arch/arm/boot/dts/sunxi-common-regulators.dtsi | 65 +- arch/arm/boot/dts/tegra124-jetson-tk1.dts | 7 + arch/arm/boot/dts/tegra124-nyan-big.dts | 2 + arch/arm/boot/dts/tegra20.dtsi | 10 +- arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +- arch/arm/boot/dts/tegra30.dtsi | 2 +- arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 2 +- arch/arm/boot/dts/vf-colibri.dtsi | 3 +- arch/arm/boot/dts/vf500.dtsi | 23 +- arch/arm/boot/dts/vf610-twr.dts | 2 +- arch/arm/boot/dts/vfxxx.dtsi | 48 +- arch/arm/boot/dts/zynq-7000.dtsi | 32 +- arch/arm/boot/dts/zynq-zc702.dts | 224 +++ arch/arm/boot/dts/zynq-zc706.dts | 194 +++ arch/arm/boot/dts/zynq-zed.dts | 15 + arch/arm/configs/efm32_defconfig | 5 +- arch/arm/configs/hisi_defconfig | 1 + arch/arm/configs/imx_v6_v7_defconfig | 39 +- arch/arm/configs/kzm9g_defconfig | 2 +- arch/arm/configs/lager_defconfig | 150 -- arch/arm/configs/multi_v7_defconfig | 22 + arch/arm/configs/mvebu_v7_defconfig | 1 + arch/arm/configs/omap2plus_defconfig | 127 +- arch/arm/configs/sama5_defconfig | 8 +- arch/arm/configs/shmobile_defconfig | 49 +- arch/arm/configs/sunxi_defconfig | 10 +- arch/arm/configs/tegra_defconfig | 2 - .../mach/debug-macro.S => include/debug/at91.S} | 19 +- arch/arm/include/debug/digicolor.S | 35 + arch/arm/include/debug/msm.S | 6 + arch/arm/include/debug/sirf.S | 30 +- arch/arm/mach-at91/Kconfig | 28 +- arch/arm/mach-at91/Makefile | 6 +- arch/arm/mach-at91/at91rm9200.c | 15 - arch/arm/mach-at91/at91sam9260.c | 35 - arch/arm/mach-at91/at91sam9261.c | 17 - arch/arm/mach-at91/at91sam9263.c | 16 - arch/arm/mach-at91/at91sam9g45.c | 16 - arch/arm/mach-at91/at91sam9n12.c | 12 - arch/arm/mach-at91/at91sam9rl.c | 28 - arch/arm/mach-at91/at91sam9x5.c | 16 - arch/arm/mach-at91/board-dt-rm9200.c | 15 +- arch/arm/mach-at91/board-dt-sam9.c | 56 +- arch/arm/mach-at91/board-dt-sama5.c | 1 + arch/arm/mach-at91/generic.h | 23 +- arch/arm/mach-at91/include/mach/at91_pio.h | 80 -- arch/arm/mach-at91/include/mach/at91_rtt.h | 35 - arch/arm/mach-at91/include/mach/memory.h | 26 - arch/arm/mach-at91/include/mach/system_rev.h | 27 - arch/arm/mach-at91/pm.c | 116 +- arch/arm/mach-at91/pm_slowclock.S | 9 - arch/arm/mach-at91/sama5d3.c | 12 - arch/arm/mach-at91/sama5d4.c | 1 - arch/arm/mach-at91/setup.c | 38 - arch/arm/mach-at91/sysirq_mask.c | 75 - arch/arm/mach-bcm/platsmp-brcmstb.c | 85 +- arch/arm/mach-davinci/Makefile | 2 +- arch/arm/mach-davinci/board-dm646x-evm.c | 31 - arch/arm/mach-davinci/cdce949.c | 295 ---- arch/arm/mach-davinci/include/mach/cdce949.h | 19 - arch/arm/mach-davinci/serial.c | 10 - arch/arm/mach-digicolor/Kconfig | 7 + arch/arm/mach-digicolor/Makefile | 1 + arch/arm/mach-digicolor/digicolor.c | 18 + arch/arm/mach-exynos/exynos.c | 40 +- arch/arm/mach-exynos/include/mach/dma.h | 26 - arch/arm/mach-exynos/include/mach/map.h | 3 - arch/arm/mach-exynos/pm.c | 3 +- arch/arm/mach-exynos/regs-pmu.h | 3 + arch/arm/mach-exynos/regs-sys.h | 22 - arch/arm/mach-exynos/suspend.c | 84 +- arch/arm/mach-hisi/Kconfig | 8 + arch/arm/mach-hisi/core.h | 5 +- arch/arm/mach-hisi/headsmp.S | 2 +- arch/arm/mach-hisi/hisilicon.c | 10 + arch/arm/mach-hisi/hotplug.c | 31 + arch/arm/mach-hisi/platsmp.c | 56 +- arch/arm/mach-imx/Makefile | 3 +- arch/arm/mach-imx/clk-gate2.c | 23 +- arch/arm/mach-imx/clk-imx6q.c | 2 +- arch/arm/mach-imx/clk-pllv3.c | 10 +- arch/arm/mach-imx/clk-vf610.c | 8 +- arch/arm/mach-imx/clk.h | 1 + arch/arm/mach-imx/common.h | 4 + arch/arm/mach-imx/cpuidle-imx6sx.c | 105 ++ arch/arm/mach-imx/cpuidle.h | 5 + arch/arm/mach-imx/gpc.c | 25 +- arch/arm/mach-imx/mach-imx6q.c | 2 +- arch/arm/mach-imx/mach-imx6sx.c | 2 +- arch/arm/mach-imx/mach-vf610.c | 5 +- arch/arm/mach-imx/pm-imx6.c | 7 +- arch/arm/mach-mediatek/Kconfig | 22 +- arch/arm/mach-mvebu/coherency.c | 58 +- arch/arm/mach-mvebu/mvebu-soc-id.h | 18 + arch/arm/mach-omap1/irq.c | 5 - arch/arm/mach-omap1/timer32k.c | 5 - arch/arm/mach-omap2/Kconfig | 12 - arch/arm/mach-omap2/Makefile | 14 +- arch/arm/mach-omap2/am35xx-emac.c | 114 -- arch/arm/mach-omap2/am35xx-emac.h | 15 - arch/arm/mach-omap2/am35xx.h | 46 - arch/arm/mach-omap2/board-am3517crane.c | 150 -- arch/arm/mach-omap2/board-am3517evm.c | 373 ----- arch/arm/mach-omap2/board-cm-t3517.c | 335 ----- arch/arm/mach-omap2/board-generic.c | 36 + arch/arm/mach-omap2/cclock3xxx_data.c | 6 +- arch/arm/mach-omap2/clkt2xxx_apll.c | 142 -- arch/arm/mach-omap2/clock.c | 3 + arch/arm/mach-omap2/clock.h | 1 - arch/arm/mach-omap2/clock2xxx.h | 11 - arch/arm/mach-omap2/clockdomain.h | 1 + arch/arm/mach-omap2/clockdomains81xx_data.c | 194 +++ arch/arm/mach-omap2/cm2xxx.c | 10 - arch/arm/mach-omap2/cm2xxx.h | 2 - arch/arm/mach-omap2/cm33xx.c | 21 - arch/arm/mach-omap2/cm81xx.h | 61 + arch/arm/mach-omap2/common.h | 11 +- arch/arm/mach-omap2/control.h | 4 + arch/arm/mach-omap2/dpll44xx.c | 20 - arch/arm/mach-omap2/id.c | 2 + arch/arm/mach-omap2/io.c | 66 +- arch/arm/mach-omap2/omap-pm-noop.c | 196 --- arch/arm/mach-omap2/omap-pm.h | 192 --- arch/arm/mach-omap2/omap_hwmod.c | 238 +--- arch/arm/mach-omap2/omap_hwmod.h | 17 +- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 33 +- arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 2 + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 5 +- arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 1136 +++++++++++++++ arch/arm/mach-omap2/omap_phy_internal.c | 35 - arch/arm/mach-omap2/pdata-quirks.c | 1 - arch/arm/mach-omap2/powerdomain.c | 82 -- arch/arm/mach-omap2/powerdomain.h | 5 - arch/arm/mach-omap2/powerdomains3xxx_data.c | 2 +- arch/arm/mach-omap2/prm3xxx.h | 1 - arch/arm/mach-omap2/prm44xx_54xx.h | 1 - arch/arm/mach-omap2/prm_common.c | 4 + arch/arm/mach-omap2/soc.h | 4 +- arch/arm/mach-omap2/ti81xx-restart.c | 34 + arch/arm/mach-omap2/timer.c | 2 + arch/arm/mach-omap2/usb-musb.c | 12 +- arch/arm/mach-omap2/usb.h | 2 - arch/arm/mach-omap2/voltage.c | 110 -- arch/arm/mach-omap2/voltage.h | 13 - arch/arm/mach-prima2/Kconfig | 22 +- arch/arm/mach-prima2/Makefile | 1 - arch/arm/mach-prima2/common.c | 22 +- arch/arm/mach-prima2/lluart.c | 35 - arch/arm/mach-prima2/platsmp.c | 52 +- arch/arm/mach-prima2/rstc.c | 41 +- arch/arm/mach-prima2/rtciobrg.c | 1 - arch/arm/mach-pxa/Kconfig | 6 - arch/arm/mach-pxa/corgi.c | 3 + arch/arm/mach-pxa/hx4700.c | 2 + arch/arm/mach-pxa/include/mach/irqs.h | 10 +- arch/arm/mach-pxa/poodle.c | 2 + arch/arm/mach-pxa/spitz.c | 2 + arch/arm/mach-qcom/Kconfig | 3 +- arch/arm/mach-qcom/scm-boot.c | 10 +- arch/arm/mach-qcom/scm-boot.h | 4 +- arch/arm/mach-qcom/scm.c | 85 +- arch/arm/mach-rockchip/Makefile | 1 + arch/arm/mach-rockchip/pm.c | 260 ++++ arch/arm/mach-rockchip/pm.h | 99 ++ arch/arm/mach-rockchip/rockchip.c | 4 +- arch/arm/mach-rockchip/sleep.S | 73 + arch/arm/mach-s3c24xx/Kconfig | 42 - arch/arm/mach-s3c24xx/Makefile | 7 - arch/arm/mach-s3c24xx/dma-s3c2410.c | 182 --- arch/arm/mach-s3c24xx/dma-s3c2412.c | 150 -- arch/arm/mach-s3c24xx/dma-s3c2440.c | 193 --- arch/arm/mach-s3c24xx/dma-s3c2443.c | 179 --- arch/arm/mach-s3c24xx/dma.c | 1465 -------------------- arch/arm/mach-s3c24xx/include/mach/dma.h | 159 --- arch/arm/mach-s3c64xx/include/mach/dma.h | 15 - arch/arm/mach-shmobile/Kconfig | 28 +- arch/arm/mach-shmobile/Makefile | 3 - arch/arm/mach-shmobile/Makefile.boot | 1 - arch/arm/mach-shmobile/board-lager-reference.c | 39 - arch/arm/mach-shmobile/board-lager.c | 840 ----------- arch/arm/mach-shmobile/clock-r8a7790.c | 459 ------ arch/arm/mach-shmobile/clock-sh73a0.c | 10 + arch/arm/mach-shmobile/pm-r8a7740.c | 14 + arch/arm/mach-shmobile/pm-rmobile.c | 314 ++++- arch/arm/mach-shmobile/pm-rmobile.h | 3 +- arch/arm/mach-shmobile/pm-sh7372.c | 11 + arch/arm/mach-shmobile/r8a7790.h | 28 - arch/arm/mach-shmobile/setup-r8a7790.c | 284 +--- arch/arm/mach-shmobile/setup-rcar-gen2.c | 4 +- arch/arm/mach-shmobile/setup-sh73a0.c | 5 +- arch/arm/mach-shmobile/smp-r8a7779.c | 2 +- arch/arm/mach-sti/board-dt.c | 1 + arch/arm/mach-sunxi/platsmp.c | 2 +- arch/arm/mach-sunxi/sunxi.c | 11 + arch/arm/mach-tegra/Kconfig | 4 + arch/arm/mach-versatile/core.c | 37 - arch/arm/mach-zynq/Kconfig | 2 + arch/arm/mach-zynq/common.c | 2 - arch/arm/mach-zynq/pm.c | 2 +- arch/arm/mach-zynq/slcr.c | 35 +- arch/arm/plat-omap/dma.c | 8 - arch/arm/plat-samsung/Kconfig | 15 - arch/arm/plat-samsung/Makefile | 6 - arch/arm/plat-samsung/cpu.c | 4 + arch/arm/plat-samsung/dma-ops.c | 146 -- arch/arm/plat-samsung/dma.c | 84 -- arch/arm/plat-samsung/include/plat/dma-core.h | 22 - arch/arm/plat-samsung/include/plat/dma-ops.h | 69 - arch/arm/plat-samsung/include/plat/dma-pl330.h | 121 -- arch/arm/plat-samsung/include/plat/dma-s3c24xx.h | 73 - arch/arm/plat-samsung/include/plat/dma.h | 130 -- arch/arm/plat-samsung/include/plat/regs-dma.h | 151 -- arch/arm/plat-samsung/s3c-dma-ops.c | 146 -- arch/arm64/Kconfig | 54 + arch/arm64/boot/dts/Makefile | 3 + arch/arm64/boot/dts/exynos/Makefile | 5 + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 84 ++ arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 588 ++++++++ arch/arm64/boot/dts/exynos/exynos7.dtsi | 530 +++++++ arch/arm64/boot/dts/freescale/Makefile | 5 + arch/arm64/boot/dts/freescale/fsl-ls2085a-simu.dts | 65 + arch/arm64/boot/dts/freescale/fsl-ls2085a.dtsi | 163 +++ arch/arm64/boot/dts/mediatek/Makefile | 5 + arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 38 + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 168 +++ arch/arm64/configs/defconfig | 3 + drivers/bus/mvebu-mbus.c | 286 +++- drivers/clk/at91/pmc.c | 9 + drivers/clk/samsung/clk-exynos5420.c | 23 +- drivers/clk/shmobile/Makefile | 1 + drivers/clk/shmobile/clk-sh73a0.c | 218 +++ drivers/clk/sunxi/clk-sunxi.c | 1 + drivers/clocksource/Kconfig | 3 + drivers/clocksource/Makefile | 2 +- drivers/dma/Kconfig | 2 +- drivers/of/platform.c | 1 + drivers/pcmcia/Kconfig | 1 + drivers/rtc/Kconfig | 28 - drivers/soc/tegra/fuse/fuse-tegra.c | 1 + drivers/soc/tegra/fuse/fuse-tegra30.c | 9 +- drivers/soc/tegra/pmc.c | 124 +- drivers/usb/gadget/udc/Kconfig | 1 + drivers/usb/gadget/udc/at91_udc.c | 525 +++---- drivers/usb/gadget/udc/at91_udc.h | 9 +- include/dt-bindings/clock/exynos5420.h | 6 + include/dt-bindings/clock/r8a7790-clock.h | 1 + include/dt-bindings/clock/r8a7791-clock.h | 2 + include/dt-bindings/clock/r8a7794-clock.h | 17 + include/dt-bindings/clock/sh73a0-clock.h | 79 ++ include/dt-bindings/clock/stih418-clks.h | 34 + include/dt-bindings/clock/vf610-clock.h | 3 +- include/dt-bindings/dma/sun4i-a10.h | 56 + include/dt-bindings/pinctrl/omap.h | 1 + include/dt-bindings/pinctrl/sun4i-a10.h | 62 + include/linux/mfd/syscon/atmel-matrix.h | 117 ++ include/linux/mfd/syscon/atmel-smc.h | 173 +++ include/soc/tegra/fuse.h | 1 + include/soc/tegra/pm.h | 2 +- 490 files changed, 20818 insertions(+), 11515 deletions(-) create mode 100644 Documentation/arm/Atmel/README delete mode 100644 Documentation/arm/Samsung-S3C24XX/DMA.txt create mode 100644 Documentation/arm/sti/stih418-overview.txt create mode 100644 Documentation/devicetree/bindings/arm/digicolor.txt create mode 100644 Documentation/devicetree/bindings/arm/rockchip/pmu-sram.txt create mode 100644 Documentation/devicetree/bindings/arm/samsung/exynos-chipid.txt create mode 100644 Documentation/devicetree/bindings/clock/alphascale,acc.txt create mode 100644 Documentation/devicetree/bindings/clock/renesas,sh73a0-cpg-clocks.txt create mode 100644 Documentation/devicetree/bindings/memory-controllers/renesas-memory-controllers.txt create mode 100644 Documentation/devicetree/bindings/mfd/atmel-matrix.txt create mode 100644 Documentation/devicetree/bindings/mfd/atmel-smc.txt create mode 100644 Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt create mode 100644 Documentation/devicetree/bindings/power/renesas,sysc-rmobile.txt create mode 100644 Documentation/devicetree/bindings/sound/atmel_ac97c.txt create mode 100644 arch/arm/arm-soc-for-next-contents.txt create mode 100644 arch/arm/boot/dts/alphascale-asm9260-devkit.dts create mode 100644 arch/arm/boot/dts/alphascale-asm9260.dtsi create mode 100644 arch/arm/boot/dts/am437x-idk-evm.dts create mode 100644 arch/arm/boot/dts/armada-385-db-ap.dts rename arch/arm/boot/dts/{armada-385-db.dts => armada-388-db.dts} (92%) create mode 100644 arch/arm/boot/dts/armada-388-gp.dts rename arch/arm/boot/dts/{armada-385-rd.dts => armada-388-rd.dts} (88%) create mode 100644 arch/arm/boot/dts/armada-388.dtsi create mode 100644 arch/arm/boot/dts/at91sam9xe.dtsi create mode 100644 arch/arm/boot/dts/atlas7-evb.dts create mode 100644 arch/arm/boot/dts/atlas7.dtsi create mode 100644 arch/arm/boot/dts/axp209.dtsi create mode 100644 arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts create mode 100644 arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts create mode 100644 arch/arm/boot/dts/cx92755.dtsi create mode 100644 arch/arm/boot/dts/cx92755_equinox.dts create mode 100644 arch/arm/boot/dts/dm8168-evm.dts create mode 100644 arch/arm/boot/dts/dm816x-clocks.dtsi create mode 100644 arch/arm/boot/dts/dm816x.dtsi create mode 100644 arch/arm/boot/dts/exynos5422-odroidxu3.dts create mode 100644 arch/arm/boot/dts/hip01-ca9x2.dts create mode 100644 arch/arm/boot/dts/hip01.dtsi create mode 100644 arch/arm/boot/dts/imx6dl-udoo.dts create mode 100644 arch/arm/boot/dts/imx6qdl-udoo.dtsi create mode 100644 arch/arm/boot/dts/imx6sx-sabreauto.dts create mode 100644 arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts create mode 100644 arch/arm/boot/dts/kirkwood-pogo_e02.dts delete mode 100644 arch/arm/boot/dts/marco-evb.dts delete mode 100644 arch/arm/boot/dts/marco.dtsi create mode 100644 arch/arm/boot/dts/rk3066a-rayeager.dts create mode 100644 arch/arm/boot/dts/rk3288-firefly-beta.dts create mode 100644 arch/arm/boot/dts/rk3288-firefly.dts create mode 100644 arch/arm/boot/dts/rk3288-firefly.dtsi create mode 100644 arch/arm/boot/dts/stih407.dtsi create mode 100644 arch/arm/boot/dts/stih418-b2199.dts create mode 100644 arch/arm/boot/dts/stih418-clock.dtsi create mode 100644 arch/arm/boot/dts/stih418.dtsi create mode 100644 arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts create mode 100644 arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts create mode 100644 arch/arm/boot/dts/sun4i-a10-marsboard.dts create mode 100644 arch/arm/boot/dts/sun4i-a10-mk802.dts create mode 100644 arch/arm/boot/dts/sun4i-a10-mk802ii.dts create mode 100644 arch/arm/boot/dts/sun5i-a10s-mk802.dts create mode 100644 arch/arm/boot/dts/sun6i-a31s-cs908.dts create mode 100644 arch/arm/boot/dts/sun6i-a31s.dtsi create mode 100644 arch/arm/boot/dts/sun7i-a20-bananapro.dts create mode 100644 arch/arm/boot/dts/sun8i-a23-ippo-q8h-v1.2.dts delete mode 100644 arch/arm/configs/lager_defconfig rename arch/arm/{mach-at91/include/mach/debug-macro.S => include/debug/at91.S} (68%) create mode 100644 arch/arm/include/debug/digicolor.S delete mode 100644 arch/arm/mach-at91/include/mach/at91_pio.h delete mode 100644 arch/arm/mach-at91/include/mach/at91_rtt.h delete mode 100644 arch/arm/mach-at91/include/mach/memory.h delete mode 100644 arch/arm/mach-at91/include/mach/system_rev.h delete mode 100644 arch/arm/mach-at91/sysirq_mask.c delete mode 100644 arch/arm/mach-davinci/cdce949.c delete mode 100644 arch/arm/mach-davinci/include/mach/cdce949.h create mode 100644 arch/arm/mach-digicolor/Kconfig create mode 100644 arch/arm/mach-digicolor/Makefile create mode 100644 arch/arm/mach-digicolor/digicolor.c delete mode 100644 arch/arm/mach-exynos/include/mach/dma.h delete mode 100644 arch/arm/mach-exynos/regs-sys.h create mode 100644 arch/arm/mach-imx/cpuidle-imx6sx.c delete mode 100644 arch/arm/mach-omap2/am35xx-emac.c delete mode 100644 arch/arm/mach-omap2/am35xx-emac.h delete mode 100644 arch/arm/mach-omap2/am35xx.h delete mode 100644 arch/arm/mach-omap2/board-am3517crane.c delete mode 100644 arch/arm/mach-omap2/board-am3517evm.c delete mode 100644 arch/arm/mach-omap2/board-cm-t3517.c delete mode 100644 arch/arm/mach-omap2/clkt2xxx_apll.c create mode 100644 arch/arm/mach-omap2/clockdomains81xx_data.c create mode 100644 arch/arm/mach-omap2/cm81xx.h create mode 100644 arch/arm/mach-omap2/omap_hwmod_81xx_data.c create mode 100644 arch/arm/mach-omap2/ti81xx-restart.c delete mode 100644 arch/arm/mach-prima2/lluart.c create mode 100644 arch/arm/mach-rockchip/pm.c create mode 100644 arch/arm/mach-rockchip/pm.h create mode 100644 arch/arm/mach-rockchip/sleep.S delete mode 100644 arch/arm/mach-s3c24xx/dma-s3c2410.c delete mode 100644 arch/arm/mach-s3c24xx/dma-s3c2412.c delete mode 100644 arch/arm/mach-s3c24xx/dma-s3c2440.c delete mode 100644 arch/arm/mach-s3c24xx/dma-s3c2443.c delete mode 100644 arch/arm/mach-s3c24xx/dma.c delete mode 100644 arch/arm/mach-shmobile/board-lager-reference.c delete mode 100644 arch/arm/mach-shmobile/board-lager.c delete mode 100644 arch/arm/mach-shmobile/clock-r8a7790.c delete mode 100644 arch/arm/plat-samsung/dma-ops.c delete mode 100644 arch/arm/plat-samsung/dma.c delete mode 100644 arch/arm/plat-samsung/include/plat/dma-core.h delete mode 100644 arch/arm/plat-samsung/include/plat/dma-ops.h delete mode 100644 arch/arm/plat-samsung/include/plat/dma-pl330.h delete mode 100644 arch/arm/plat-samsung/include/plat/dma-s3c24xx.h delete mode 100644 arch/arm/plat-samsung/include/plat/dma.h delete mode 100644 arch/arm/plat-samsung/include/plat/regs-dma.h delete mode 100644 arch/arm/plat-samsung/s3c-dma-ops.c create mode 100644 arch/arm64/boot/dts/exynos/Makefile create mode 100644 arch/arm64/boot/dts/exynos/exynos7-espresso.dts create mode 100644 arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi create mode 100644 arch/arm64/boot/dts/exynos/exynos7.dtsi create mode 100644 arch/arm64/boot/dts/freescale/Makefile create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls2085a-simu.dts create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls2085a.dtsi create mode 100644 arch/arm64/boot/dts/mediatek/Makefile create mode 100644 arch/arm64/boot/dts/mediatek/mt8173-evb.dts create mode 100644 arch/arm64/boot/dts/mediatek/mt8173.dtsi create mode 100644 drivers/clk/shmobile/clk-sh73a0.c create mode 100644 include/dt-bindings/clock/sh73a0-clock.h create mode 100644 include/dt-bindings/clock/stih418-clks.h create mode 100644 include/dt-bindings/dma/sun4i-a10.h create mode 100644 include/dt-bindings/pinctrl/sun4i-a10.h create mode 100644 include/linux/mfd/syscon/atmel-matrix.h create mode 100644 include/linux/mfd/syscon/atmel-smc.h Merging bcm2835/for-next (b2776bf7149b Linux 3.18) $ git merge bcm2835/for-next Already up-to-date. Merging berlin/berlin/for-next (8553bf8fd181 Merge branch 'berlin/dt' into berlin/for-next) $ git merge berlin/berlin/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging cortex-m/for-next (e799b6f37e6c ARM: zImage: add support for ARMv7-M) $ git merge cortex-m/for-next Auto-merging arch/arm/boot/compressed/head.S Merge made by the 'recursive' strategy. arch/arm/boot/compressed/head.S | 33 +++++++++++++++++++++++++++------ arch/arm/include/asm/unified.h | 8 ++++++++ 2 files changed, 35 insertions(+), 6 deletions(-) Merging imx-mxs/for-next (395ae1400a35 Merge branch 'imx/defconfig' into for-next) $ git merge imx-mxs/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging keystone/next (b17275a4a6cc Merge branch 'for_3.19/soc' into next) $ git merge keystone/next Already up-to-date! Merge made by the 'recursive' strategy. Merging mvebu/for-next (feeddcd9c17b Merge branch 'mvebu/dt' into mvebu/for-next) $ git merge mvebu/for-next Merge made by the 'recursive' strategy. arch/arm/boot/dts/armada-370-db.dts | 40 +++++++++++++++++++++-- arch/arm/boot/dts/armada-370-mirabox.dts | 40 +++++++++++++++++++++-- arch/arm/boot/dts/armada-370-netgear-rn102.dts | 41 +++++++++++++++++++++--- arch/arm/boot/dts/armada-370-netgear-rn104.dts | 41 +++++++++++++++++++++--- arch/arm/boot/dts/armada-370-rd.dts | 40 +++++++++++++++++++++-- arch/arm/boot/dts/armada-370-synology-ds213j.dts | 41 +++++++++++++++++++++--- arch/arm/boot/dts/armada-370-xp.dtsi | 40 +++++++++++++++++++++-- arch/arm/boot/dts/armada-370.dtsi | 40 +++++++++++++++++++++-- arch/arm/boot/dts/armada-375-db.dts | 40 +++++++++++++++++++++-- arch/arm/boot/dts/armada-375.dtsi | 40 +++++++++++++++++++++-- arch/arm/boot/dts/armada-380.dtsi | 40 +++++++++++++++++++++-- arch/arm/boot/dts/armada-385.dtsi | 40 +++++++++++++++++++++-- arch/arm/boot/dts/armada-388-db.dts | 40 +++++++++++++++++++++-- arch/arm/boot/dts/armada-388-rd.dts | 40 +++++++++++++++++++++-- arch/arm/boot/dts/armada-38x.dtsi | 40 +++++++++++++++++++++-- arch/arm/boot/dts/armada-xp-axpwifiap.dts | 40 +++++++++++++++++++++-- arch/arm/boot/dts/armada-xp-db.dts | 40 +++++++++++++++++++++-- arch/arm/boot/dts/armada-xp-gp.dts | 40 +++++++++++++++++++++-- arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 41 +++++++++++++++++++++--- arch/arm/boot/dts/armada-xp-matrix.dts | 40 +++++++++++++++++++++-- arch/arm/boot/dts/armada-xp-mv78230.dtsi | 40 +++++++++++++++++++++-- arch/arm/boot/dts/armada-xp-mv78260.dtsi | 40 +++++++++++++++++++++-- arch/arm/boot/dts/armada-xp-mv78460.dtsi | 40 +++++++++++++++++++++-- arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 41 +++++++++++++++++++++--- arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 40 +++++++++++++++++++++-- arch/arm/boot/dts/armada-xp-synology-ds414.dts | 41 +++++++++++++++++++++--- arch/arm/boot/dts/armada-xp.dtsi | 40 +++++++++++++++++++++-- 27 files changed, 999 insertions(+), 87 deletions(-) Merging omap/for-next (5cb1e109eee0 Merge tag 'omap-for-v3.20/dt-pt3-v2' into for-next) $ git merge omap/for-next Merge made by the 'recursive' strategy. arch/arm/boot/dts/am57xx-beagle-x15.dts | 37 ++++++++++++++++++++++++ arch/arm/boot/dts/dm816x.dtsi | 35 +++++++++++++---------- arch/arm/boot/dts/dra7-evm.dts | 31 ++++++++++++++++++++ arch/arm/boot/dts/dra72-evm.dts | 31 ++++++++++++++++++++ arch/arm/boot/dts/omap3-gta04.dtsi | 50 +++++++++++++++++++++++---------- 5 files changed, 154 insertions(+), 30 deletions(-) Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data) $ git merge omap-pending/for-next Merge made by the 'recursive' strategy. Merging renesas/next (b2cb094d275e Merge branch 'heads/soc-fixes-for-v3.19' into next) $ git merge renesas/next Merge made by the 'recursive' strategy. drivers/sh/pm_runtime.c | 2 ++ 1 file changed, 2 insertions(+) Merging samsung/for-next (ce275c369a0b Merge branch 'v3.20-samsung-cpuidle' into for-next) $ git merge samsung/for-next Merge made by the 'recursive' strategy. arch/arm/configs/exynos_defconfig | 11 +++ arch/arm/mach-exynos/common.h | 4 + arch/arm/mach-exynos/exynos.c | 4 + arch/arm/mach-exynos/platsmp.c | 2 +- arch/arm/mach-exynos/pm.c | 133 ++++++++++++++++++++++++++- arch/arm/mach-exynos/suspend.c | 4 + drivers/cpuidle/Kconfig.arm | 1 + drivers/cpuidle/cpuidle-exynos.c | 76 ++++++++++++++- include/linux/platform_data/cpuidle-exynos.h | 20 ++++ 9 files changed, 245 insertions(+), 10 deletions(-) create mode 100644 include/linux/platform_data/cpuidle-exynos.h Merging sunxi/sunxi/for-next (16e8c17e18d6 Merge branch 'sunxi/clocks-for-3.20' into sunxi/for-next) $ git merge sunxi/sunxi/for-next Removing include/linux/clk/sunxi.h Auto-merging arch/arm/boot/dts/sun8i-a23.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 Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/clock/sunxi.txt | 43 +++- .../devicetree/bindings/mmc/sunxi-mmc.txt | 8 +- arch/arm/boot/dts/sun4i-a10.dtsi | 72 ++++-- arch/arm/boot/dts/sun5i-a10s.dtsi | 54 +++-- arch/arm/boot/dts/sun5i-a13.dtsi | 44 ++-- arch/arm/boot/dts/sun6i-a31.dtsi | 86 ++++--- arch/arm/boot/dts/sun7i-a20.dtsi | 72 ++++-- arch/arm/boot/dts/sun8i-a23.dtsi | 96 +++++--- drivers/clk/sunxi/Makefile | 1 + drivers/clk/sunxi/clk-factors.c | 10 +- drivers/clk/sunxi/clk-factors.h | 7 +- drivers/clk/sunxi/clk-mod0.c | 224 +++++++++++++----- drivers/clk/sunxi/clk-sun8i-mbus.c | 13 +- drivers/clk/sunxi/clk-sun9i-core.c | 62 ++++- drivers/clk/sunxi/clk-sun9i-mmc.c | 219 +++++++++++++++++ drivers/clk/sunxi/clk-sunxi.c | 259 +++++++++++++++++---- drivers/mmc/host/sunxi-mmc.c | 73 ++++-- include/linux/clk/sunxi.h | 22 -- 18 files changed, 1062 insertions(+), 303 deletions(-) create mode 100644 drivers/clk/sunxi/clk-sun9i-mmc.c delete mode 100644 include/linux/clk/sunxi.h Merging tegra/for-next (794345d409ad Merge branch for-3.20/arm64 into for-next) $ git merge tegra/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging arm64/for-next/core (d476d94f180a arm64: compat: Remove incorrect comment in compat_siginfo) $ git merge arm64/for-next/core Resolved 'arch/arm64/mm/dump.c' using previous resolution. Auto-merging arch/arm64/mm/init.c Auto-merging arch/arm64/mm/dump.c CONFLICT (content): Merge conflict in arch/arm64/mm/dump.c Auto-merging arch/arm64/kvm/sys_regs.c Auto-merging arch/arm64/kvm/hyp.S Auto-merging arch/arm64/kernel/entry32.S Auto-merging arch/arm64/include/uapi/asm/ucontext.h Auto-merging arch/arm64/include/asm/unistd.h Removing arch/arm64/include/asm/syscalls.h Auto-merging arch/arm64/include/asm/kvm_emulate.h Auto-merging arch/arm64/configs/defconfig Auto-merging arch/arm64/Makefile Auto-merging arch/arm64/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 01b0c42a37af] Merge remote-tracking branch 'arm64/for-next/core' $ git diff -M --stat --summary HEAD^.. Documentation/arm64/legacy_instructions.txt | 12 + arch/arm64/Kconfig | 18 +- arch/arm64/Kconfig.debug | 23 ++ arch/arm64/Makefile | 3 - arch/arm64/configs/defconfig | 2 + arch/arm64/include/asm/cacheflush.h | 5 + arch/arm64/include/asm/cachetype.h | 29 +- arch/arm64/include/asm/compat.h | 1 - arch/arm64/include/asm/cpu_ops.h | 8 +- arch/arm64/include/asm/cpufeature.h | 2 + arch/arm64/include/asm/cpuidle.h | 6 + arch/arm64/include/asm/cputype.h | 17 ++ arch/arm64/include/asm/dma-mapping.h | 11 +- arch/arm64/include/asm/efi.h | 30 ++- arch/arm64/include/asm/esr.h | 117 +++++--- arch/arm64/include/asm/fixmap.h | 1 + arch/arm64/include/asm/fpsimdmacros.h | 43 ++- arch/arm64/include/asm/hardirq.h | 2 +- arch/arm64/include/asm/io.h | 5 +- arch/arm64/include/asm/kvm_arm.h | 73 +---- arch/arm64/include/asm/kvm_emulate.h | 28 +- arch/arm64/include/asm/memory.h | 10 +- arch/arm64/include/asm/mmu.h | 5 +- arch/arm64/include/asm/pgtable.h | 8 + arch/arm64/include/asm/ptrace.h | 7 + arch/arm64/include/asm/suspend.h | 2 - arch/arm64/include/asm/syscalls.h | 30 --- arch/arm64/include/asm/unistd.h | 3 + arch/arm64/include/uapi/asm/Kbuild | 1 + arch/arm64/include/{ => uapi}/asm/ucontext.h | 8 +- arch/arm64/kernel/Makefile | 6 +- arch/arm64/kernel/armv8_deprecated.c | 205 ++++++++++---- arch/arm64/kernel/asm-offsets.c | 2 +- arch/arm64/kernel/cacheinfo.c | 128 +++++++++ arch/arm64/kernel/cpuidle.c | 20 ++ arch/arm64/kernel/cpuinfo.c | 34 ++- arch/arm64/kernel/efi.c | 356 ++++++++----------------- arch/arm64/kernel/entry.S | 66 ++--- arch/arm64/kernel/{sys32.S => entry32.S} | 34 +-- arch/arm64/kernel/hw_breakpoint.c | 2 +- arch/arm64/kernel/insn.c | 47 +++- arch/arm64/kernel/psci.c | 2 - arch/arm64/kernel/setup.c | 22 +- arch/arm64/kernel/signal32.c | 7 +- arch/arm64/kernel/smp.c | 10 +- arch/arm64/kernel/suspend.c | 21 -- arch/arm64/kernel/sys.c | 5 +- arch/arm64/kernel/sys32.c | 51 ++++ arch/arm64/kernel/traps.c | 50 +++- arch/arm64/kernel/vmlinux.lds.S | 17 +- arch/arm64/kvm/emulate.c | 5 +- arch/arm64/kvm/handle_exit.c | 39 +-- arch/arm64/kvm/hyp.S | 17 +- arch/arm64/kvm/inject_fault.c | 14 +- arch/arm64/kvm/sys_regs.c | 23 +- arch/arm64/mm/dma-mapping.c | 116 ++++---- arch/arm64/mm/dump.c | 30 ++- arch/arm64/mm/fault.c | 2 +- arch/arm64/mm/init.c | 25 +- arch/arm64/mm/ioremap.c | 1 + arch/arm64/mm/mm.h | 2 + arch/arm64/mm/mmu.c | 342 +++++++++++++++--------- arch/arm64/mm/proc.S | 14 +- drivers/cpuidle/Kconfig.arm64 | 1 - drivers/cpuidle/cpuidle-arm64.c | 1 - drivers/firmware/efi/efi.c | 56 ++-- drivers/firmware/efi/libstub/arm-stub.c | 59 ++++ drivers/firmware/efi/libstub/efi-stub-helper.c | 25 +- drivers/firmware/efi/libstub/efistub.h | 4 + drivers/firmware/efi/libstub/fdt.c | 62 ++++- include/linux/compat.h | 9 + include/linux/efi.h | 2 + include/linux/syscalls.h | 8 +- 73 files changed, 1533 insertions(+), 919 deletions(-) delete mode 100644 arch/arm64/include/asm/syscalls.h rename arch/arm64/include/{ => uapi}/asm/ucontext.h (88%) create mode 100644 arch/arm64/kernel/cacheinfo.c rename arch/arm64/kernel/{sys32.S => entry32.S} (80%) create mode 100644 arch/arm64/kernel/sys32.c Merging blackfin/for-linus (275f5a8573e7 blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP) $ git merge blackfin/for-linus Merge made by the 'recursive' strategy. arch/blackfin/configs/BF518F-EZBRD_defconfig | 1 - arch/blackfin/configs/BF527-TLL6527M_defconfig | 1 - arch/blackfin/configs/BF533-EZKIT_defconfig | 1 - arch/blackfin/configs/BF533-STAMP_defconfig | 1 - arch/blackfin/configs/BF537-STAMP_defconfig | 3 ++- arch/blackfin/configs/BF538-EZKIT_defconfig | 1 - arch/blackfin/configs/BF561-ACVILON_defconfig | 1 - arch/blackfin/configs/BF561-EZKIT-SMP_defconfig | 1 - arch/blackfin/configs/BF561-EZKIT_defconfig | 1 - arch/blackfin/configs/CM-BF527_defconfig | 1 - arch/blackfin/configs/CM-BF533_defconfig | 1 - arch/blackfin/configs/CM-BF537E_defconfig | 1 - arch/blackfin/configs/CM-BF537U_defconfig | 1 - arch/blackfin/configs/CM-BF548_defconfig | 1 - arch/blackfin/configs/CM-BF561_defconfig | 1 - arch/blackfin/configs/DNP5370_defconfig | 1 - arch/blackfin/configs/IP0X_defconfig | 1 - arch/blackfin/configs/PNAV-10_defconfig | 1 - arch/blackfin/configs/SRV1_defconfig | 1 - arch/blackfin/configs/TCM-BF518_defconfig | 1 - arch/blackfin/configs/TCM-BF537_defconfig | 1 - arch/blackfin/kernel/kgdb.c | 12 ++++-------- arch/blackfin/mach-bf609/boards/ezkit.c | 8 ++++---- 23 files changed, 10 insertions(+), 33 deletions(-) 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 (a74f9ec869a8 CRIS: macro whitespace fixes in uaccess.h) $ git merge cris/for-next Auto-merging arch/cris/mm/fault.c Merge made by the 'recursive' strategy. arch/cris/Kconfig | 4 ++++ arch/cris/arch-v32/drivers/sync_serial.c | 4 ++-- arch/cris/arch-v32/kernel/time.c | 4 ++++ arch/cris/kernel/crisksyms.c | 1 + arch/cris/mm/fault.c | 4 +++- 5 files changed, 14 insertions(+), 3 deletions(-) Merging hexagon/linux-next (8914d7e85780 Hexagon: fix signal delivery for debug traps) $ git merge hexagon/linux-next Already up-to-date. Merging ia64/next (a6b8978c54b7 pstore: Fix sprintf format specifier in pstore_dump()) $ git merge ia64/next Merge made by the 'recursive' strategy. fs/pstore/Kconfig | 10 ++++ fs/pstore/Makefile | 2 + fs/pstore/inode.c | 26 +++++++---- fs/pstore/internal.h | 6 +++ fs/pstore/platform.c | 5 +- fs/pstore/pmsg.c | 114 +++++++++++++++++++++++++++++++++++++++++++++ fs/pstore/ram.c | 53 +++++++++++++++------ include/linux/pstore.h | 1 + include/linux/pstore_ram.h | 1 + 9 files changed, 193 insertions(+), 25 deletions(-) create mode 100644 fs/pstore/pmsg.c Merging m68k/for-next (4436820a98cd m68k/defconfig: Enable Ethernet bridging) $ git merge m68k/for-next Removing arch/m68k/include/asm/futex.h Merge made by the 'recursive' strategy. arch/m68k/atari/atakeyb.c | 72 +-------------------------- arch/m68k/atari/stdma.c | 2 +- arch/m68k/atari/time.c | 3 +- arch/m68k/configs/amiga_defconfig | 73 +++++++++++++++++++++++---- arch/m68k/configs/apollo_defconfig | 73 +++++++++++++++++++++++---- arch/m68k/configs/atari_defconfig | 78 +++++++++++++++++++++++++---- arch/m68k/configs/bvme6000_defconfig | 73 +++++++++++++++++++++++---- arch/m68k/configs/hp300_defconfig | 73 +++++++++++++++++++++++---- arch/m68k/configs/mac_defconfig | 72 +++++++++++++++++++++++---- arch/m68k/configs/multi_defconfig | 78 ++++++++++++++++++++++++----- arch/m68k/configs/mvme147_defconfig | 73 +++++++++++++++++++++++---- arch/m68k/configs/mvme16x_defconfig | 72 +++++++++++++++++++++++---- arch/m68k/configs/q40_defconfig | 73 +++++++++++++++++++++++---- arch/m68k/configs/sun3_defconfig | 72 +++++++++++++++++++++++---- arch/m68k/configs/sun3x_defconfig | 73 +++++++++++++++++++++++---- arch/m68k/include/asm/Kbuild | 1 + arch/m68k/include/asm/atariints.h | 5 -- arch/m68k/include/asm/futex.h | 94 ----------------------------------- arch/m68k/include/asm/macintosh.h | 2 +- arch/m68k/mac/config.c | 32 ++++++------ arch/m68k/mvme147/config.c | 46 ----------------- arch/m68k/mvme16x/rtc.c | 2 +- drivers/net/ethernet/amd/atarilance.c | 8 +-- drivers/parport/parport_atari.c | 4 +- drivers/video/fbdev/atafb.c | 3 +- sound/oss/dmasound/dmasound_atari.c | 2 +- 26 files changed, 782 insertions(+), 377 deletions(-) delete mode 100644 arch/m68k/include/asm/futex.h Merging m68knommu/for-next (8d84d4aaf311 arch: m68k: 68360: config: Remove unused function) $ git merge m68knommu/for-next Merge made by the 'recursive' strategy. arch/m68k/68360/commproc.c | 8 ++++---- arch/m68k/68360/config.c | 13 ------------- arch/m68k/include/asm/commproc.h | 24 +----------------------- 3 files changed, 5 insertions(+), 40 deletions(-) Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check) $ git merge metag/for-next Already up-to-date. Merging microblaze/next (51cae8bfe7dd microblaze: Remove generated *.dtb files from dts) $ git merge microblaze/next Removing arch/microblaze/kernel/prom_parse.c Merge made by the 'recursive' strategy. arch/microblaze/boot/Makefile | 2 +- arch/microblaze/include/asm/delay.h | 4 +-- arch/microblaze/include/asm/kgdb.h | 3 +++ arch/microblaze/include/asm/linkage.h | 16 +----------- arch/microblaze/include/asm/pgalloc.h | 14 +++++------ arch/microblaze/include/asm/syscall.h | 2 +- arch/microblaze/include/asm/uaccess.h | 6 ++--- arch/microblaze/include/asm/unistd.h | 2 +- arch/microblaze/include/uapi/asm/unistd.h | 1 + arch/microblaze/kernel/Makefile | 2 +- arch/microblaze/kernel/cpu/cache.c | 6 ++--- arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c | 2 +- arch/microblaze/kernel/cpu/cpuinfo-static.c | 2 +- arch/microblaze/kernel/cpu/cpuinfo.c | 7 ++++++ arch/microblaze/kernel/intc.c | 8 +++--- arch/microblaze/kernel/kgdb.c | 10 +++++--- arch/microblaze/kernel/prom_parse.c | 35 --------------------------- arch/microblaze/kernel/ptrace.c | 4 +-- arch/microblaze/kernel/reset.c | 1 - arch/microblaze/kernel/signal.c | 4 +-- arch/microblaze/kernel/syscall_table.S | 1 + arch/microblaze/kernel/unwind.c | 2 +- 22 files changed, 49 insertions(+), 85 deletions(-) delete mode 100644 arch/microblaze/kernel/prom_parse.c Merging mips/mips-for-linux-next (a788a832b557 Merge branch '3.19-fixes' into mips-for-linux-next) $ git merge mips/mips-for-linux-next Merge made by the 'recursive' strategy. arch/mips/Kconfig | 23 +++++++++----------- arch/mips/cavium-octeon/smp.c | 2 -- arch/mips/configs/malta_defconfig | 16 ++++---------- arch/mips/fw/arc/misc.c | 26 +++++++++++++--------- arch/mips/include/asm/checksum.h | 40 ++++++++++++---------------------- arch/mips/include/asm/fpu.h | 43 ++++++++++++++++++++++--------------- arch/mips/include/asm/fw/arc/hinv.h | 6 +++--- arch/mips/include/asm/mips-cm.h | 4 ++-- arch/mips/include/asm/mipsregs.h | 15 +++++++++++++ arch/mips/include/asm/prom.h | 7 ------ arch/mips/include/asm/sgialib.h | 8 +++++-- arch/mips/include/uapi/asm/unistd.h | 15 +++++++------ arch/mips/jz4740/irq.c | 3 +++ arch/mips/kernel/elf.c | 8 +++---- arch/mips/kernel/irq_cpu.c | 4 ++++ arch/mips/kernel/process.c | 36 ++++++++++++++++++++----------- arch/mips/kernel/scall32-o32.S | 2 ++ arch/mips/kernel/scall64-64.S | 1 + arch/mips/kernel/scall64-n32.S | 1 + arch/mips/kernel/scall64-o32.S | 2 ++ arch/mips/kernel/smp-cmp.c | 4 ++-- arch/mips/kernel/smp-mt.c | 3 ++- arch/mips/kernel/smp.c | 2 +- arch/mips/kernel/traps.c | 3 ++- arch/mips/mm/tlb-r4k.c | 2 ++ arch/mips/pci/pci-bcm1480.c | 4 ++-- arch/mips/pci/pci-octeon.c | 4 ++-- arch/mips/pci/pcie-octeon.c | 12 +++++------ arch/mips/sgi-ip27/ip27-reset.c | 7 +++--- arch/mips/sgi-ip32/ip32-reset.c | 7 +++--- 30 files changed, 173 insertions(+), 137 deletions(-) Merging nios2/nios2-next (d24c8163b755 nios2: fix kuser trampoline address) $ git merge nios2/nios2-next Already up-to-date. Merging parisc-hd/for-next (b2776bf7149b Linux 3.18) $ git merge parisc-hd/for-next Already up-to-date. Merging powerpc/next (d557b09800da powerpc/mm/thp: Use tlbiel if possible) $ git merge powerpc/next Already up-to-date. Merging powerpc-mpe/next (fe12545e7650 powerpc/kernel: Avoid initializing device-tree pointer twice) $ git merge powerpc-mpe/next Auto-merging drivers/misc/cxl/file.c Auto-merging arch/powerpc/xmon/xmon.c Auto-merging arch/powerpc/kernel/smp.c Auto-merging arch/powerpc/include/asm/thread_info.h Auto-merging Documentation/kernel-parameters.txt Merge made by the 'recursive' strategy. Documentation/ABI/testing/sysfs-class-cxl | 32 +- Documentation/kernel-parameters.txt | 2 + arch/powerpc/Kconfig | 1 + arch/powerpc/configs/40x/acadia_defconfig | 21 +- arch/powerpc/configs/40x/ep405_defconfig | 18 +- arch/powerpc/configs/40x/kilauea_defconfig | 27 +- arch/powerpc/configs/40x/klondike_defconfig | 4 - arch/powerpc/configs/40x/makalu_defconfig | 20 +- arch/powerpc/configs/40x/obs600_defconfig | 13 +- arch/powerpc/configs/40x/virtex_defconfig | 21 +- arch/powerpc/configs/40x/walnut_defconfig | 18 +- arch/powerpc/configs/44x/akebono_defconfig | 7 - arch/powerpc/configs/44x/arches_defconfig | 23 +- arch/powerpc/configs/44x/bamboo_defconfig | 15 +- arch/powerpc/configs/44x/bluestone_defconfig | 16 +- arch/powerpc/configs/44x/canyonlands_defconfig | 26 +- arch/powerpc/configs/44x/currituck_defconfig | 13 +- arch/powerpc/configs/44x/ebony_defconfig | 17 +- arch/powerpc/configs/44x/eiger_defconfig | 26 +- arch/powerpc/configs/44x/icon_defconfig | 20 - arch/powerpc/configs/44x/iss476-smp_defconfig | 16 +- arch/powerpc/configs/44x/katmai_defconfig | 15 - arch/powerpc/configs/44x/rainier_defconfig | 15 +- arch/powerpc/configs/44x/redwood_defconfig | 26 +- arch/powerpc/configs/44x/sam440ep_defconfig | 19 +- arch/powerpc/configs/44x/sequoia_defconfig | 21 +- arch/powerpc/configs/44x/taishan_defconfig | 16 +- arch/powerpc/configs/44x/virtex5_defconfig | 21 +- arch/powerpc/configs/44x/warp_defconfig | 23 +- arch/powerpc/configs/52xx/cm5200_defconfig | 19 +- arch/powerpc/configs/52xx/lite5200b_defconfig | 20 +- arch/powerpc/configs/52xx/motionpro_defconfig | 22 +- arch/powerpc/configs/52xx/pcm030_defconfig | 21 +- arch/powerpc/configs/52xx/tqm5200_defconfig | 22 +- arch/powerpc/configs/83xx/asp8347_defconfig | 22 +- arch/powerpc/configs/83xx/kmeter1_defconfig | 4 - arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | 25 +- arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | 22 +- arch/powerpc/configs/83xx/mpc832x_mds_defconfig | 21 +- arch/powerpc/configs/83xx/mpc832x_rdb_defconfig | 23 +- arch/powerpc/configs/83xx/mpc834x_itx_defconfig | 20 +- arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig | 20 +- arch/powerpc/configs/83xx/mpc834x_mds_defconfig | 23 +- arch/powerpc/configs/83xx/mpc836x_mds_defconfig | 22 +- arch/powerpc/configs/83xx/mpc836x_rdk_defconfig | 16 +- arch/powerpc/configs/83xx/mpc837x_mds_defconfig | 15 +- arch/powerpc/configs/83xx/mpc837x_rdb_defconfig | 17 +- arch/powerpc/configs/83xx/sbc834x_defconfig | 16 +- arch/powerpc/configs/85xx/ge_imp3a_defconfig | 16 +- arch/powerpc/configs/85xx/kmp204x_defconfig | 3 - arch/powerpc/configs/85xx/ksi8560_defconfig | 17 +- arch/powerpc/configs/85xx/mpc8540_ads_defconfig | 19 +- arch/powerpc/configs/85xx/mpc8560_ads_defconfig | 19 +- arch/powerpc/configs/85xx/mpc85xx_cds_defconfig | 21 +- arch/powerpc/configs/85xx/ppa8548_defconfig | 62 +-- arch/powerpc/configs/85xx/sbc8548_defconfig | 40 +- arch/powerpc/configs/85xx/socrates_defconfig | 24 +- arch/powerpc/configs/85xx/stx_gp3_defconfig | 15 +- arch/powerpc/configs/85xx/tqm8540_defconfig | 17 +- arch/powerpc/configs/85xx/tqm8541_defconfig | 17 +- arch/powerpc/configs/85xx/tqm8548_defconfig | 22 +- arch/powerpc/configs/85xx/tqm8555_defconfig | 17 +- arch/powerpc/configs/85xx/tqm8560_defconfig | 17 +- arch/powerpc/configs/85xx/xes_mpc85xx_defconfig | 34 +- arch/powerpc/configs/86xx/gef_ppc9a_defconfig | 36 +- arch/powerpc/configs/86xx/gef_sbc310_defconfig | 35 +- arch/powerpc/configs/86xx/gef_sbc610_defconfig | 53 +-- arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig | 32 +- arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig | 33 +- arch/powerpc/configs/86xx/sbc8641d_defconfig | 54 +-- arch/powerpc/configs/adder875_defconfig | 27 +- arch/powerpc/configs/amigaone_defconfig | 36 +- arch/powerpc/configs/c2k_defconfig | 82 +--- arch/powerpc/configs/cell_defconfig | 30 +- arch/powerpc/configs/celleb_defconfig | 21 +- arch/powerpc/configs/chrp32_defconfig | 37 +- arch/powerpc/configs/corenet32_smp_defconfig | 19 +- arch/powerpc/configs/corenet64_smp_defconfig | 1 - arch/powerpc/configs/ep8248e_defconfig | 17 +- arch/powerpc/configs/ep88xc_defconfig | 29 +- arch/powerpc/configs/g5_defconfig | 63 +-- arch/powerpc/configs/gamecube_defconfig | 15 +- arch/powerpc/configs/holly_defconfig | 15 +- arch/powerpc/configs/linkstation_defconfig | 28 +- arch/powerpc/configs/maple_defconfig | 26 +- arch/powerpc/configs/mgcoge_defconfig | 12 +- arch/powerpc/configs/mpc512x_defconfig | 2 - arch/powerpc/configs/mpc5200_defconfig | 18 +- arch/powerpc/configs/mpc7448_hpc2_defconfig | 18 +- arch/powerpc/configs/mpc8272_ads_defconfig | 24 +- arch/powerpc/configs/mpc83xx_defconfig | 7 - arch/powerpc/configs/mpc85xx_defconfig | 58 +-- arch/powerpc/configs/mpc85xx_smp_defconfig | 62 +-- arch/powerpc/configs/mpc866_ads_defconfig | 22 +- arch/powerpc/configs/mpc86xx_defconfig | 39 +- arch/powerpc/configs/mpc885_ads_defconfig | 29 +- arch/powerpc/configs/mvme5100_defconfig | 9 - arch/powerpc/configs/pasemi_defconfig | 3 - arch/powerpc/configs/pmac32_defconfig | 65 +-- arch/powerpc/configs/ppc40x_defconfig | 17 +- arch/powerpc/configs/ppc44x_defconfig | 14 - arch/powerpc/configs/ppc64_defconfig | 16 +- arch/powerpc/configs/ppc64e_defconfig | 4 - arch/powerpc/configs/ppc6xx_defconfig | 348 ++++++---------- arch/powerpc/configs/pq2fads_defconfig | 28 +- arch/powerpc/configs/ps3_defconfig | 18 +- arch/powerpc/configs/pseries_defconfig | 29 +- arch/powerpc/configs/pseries_le_defconfig | 31 +- arch/powerpc/configs/storcenter_defconfig | 12 +- arch/powerpc/configs/tqm8xx_defconfig | 32 +- arch/powerpc/configs/wii_defconfig | 18 +- arch/powerpc/include/asm/cputable.h | 2 +- arch/powerpc/include/asm/eeh.h | 13 +- arch/powerpc/include/asm/kprobes.h | 63 ++- arch/powerpc/include/asm/opal.h | 8 + arch/powerpc/include/asm/pnv-pci.h | 4 +- arch/powerpc/include/asm/rtas.h | 2 +- arch/powerpc/include/asm/smp.h | 1 - arch/powerpc/include/asm/thread_info.h | 2 +- arch/powerpc/kernel/asm-offsets.c | 15 +- arch/powerpc/kernel/eeh.c | 24 ++ arch/powerpc/kernel/eeh_driver.c | 4 +- arch/powerpc/kernel/eeh_pe.c | 20 +- arch/powerpc/kernel/entry_32.S | 83 +--- arch/powerpc/kernel/entry_64.S | 37 +- arch/powerpc/kernel/paca.c | 8 + arch/powerpc/kernel/pci_dn.c | 4 +- arch/powerpc/kernel/prom.c | 3 - arch/powerpc/kernel/rtas.c | 22 +- arch/powerpc/kernel/smp.c | 14 - arch/powerpc/kernel/syscalls.c | 14 - arch/powerpc/kernel/traps.c | 15 - arch/powerpc/kvm/book3s_hv_interrupts.S | 26 +- arch/powerpc/kvm/book3s_hv_rmhandlers.S | 28 +- arch/powerpc/lib/Makefile | 27 +- arch/powerpc/lib/memcmp_64.S | 233 +++++++++++ arch/powerpc/lib/string.S | 2 + arch/powerpc/mm/slice.c | 29 -- arch/powerpc/platforms/44x/Kconfig | 1 - arch/powerpc/platforms/cell/smp.c | 2 +- arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 11 - arch/powerpc/platforms/powernv/eeh-powernv.c | 11 + arch/powerpc/platforms/powernv/opal.c | 72 +++- arch/powerpc/platforms/powernv/pci-ioda.c | 41 +- arch/powerpc/platforms/powernv/pci.c | 30 -- arch/powerpc/platforms/ps3/mm.c | 77 ++-- arch/powerpc/platforms/ps3/platform.h | 13 + arch/powerpc/platforms/pseries/Kconfig | 20 +- arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 +- arch/powerpc/platforms/pseries/mobility.c | 22 +- arch/powerpc/platforms/pseries/ras.c | 2 + arch/powerpc/sysdev/mpic.c | 2 +- arch/powerpc/sysdev/ppc4xx_hsta_msi.c | 2 +- arch/powerpc/sysdev/xics/xics-common.c | 2 +- arch/powerpc/xmon/xmon.c | 14 +- drivers/misc/cxl/Makefile | 5 +- drivers/misc/cxl/cxl.h | 9 + drivers/misc/cxl/fault.c | 11 + drivers/misc/cxl/file.c | 7 +- drivers/misc/cxl/irq.c | 6 +- drivers/misc/cxl/main.c | 2 + drivers/misc/cxl/native.c | 39 +- drivers/misc/cxl/pci.c | 91 +++- drivers/misc/cxl/sysfs.c | 57 +++ drivers/misc/cxl/trace.c | 13 + drivers/misc/cxl/trace.h | 459 +++++++++++++++++++++ drivers/ps3/ps3-vuart.c | 5 - drivers/ps3/sys-manager-core.c | 6 +- drivers/ps3/vuart.h | 16 + tools/testing/selftests/powerpc/Makefile | 2 +- .../testing/selftests/powerpc/copyloops/.gitignore | 4 + tools/testing/selftests/powerpc/mm/.gitignore | 3 + tools/testing/selftests/powerpc/mm/Makefile | 9 +- tools/testing/selftests/powerpc/mm/subpage_prot.c | 220 ++++++++++ tools/testing/selftests/powerpc/pmu/.gitignore | 3 + tools/testing/selftests/powerpc/pmu/ebb/.gitignore | 22 + .../selftests/powerpc/primitives/.gitignore | 1 + .../selftests/powerpc/stringloops/.gitignore | 1 + .../testing/selftests/powerpc/stringloops/Makefile | 20 + .../selftests/powerpc/stringloops/asm/ppc_asm.h | 7 + .../testing/selftests/powerpc/stringloops/memcmp.c | 103 +++++ .../selftests/powerpc/stringloops/memcmp_64.S | 1 + tools/testing/selftests/powerpc/tm/.gitignore | 1 + 183 files changed, 2356 insertions(+), 2660 deletions(-) create mode 100644 arch/powerpc/lib/memcmp_64.S create mode 100644 drivers/misc/cxl/trace.c create mode 100644 drivers/misc/cxl/trace.h create mode 100644 tools/testing/selftests/powerpc/copyloops/.gitignore create mode 100644 tools/testing/selftests/powerpc/mm/.gitignore create mode 100644 tools/testing/selftests/powerpc/mm/subpage_prot.c create mode 100644 tools/testing/selftests/powerpc/pmu/.gitignore create mode 100644 tools/testing/selftests/powerpc/pmu/ebb/.gitignore create mode 100644 tools/testing/selftests/powerpc/primitives/.gitignore create mode 100644 tools/testing/selftests/powerpc/stringloops/.gitignore create mode 100644 tools/testing/selftests/powerpc/stringloops/Makefile create mode 100644 tools/testing/selftests/powerpc/stringloops/asm/ppc_asm.h create mode 100644 tools/testing/selftests/powerpc/stringloops/memcmp.c create mode 120000 tools/testing/selftests/powerpc/stringloops/memcmp_64.S create mode 100644 tools/testing/selftests/powerpc/tm/.gitignore Merging fsl/next (0dc294f717d4 powerpc/mm: bail out early when flushing TLB page) $ git merge fsl/next Removing arch/powerpc/boot/dts/t4240emu.dts Merge made by the 'recursive' strategy. .../devicetree/bindings/powerpc/fsl/fman.txt | 70 +++++ Documentation/devicetree/bindings/soc/fsl/bman.txt | 12 +- Documentation/devicetree/bindings/soc/fsl/qman.txt | 14 +- arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi | 1 + arch/powerpc/boot/dts/fsl/pq3-etsec2-1.dtsi | 1 + arch/powerpc/boot/dts/fsl/pq3-etsec2-2.dtsi | 1 + arch/powerpc/boot/dts/fsl/pq3-gpio-0.dtsi | 6 +- arch/powerpc/boot/dts/fsl/qoriq-bman1-portals.dtsi | 90 +++++++ arch/powerpc/boot/dts/fsl/qoriq-bman1.dtsi | 41 +++ arch/powerpc/boot/dts/fsl/qoriq-qman1-portals.dtsi | 101 ++++++++ arch/powerpc/boot/dts/fsl/qoriq-qman1.dtsi | 41 +++ arch/powerpc/boot/dts/fsl/qoriq-qman3.dtsi | 41 +++ arch/powerpc/boot/dts/mvme2500.dts | 280 ++++++++++++++++++++ arch/powerpc/boot/dts/t4240emu.dts | 281 --------------------- arch/powerpc/configs/corenet32_smp_defconfig | 2 + arch/powerpc/configs/corenet64_smp_defconfig | 5 + arch/powerpc/configs/mpc85xx_defconfig | 16 +- arch/powerpc/configs/mpc85xx_smp_defconfig | 1 + arch/powerpc/include/asm/pci-bridge.h | 4 + arch/powerpc/include/asm/pgtable-ppc32.h | 23 +- arch/powerpc/include/asm/pgtable.h | 7 +- arch/powerpc/include/asm/pte-8xx.h | 9 +- arch/powerpc/include/asm/pte-common.h | 25 +- arch/powerpc/kernel/cputable.c | 1 + arch/powerpc/kernel/head_8xx.S | 123 ++++----- arch/powerpc/mm/fsl_booke_mmu.c | 2 - arch/powerpc/mm/mmu_context_nohash.c | 43 +++- arch/powerpc/mm/pgtable_32.c | 19 +- arch/powerpc/mm/tlb_nohash.c | 5 +- arch/powerpc/perf/core-fsl-emb.c | 10 +- arch/powerpc/platforms/83xx/usb.c | 3 +- arch/powerpc/platforms/85xx/Kconfig | 6 + arch/powerpc/platforms/85xx/Makefile | 1 + arch/powerpc/platforms/85xx/mvme2500.c | 74 ++++++ arch/powerpc/sysdev/fsl_pci.c | 11 +- arch/powerpc/sysdev/indirect_pci.c | 25 +- arch/powerpc/sysdev/qe_lib/qe.c | 6 +- drivers/memory/fsl-corenet-cf.c | 36 ++- 38 files changed, 1011 insertions(+), 426 deletions(-) create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-bman1-portals.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-bman1.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-qman1-portals.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-qman1.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-qman3.dtsi create mode 100644 arch/powerpc/boot/dts/mvme2500.dts delete mode 100644 arch/powerpc/boot/dts/t4240emu.dts create mode 100644 arch/powerpc/platforms/85xx/mvme2500.c Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate) $ git merge mpc5xxx/next Already up-to-date. Merging s390/features (5c75a0dac309 s390/smp: increase maximum value of NR_CPUS to 512) $ git merge s390/features Auto-merging scripts/recordmcount.pl Auto-merging kernel/trace/Makefile Auto-merging include/linux/compiler.h Auto-merging arch/s390/mm/pgtable.c Auto-merging arch/s390/mm/fault.c Auto-merging arch/s390/include/asm/sigp.h Auto-merging Makefile Merge made by the 'recursive' strategy. Documentation/s390/Debugging390.txt | 493 +++++++++++++++----------------- Makefile | 6 +- arch/s390/Kconfig | 42 ++- arch/s390/Makefile | 12 + arch/s390/boot/compressed/misc.c | 3 +- arch/s390/configs/default_defconfig | 2 +- arch/s390/configs/gcov_defconfig | 1 + arch/s390/configs/performance_defconfig | 1 + arch/s390/configs/zfcpdump_defconfig | 1 + arch/s390/crypto/aes_s390.c | 4 +- arch/s390/defconfig | 7 +- arch/s390/include/asm/cpu_mf.h | 14 + arch/s390/include/asm/elf.h | 8 +- arch/s390/include/asm/ftrace.h | 15 + arch/s390/include/asm/jump_label.h | 7 +- arch/s390/include/asm/pgtable.h | 4 + arch/s390/include/asm/processor.h | 5 +- arch/s390/include/asm/reset.h | 3 +- arch/s390/include/asm/sclp.h | 7 +- arch/s390/include/asm/setup.h | 3 + arch/s390/include/asm/sigp.h | 1 + arch/s390/include/asm/smp.h | 4 + arch/s390/include/asm/sysinfo.h | 20 +- arch/s390/include/asm/topology.h | 4 + arch/s390/kernel/Makefile | 4 +- arch/s390/kernel/base.S | 3 +- arch/s390/kernel/cache.c | 388 ++++++------------------- arch/s390/kernel/dis.c | 9 +- arch/s390/kernel/early.c | 18 ++ arch/s390/kernel/entry.h | 4 +- arch/s390/kernel/ftrace.c | 108 ++++--- arch/s390/kernel/head.S | 4 +- arch/s390/kernel/ipl.c | 11 +- arch/s390/kernel/jump_label.c | 63 +++- arch/s390/kernel/kprobes.c | 3 +- arch/s390/kernel/machine_kexec.c | 19 +- arch/s390/kernel/mcount.S | 2 + arch/s390/kernel/process.c | 10 - arch/s390/kernel/processor.c | 10 +- arch/s390/kernel/sclp.S | 3 +- arch/s390/kernel/setup.c | 3 + arch/s390/kernel/smp.c | 261 +++++++++++++---- arch/s390/kernel/sysinfo.c | 8 + arch/s390/kernel/topology.c | 63 ++-- arch/s390/kernel/vtime.c | 58 +++- arch/s390/lib/spinlock.c | 52 +++- arch/s390/mm/fault.c | 4 +- arch/s390/mm/init.c | 9 +- arch/s390/mm/mmap.c | 142 ++++++++- arch/s390/mm/pgtable.c | 6 +- arch/s390/pci/pci_mmio.c | 4 +- drivers/s390/block/dasd.c | 102 ++----- drivers/s390/block/dasd_int.h | 3 +- drivers/s390/block/dasd_proc.c | 21 +- drivers/s390/block/dcssblk.c | 15 +- drivers/s390/char/hmcdrv_ftp.c | 6 +- drivers/s390/char/hmcdrv_mod.c | 1 - drivers/s390/char/sclp_early.c | 49 +++- drivers/s390/char/tape_34xx.c | 12 +- drivers/s390/cio/cio.c | 2 +- drivers/s390/cio/idset.c | 20 -- drivers/s390/cio/idset.h | 2 - drivers/s390/crypto/ap_bus.c | 140 ++++++--- drivers/s390/crypto/ap_bus.h | 1 + drivers/s390/crypto/zcrypt_api.h | 1 + drivers/s390/crypto/zcrypt_cex4.c | 33 ++- drivers/tty/hvc/hvc_iucv.c | 31 +- include/linux/compiler.h | 4 + kernel/Makefile | 4 +- kernel/events/Makefile | 2 +- kernel/locking/Makefile | 8 +- kernel/sched/Makefile | 2 +- kernel/trace/Makefile | 4 +- lib/Makefile | 2 +- scripts/Makefile.build | 5 +- scripts/recordmcount.pl | 9 +- 76 files changed, 1429 insertions(+), 986 deletions(-) Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) $ git merge sparc-next/master Already up-to-date. Merging tile/master (b9f705758a4f tile: enable sparse checks for get/put_user) $ git merge tile/master Merge made by the 'recursive' strategy. arch/tile/include/asm/uaccess.h | 37 ++++++++++++++++++---------------- arch/tile/include/uapi/asm/byteorder.h | 4 +--- 2 files changed, 21 insertions(+), 20 deletions(-) Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) $ git merge unicore32/unicore32 Already up-to-date. Merging xtensa/for_next (1f2fdbd0078c xtensa: disable link optimization) $ git merge xtensa/for_next Already up-to-date. Merging btrfs/next (1edb647bb954 Btrfs: remove non-sense btrfs_error_discard_extent() function) $ git merge btrfs/next Already up-to-date. Merging ceph/master (388cfdc9bc19 libceph: require cephx message signature by default) $ git merge ceph/master Resolved 'fs/ceph/snap.c' using previous resolution. Resolved 'fs/ceph/super.c' using previous resolution. Resolved 'fs/ceph/super.h' using previous resolution. Resolved 'net/ceph/auth_x.c' using previous resolution. Auto-merging net/ceph/auth_x.c CONFLICT (content): Merge conflict in net/ceph/auth_x.c Auto-merging fs/ceph/super.h CONFLICT (content): Merge conflict in fs/ceph/super.h Auto-merging fs/ceph/super.c CONFLICT (content): Merge conflict in fs/ceph/super.c Auto-merging fs/ceph/snap.c CONFLICT (content): Merge conflict in fs/ceph/snap.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 541a00b2495c] Merge remote-tracking branch 'ceph/master' $ git diff -M --stat --summary HEAD^.. Merging cifs/for-next (7a1ceba07170 cifs: fix MUST SecurityFlags filtering) $ git merge cifs/for-next Merge made by the 'recursive' strategy. fs/cifs/cifs_debug.c | 6 ++++-- fs/cifs/file.c | 6 +++++- fs/cifs/smbencrypt.c | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) Merging ecryptfs/next (e7a823be2adc Merge tag 'linux-kselftest-3.19-rc-5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest) $ git merge ecryptfs/next Already up-to-date. Merging ext3/for_next (b10a08194c2b quota: Store maximum space limit in bytes) $ git merge ext3/for_next Merge made by the 'recursive' strategy. fs/ext3/super.c | 2 + fs/ext4/super.c | 42 +----------------- fs/isofs/util.c | 18 ++------ fs/ocfs2/quota.h | 1 + fs/ocfs2/quota_local.c | 14 +++--- fs/ocfs2/super.c | 32 +------------- fs/quota/dquot.c | 107 +++++++++++++++++++++++++++++++++++++++++---- fs/quota/quota.c | 52 +++++++++++++++++----- fs/quota/quota_v1.c | 4 +- fs/quota/quota_v2.c | 16 ++++--- fs/udf/Kconfig | 10 +++-- fs/udf/inode.c | 28 +++++++----- fs/udf/super.c | 1 + fs/xfs/xfs_qm_syscalls.c | 74 ++++++++++--------------------- fs/xfs/xfs_quotaops.c | 59 +++++++++++++++---------- include/linux/dqblk_v1.h | 3 -- include/linux/jbd.h | 9 ---- include/linux/jbd2.h | 9 ---- include/linux/quota.h | 22 +++++----- include/linux/quotaops.h | 3 ++ include/uapi/linux/quota.h | 14 +++++- 21 files changed, 280 insertions(+), 240 deletions(-) Merging ext4/dev (d7e9b1b7b9ab ext4: change to use setup_timer() instead of init_timer()) $ git merge ext4/dev Auto-merging include/linux/fs.h Auto-merging fs/ext4/super.c Merge made by the 'recursive' strategy. fs/ext4/ext4.h | 17 +++++-- fs/ext4/inode.c | 70 +++++++++++++++++++++++++- fs/ext4/super.c | 15 ++++-- fs/fs-writeback.c | 62 +++++++++++++++++++---- fs/gfs2/file.c | 4 +- fs/inode.c | 106 +++++++++++++++++++++++++++++++++------ fs/jbd2/recovery.c | 3 ++ fs/jfs/file.c | 2 +- fs/libfs.c | 2 +- fs/proc_namespace.c | 1 + fs/sync.c | 8 +++ include/linux/backing-dev.h | 1 + include/linux/fs.h | 10 ++++ include/trace/events/ext4.h | 30 +++++++++++ include/trace/events/writeback.h | 60 +++++++++++++++++++++- include/uapi/linux/fs.h | 4 +- mm/backing-dev.c | 10 +++- 17 files changed, 361 insertions(+), 44 deletions(-) Merging f2fs/dev (b83bd37d3b01 f2fs: introduce a batched trim) $ git merge f2fs/dev Auto-merging include/uapi/linux/fs.h Merge made by the 'recursive' strategy. fs/f2fs/Kconfig | 10 ++ fs/f2fs/Makefile | 1 + fs/f2fs/acl.c | 6 +- fs/f2fs/checkpoint.c | 71 +++++++++----- fs/f2fs/data.c | 225 +++++++++++++++++++++++++------------------- fs/f2fs/debug.c | 53 ++++++++--- fs/f2fs/dir.c | 3 +- fs/f2fs/f2fs.h | 70 ++++++++------ fs/f2fs/file.c | 132 +++++++++++++++++++++++--- fs/f2fs/gc.c | 35 ++----- fs/f2fs/gc.h | 35 ++++--- fs/f2fs/inline.c | 32 +++---- fs/f2fs/inode.c | 44 ++++----- fs/f2fs/node.c | 114 ++++++++++------------ fs/f2fs/node.h | 45 ++++++--- fs/f2fs/recovery.c | 7 +- fs/f2fs/segment.c | 159 ++++++++++++++++++------------- fs/f2fs/super.c | 68 ++++++++++--- fs/f2fs/trace.c | 159 +++++++++++++++++++++++++++++++ fs/f2fs/trace.h | 46 +++++++++ fs/xfs/xfs_fs.h | 8 +- include/linux/f2fs_fs.h | 4 +- include/trace/events/f2fs.h | 134 ++++++++++++-------------- include/uapi/linux/fs.h | 8 ++ 24 files changed, 968 insertions(+), 501 deletions(-) create mode 100644 fs/f2fs/trace.c create mode 100644 fs/f2fs/trace.h Merging fscache/fscache (1a8ed18fb7db cachefiles: remove two unused pagevecs.) $ git merge fscache/fscache Resolved 'fs/fscache/object.c' using previous resolution. Auto-merging fs/fscache/object.c CONFLICT (content): Merge conflict in fs/fscache/object.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master be7c35170ffb] Merge remote-tracking branch 'fscache/fscache' $ git diff -M --stat --summary HEAD^.. Merging fuse/for-next (9759bd518994 fuse: add memory barrier to INIT) $ git merge fuse/for-next Already up-to-date. Merging gfs2/master (45094a58b1f5 GFS2: Eliminate a nonsense goto) $ git merge gfs2/master Merge made by the 'recursive' strategy. fs/gfs2/glock.c | 13 +++---------- fs/gfs2/inode.c | 3 --- fs/gfs2/recovery.c | 2 +- fs/gfs2/sys.c | 2 +- 4 files changed, 5 insertions(+), 15 deletions(-) Merging jfs/jfs-next (648695c74811 jfs: Deletion of an unnecessary check before the function call "unload_nls") $ git merge jfs/jfs-next Removing fs/jfs/endian24.h Merge made by the 'recursive' strategy. fs/jfs/endian24.h | 49 ------------------------------------------------ fs/jfs/jfs_dtree.c | 4 ++-- fs/jfs/jfs_types.h | 55 ++++++++++++++++++++++++++++++++---------------------- fs/jfs/jfs_xtree.h | 25 +++++++++---------------- fs/jfs/super.c | 3 +-- 5 files changed, 45 insertions(+), 91 deletions(-) delete mode 100644 fs/jfs/endian24.h Merging nfs/linux-next (c7c545d4a348 NFS: a couple off by ones) $ git merge nfs/linux-next Merge made by the 'recursive' strategy. fs/nfs/callback.c | 8 +- fs/nfs/delegation.c | 20 ++++- fs/nfs/inode.c | 7 +- fs/nfs/nfs4_fs.h | 3 + fs/nfs/nfs4proc.c | 199 +++++++++++++++++++++++++++--------------------- fs/nfs/nfs4state.c | 31 +++++--- fs/nfs/nfs4xdr.c | 25 +++--- fs/nfs/nfsroot.c | 4 +- fs/nfs/pnfs.c | 24 +++++- fs/nfs/pnfs.h | 10 +++ include/linux/nfs_xdr.h | 9 ++- net/sunrpc/sched.c | 7 +- 12 files changed, 217 insertions(+), 130 deletions(-) Merging nfsd/nfsd-next (168db98e1a62 nfsd: default NFSv4.2 to on) $ git merge nfsd/nfsd-next Auto-merging include/linux/fs.h Auto-merging fs/nfs/nfs4state.c Auto-merging fs/nfs/delegation.c Auto-merging fs/inode.c Auto-merging fs/cifs/file.c Merge made by the 'recursive' strategy. fs/ceph/locks.c | 64 ++-- fs/ceph/mds_client.c | 4 - fs/cifs/file.c | 34 +- fs/inode.c | 3 +- fs/lockd/svclock.c | 4 +- fs/lockd/svcsubs.c | 26 +- fs/lockd/xdr.c | 8 - fs/locks.c | 569 +++++++++++++++++-------------- fs/nfs/delegation.c | 23 +- fs/nfs/nfs4state.c | 70 ++-- fs/nfs/pagelist.c | 6 +- fs/nfs/write.c | 41 ++- fs/nfsd/nfs4state.c | 46 +-- fs/nfsd/nfs4xdr.c | 50 +-- fs/nfsd/nfssvc.c | 1 + fs/nfsd/state.h | 2 +- fs/read_write.c | 2 +- include/linux/fs.h | 52 ++- include/linux/sunrpc/svc.h | 2 +- include/linux/sunrpc/svc_rdma.h | 13 +- net/sunrpc/svc.c | 4 +- net/sunrpc/svc_xprt.c | 3 +- net/sunrpc/xprtrdma/svc_rdma_marshal.c | 16 - net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 244 ++++++++----- net/sunrpc/xprtrdma/svc_rdma_sendto.c | 46 +-- net/sunrpc/xprtrdma/svc_rdma_transport.c | 47 ++- 26 files changed, 775 insertions(+), 605 deletions(-) Merging overlayfs/overlayfs-next (4330397e4e8a ovl: discard independent cursor in readdir()) $ git merge overlayfs/overlayfs-next Auto-merging fs/overlayfs/readdir.c Merge made by the 'recursive' strategy. Documentation/filesystems/overlayfs.txt | 28 ++ fs/overlayfs/copy_up.c | 5 +- fs/overlayfs/dir.c | 28 +- fs/overlayfs/inode.c | 12 +- fs/overlayfs/overlayfs.h | 18 +- fs/overlayfs/readdir.c | 181 +++++----- fs/overlayfs/super.c | 564 +++++++++++++++++++++----------- 7 files changed, 517 insertions(+), 319 deletions(-) Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option) $ git merge squashfs/master Already up-to-date. Merging v9fs/for-next (f15844e0777f 9P: fix return value in v9fs_fid_xattr_set) $ git merge v9fs/for-next Already up-to-date. Merging ubifs/linux-next (832b52a15085 UBI: Block: Explain usage of blk_rq_map_sg()) $ git merge ubifs/linux-next Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 9 +- drivers/mtd/ubi/block.c | 208 ++++++++++++++++++++++------------------------ drivers/mtd/ubi/build.c | 6 +- drivers/mtd/ubi/cdev.c | 19 +++-- drivers/mtd/ubi/eba.c | 56 +++++++++++++ drivers/mtd/ubi/fastmap.c | 13 +++ drivers/mtd/ubi/io.c | 3 +- drivers/mtd/ubi/kapi.c | 110 ++++++++++++++++++++---- drivers/mtd/ubi/misc.c | 2 + drivers/mtd/ubi/ubi.h | 19 +++-- drivers/mtd/ubi/vtbl.c | 7 +- drivers/mtd/ubi/wl.c | 10 +-- fs/ubifs/debug.c | 4 + fs/ubifs/dir.c | 16 ++++ fs/ubifs/file.c | 4 + fs/ubifs/super.c | 1 + fs/ubifs/ubifs.h | 4 + fs/ubifs/xattr.c | 112 +++++++++++++++++++++++-- include/linux/mtd/ubi.h | 53 +++++++++++- 19 files changed, 482 insertions(+), 174 deletions(-) Merging xfs/for-next (179073620d80 Merge branch 'xfs-ioctl-setattr-cleanup' into for-next) $ git merge xfs/for-next Auto-merging fs/xfs/xfs_qm_syscalls.c Auto-merging fs/xfs/xfs_qm.h Merge made by the 'recursive' strategy. Documentation/filesystems/xfs.txt | 17 +- fs/xfs/kmem.c | 10 - fs/xfs/kmem.h | 5 +- fs/xfs/libxfs/xfs_attr_leaf.c | 2 +- fs/xfs/libxfs/xfs_bmap.c | 20 +- fs/xfs/libxfs/xfs_bmap.h | 33 +++ fs/xfs/libxfs/xfs_format.h | 24 +- fs/xfs/{ => libxfs}/xfs_fs.h | 0 fs/xfs/libxfs/xfs_sb.c | 320 ++++++++++------------- fs/xfs/libxfs/xfs_sb.h | 11 +- fs/xfs/libxfs/xfs_shared.h | 33 ++- fs/xfs/libxfs/xfs_symlink_remote.c | 2 + fs/xfs/libxfs/xfs_trans_resv.c | 14 -- fs/xfs/libxfs/xfs_trans_resv.h | 1 - fs/xfs/{ => libxfs}/xfs_types.h | 0 fs/xfs/xfs_aops.c | 149 +++++------ fs/xfs/xfs_aops.h | 3 - fs/xfs/xfs_bmap_util.h | 37 +-- fs/xfs/xfs_buf_item.c | 6 +- fs/xfs/xfs_dquot.h | 2 +- fs/xfs/xfs_file.c | 64 +++-- fs/xfs/xfs_fsops.c | 33 +-- fs/xfs/xfs_inode.c | 136 +++++++++- fs/xfs/xfs_inode.h | 11 +- fs/xfs/xfs_ioctl.c | 501 ++++++++++++++++++------------------- fs/xfs/xfs_ioctl32.c | 2 +- fs/xfs/xfs_iomap.c | 2 +- fs/xfs/xfs_iomap.h | 2 +- fs/xfs/xfs_iops.c | 21 +- fs/xfs/xfs_log.c | 28 ++- fs/xfs/xfs_mount.c | 107 ++------ fs/xfs/xfs_mount.h | 5 +- fs/xfs/xfs_qm.c | 43 +--- fs/xfs/xfs_qm.h | 1 - fs/xfs/xfs_qm_syscalls.c | 14 +- fs/xfs/xfs_super.c | 15 +- fs/xfs/xfs_sysctl.c | 18 -- fs/xfs/xfs_trans.c | 1 + 38 files changed, 805 insertions(+), 888 deletions(-) rename fs/xfs/{ => libxfs}/xfs_fs.h (100%) rename fs/xfs/{ => libxfs}/xfs_types.h (100%) Merging file-locks/linux-next (8116bf4cb62d locks: update comments that refer to inode->i_flock) $ git merge file-locks/linux-next Already up-to-date. Merging vfs/for-next (795b4313ea3b Merge branch 'iov_iter' into for-next) $ git merge vfs/for-next Auto-merging include/linux/fs.h Auto-merging fs/read_write.c Merge made by the 'recursive' strategy. drivers/infiniband/hw/cxgb4/device.c | 35 +-- drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 9 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.h | 2 +- drivers/scsi/csiostor/csio_init.c | 9 +- drivers/staging/lustre/lustre/llite/dcache.c | 20 +- drivers/staging/lustre/lustre/llite/file.c | 8 +- .../staging/lustre/lustre/llite/llite_internal.h | 5 +- drivers/staging/lustre/lustre/llite/llite_lib.c | 42 --- drivers/staging/lustre/lustre/llite/namei.c | 12 +- drivers/usb/gadget/udc/atmel_usba_udc.c | 15 +- fs/dcache.c | 149 ++++++++--- fs/debugfs/inode.c | 291 ++++++++++++--------- fs/exec.c | 10 +- fs/fs_pin.c | 23 -- fs/namei.c | 143 ++++++---- fs/ncpfs/dir.c | 98 +++---- fs/ncpfs/ncp_fs_i.h | 1 + fs/ncpfs/ncplib_kernel.h | 30 --- fs/open.c | 10 +- fs/proc/generic.c | 25 +- fs/read_write.c | 46 ++++ fs/splice.c | 23 +- include/linux/audit.h | 3 - include/linux/dcache.h | 3 - include/linux/debugfs.h | 18 ++ include/linux/fs.h | 12 +- include/linux/fs_pin.h | 1 - include/linux/lockref.h | 3 +- include/linux/uio.h | 4 +- kernel/acct.c | 20 +- kernel/audit.h | 17 +- kernel/auditsc.c | 176 +++---------- lib/lockref.c | 36 ++- mm/iov_iter.c | 17 +- mm/page_io.c | 9 +- security/commoncap.c | 6 +- security/selinux/selinuxfs.c | 52 +--- 37 files changed, 674 insertions(+), 709 deletions(-) Merging pci/next (66e5bde9e5f9 Merge branches 'pci/misc' and 'pci/msi' into next) $ git merge pci/next Resolved 'arch/mips/pci/pci-bcm1480.c' using previous resolution. Resolved 'arch/mips/pci/pci-octeon.c' using previous resolution. Resolved 'arch/mips/pci/pcie-octeon.c' using previous resolution. Auto-merging include/linux/pci.h Auto-merging drivers/pci/host/pcie-designware.c Auto-merging arch/x86/pci/xen.c Auto-merging arch/powerpc/sysdev/fsl_pci.c Auto-merging arch/mn10300/unit-asb2305/pci.c Auto-merging arch/mips/pci/pcie-octeon.c CONFLICT (content): Merge conflict in arch/mips/pci/pcie-octeon.c Auto-merging arch/mips/pci/pci-octeon.c CONFLICT (content): Merge conflict in arch/mips/pci/pci-octeon.c Auto-merging arch/mips/pci/pci-bcm1480.c CONFLICT (content): Merge conflict in arch/mips/pci/pci-bcm1480.c Auto-merging arch/arm/Kconfig Auto-merging MAINTAINERS Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 7c2a62a253c2] Merge remote-tracking branch 'pci/next' $ git diff -M --stat --summary HEAD^.. .../devicetree/bindings/pci/versatile.txt | 59 +++++ MAINTAINERS | 8 + arch/arm/Kconfig | 3 + arch/arm/boot/dts/versatile-pb.dts | 37 ++++ arch/arm/include/asm/mach/pci.h | 6 - arch/arm/include/asm/pci.h | 7 - arch/arm/kernel/bios32.c | 3 - arch/arm/mach-cns3xxx/pcie.c | 92 +++----- arch/arm/mach-integrator/pci_v3.c | 62 +----- arch/arm/mach-ks8695/pci.c | 77 +------ arch/arm/mach-sa1100/pci-nanoengine.c | 94 +------- arch/arm64/kernel/pci.c | 22 -- arch/frv/mb93090-mb00/pci-vdk.c | 4 +- arch/mn10300/unit-asb2305/pci.c | 4 +- arch/powerpc/platforms/cell/celleb_scc_pciex.c | 4 +- arch/powerpc/platforms/powermac/pci.c | 209 ++++-------------- arch/powerpc/sysdev/fsl_pci.c | 46 +--- arch/tile/kernel/pci.c | 4 +- arch/x86/pci/xen.c | 4 + drivers/net/ethernet/realtek/r8169.c | 6 +- drivers/of/of_pci.c | 4 + drivers/pci/access.c | 87 ++++++++ drivers/pci/host/Kconfig | 4 + drivers/pci/host/Makefile | 1 + drivers/pci/host/pci-host-generic.c | 51 +---- drivers/pci/host/pci-keystone.c | 4 +- drivers/pci/host/pci-layerscape.c | 1 - drivers/pci/host/pci-mvebu.c | 15 +- drivers/pci/host/pci-rcar-gen2.c | 51 +---- drivers/pci/host/pci-tegra.c | 68 +----- drivers/pci/host/pci-versatile.c | 237 +++++++++++++++++++++ drivers/pci/host/pci-xgene.c | 152 +------------ drivers/pci/host/pcie-designware.c | 3 - drivers/pci/host/pcie-rcar.c | 7 +- drivers/pci/host/pcie-xilinx.c | 92 +------- drivers/pci/hotplug/cpci_hotplug_core.c | 3 +- drivers/pci/hotplug/pciehp_ctrl.c | 2 - drivers/pci/msi.c | 5 + drivers/pci/pci-driver.c | 2 +- drivers/pci/pci.c | 51 ++++- drivers/pci/pcie/aspm.c | 12 +- drivers/pci/quirks.c | 64 ++++++ drivers/pci/rom.c | 7 +- drivers/rapidio/devices/tsi721.c | 2 +- drivers/rapidio/devices/tsi721.h | 2 - drivers/scsi/esas2r/esas2r_init.c | 5 +- include/linux/pci.h | 13 ++ include/uapi/linux/pci_regs.h | 4 + 48 files changed, 732 insertions(+), 968 deletions(-) create mode 100644 Documentation/devicetree/bindings/pci/versatile.txt create mode 100644 drivers/pci/host/pci-versatile.c Merging hid/for-next (dc5439f4c356 Merge branch 'for-3.20/wacom' into for-next) $ git merge hid/for-next Auto-merging drivers/hid/usbhid/hid-quirks.c Auto-merging drivers/hid/hid-logitech-hidpp.c Auto-merging drivers/hid/hid-input.c Auto-merging drivers/hid/hid-ids.h Auto-merging drivers/hid/hid-core.c Auto-merging drivers/hid/Kconfig Merge made by the 'recursive' strategy. drivers/hid/Kconfig | 12 +- drivers/hid/Makefile | 50 +++----- drivers/hid/hid-betopff.c | 160 ++++++++++++++++++++++++++ drivers/hid/hid-core.c | 31 ++++- drivers/hid/hid-hyperv.c | 2 +- drivers/hid/hid-ids.h | 9 ++ drivers/hid/hid-input.c | 26 ++++- drivers/hid/hid-lenovo.c | 79 ++++++++++++- drivers/hid/hid-lg4ff.c | 11 +- drivers/hid/hid-logitech-hidpp.c | 81 ++++++++----- drivers/hid/hid-microsoft.c | 2 + drivers/hid/hid-rmi.c | 118 +++++++++++++++---- drivers/hid/usbhid/Makefile | 12 +- drivers/hid/usbhid/hid-pidff.c | 6 + drivers/hid/usbhid/hid-quirks.c | 1 + drivers/hid/wacom_sys.c | 9 +- drivers/hid/wacom_wac.c | 239 +++++++++++++++++++++------------------ drivers/hid/wacom_wac.h | 17 ++- include/linux/hid.h | 4 +- include/uapi/linux/input.h | 1 + 20 files changed, 641 insertions(+), 229 deletions(-) create mode 100644 drivers/hid/hid-betopff.c Merging i2c/i2c/for-next (6d9130940f26 Merge branch 'i2c/for-current' into i2c/for-next) $ git merge i2c/i2c/for-next Merge made by the 'recursive' strategy. .../devicetree/bindings/i2c/i2c-mux-pca954x.txt | 3 + Documentation/devicetree/bindings/i2c/i2c-rk3x.txt | 14 ++ .../devicetree/bindings/i2c/trivial-devices.txt | 5 +- drivers/i2c/busses/Kconfig | 10 ++ drivers/i2c/busses/Makefile | 1 + drivers/i2c/busses/i2c-cadence.c | 189 +++++++++++++-------- drivers/i2c/busses/i2c-designware-baytrail.c | 160 +++++++++++++++++ drivers/i2c/busses/i2c-designware-core.c | 83 +++++---- drivers/i2c/busses/i2c-designware-core.h | 12 ++ drivers/i2c/busses/i2c-designware-pcidrv.c | 31 ---- drivers/i2c/busses/i2c-designware-platdrv.c | 20 ++- drivers/i2c/busses/i2c-imx.c | 33 ++-- drivers/i2c/busses/i2c-pmcmsp.c | 7 - drivers/i2c/busses/i2c-rk3x.c | 99 ++++++++--- drivers/i2c/busses/i2c-tegra.c | 2 + drivers/i2c/i2c-core.c | 170 +++--------------- drivers/i2c/muxes/i2c-mux-pca954x.c | 11 +- include/linux/i2c.h | 4 - 18 files changed, 515 insertions(+), 339 deletions(-) create mode 100644 drivers/i2c/busses/i2c-designware-baytrail.c Merging jdelvare-hwmon/master (26bc420b59a3 Linux 3.19-rc6) $ git merge jdelvare-hwmon/master Already up-to-date. Merging hwmon-staging/hwmon-next (7f444bf0a28c hwmon: (ads2828) Only keep data in device data structure if needed) $ git merge hwmon-staging/hwmon-next Merge made by the 'recursive' strategy. Documentation/hwmon/ina2xx | 23 +++- drivers/hwmon/Kconfig | 5 +- drivers/hwmon/abx500.c | 6 +- drivers/hwmon/ad7314.c | 5 +- drivers/hwmon/adc128d818.c | 3 +- drivers/hwmon/ads7828.c | 102 ++++++-------- drivers/hwmon/ina2xx.c | 334 +++++++++++++++++++++++++++++++++++++++------ drivers/hwmon/jc42.c | 15 +- drivers/hwmon/nct7802.c | 2 +- 9 files changed, 371 insertions(+), 124 deletions(-) Merging v4l-dvb/master (720871c6085e Merge branch 'patchwork' into to_next) $ git merge v4l-dvb/master Removing include/linux/platform_data/vsp1.h Removing drivers/staging/media/vino/vino.h Removing drivers/staging/media/vino/vino.c Removing drivers/staging/media/vino/saa7191.h Removing drivers/staging/media/vino/saa7191.c Removing drivers/staging/media/vino/indycam.h Removing drivers/staging/media/vino/indycam.c Removing drivers/staging/media/vino/Makefile Removing drivers/staging/media/vino/Kconfig Removing drivers/staging/media/tlg2300/vendorcmds.h Removing drivers/staging/media/tlg2300/pd-video.c Removing drivers/staging/media/tlg2300/pd-radio.c Removing drivers/staging/media/tlg2300/pd-main.c Removing drivers/staging/media/tlg2300/pd-dvb.c Removing drivers/staging/media/tlg2300/pd-common.h Removing drivers/staging/media/tlg2300/pd-alsa.c Removing drivers/staging/media/tlg2300/Makefile Removing drivers/staging/media/tlg2300/Kconfig Removing drivers/staging/media/parport/w9966.c Removing drivers/staging/media/parport/pms.c Removing drivers/staging/media/parport/c-qcam.c Removing drivers/staging/media/parport/bw-qcam.c Removing drivers/staging/media/parport/Makefile Removing drivers/staging/media/parport/Kconfig Auto-merging drivers/media/pci/bt8xx/btcx-risc.c Auto-merging MAINTAINERS Removing Documentation/video4linux/w9966.txt Removing Documentation/video4linux/README.tlg2300 Removing Documentation/video4linux/CQcam.txt Merge made by the 'recursive' strategy. Documentation/DocBook/media/v4l/controls.xml | 11 +- Documentation/DocBook/media/v4l/pixfmt-srggb10.xml | 2 +- .../DocBook/media/v4l/pixfmt-srggb10alaw8.xml | 2 +- .../DocBook/media/v4l/pixfmt-srggb10dpcm8.xml | 2 +- .../DocBook/media/v4l/pixfmt-srggb10p.xml | 99 + Documentation/DocBook/media/v4l/pixfmt-srggb12.xml | 2 +- Documentation/DocBook/media/v4l/pixfmt.xml | 1 + .../DocBook/media/v4l/vidioc-dv-timings-cap.xml | 8 - .../DocBook/media/v4l/vidioc-enum-dv-timings.xml | 8 - .../devicetree/bindings/media/i2c/nokia,smia.txt | 63 + .../devicetree/bindings/media/sunxi-ir.txt | 4 +- .../devicetree/bindings/media/ti-am437x-vpfe.txt | 61 + .../devicetree/bindings/media/video-interfaces.txt | 3 + Documentation/video4linux/CQcam.txt | 205 - Documentation/video4linux/README.tlg2300 | 47 - Documentation/video4linux/v4l2-framework.txt | 25 +- Documentation/video4linux/w9966.txt | 33 - MAINTAINERS | 41 +- drivers/media/common/Kconfig | 4 - drivers/media/common/Makefile | 1 - drivers/media/common/btcx-risc.h | 6 - drivers/media/dvb-frontends/au8522.h | 5 - drivers/media/dvb-frontends/dib8000.c | 3 +- drivers/media/dvb-frontends/hd29l2.c | 10 +- drivers/media/dvb-frontends/lg2160.c | 6 - drivers/media/dvb-frontends/lgdt3305.c | 23 +- drivers/media/dvb-frontends/lgdt3305.h | 6 + drivers/media/dvb-frontends/lgdt330x.c | 6 - drivers/media/dvb-frontends/lgdt330x.h | 6 - drivers/media/dvb-frontends/lgdt330x_priv.h | 6 - drivers/media/dvb-frontends/mb86a20s.c | 4 - drivers/media/dvb-frontends/mn88472.h | 6 + drivers/media/dvb-frontends/nxt200x.h | 6 - drivers/media/dvb-frontends/or51132.c | 6 - drivers/media/dvb-frontends/or51132.h | 6 - drivers/media/dvb-frontends/rtl2832.c | 108 + drivers/media/dvb-frontends/rtl2832.h | 10 + drivers/media/dvb-frontends/rtl2832_priv.h | 1 + drivers/media/dvb-frontends/s5h1409.c | 6 - drivers/media/dvb-frontends/s5h1409.h | 5 - drivers/media/dvb-frontends/s5h1411.c | 5 - drivers/media/dvb-frontends/s5h1411.h | 5 - drivers/media/dvb-frontends/si2168.c | 310 +- drivers/media/dvb-frontends/si2168.h | 6 +- drivers/media/dvb-frontends/si2168_priv.h | 3 +- drivers/media/dvb-frontends/stb0899_drv.c | 7 +- drivers/media/i2c/Kconfig | 9 +- drivers/media/i2c/adv7180.c | 1010 ++++- drivers/media/i2c/adv7604.c | 76 - drivers/media/i2c/adv7842.c | 184 +- drivers/media/i2c/m5mols/m5mols_core.c | 9 +- drivers/media/i2c/msp3400-driver.c | 8 - drivers/media/i2c/mt9m032.c | 42 +- drivers/media/i2c/mt9p031.c | 41 +- drivers/media/i2c/mt9t001.c | 41 +- drivers/media/i2c/mt9v032.c | 43 +- drivers/media/i2c/s5k4ecgx.c | 11 +- drivers/media/i2c/s5k5baf.c | 13 +- drivers/media/i2c/s5k6aa.c | 46 +- drivers/media/i2c/smiapp-pll.c | 7 +- drivers/media/i2c/smiapp-pll.h | 8 - drivers/media/i2c/smiapp/smiapp-core.c | 386 +- drivers/media/i2c/smiapp/smiapp-limits.c | 6 - drivers/media/i2c/smiapp/smiapp-limits.h | 6 - drivers/media/i2c/smiapp/smiapp-quirk.c | 14 +- drivers/media/i2c/smiapp/smiapp-quirk.h | 24 +- drivers/media/i2c/smiapp/smiapp-reg-defs.h | 6 - drivers/media/i2c/smiapp/smiapp-reg.h | 6 - drivers/media/i2c/smiapp/smiapp-regs.c | 6 - drivers/media/i2c/smiapp/smiapp-regs.h | 6 - drivers/media/i2c/smiapp/smiapp.h | 7 - drivers/media/i2c/soc_camera/ov2640.c | 82 +- drivers/media/i2c/ths8200.c | 10 - drivers/media/mmc/siano/Kconfig | 2 + drivers/media/pci/bt8xx/Kconfig | 4 +- drivers/media/pci/bt8xx/Makefile | 2 +- drivers/media/pci/bt8xx/bt878.c | 6 - drivers/media/{common => pci/bt8xx}/btcx-risc.c | 36 +- drivers/media/pci/bt8xx/btcx-risc.h | 26 + drivers/media/pci/bt8xx/bttv-cards.c | 324 +- drivers/media/pci/bt8xx/bttv-driver.c | 44 +- drivers/media/pci/bt8xx/bttv-gpio.c | 6 - drivers/media/pci/bt8xx/bttv-if.c | 6 - drivers/media/pci/bt8xx/bttv-risc.c | 6 - drivers/media/pci/bt8xx/bttv-vbi.c | 7 - drivers/media/pci/bt8xx/bttv.h | 5 - drivers/media/pci/bt8xx/bttvp.h | 20 +- drivers/media/pci/cx23885/Kconfig | 1 + drivers/media/pci/cx23885/cx23885-cards.c | 43 + drivers/media/pci/cx23885/cx23885-dvb.c | 376 +- drivers/media/pci/cx23885/cx23885-i2c.c | 4 +- drivers/media/pci/cx23885/cx23885.h | 3 +- drivers/media/pci/cx25821/Kconfig | 3 +- drivers/media/pci/cx25821/Makefile | 3 +- drivers/media/pci/cx25821/cx25821-alsa.c | 113 +- drivers/media/pci/cx25821/cx25821-core.c | 112 +- drivers/media/pci/cx25821/cx25821-video.c | 685 +-- drivers/media/pci/cx25821/cx25821.h | 48 +- drivers/media/pci/cx88/cx88-blackbird.c | 3 - drivers/media/pci/cx88/cx88-core.c | 7 - drivers/media/pci/cx88/cx88-mpeg.c | 7 - drivers/media/pci/cx88/cx88-tvaudio.c | 7 - drivers/media/pci/ivtv/ivtv-irq.c | 22 +- drivers/media/pci/mantis/mantis_core.c | 23 - drivers/media/pci/saa7134/saa7134-video.c | 5 - drivers/media/pci/solo6x10/solo6x10-core.c | 4 +- drivers/media/pci/solo6x10/solo6x10-eeprom.c | 2 +- drivers/media/pci/solo6x10/solo6x10-enc.c | 6 +- drivers/media/pci/solo6x10/solo6x10-g723.c | 4 +- drivers/media/pci/solo6x10/solo6x10-jpeg.h | 4 +- drivers/media/pci/solo6x10/solo6x10-tw28.c | 4 +- drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 48 +- drivers/media/pci/solo6x10/solo6x10.h | 6 +- drivers/media/pci/sta2x11/Kconfig | 1 + drivers/media/pci/ttpci/av7110.c | 5 +- drivers/media/pci/ttpci/budget-core.c | 89 +- drivers/media/pci/tw68/tw68.h | 1 - drivers/media/platform/Kconfig | 11 +- drivers/media/platform/Makefile | 2 + drivers/media/platform/am437x/Kconfig | 11 + drivers/media/platform/am437x/Makefile | 3 + drivers/media/platform/am437x/am437x-vpfe.c | 2776 +++++++++++++ drivers/media/platform/am437x/am437x-vpfe.h | 283 ++ drivers/media/platform/am437x/am437x-vpfe_regs.h | 140 + drivers/media/platform/coda/coda-bit.c | 25 +- drivers/media/platform/coda/coda-common.c | 165 +- drivers/media/platform/coda/coda.h | 2 +- drivers/media/platform/coda/coda_regs.h | 4 +- drivers/media/platform/davinci/Kconfig | 6 +- drivers/media/platform/exynos-gsc/gsc-core.h | 12 - drivers/media/platform/exynos-gsc/gsc-m2m.c | 6 +- drivers/media/platform/marvell-ccic/Kconfig | 3 +- drivers/media/platform/marvell-ccic/mcam-core.c | 1 - drivers/media/platform/omap3isp/isp.c | 3 + drivers/media/platform/s3c-camif/camif-capture.c | 17 +- drivers/media/platform/s5p-g2d/g2d.c | 1 - drivers/media/platform/s5p-mfc/s5p_mfc.c | 1 + drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 23 +- drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 21 +- drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 6 +- drivers/media/platform/s5p-tv/mixer_video.c | 21 +- drivers/media/platform/sh_veu.c | 35 +- drivers/media/platform/soc_camera/atmel-isi.c | 7 +- drivers/media/platform/soc_camera/mx3_camera.c | 7 +- drivers/media/platform/soc_camera/rcar_vin.c | 94 +- .../platform/soc_camera/sh_mobile_ceu_camera.c | 7 +- drivers/media/platform/soc_camera/soc_camera.c | 18 - drivers/media/platform/ti-vpe/vpe.c | 162 +- drivers/media/platform/vivid/vivid-ctrls.c | 4 +- drivers/media/platform/vivid/vivid-tpg.c | 10 +- drivers/media/platform/vivid/vivid-tpg.h | 1 - drivers/media/platform/vsp1/vsp1.h | 14 +- drivers/media/platform/vsp1/vsp1_bru.c | 2 +- drivers/media/platform/vsp1/vsp1_drv.c | 81 +- drivers/media/platform/vsp1/vsp1_hsit.c | 5 - drivers/media/platform/vsp1/vsp1_regs.h | 4 +- drivers/media/platform/vsp1/vsp1_rpf.c | 18 + drivers/media/platform/vsp1/vsp1_rwpf.h | 1 + drivers/media/platform/vsp1/vsp1_wpf.c | 13 +- drivers/media/radio/radio-aimslab.c | 4 +- drivers/media/radio/tea575x.c | 41 +- drivers/media/radio/wl128x/fmdrv_rx.c | 16 - drivers/media/radio/wl128x/fmdrv_rx.h | 1 - drivers/media/rc/img-ir/Kconfig | 15 + drivers/media/rc/img-ir/Makefile | 2 + drivers/media/rc/img-ir/img-ir-hw.c | 84 +- drivers/media/rc/img-ir/img-ir-hw.h | 24 +- drivers/media/rc/img-ir/img-ir-jvc.c | 8 +- drivers/media/rc/img-ir/img-ir-nec.c | 24 +- drivers/media/rc/img-ir/img-ir-rc5.c | 88 + drivers/media/rc/img-ir/img-ir-rc6.c | 117 + drivers/media/rc/img-ir/img-ir-sanyo.c | 8 +- drivers/media/rc/img-ir/img-ir-sharp.c | 8 +- drivers/media/rc/img-ir/img-ir-sony.c | 12 +- drivers/media/rc/rc-main.c | 14 +- drivers/media/rc/sunxi-cir.c | 46 +- drivers/media/tuners/mt20xx.c | 8 - drivers/media/tuners/mt2131.c | 5 - drivers/media/tuners/mt2131.h | 5 - drivers/media/tuners/mt2131_priv.h | 5 - drivers/media/tuners/mxl5007t.c | 8 - drivers/media/tuners/mxl5007t.h | 9 - drivers/media/tuners/si2157.c | 189 +- drivers/media/tuners/si2157_priv.h | 3 +- drivers/media/tuners/tda18271-fe.c | 8 - drivers/media/tuners/tda18271-maps.c | 8 - drivers/media/tuners/tda18271-priv.h | 8 - drivers/media/tuners/tda827x.c | 8 - drivers/media/tuners/tda8290.c | 8 - drivers/media/tuners/tda9887.c | 8 - drivers/media/tuners/tuner-simple.c | 8 - drivers/media/usb/au0828/Kconfig | 2 +- drivers/media/usb/au0828/au0828-cards.c | 2 +- drivers/media/usb/au0828/au0828-vbi.c | 122 +- drivers/media/usb/au0828/au0828-video.c | 976 ++--- drivers/media/usb/au0828/au0828.h | 61 +- drivers/media/usb/cx231xx/cx231xx-cards.c | 9 +- drivers/media/usb/cx231xx/cx231xx-video.c | 1 - drivers/media/usb/cx231xx/cx231xx.h | 10 +- drivers/media/usb/dvb-usb-v2/mxl111sf-demod.c | 6 - drivers/media/usb/dvb-usb-v2/mxl111sf-demod.h | 6 - drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.c | 6 - drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.h | 6 - drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.c | 6 - drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.h | 6 - drivers/media/usb/dvb-usb-v2/mxl111sf-phy.c | 6 - drivers/media/usb/dvb-usb-v2/mxl111sf-phy.h | 6 - drivers/media/usb/dvb-usb-v2/mxl111sf-reg.h | 6 - drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c | 8 - drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h | 9 - drivers/media/usb/dvb-usb-v2/mxl111sf.c | 6 - drivers/media/usb/dvb-usb-v2/mxl111sf.h | 6 - drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 93 +- drivers/media/usb/dvb-usb-v2/rtl28xxu.h | 1 + drivers/media/usb/dvb-usb/m920x.c | 5 - drivers/media/usb/em28xx/em28xx-audio.c | 8 +- drivers/media/usb/em28xx/em28xx-core.c | 4 +- drivers/media/usb/em28xx/em28xx-dvb.c | 14 +- drivers/media/usb/em28xx/em28xx-input.c | 9 +- drivers/media/usb/em28xx/em28xx-video.c | 7 +- drivers/media/usb/gspca/Kconfig | 10 + drivers/media/usb/gspca/Makefile | 2 + drivers/media/usb/gspca/gspca.c | 2 +- drivers/media/usb/gspca/ov534.c | 10 +- drivers/media/usb/gspca/stv06xx/stv06xx.c | 4 +- drivers/media/usb/gspca/touptek.c | 731 ++++ drivers/media/usb/gspca/vc032x.c | 10 +- drivers/media/usb/pvrusb2/pvrusb2-audio.c | 10 - drivers/media/usb/pvrusb2/pvrusb2-audio.h | 10 - drivers/media/usb/pvrusb2/pvrusb2-context.c | 11 - drivers/media/usb/pvrusb2/pvrusb2-context.h | 9 - drivers/media/usb/pvrusb2/pvrusb2-cs53l32a.c | 11 - drivers/media/usb/pvrusb2/pvrusb2-cs53l32a.h | 10 - drivers/media/usb/pvrusb2/pvrusb2-ctrl.c | 11 - drivers/media/usb/pvrusb2/pvrusb2-ctrl.h | 10 - drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c | 12 - drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.h | 10 - drivers/media/usb/pvrusb2/pvrusb2-debug.h | 10 - drivers/media/usb/pvrusb2/pvrusb2-debugifc.c | 11 - drivers/media/usb/pvrusb2/pvrusb2-debugifc.h | 10 - drivers/media/usb/pvrusb2/pvrusb2-devattr.c | 10 - drivers/media/usb/pvrusb2/pvrusb2-devattr.h | 10 - drivers/media/usb/pvrusb2/pvrusb2-eeprom.c | 10 - drivers/media/usb/pvrusb2/pvrusb2-eeprom.h | 10 - drivers/media/usb/pvrusb2/pvrusb2-encoder.c | 11 - drivers/media/usb/pvrusb2/pvrusb2-encoder.h | 10 - drivers/media/usb/pvrusb2/pvrusb2-fx2-cmd.h | 10 - drivers/media/usb/pvrusb2/pvrusb2-hdw-internal.h | 10 - drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 50 +- drivers/media/usb/pvrusb2/pvrusb2-hdw.h | 13 - drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c | 10 - drivers/media/usb/pvrusb2/pvrusb2-i2c-core.h | 11 - drivers/media/usb/pvrusb2/pvrusb2-io.c | 11 - drivers/media/usb/pvrusb2/pvrusb2-io.h | 10 - drivers/media/usb/pvrusb2/pvrusb2-ioread.c | 11 - drivers/media/usb/pvrusb2/pvrusb2-ioread.h | 10 - drivers/media/usb/pvrusb2/pvrusb2-main.c | 11 - drivers/media/usb/pvrusb2/pvrusb2-std.c | 11 - drivers/media/usb/pvrusb2/pvrusb2-std.h | 10 - drivers/media/usb/pvrusb2/pvrusb2-sysfs.c | 11 - drivers/media/usb/pvrusb2/pvrusb2-sysfs.h | 10 - drivers/media/usb/pvrusb2/pvrusb2-util.h | 10 - drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 10 - drivers/media/usb/pvrusb2/pvrusb2-v4l2.h | 10 - drivers/media/usb/pvrusb2/pvrusb2-video-v4l.c | 11 - drivers/media/usb/pvrusb2/pvrusb2-video-v4l.h | 10 - drivers/media/usb/pvrusb2/pvrusb2-wm8775.c | 12 - drivers/media/usb/pvrusb2/pvrusb2-wm8775.h | 10 - drivers/media/usb/pvrusb2/pvrusb2.h | 10 - drivers/media/usb/pwc/pwc-if.c | 12 +- drivers/media/usb/s2255/s2255drv.c | 4 +- drivers/media/usb/siano/Kconfig | 2 + drivers/media/usb/stk1160/stk1160-v4l.c | 5 - drivers/media/usb/stkwebcam/stk-webcam.c | 1 - drivers/media/usb/tm6000/tm6000-video.c | 3 +- drivers/media/usb/usbvision/usbvision-core.c | 13 +- drivers/media/usb/usbvision/usbvision-i2c.c | 8 - drivers/media/usb/usbvision/usbvision-video.c | 8 - drivers/media/usb/usbvision/usbvision.h | 8 - drivers/media/usb/uvc/uvc_driver.c | 5 + drivers/media/usb/uvc/uvc_queue.c | 19 +- drivers/media/usb/uvc/uvc_v4l2.c | 1 - drivers/media/usb/uvc/uvc_video.c | 6 +- drivers/media/usb/uvc/uvcvideo.h | 3 + drivers/media/usb/zr364xx/zr364xx.c | 2 - drivers/media/v4l2-core/v4l2-dev.c | 35 +- drivers/media/v4l2-core/v4l2-ioctl.c | 10 +- drivers/media/v4l2-core/v4l2-subdev.c | 8 - drivers/media/v4l2-core/videobuf-dma-sg.c | 15 +- drivers/media/v4l2-core/videobuf2-vmalloc.c | 9 +- drivers/staging/media/Kconfig | 6 - drivers/staging/media/Makefile | 4 - drivers/staging/media/bcm2048/radio-bcm2048.c | 6 +- drivers/staging/media/davinci_vpfe/dm365_isif.c | 69 +- drivers/staging/media/lirc/lirc_zilog.c | 118 +- drivers/staging/media/mn88472/mn88472.c | 30 +- drivers/staging/media/mn88472/mn88472_priv.h | 1 + drivers/staging/media/omap4iss/iss.c | 111 +- drivers/staging/media/omap4iss/iss_csi2.c | 43 +- drivers/staging/media/omap4iss/iss_csi2.h | 2 +- drivers/staging/media/omap4iss/iss_ipipeif.c | 22 +- drivers/staging/media/omap4iss/iss_regs.h | 2 + drivers/staging/media/omap4iss/iss_resizer.c | 18 +- drivers/staging/media/omap4iss/iss_video.c | 16 +- drivers/staging/media/parport/Kconfig | 69 - drivers/staging/media/parport/Makefile | 4 - drivers/staging/media/parport/bw-qcam.c | 1177 ------ drivers/staging/media/parport/c-qcam.c | 882 ---- drivers/staging/media/parport/pms.c | 1156 ------ drivers/staging/media/parport/w9966.c | 980 ----- drivers/staging/media/tlg2300/Kconfig | 21 - drivers/staging/media/tlg2300/Makefile | 9 - drivers/staging/media/tlg2300/pd-alsa.c | 337 -- drivers/staging/media/tlg2300/pd-common.h | 271 -- drivers/staging/media/tlg2300/pd-dvb.c | 597 --- drivers/staging/media/tlg2300/pd-main.c | 553 --- drivers/staging/media/tlg2300/pd-radio.c | 339 -- drivers/staging/media/tlg2300/pd-video.c | 1570 ------- drivers/staging/media/tlg2300/vendorcmds.h | 243 -- drivers/staging/media/vino/Kconfig | 24 - drivers/staging/media/vino/Makefile | 3 - drivers/staging/media/vino/indycam.c | 378 -- drivers/staging/media/vino/indycam.h | 93 - drivers/staging/media/vino/saa7191.c | 649 --- drivers/staging/media/vino/saa7191.h | 245 -- drivers/staging/media/vino/vino.c | 4345 -------------------- drivers/staging/media/vino/vino.h | 138 - drivers/video/hdmi.c | 822 +++- include/linux/hdmi.h | 37 +- include/linux/platform_data/vsp1.h | 27 - include/media/smiapp.h | 10 +- include/media/tea575x.h | 5 + include/media/v4l2-dev.h | 3 +- include/media/v4l2-ioctl.h | 15 +- include/media/v4l2-subdev.h | 6 - include/media/videobuf-dma-sg.h | 8 - include/media/videobuf-dvb.h | 6 - include/uapi/linux/Kbuild | 1 + include/uapi/linux/am437x-vpfe.h | 122 + include/uapi/linux/v4l2-controls.h | 4 + include/uapi/linux/videodev2.h | 17 +- 341 files changed, 9534 insertions(+), 19170 deletions(-) create mode 100644 Documentation/DocBook/media/v4l/pixfmt-srggb10p.xml create mode 100644 Documentation/devicetree/bindings/media/i2c/nokia,smia.txt create mode 100644 Documentation/devicetree/bindings/media/ti-am437x-vpfe.txt delete mode 100644 Documentation/video4linux/CQcam.txt delete mode 100644 Documentation/video4linux/README.tlg2300 delete mode 100644 Documentation/video4linux/w9966.txt rename drivers/media/{common => pci/bt8xx}/btcx-risc.c (90%) create mode 100644 drivers/media/pci/bt8xx/btcx-risc.h create mode 100644 drivers/media/platform/am437x/Kconfig create mode 100644 drivers/media/platform/am437x/Makefile create mode 100644 drivers/media/platform/am437x/am437x-vpfe.c create mode 100644 drivers/media/platform/am437x/am437x-vpfe.h create mode 100644 drivers/media/platform/am437x/am437x-vpfe_regs.h create mode 100644 drivers/media/rc/img-ir/img-ir-rc5.c create mode 100644 drivers/media/rc/img-ir/img-ir-rc6.c create mode 100644 drivers/media/usb/gspca/touptek.c delete mode 100644 drivers/staging/media/parport/Kconfig delete mode 100644 drivers/staging/media/parport/Makefile delete mode 100644 drivers/staging/media/parport/bw-qcam.c delete mode 100644 drivers/staging/media/parport/c-qcam.c delete mode 100644 drivers/staging/media/parport/pms.c delete mode 100644 drivers/staging/media/parport/w9966.c delete mode 100644 drivers/staging/media/tlg2300/Kconfig delete mode 100644 drivers/staging/media/tlg2300/Makefile delete mode 100644 drivers/staging/media/tlg2300/pd-alsa.c delete mode 100644 drivers/staging/media/tlg2300/pd-common.h delete mode 100644 drivers/staging/media/tlg2300/pd-dvb.c delete mode 100644 drivers/staging/media/tlg2300/pd-main.c delete mode 100644 drivers/staging/media/tlg2300/pd-radio.c delete mode 100644 drivers/staging/media/tlg2300/pd-video.c delete mode 100644 drivers/staging/media/tlg2300/vendorcmds.h delete mode 100644 drivers/staging/media/vino/Kconfig delete mode 100644 drivers/staging/media/vino/Makefile delete mode 100644 drivers/staging/media/vino/indycam.c delete mode 100644 drivers/staging/media/vino/indycam.h delete mode 100644 drivers/staging/media/vino/saa7191.c delete mode 100644 drivers/staging/media/vino/saa7191.h delete mode 100644 drivers/staging/media/vino/vino.c delete mode 100644 drivers/staging/media/vino/vino.h delete mode 100644 include/linux/platform_data/vsp1.h create mode 100644 include/uapi/linux/am437x-vpfe.h Merging kbuild/for-next (8d18d1d514d1 Merge branch 'kbuild/kconfig' into kbuild/for-next) $ git merge kbuild/for-next Auto-merging lib/Kconfig Auto-merging drivers/usb/gadget/udc/Kconfig Auto-merging drivers/rtc/Kconfig Auto-merging drivers/hwmon/Kconfig Auto-merging arch/x86/Kconfig Auto-merging Makefile Merge made by the 'recursive' strategy. Documentation/kbuild/makefiles.txt | 20 ++--- Documentation/lto-build | 173 ++++++++++++++++++++++++++++++++++++ Kbuild | 61 +++++-------- Makefile | 23 ++++- arch/mips/pmcs-msp71xx/Kconfig | 6 +- arch/parisc/Makefile | 2 +- arch/powerpc/Makefile | 6 +- arch/x86/Kconfig | 2 +- arch/x86/Makefile.um | 2 +- drivers/connector/Kconfig | 2 +- drivers/hwmon/Kconfig | 2 +- drivers/hwmon/pmbus/Kconfig | 2 +- drivers/i2c/Kconfig | 4 +- drivers/iio/Kconfig | 4 +- drivers/isdn/hardware/mISDN/Kconfig | 2 +- drivers/md/Kconfig | 4 +- drivers/md/persistent-data/Kconfig | 2 +- drivers/net/ethernet/ti/Kconfig | 4 +- drivers/net/usb/Kconfig | 12 +-- drivers/net/wireless/rt2x00/Kconfig | 6 +- drivers/pci/pcie/aer/Kconfig | 2 +- drivers/rtc/Kconfig | 8 +- drivers/spi/Kconfig | 6 +- drivers/staging/board/Kconfig | 2 +- drivers/staging/emxx_udc/Kconfig | 2 +- drivers/staging/iio/Kconfig | 4 +- drivers/tty/serial/Kconfig | 2 +- drivers/usb/gadget/Kconfig | 34 +++---- drivers/usb/gadget/legacy/Kconfig | 2 +- drivers/usb/gadget/udc/Kconfig | 4 +- drivers/usb/phy/Kconfig | 2 +- init/Kconfig | 81 ++++++++++++++++- kernel/gcov/Kconfig | 2 +- kernel/gcov/Makefile | 36 ++------ lib/Kconfig | 30 +++---- lib/Kconfig.debug | 2 +- mm/Kconfig | 22 ++--- net/Kconfig | 14 +-- net/sched/Kconfig | 2 +- net/switchdev/Kconfig | 2 +- scripts/Kbuild.include | 7 +- scripts/Makefile.clean | 3 - scripts/Makefile.lto | 84 +++++++++++++++++ scripts/Makefile.modpost | 7 +- scripts/kconfig/confdata.c | 1 + scripts/kconfig/merge_config.sh | 5 ++ scripts/link-vmlinux.sh | 2 +- scripts/package/builddeb | 17 +++- security/integrity/Kconfig | 4 +- security/integrity/evm/Kconfig | 2 +- 50 files changed, 522 insertions(+), 208 deletions(-) create mode 100644 Documentation/lto-build create mode 100644 scripts/Makefile.lto Merging kconfig/for-next (b2776bf7149b Linux 3.18) $ git merge kconfig/for-next Already up-to-date. Merging libata/for-next (c443dffd97c1 Merge branch 'for-3.20' into for-next) $ git merge libata/for-next Merge made by the 'recursive' strategy. .../devicetree/bindings/ata/ahci-platform.txt | 9 +- drivers/ata/Kconfig | 2 +- drivers/ata/ahci.h | 6 +- drivers/ata/ahci_da850.c | 11 +- drivers/ata/ahci_imx.c | 25 ++- drivers/ata/ahci_mvebu.c | 11 +- drivers/ata/ahci_platform.c | 11 +- drivers/ata/ahci_st.c | 11 +- drivers/ata/ahci_sunxi.c | 11 +- drivers/ata/ahci_tegra.c | 11 +- drivers/ata/ahci_xgene.c | 200 ++++++++++++++++- drivers/ata/libahci_platform.c | 247 ++++++++++++++------- drivers/ata/libata-core.c | 27 --- drivers/ata/libata-eh.c | 1 - drivers/ata/libata-scsi.c | 4 +- drivers/ata/libata.h | 1 - drivers/ata/pata_of_platform.c | 10 +- drivers/ata/pata_pdc2027x.c | 10 +- drivers/ata/pata_platform.c | 8 +- drivers/ata/sata_dwc_460ex.c | 116 +++++----- drivers/ata/sata_rcar.c | 25 ++- include/linux/ahci_platform.h | 6 +- include/linux/ata.h | 2 +- include/linux/ata_platform.h | 5 +- include/linux/libata.h | 6 + 25 files changed, 555 insertions(+), 221 deletions(-) Merging pm/linux-next (b4302834d287 Merge branch 'pm-cpufreq' into linux-next) $ git merge pm/linux-next Auto-merging drivers/pci/pci.c Auto-merging drivers/pci/pci-driver.c Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. Documentation/acpi/enumeration.txt | 2 +- Documentation/cpu-freq/intel-pstate.txt | 8 + .../bindings/devfreq/event/exynos-ppmu.txt | 110 ++++ Documentation/power/s2ram.txt | 4 + MAINTAINERS | 4 +- arch/ia64/kernel/acpi-ext.c | 6 +- arch/ia64/pci/pci.c | 14 +- arch/x86/pci/acpi.c | 26 +- arch/x86/pci/mmconfig-shared.c | 6 +- drivers/acpi/acpi_lpss.c | 4 +- drivers/acpi/acpi_memhotplug.c | 8 +- drivers/acpi/acpica/nsxfobj.c | 44 -- drivers/acpi/acpica/rsaddr.c | 9 +- drivers/acpi/acpica/rsdumpinfo.c | 59 +- drivers/acpi/acpica/rsxface.c | 10 +- drivers/acpi/acpica/tbxface.c | 39 -- drivers/acpi/ec.c | 183 +++--- drivers/acpi/internal.h | 1 + drivers/acpi/pci_root.c | 6 +- drivers/acpi/resource.c | 24 +- drivers/acpi/sleep.c | 2 +- drivers/acpi/video.c | 9 + drivers/base/power/domain.c | 20 - drivers/base/power/opp.c | 194 ++++-- drivers/base/power/qos.c | 4 + drivers/char/hpet.c | 4 +- drivers/cpufreq/cpufreq.c | 140 ++-- drivers/cpufreq/cpufreq_stats.c | 219 +++---- drivers/cpufreq/intel_pstate.c | 49 +- drivers/cpufreq/ls1x-cpufreq.c | 1 - drivers/cpuidle/cpuidle-big_little.c | 4 + drivers/devfreq/Kconfig | 12 + drivers/devfreq/Makefile | 4 + drivers/devfreq/devfreq-event.c | 494 ++++++++++++++ drivers/devfreq/event/Kconfig | 25 + drivers/devfreq/event/Makefile | 2 + drivers/devfreq/event/exynos-ppmu.c | 374 +++++++++++ drivers/devfreq/event/exynos-ppmu.h | 93 +++ drivers/devfreq/tegra-devfreq.c | 718 +++++++++++++++++++++ drivers/hv/vmbus_drv.c | 4 +- drivers/pci/hotplug/sgi_hotplug.c | 13 +- drivers/pci/pci-acpi.c | 17 + drivers/pci/pci-driver.c | 11 +- drivers/pci/pci.c | 26 + drivers/pci/pci.h | 6 + drivers/pnp/pnpacpi/rsparser.c | 16 +- drivers/xen/xen-acpi-memhotplug.c | 8 +- include/acpi/acpixf.h | 6 - include/acpi/acrestyp.h | 40 +- include/linux/cpufreq.h | 10 +- include/linux/devfreq-event.h | 196 ++++++ include/linux/pm_domain.h | 2 - kernel/power/qos.c | 91 ++- kernel/power/snapshot.c | 2 - kernel/trace/power-traces.c | 1 + tools/power/cpupower/Makefile | 2 +- 56 files changed, 2782 insertions(+), 604 deletions(-) create mode 100644 Documentation/devicetree/bindings/devfreq/event/exynos-ppmu.txt create mode 100644 drivers/devfreq/devfreq-event.c create mode 100644 drivers/devfreq/event/Kconfig create mode 100644 drivers/devfreq/event/Makefile create mode 100644 drivers/devfreq/event/exynos-ppmu.c create mode 100644 drivers/devfreq/event/exynos-ppmu.h create mode 100644 drivers/devfreq/tegra-devfreq.c create mode 100644 include/linux/devfreq-event.h Merging idle/next (2985a86aa4ec Merge branch 'turbostat' into next) $ git merge idle/next Resolved 'arch/x86/include/uapi/asm/msr-index.h' using previous resolution. Auto-merging drivers/cpufreq/Makefile Auto-merging arch/x86/include/uapi/asm/msr-index.h CONFLICT (content): Merge conflict in arch/x86/include/uapi/asm/msr-index.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 05da9dda172d] Merge remote-tracking branch 'idle/next' $ git diff -M --stat --summary HEAD^.. arch/x86/include/uapi/asm/msr-index.h | 5 + drivers/cpufreq/Kconfig.x86 | 10 + drivers/cpufreq/Makefile | 1 + drivers/cpufreq/sfi-cpufreq.c | 136 ++++++++++++++ drivers/sfi/sfi_core.c | 4 +- tools/power/x86/turbostat/turbostat.8 | 66 ++++--- tools/power/x86/turbostat/turbostat.c | 337 ++++++++++++++++++++++++++-------- 7 files changed, 462 insertions(+), 97 deletions(-) create mode 100644 drivers/cpufreq/sfi-cpufreq.c Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) $ git merge apm/for-next Already up-to-date. Merging thermal/next (ec6f34e5b552 Linux 3.19-rc5) $ git merge thermal/next Already up-to-date. Merging thermal-soc/next (1024cf8b0fcd thermal: exynos: Remove exynos_tmu_data.c file) $ git merge thermal-soc/next Removing drivers/thermal/samsung/exynos_tmu_data.c Removing drivers/thermal/samsung/exynos_thermal_common.h Removing drivers/thermal/samsung/exynos_thermal_common.c Merge made by the 'recursive' strategy. .../devicetree/bindings/thermal/exynos-thermal.txt | 17 + drivers/cpufreq/exynos-cpufreq.c | 33 +- drivers/thermal/of-thermal.c | 3 + drivers/thermal/rockchip_thermal.c | 36 +- drivers/thermal/samsung/Makefile | 2 - drivers/thermal/samsung/exynos_thermal_common.c | 427 --------------------- drivers/thermal/samsung/exynos_thermal_common.h | 106 ----- drivers/thermal/samsung/exynos_tmu.c | 348 +++++++++++------ drivers/thermal/samsung/exynos_tmu.h | 76 +--- drivers/thermal/samsung/exynos_tmu_data.c | 264 ------------- include/dt-bindings/thermal/thermal_exynos.h | 28 ++ 11 files changed, 326 insertions(+), 1014 deletions(-) delete mode 100644 drivers/thermal/samsung/exynos_thermal_common.c delete mode 100644 drivers/thermal/samsung/exynos_thermal_common.h delete mode 100644 drivers/thermal/samsung/exynos_tmu_data.c create mode 100644 include/dt-bindings/thermal/thermal_exynos.h Merging ieee1394/for-next (d71e6a11737f firewire: core: use correct vendor/model IDs) $ git merge ieee1394/for-next Merge made by the 'recursive' strategy. drivers/firewire/core-transaction.c | 4 ++-- drivers/firewire/ohci.c | 5 ----- drivers/firewire/sbp2.c | 11 ----------- 3 files changed, 2 insertions(+), 18 deletions(-) Merging dlm/next (2ab4bd8ea3a6 dlm: adopt orphan locks) $ git merge dlm/next Already up-to-date. Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid) $ git merge swiotlb/linux-next Already up-to-date. Merging slave-dma/next (409490076137 Merge branch 'for-linus' into next) $ git merge slave-dma/next Merge made by the 'recursive' strategy. .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 3 - Documentation/dmaengine/provider.txt | 97 +- drivers/crypto/ux500/cryp/cryp_core.c | 4 +- drivers/crypto/ux500/hash/hash_core.c | 2 +- drivers/dma/Makefile | 2 +- drivers/dma/amba-pl08x.c | 156 +- drivers/dma/at_hdmac.c | 130 +- drivers/dma/at_hdmac_regs.h | 3 +- drivers/dma/at_xdmac.c | 128 +- drivers/dma/bcm2835-dma.c | 46 +- drivers/dma/coh901318.c | 153 +- drivers/dma/cppi41.c | 30 +- drivers/dma/dma-jz4740.c | 20 +- drivers/dma/dmaengine.c | 84 +- drivers/dma/dw/core.c | 98 +- drivers/dma/dw/regs.h | 2 +- drivers/dma/edma.c | 70 +- drivers/dma/ep93xx_dma.c | 43 +- drivers/dma/fsl-edma.c | 123 +- drivers/dma/fsldma.c | 97 +- drivers/dma/fsldma.h | 4 + drivers/dma/imx-dma.c | 108 +- drivers/dma/imx-sdma.c | 150 +- drivers/dma/intel_mid_dma.c | 25 +- drivers/dma/ioat/dma_v3.c | 11 + drivers/dma/ipu/ipu_idmac.c | 96 +- drivers/dma/k3dma.c | 203 +-- drivers/dma/mmp_pdma.c | 109 +- drivers/dma/mmp_tdma.c | 85 +- drivers/dma/moxart-dma.c | 25 +- drivers/dma/mpc512x_dma.c | 111 +- drivers/dma/mv_xor.c | 9 - drivers/dma/mxs-dma.c | 65 +- drivers/dma/nbpfaxi.c | 112 +- drivers/dma/of-dma.c | 4 + drivers/dma/omap-dma.c | 69 +- drivers/dma/pch_dma.c | 8 +- drivers/dma/pl330.c | 134 +- drivers/dma/qcom_bam_dma.c | 85 +- drivers/dma/s3c24xx-dma.c | 75 +- drivers/dma/sa11x0-dma.c | 157 +- drivers/dma/sh/Kconfig | 14 +- drivers/dma/sh/Makefile | 1 + drivers/dma/sh/rcar-dmac.c | 1747 ++++++++++++++++++++ drivers/dma/sh/rcar-hpbdma.c | 6 + drivers/dma/sh/shdma-base.c | 72 +- drivers/dma/sh/shdmac.c | 9 + drivers/dma/sirf-dma.c | 59 +- drivers/dma/ste_dma40.c | 63 +- drivers/dma/sun6i-dma.c | 160 +- drivers/dma/tegra20-apb-dma.c | 42 +- drivers/dma/timb_dma.c | 8 +- drivers/dma/txx9dmac.c | 9 +- drivers/dma/xilinx/xilinx_vdma.c | 29 +- drivers/rapidio/devices/tsi721_dma.c | 8 +- include/linux/dmaengine.h | 120 +- sound/soc/soc-generic-dmaengine-pcm.c | 2 +- 57 files changed, 3436 insertions(+), 1849 deletions(-) create mode 100644 drivers/dma/sh/rcar-dmac.c Merging net-next/master (9766e97af1b9 net: rocker: Add support for retrieving port level statistics) $ git merge net-next/master Resolved 'arch/arm/boot/dts/rk3288.dtsi' using previous resolution. Resolved 'arch/arm/boot/dts/stih407-family.dtsi' using previous resolution. Resolved 'arch/arm/boot/dts/stih410.dtsi' using previous resolution. Resolved 'drivers/net/vxlan.c' using previous resolution. Resolved 'include/linux/if_vlan.h' using previous resolution. Auto-merging net/sched/Kconfig Auto-merging net/netlink/af_netlink.c Auto-merging net/ipv4/tcp_ipv4.c Auto-merging net/ipv4/tcp_cong.c Auto-merging net/ipv4/route.c Removing net/ieee802154/reassembly.h Removing net/ieee802154/raw.c Removing net/ieee802154/dgram.c Removing net/ieee802154/af_ieee802154.c Removing net/ieee802154/af802154.h Removing net/ieee802154/6lowpan_rtnl.c Auto-merging net/ieee802154/6lowpan/reassembly.c Auto-merging net/core/rtnetlink.c Auto-merging net/core/dev.c Auto-merging lib/Makefile Auto-merging lib/Kconfig.debug Auto-merging include/uapi/linux/Kbuild Auto-merging include/net/tcp.h Auto-merging include/net/netns/ipv4.h Auto-merging include/net/ip.h Auto-merging include/linux/if_vlan.h CONFLICT (content): Merge conflict in include/linux/if_vlan.h Auto-merging drivers/scsi/csiostor/csio_init.c Removing drivers/scsi/csiostor/csio_hw_t4.c Auto-merging drivers/net/vxlan.c CONFLICT (content): Merge conflict in drivers/net/vxlan.c Auto-merging drivers/net/hyperv/netvsc.c Auto-merging drivers/net/ethernet/ti/Kconfig Auto-merging drivers/net/ethernet/realtek/r8169.c Auto-merging drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c Auto-merging drivers/net/ethernet/intel/igbvf/netdev.c Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.h Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c Auto-merging drivers/net/ethernet/apm/xgene/xgene_enet_main.c Auto-merging drivers/net/ethernet/amd/Kconfig Auto-merging drivers/infiniband/hw/cxgb4/device.c Auto-merging arch/arm/mach-sa1100/collie.c Auto-merging arch/arm/boot/dts/stih410.dtsi CONFLICT (content): Merge conflict in arch/arm/boot/dts/stih410.dtsi Auto-merging arch/arm/boot/dts/stih407-family.dtsi CONFLICT (content): Merge conflict in arch/arm/boot/dts/stih407-family.dtsi Auto-merging arch/arm/boot/dts/rk3288.dtsi CONFLICT (content): Merge conflict in arch/arm/boot/dts/rk3288.dtsi Auto-merging arch/arm/boot/dts/rk3288-evb-rk808.dts Auto-merging MAINTAINERS Auto-merging Documentation/kernel-parameters.txt Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 8c3316efd560] Merge remote-tracking branch 'net-next/master' $ git diff -M --stat --summary HEAD^.. Documentation/DocBook/80211.tmpl | 1 - .../devicetree/bindings/net/amd-xgbe-phy.txt | 21 + .../devicetree/bindings/net/davicom-dm9000.txt | 4 + Documentation/devicetree/bindings/net/fsl-fec.txt | 2 + .../bindings/net/hisilicon-hip04-net.txt | 88 + .../devicetree/bindings/net/keystone-netcp.txt | 197 ++ .../devicetree/bindings/net/nfc/st21nfca.txt | 11 +- .../devicetree/bindings/net/nfc/st21nfcb.txt | 4 +- .../devicetree/bindings/net/rockchip-dwmac.txt | 68 + .../devicetree/bindings/net/sti-dwmac.txt | 14 +- Documentation/devicetree/bindings/net/stmmac.txt | 1 + .../bindings/net/wireless/qcom,ath10k.txt | 30 + .../devicetree/bindings/phy/phy-miphy365x.txt | 15 +- .../devicetree/bindings/phy/phy-stih407-usb.txt | 10 +- Documentation/kernel-parameters.txt | 12 + Documentation/networking/filter.txt | 4 +- Documentation/networking/ip-sysctl.txt | 7 + Documentation/networking/nf_conntrack-sysctl.txt | 3 +- Documentation/networking/openvswitch.txt | 13 + .../networking/timestamping/txtimestamp.c | 10 +- Documentation/rfkill.txt | 3 + MAINTAINERS | 19 +- arch/arm/boot/dts/am3517.dtsi | 1 + arch/arm/boot/dts/rk3288-evb-rk808.dts | 23 + arch/arm/boot/dts/rk3288-evb.dtsi | 19 + arch/arm/boot/dts/rk3288.dtsi | 54 + arch/arm/boot/dts/stih415.dtsi | 12 +- arch/arm/boot/dts/stih416.dtsi | 22 +- arch/arm/mach-sa1100/assabet.c | 2 +- arch/arm/mach-sa1100/collie.c | 2 +- arch/arm/mach-sa1100/h3100.c | 2 +- arch/arm/mach-sa1100/h3600.c | 2 +- arch/microblaze/kernel/timer.c | 1 + drivers/acpi/event.c | 7 +- drivers/atm/eni.c | 33 +- drivers/atm/fore200e.c | 22 +- drivers/atm/he.c | 125 +- drivers/atm/he.h | 4 +- drivers/atm/horizon.c | 24 - drivers/atm/idt77252.c | 107 +- drivers/atm/iphase.c | 54 +- drivers/atm/lanai.c | 23 +- drivers/atm/nicstar.c | 60 +- drivers/atm/solos-pci.c | 26 +- drivers/atm/zatm.c | 17 +- drivers/bcma/bcma_private.h | 10 +- drivers/bcma/driver_chipcommon.c | 10 +- drivers/bcma/host_soc.c | 2 +- drivers/bcma/main.c | 49 +- drivers/bcma/scan.c | 67 +- drivers/bluetooth/bfusb.c | 2 + drivers/bluetooth/btmrvl_drv.h | 5 +- drivers/bluetooth/btmrvl_main.c | 32 +- drivers/bluetooth/btmrvl_sdio.c | 6 +- drivers/bluetooth/btusb.c | 43 +- drivers/clk/rockchip/clk-rk3288.c | 14 +- drivers/clocksource/arm_arch_timer.c | 1 + drivers/infiniband/hw/cxgb4/cm.c | 118 +- drivers/infiniband/hw/cxgb4/cq.c | 60 +- drivers/infiniband/hw/cxgb4/device.c | 12 +- drivers/infiniband/hw/cxgb4/ev.c | 12 +- drivers/infiniband/hw/cxgb4/mem.c | 22 +- drivers/infiniband/hw/cxgb4/qp.c | 62 +- drivers/infiniband/hw/cxgb4/t4.h | 126 +- drivers/infiniband/hw/cxgb4/t4fw_ri_api.h | 812 ++--- drivers/infiniband/hw/mlx4/alias_GUID.c | 2 +- drivers/infiniband/hw/mlx4/mad.c | 3 +- drivers/infiniband/hw/mlx4/main.c | 17 +- drivers/infiniband/hw/mlx4/mr.c | 6 +- drivers/infiniband/hw/mlx4/sysfs.c | 6 +- drivers/infiniband/hw/mlx5/mem.c | 2 +- drivers/infiniband/hw/nes/nes_nic.c | 13 +- drivers/isdn/hardware/mISDN/mISDNipac.c | 12 +- drivers/isdn/hardware/mISDN/w6692.c | 6 +- drivers/isdn/hisax/hfc4s8s_l1.c | 21 - drivers/isdn/sc/init.c | 15 +- drivers/net/bonding/bond_3ad.c | 55 +- drivers/net/bonding/bond_main.c | 21 +- drivers/net/bonding/bond_options.c | 6 +- drivers/net/can/at91_can.c | 2 - drivers/net/can/bfin_can.c | 1 + drivers/net/can/c_can/c_can.c | 2 +- drivers/net/can/cc770/cc770.c | 1 + drivers/net/can/dev.c | 5 +- drivers/net/can/flexcan.c | 2 - drivers/net/can/janz-ican3.c | 1 + drivers/net/can/m_can/m_can.c | 1 + drivers/net/can/pch_can.c | 1 + drivers/net/can/rcar_can.c | 1 + drivers/net/can/softing/softing_main.c | 1 + drivers/net/can/spi/mcp251x.c | 1 + drivers/net/can/ti_hecc.c | 1 + drivers/net/can/usb/Kconfig | 22 +- drivers/net/can/usb/ems_usb.c | 1 + drivers/net/can/usb/esd_usb2.c | 1 + drivers/net/can/usb/kvaser_usb.c | 722 +++-- drivers/net/can/usb/peak_usb/Makefile | 2 +- drivers/net/can/usb/peak_usb/pcan_ucan.h | 222 ++ drivers/net/can/usb/peak_usb/pcan_usb.c | 4 +- drivers/net/can/usb/peak_usb/pcan_usb_core.c | 83 +- drivers/net/can/usb/peak_usb/pcan_usb_core.h | 26 +- drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 1095 +++++++ drivers/net/can/usb/peak_usb/pcan_usb_pro.c | 20 +- drivers/net/can/usb/peak_usb/pcan_usb_pro.h | 13 + drivers/net/can/usb/usb_8dev.c | 1 + drivers/net/dsa/bcm_sf2.c | 24 +- drivers/net/dsa/mv88e6352.c | 13 +- drivers/net/dsa/mv88e6xxx.c | 9 + drivers/net/ethernet/3com/typhoon.c | 4 +- drivers/net/ethernet/alteon/acenic.c | 8 +- drivers/net/ethernet/amd/Kconfig | 2 +- drivers/net/ethernet/amd/amd8111e.c | 4 +- drivers/net/ethernet/amd/pcnet32.c | 2 +- drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c | 2 +- drivers/net/ethernet/amd/xgbe/xgbe-desc.c | 32 +- drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 66 +- drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 67 +- drivers/net/ethernet/amd/xgbe/xgbe-main.c | 203 +- drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 29 +- drivers/net/ethernet/amd/xgbe/xgbe-ptp.c | 12 +- drivers/net/ethernet/amd/xgbe/xgbe.h | 31 +- drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 94 +- drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 109 +- drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 3 + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 4 +- drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 9 +- drivers/net/ethernet/atheros/atlx/atl1.c | 4 +- drivers/net/ethernet/atheros/atlx/atl2.c | 14 +- drivers/net/ethernet/broadcom/bnx2.c | 4 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 6 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 4 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 8 +- drivers/net/ethernet/broadcom/tg3.c | 29 +- drivers/net/ethernet/brocade/bna/bnad.c | 4 +- drivers/net/ethernet/cadence/macb.c | 85 +- drivers/net/ethernet/cadence/macb.h | 631 ++-- drivers/net/ethernet/chelsio/cxgb/sge.c | 4 +- drivers/net/ethernet/chelsio/cxgb3/mc5.c | 16 - drivers/net/ethernet/chelsio/cxgb3/sge.c | 6 +- drivers/net/ethernet/chelsio/cxgb3/t3_hw.c | 6 +- drivers/net/ethernet/chelsio/cxgb4/Makefile | 2 +- drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c | 314 ++ drivers/net/ethernet/chelsio/cxgb4/clip_tbl.h | 41 + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 50 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 1484 ++++++++- drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.h | 33 + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 975 ++---- drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 3 - drivers/net/ethernet/chelsio/cxgb4/l2t.c | 13 +- drivers/net/ethernet/chelsio/cxgb4/sge.c | 223 +- drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 1423 ++++++--- drivers/net/ethernet/chelsio/cxgb4/t4_hw.h | 22 + drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 367 ++- drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 1 + drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 3362 ++++++++++++++------ drivers/net/ethernet/chelsio/cxgb4/t4_values.h | 118 + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 87 + drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h | 48 + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 44 +- drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 57 +- drivers/net/ethernet/chelsio/cxgb4vf/t4vf_defs.h | 4 +- drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 43 +- drivers/net/ethernet/cisco/enic/enic.h | 16 +- drivers/net/ethernet/cisco/enic/enic_dev.c | 56 - drivers/net/ethernet/cisco/enic/enic_dev.h | 5 - drivers/net/ethernet/cisco/enic/enic_ethtool.c | 19 +- drivers/net/ethernet/cisco/enic/enic_main.c | 173 +- drivers/net/ethernet/cisco/enic/vnic_stats.h | 5 + drivers/net/ethernet/cisco/enic/vnic_wq.c | 3 + drivers/net/ethernet/cisco/enic/vnic_wq.h | 1 + drivers/net/ethernet/davicom/dm9000.c | 40 + drivers/net/ethernet/emulex/benet/be.h | 4 +- drivers/net/ethernet/emulex/benet/be_cmds.c | 20 +- drivers/net/ethernet/emulex/benet/be_cmds.h | 175 + drivers/net/ethernet/emulex/benet/be_ethtool.c | 16 +- drivers/net/ethernet/emulex/benet/be_hw.h | 228 +- drivers/net/ethernet/emulex/benet/be_main.c | 318 +- drivers/net/ethernet/freescale/Kconfig | 3 +- drivers/net/ethernet/freescale/fec.h | 3 + drivers/net/ethernet/freescale/fec_main.c | 138 +- drivers/net/ethernet/freescale/fec_ptp.c | 16 +- drivers/net/ethernet/freescale/gianfar.c | 17 +- drivers/net/ethernet/freescale/gianfar.h | 2 +- drivers/net/ethernet/freescale/xgmac_mdio.c | 130 +- drivers/net/ethernet/hisilicon/Kconfig | 9 + drivers/net/ethernet/hisilicon/Makefile | 1 + drivers/net/ethernet/hisilicon/hip04_eth.c | 970 ++++++ drivers/net/ethernet/hisilicon/hip04_mdio.c | 186 ++ drivers/net/ethernet/ibm/ehea/ehea_main.c | 4 +- drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 3 +- drivers/net/ethernet/intel/e1000/e1000_main.c | 20 +- drivers/net/ethernet/intel/e1000e/e1000.h | 2 +- drivers/net/ethernet/intel/e1000e/netdev.c | 41 +- drivers/net/ethernet/intel/e1000e/ptp.c | 5 +- drivers/net/ethernet/intel/fm10k/fm10k_main.c | 44 +- drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 15 +- drivers/net/ethernet/intel/fm10k/fm10k_type.h | 2 +- drivers/net/ethernet/intel/i40e/i40e.h | 5 +- drivers/net/ethernet/intel/i40e/i40e_adminq.h | 2 +- drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 152 +- drivers/net/ethernet/intel/i40e/i40e_common.c | 130 + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 1 - drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 43 +- drivers/net/ethernet/intel/i40e/i40e_fcoe.c | 2 - drivers/net/ethernet/intel/i40e/i40e_main.c | 135 +- drivers/net/ethernet/intel/i40e/i40e_prototype.h | 5 + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 44 +- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 7 +- drivers/net/ethernet/intel/i40e/i40e_type.h | 10 +- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 11 +- drivers/net/ethernet/intel/i40evf/i40e_adminq.h | 2 +- .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 108 +- drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 4 +- drivers/net/ethernet/intel/i40evf/i40e_type.h | 8 +- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 99 +- .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 6 +- drivers/net/ethernet/intel/igb/igb.h | 11 +- drivers/net/ethernet/intel/igb/igb_main.c | 157 +- drivers/net/ethernet/intel/igb/igb_ptp.c | 267 +- drivers/net/ethernet/intel/igbvf/netdev.c | 5 +- drivers/net/ethernet/intel/ixgb/ixgb_main.c | 4 +- drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 6 +- drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 13 +- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 4 +- drivers/net/ethernet/jme.c | 4 +- drivers/net/ethernet/marvell/sky2.c | 6 +- drivers/net/ethernet/mellanox/mlx4/alloc.c | 15 +- drivers/net/ethernet/mellanox/mlx4/catas.c | 294 +- drivers/net/ethernet/mellanox/mlx4/cmd.c | 413 ++- drivers/net/ethernet/mellanox/mlx4/en_clock.c | 10 +- drivers/net/ethernet/mellanox/mlx4/en_cq.c | 4 +- drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 20 +- drivers/net/ethernet/mellanox/mlx4/en_main.c | 4 +- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 +- drivers/net/ethernet/mellanox/mlx4/en_rx.c | 4 +- drivers/net/ethernet/mellanox/mlx4/en_tx.c | 16 +- drivers/net/ethernet/mellanox/mlx4/eq.c | 100 +- drivers/net/ethernet/mellanox/mlx4/fw.c | 88 +- drivers/net/ethernet/mellanox/mlx4/fw.h | 1 + drivers/net/ethernet/mellanox/mlx4/icm.c | 11 +- drivers/net/ethernet/mellanox/mlx4/intf.c | 8 +- drivers/net/ethernet/mellanox/mlx4/main.c | 397 ++- drivers/net/ethernet/mellanox/mlx4/mcg.c | 6 + drivers/net/ethernet/mellanox/mlx4/mlx4.h | 28 +- drivers/net/ethernet/mellanox/mlx4/mr.c | 12 +- drivers/net/ethernet/mellanox/mlx4/pd.c | 7 +- drivers/net/ethernet/mellanox/mlx4/port.c | 17 +- drivers/net/ethernet/mellanox/mlx4/reset.c | 23 +- .../net/ethernet/mellanox/mlx4/resource_tracker.c | 52 +- drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 6 +- drivers/net/ethernet/micrel/ksz884x.c | 4 +- drivers/net/ethernet/natsemi/ns83820.c | 4 +- drivers/net/ethernet/neterion/s2io.c | 4 +- drivers/net/ethernet/neterion/vxge/vxge-main.c | 4 +- drivers/net/ethernet/nvidia/forcedeth.c | 4 +- .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 4 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 25 +- drivers/net/ethernet/qlogic/qlge/qlge_main.c | 6 +- drivers/net/ethernet/realtek/8139cp.c | 4 +- drivers/net/ethernet/realtek/r8169.c | 16 +- drivers/net/ethernet/renesas/sh_eth.c | 48 +- drivers/net/ethernet/renesas/sh_eth.h | 30 +- drivers/net/ethernet/rocker/rocker.c | 177 +- drivers/net/ethernet/rocker/rocker.h | 21 + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 12 +- drivers/net/ethernet/smsc/Kconfig | 10 +- drivers/net/ethernet/smsc/smc91x.h | 21 + drivers/net/ethernet/stmicro/stmmac/Makefile | 2 +- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 437 +++ drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 13 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 26 +- drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 113 +- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 4 + .../net/ethernet/stmicro/stmmac/stmmac_platform.h | 1 + drivers/net/ethernet/sun/niu.c | 3 +- drivers/net/ethernet/sun/sunvnet.c | 90 +- drivers/net/ethernet/tehuti/tehuti.c | 4 +- drivers/net/ethernet/ti/Kconfig | 25 + drivers/net/ethernet/ti/Makefile | 11 +- drivers/net/ethernet/ti/cpsw-common.c | 53 + drivers/net/ethernet/ti/cpsw.c | 111 +- drivers/net/ethernet/ti/cpsw.h | 2 + drivers/net/ethernet/ti/cpsw_ale.c | 26 +- drivers/net/ethernet/ti/cpts.c | 5 +- drivers/net/ethernet/ti/cpts.h | 1 + drivers/net/ethernet/ti/davinci_emac.c | 56 +- drivers/net/ethernet/ti/netcp.h | 229 ++ drivers/net/ethernet/ti/netcp_core.c | 2149 +++++++++++++ drivers/net/ethernet/ti/netcp_ethss.c | 2161 +++++++++++++ drivers/net/ethernet/ti/netcp_sgmii.c | 131 + drivers/net/ethernet/ti/netcp_xgbepcsr.c | 501 +++ drivers/net/ethernet/via/via-rhine.c | 9 +- drivers/net/ethernet/via/via-velocity.c | 4 +- drivers/net/fddi/skfp/smt.c | 12 - drivers/net/hyperv/netvsc.c | 5 +- drivers/net/hyperv/rndis_filter.c | 19 +- drivers/net/ieee802154/at86rf230.c | 82 +- drivers/net/ieee802154/cc2520.c | 27 +- drivers/net/ieee802154/mrf24j40.c | 6 +- drivers/net/ipvlan/ipvlan_core.c | 2 +- drivers/net/irda/ali-ircc.c | 11 +- drivers/net/irda/ali-ircc.h | 5 +- drivers/net/irda/au1k_ir.c | 3 - drivers/net/irda/irda-usb.c | 10 +- drivers/net/irda/irda-usb.h | 5 +- drivers/net/irda/kingsun-sir.c | 3 - drivers/net/irda/ks959-sir.c | 3 - drivers/net/irda/mcs7780.c | 2 - drivers/net/irda/mcs7780.h | 1 - drivers/net/irda/nsc-ircc.c | 7 +- drivers/net/irda/nsc-ircc.h | 5 +- drivers/net/irda/sa1100_ir.c | 2 +- drivers/net/irda/stir4200.c | 16 +- drivers/net/irda/via-ircc.h | 4 - drivers/net/irda/vlsi_ir.c | 46 +- drivers/net/irda/vlsi_ir.h | 2 +- drivers/net/macvlan.c | 6 + drivers/net/macvtap.c | 6 +- drivers/net/mii.c | 12 +- drivers/net/phy/Kconfig | 2 +- drivers/net/phy/amd-xgbe-phy.c | 981 ++++-- drivers/net/phy/fixed_phy.c | 2 +- drivers/net/phy/mdio_bus.c | 14 +- drivers/net/phy/phy.c | 3 + drivers/net/phy/phy_device.c | 22 +- drivers/net/team/team.c | 12 +- drivers/net/tun.c | 15 +- drivers/net/usb/hso.c | 91 +- drivers/net/usb/r8152.c | 132 +- drivers/net/usb/usbnet.c | 17 +- drivers/net/veth.c | 9 + drivers/net/virtio_net.c | 6 + drivers/net/vmxnet3/vmxnet3_defs.h | 1 + drivers/net/vmxnet3/vmxnet3_drv.c | 54 +- drivers/net/vmxnet3/vmxnet3_ethtool.c | 29 +- drivers/net/vmxnet3/vmxnet3_int.h | 6 +- drivers/net/vxlan.c | 449 ++- drivers/net/wireless/adm8211.c | 1 + drivers/net/wireless/ath/ath10k/Makefile | 2 + drivers/net/wireless/ath/ath10k/ce.c | 2 + drivers/net/wireless/ath/ath10k/core.c | 250 +- drivers/net/wireless/ath/ath10k/core.h | 21 +- drivers/net/wireless/ath/ath10k/debug.c | 88 +- drivers/net/wireless/ath/ath10k/htt_tx.c | 5 - drivers/net/wireless/ath/ath10k/hw.h | 30 + drivers/net/wireless/ath/ath10k/mac.c | 195 +- drivers/net/wireless/ath/ath10k/pci.c | 31 + drivers/net/wireless/ath/ath10k/pci.h | 5 + drivers/net/wireless/ath/ath10k/spectral.c | 1 + drivers/net/wireless/ath/ath10k/testmode.c | 5 +- drivers/net/wireless/ath/ath10k/thermal.c | 243 ++ drivers/net/wireless/ath/ath10k/thermal.h | 58 + drivers/net/wireless/ath/ath10k/wmi-ops.h | 860 +++++ drivers/net/wireless/ath/ath10k/wmi-tlv.c | 2222 +++++++++++++ drivers/net/wireless/ath/ath10k/wmi-tlv.h | 1380 ++++++++ drivers/net/wireless/ath/ath10k/wmi.c | 1745 +++++++--- drivers/net/wireless/ath/ath10k/wmi.h | 302 +- drivers/net/wireless/ath/ath5k/ahb.c | 1 - drivers/net/wireless/ath/ath5k/mac80211-ops.c | 16 +- drivers/net/wireless/ath/ath5k/pcu.c | 1 + drivers/net/wireless/ath/ath6kl/cfg80211.c | 17 +- drivers/net/wireless/ath/ath6kl/main.c | 1 - drivers/net/wireless/ath/ath9k/ahb.c | 4 + drivers/net/wireless/ath/ath9k/ani.c | 3 +- drivers/net/wireless/ath/ath9k/ar5008_phy.c | 80 + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 15 +- drivers/net/wireless/ath/ath9k/ar9003_hw.c | 61 +- drivers/net/wireless/ath/ath9k/ar9003_phy.c | 47 +- drivers/net/wireless/ath/ath9k/ar9003_phy.h | 19 +- drivers/net/wireless/ath/ath9k/ar956x_initvals.h | 1046 ++++++ drivers/net/wireless/ath/ath9k/debug.c | 195 +- drivers/net/wireless/ath/ath9k/eeprom_4k.c | 14 + drivers/net/wireless/ath/ath9k/eeprom_9287.c | 15 + drivers/net/wireless/ath/ath9k/eeprom_def.c | 14 + drivers/net/wireless/ath/ath9k/htc.h | 3 + drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 4 + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 4 + drivers/net/wireless/ath/ath9k/htc_hst.c | 6 +- drivers/net/wireless/ath/ath9k/hw.c | 43 +- drivers/net/wireless/ath/ath9k/hw.h | 3 + drivers/net/wireless/ath/ath9k/link.c | 16 +- drivers/net/wireless/ath/ath9k/mac.c | 3 +- drivers/net/wireless/ath/ath9k/pci.c | 85 + drivers/net/wireless/ath/ath9k/recv.c | 3 +- drivers/net/wireless/ath/ath9k/reg.h | 4 + drivers/net/wireless/ath/ath9k/xmit.c | 83 +- drivers/net/wireless/ath/carl9170/cmd.c | 12 +- drivers/net/wireless/ath/carl9170/main.c | 6 +- drivers/net/wireless/ath/dfs_pattern_detector.c | 2 +- drivers/net/wireless/ath/wcn36xx/dxe.c | 3 + drivers/net/wireless/ath/wcn36xx/main.c | 16 +- drivers/net/wireless/ath/wcn36xx/smd.c | 73 +- drivers/net/wireless/ath/wcn36xx/txrx.c | 83 +- drivers/net/wireless/ath/wcn36xx/txrx.h | 9 +- drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 20 + drivers/net/wireless/ath/wil6210/cfg80211.c | 30 +- drivers/net/wireless/ath/wil6210/debugfs.c | 164 +- drivers/net/wireless/ath/wil6210/ethtool.c | 46 +- drivers/net/wireless/ath/wil6210/interrupt.c | 109 +- drivers/net/wireless/ath/wil6210/main.c | 194 +- drivers/net/wireless/ath/wil6210/pcie_bus.c | 65 +- drivers/net/wireless/ath/wil6210/rx_reorder.c | 275 +- drivers/net/wireless/ath/wil6210/txrx.c | 70 +- drivers/net/wireless/ath/wil6210/txrx.h | 158 +- drivers/net/wireless/ath/wil6210/wil6210.h | 161 +- drivers/net/wireless/ath/wil6210/wmi.c | 222 +- drivers/net/wireless/ath/wil6210/wmi.h | 12 +- drivers/net/wireless/atmel.c | 12 +- drivers/net/wireless/b43/main.c | 1 + drivers/net/wireless/b43legacy/radio.c | 19 - drivers/net/wireless/b43legacy/radio.h | 1 - drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 20 +- drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 196 +- drivers/net/wireless/brcm80211/brcmfmac/cfg80211.h | 5 + drivers/net/wireless/brcm80211/brcmfmac/chip.c | 15 +- drivers/net/wireless/brcm80211/brcmfmac/common.c | 3 + drivers/net/wireless/brcm80211/brcmfmac/common.h | 20 + drivers/net/wireless/brcm80211/brcmfmac/core.c | 3 +- drivers/net/wireless/brcm80211/brcmfmac/core.h | 4 +- drivers/net/wireless/brcm80211/brcmfmac/flowring.c | 6 +- drivers/net/wireless/brcm80211/brcmfmac/fwil.h | 4 + .../net/wireless/brcm80211/brcmfmac/fwil_types.h | 14 + drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c | 24 +- drivers/net/wireless/brcm80211/brcmfmac/pcie.c | 10 +- drivers/net/wireless/brcm80211/brcmfmac/sdio.c | 7 +- .../net/wireless/brcm80211/include/brcm_hw_ids.h | 12 +- drivers/net/wireless/cw1200/main.c | 6 +- drivers/net/wireless/cw1200/pm.c | 5 +- drivers/net/wireless/cw1200/queue.c | 4 +- drivers/net/wireless/cw1200/sta.c | 4 +- drivers/net/wireless/iwlegacy/3945-mac.c | 4 +- drivers/net/wireless/iwlegacy/4965-mac.c | 9 +- drivers/net/wireless/iwlwifi/dvm/main.c | 24 +- drivers/net/wireless/iwlwifi/dvm/tt.c | 13 +- drivers/net/wireless/iwlwifi/iwl-7000.c | 23 +- drivers/net/wireless/iwlwifi/iwl-8000.c | 31 +- drivers/net/wireless/iwlwifi/iwl-config.h | 15 +- drivers/net/wireless/iwlwifi/iwl-csr.h | 2 + drivers/net/wireless/iwlwifi/iwl-drv.c | 83 +- drivers/net/wireless/iwlwifi/iwl-drv.h | 1 - drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h | 43 +- drivers/net/wireless/iwlwifi/iwl-fw-file.h | 16 +- drivers/net/wireless/iwlwifi/iwl-fw.h | 4 + drivers/net/wireless/iwlwifi/iwl-io.c | 10 +- drivers/net/wireless/iwlwifi/iwl-modparams.h | 2 + drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 6 + drivers/net/wireless/iwlwifi/iwl-prph.h | 26 +- drivers/net/wireless/iwlwifi/iwl-trans.h | 21 + drivers/net/wireless/iwlwifi/mvm/coex.c | 20 +- drivers/net/wireless/iwlwifi/mvm/coex_legacy.c | 20 +- drivers/net/wireless/iwlwifi/mvm/constants.h | 33 +- drivers/net/wireless/iwlwifi/mvm/d3.c | 51 +- drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c | 33 +- drivers/net/wireless/iwlwifi/mvm/debugfs.c | 247 +- drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 20 +- drivers/net/wireless/iwlwifi/mvm/fw-api-rs.h | 15 +- drivers/net/wireless/iwlwifi/mvm/fw-api-stats.h | 277 ++ drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h | 39 + drivers/net/wireless/iwlwifi/mvm/fw-api.h | 301 +- drivers/net/wireless/iwlwifi/mvm/fw.c | 116 +- drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 14 +- drivers/net/wireless/iwlwifi/mvm/mac80211.c | 350 +- drivers/net/wireless/iwlwifi/mvm/mvm.h | 67 +- drivers/net/wireless/iwlwifi/mvm/nvm.c | 4 +- drivers/net/wireless/iwlwifi/mvm/ops.c | 55 +- drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c | 4 +- drivers/net/wireless/iwlwifi/mvm/rs.c | 340 +- drivers/net/wireless/iwlwifi/mvm/rs.h | 39 - drivers/net/wireless/iwlwifi/mvm/rx.c | 10 +- drivers/net/wireless/iwlwifi/mvm/scan.c | 44 +- drivers/net/wireless/iwlwifi/mvm/sta.c | 29 +- drivers/net/wireless/iwlwifi/mvm/tt.c | 7 +- drivers/net/wireless/iwlwifi/mvm/tx.c | 12 +- drivers/net/wireless/iwlwifi/mvm/utils.c | 73 +- drivers/net/wireless/iwlwifi/pcie/drv.c | 2 + drivers/net/wireless/iwlwifi/pcie/internal.h | 8 + drivers/net/wireless/iwlwifi/pcie/trans.c | 73 +- drivers/net/wireless/iwlwifi/pcie/tx.c | 48 +- drivers/net/wireless/libertas/cfg.c | 12 +- drivers/net/wireless/mac80211_hwsim.c | 33 +- drivers/net/wireless/mwifiex/11n.c | 2 +- drivers/net/wireless/mwifiex/11n.h | 14 +- drivers/net/wireless/mwifiex/11n_aggr.c | 15 +- drivers/net/wireless/mwifiex/11n_rxreorder.c | 14 +- drivers/net/wireless/mwifiex/Makefile | 2 + drivers/net/wireless/mwifiex/cfg80211.c | 135 +- drivers/net/wireless/mwifiex/cfp.c | 18 + drivers/net/wireless/mwifiex/cmdevt.c | 6 - drivers/net/wireless/mwifiex/debugfs.c | 281 +- drivers/net/wireless/mwifiex/decl.h | 34 +- drivers/net/wireless/mwifiex/ethtool.c | 16 +- drivers/net/wireless/mwifiex/fw.h | 3 + drivers/net/wireless/mwifiex/init.c | 23 + drivers/net/wireless/mwifiex/ioctl.h | 11 +- drivers/net/wireless/mwifiex/main.c | 133 +- drivers/net/wireless/mwifiex/main.h | 24 +- drivers/net/wireless/mwifiex/pcie.c | 5 +- drivers/net/wireless/mwifiex/scan.c | 6 + drivers/net/wireless/mwifiex/sdio.c | 104 +- drivers/net/wireless/mwifiex/sdio.h | 26 + drivers/net/wireless/mwifiex/sta_cmd.c | 7 +- drivers/net/wireless/mwifiex/sta_cmdresp.c | 2 + drivers/net/wireless/mwifiex/sta_event.c | 7 + drivers/net/wireless/mwifiex/sta_ioctl.c | 6 +- drivers/net/wireless/mwifiex/sta_rx.c | 9 + drivers/net/wireless/mwifiex/sta_tx.c | 19 +- drivers/net/wireless/mwifiex/tdls.c | 35 +- drivers/net/wireless/mwifiex/uap_event.c | 3 +- drivers/net/wireless/mwifiex/uap_txrx.c | 28 +- drivers/net/wireless/mwifiex/usb.c | 11 +- drivers/net/wireless/mwifiex/usb.h | 7 - drivers/net/wireless/mwifiex/util.c | 220 ++ drivers/net/wireless/mwifiex/util.h | 20 + drivers/net/wireless/mwl8k.c | 12 +- drivers/net/wireless/orinoco/Kconfig | 3 +- drivers/net/wireless/orinoco/orinoco_usb.c | 4 +- drivers/net/wireless/p54/eeprom.c | 6 +- drivers/net/wireless/p54/fwio.c | 9 +- drivers/net/wireless/p54/main.c | 10 +- drivers/net/wireless/p54/p54pci.c | 7 +- drivers/net/wireless/p54/txrx.c | 12 +- drivers/net/wireless/rndis_wlan.c | 4 +- drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 4 +- drivers/net/wireless/rt2x00/rt2800lib.c | 12 +- drivers/net/wireless/rt2x00/rt2x00config.c | 4 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 18 +- drivers/net/wireless/rt2x00/rt2x00firmware.c | 2 +- drivers/net/wireless/rt2x00/rt2x00mac.c | 2 +- drivers/net/wireless/rt2x00/rt2x00queue.c | 18 +- drivers/net/wireless/rt2x00/rt2x00usb.c | 8 +- drivers/net/wireless/rtlwifi/base.c | 156 +- drivers/net/wireless/rtlwifi/base.h | 4 +- drivers/net/wireless/rtlwifi/core.c | 61 +- drivers/net/wireless/rtlwifi/core.h | 42 + drivers/net/wireless/rtlwifi/rtl8188ee/dm.c | 36 +- drivers/net/wireless/rtlwifi/rtl8188ee/dm.h | 41 - drivers/net/wireless/rtlwifi/rtl8188ee/trx.c | 162 +- drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 45 +- drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h | 38 - drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h | 1 + drivers/net/wireless/rtlwifi/rtl8192ce/dm.c | 1 + drivers/net/wireless/rtlwifi/rtl8192ce/dm.h | 13 - drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 165 +- drivers/net/wireless/rtlwifi/rtl8192ce/phy.c | 5 +- drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 30 +- drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 13 +- drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 4 +- drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 28 +- drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 20 +- drivers/net/wireless/rtlwifi/rtl8192de/dm.c | 33 +- drivers/net/wireless/rtlwifi/rtl8192de/dm.h | 38 - drivers/net/wireless/rtlwifi/rtl8192de/fw.c | 17 - drivers/net/wireless/rtlwifi/rtl8192de/fw.h | 1 - drivers/net/wireless/rtlwifi/rtl8192de/hw.c | 2 +- drivers/net/wireless/rtlwifi/rtl8192de/sw.c | 30 +- drivers/net/wireless/rtlwifi/rtl8192de/trx.c | 27 +- drivers/net/wireless/rtlwifi/rtl8192ee/dm.c | 55 +- drivers/net/wireless/rtlwifi/rtl8192ee/dm.h | 16 - drivers/net/wireless/rtlwifi/rtl8192ee/trx.c | 196 +- drivers/net/wireless/rtlwifi/rtl8192ee/trx.h | 9 +- drivers/net/wireless/rtlwifi/rtl8192se/def.h | 8 +- drivers/net/wireless/rtlwifi/rtl8192se/dm.c | 7 +- drivers/net/wireless/rtlwifi/rtl8192se/dm.h | 28 - drivers/net/wireless/rtlwifi/rtl8192se/sw.c | 30 +- drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 23 +- drivers/net/wireless/rtlwifi/rtl8723ae/dm.c | 42 +- drivers/net/wireless/rtlwifi/rtl8723ae/dm.h | 38 - drivers/net/wireless/rtlwifi/rtl8723ae/trx.c | 162 +- drivers/net/wireless/rtlwifi/rtl8723be/dm.c | 55 +- drivers/net/wireless/rtlwifi/rtl8723be/dm.h | 33 - drivers/net/wireless/rtlwifi/rtl8723be/phy.c | 25 - drivers/net/wireless/rtlwifi/rtl8723be/phy.h | 2 - drivers/net/wireless/rtlwifi/rtl8723be/sw.c | 10 +- drivers/net/wireless/rtlwifi/rtl8723be/trx.c | 162 +- drivers/net/wireless/rtlwifi/rtl8821ae/def.h | 54 - drivers/net/wireless/rtlwifi/rtl8821ae/dm.c | 58 +- drivers/net/wireless/rtlwifi/rtl8821ae/dm.h | 41 - drivers/net/wireless/rtlwifi/rtl8821ae/pwrseq.h | 4 +- drivers/net/wireless/rtlwifi/rtl8821ae/sw.c | 74 +- drivers/net/wireless/rtlwifi/rtl8821ae/trx.c | 232 +- drivers/net/wireless/rtlwifi/wifi.h | 98 +- drivers/net/wireless/ti/wl1251/main.c | 5 +- drivers/net/wireless/ti/wl12xx/main.c | 4 + drivers/net/wireless/ti/wl18xx/acx.c | 88 + drivers/net/wireless/ti/wl18xx/acx.h | 46 +- drivers/net/wireless/ti/wl18xx/cmd.c | 93 +- drivers/net/wireless/ti/wl18xx/cmd.h | 27 + drivers/net/wireless/ti/wl18xx/conf.h | 23 +- drivers/net/wireless/ti/wl18xx/debugfs.c | 43 + drivers/net/wireless/ti/wl18xx/event.c | 21 + drivers/net/wireless/ti/wl18xx/event.h | 14 +- drivers/net/wireless/ti/wl18xx/main.c | 37 +- drivers/net/wireless/ti/wl18xx/wl18xx.h | 4 +- drivers/net/wireless/ti/wlcore/acx.c | 2 +- drivers/net/wireless/ti/wlcore/cmd.c | 20 +- drivers/net/wireless/ti/wlcore/cmd.h | 8 + drivers/net/wireless/ti/wlcore/conf.h | 7 +- drivers/net/wireless/ti/wlcore/debugfs.c | 9 +- drivers/net/wireless/ti/wlcore/event.c | 11 +- drivers/net/wireless/ti/wlcore/hw_ops.h | 48 +- drivers/net/wireless/ti/wlcore/init.c | 8 +- drivers/net/wireless/ti/wlcore/main.c | 405 ++- drivers/net/wireless/ti/wlcore/ps.c | 8 +- drivers/net/wireless/ti/wlcore/vendor_cmd.c | 2 +- drivers/net/wireless/ti/wlcore/wlcore.h | 12 +- drivers/net/wireless/ti/wlcore/wlcore_i.h | 7 + drivers/net/xen-netback/common.h | 1 - drivers/net/xen-netback/netback.c | 107 +- drivers/net/xen-netfront.c | 196 +- drivers/nfc/microread/microread.c | 3 +- drivers/nfc/pn544/i2c.c | 133 +- drivers/nfc/pn544/pn544.c | 3 +- drivers/nfc/st21nfca/Makefile | 2 +- drivers/nfc/st21nfca/i2c.c | 23 +- drivers/nfc/st21nfca/st21nfca.c | 186 +- drivers/nfc/st21nfca/st21nfca.h | 21 +- drivers/nfc/st21nfca/st21nfca_se.c | 390 +++ drivers/nfc/st21nfca/st21nfca_se.h | 63 + drivers/nfc/st21nfcb/i2c.c | 19 +- drivers/nfc/st21nfcb/ndlc.c | 3 +- drivers/phy/phy-miphy365x.c | 29 +- drivers/phy/phy-stih407-usb.c | 25 +- drivers/s390/net/claw.c | 6 +- drivers/s390/net/ctcm_fsms.c | 18 +- drivers/s390/net/ctcm_main.c | 4 +- drivers/s390/net/ctcm_main.h | 2 +- drivers/s390/net/ctcm_sysfs.c | 4 +- drivers/s390/net/lcs.c | 6 +- drivers/s390/net/netiucv.c | 15 +- drivers/s390/net/qeth_core.h | 1 - drivers/s390/net/qeth_core_sys.c | 45 +- drivers/s390/net/qeth_l2_main.c | 6 +- drivers/s390/net/qeth_l3_main.c | 15 +- drivers/s390/net/qeth_l3_sys.c | 45 +- drivers/scsi/csiostor/Makefile | 2 +- drivers/scsi/csiostor/csio_hw.c | 1171 +++---- drivers/scsi/csiostor/csio_hw.h | 49 +- drivers/scsi/csiostor/csio_hw_chip.h | 65 +- drivers/scsi/csiostor/csio_hw_t4.c | 404 --- drivers/scsi/csiostor/csio_hw_t5.c | 150 +- drivers/scsi/csiostor/csio_init.c | 6 +- drivers/scsi/csiostor/csio_isr.c | 2 +- drivers/scsi/csiostor/csio_lnode.c | 2 +- drivers/scsi/csiostor/csio_mb.c | 53 +- drivers/scsi/csiostor/csio_scsi.c | 4 +- drivers/scsi/csiostor/csio_wr.c | 157 +- drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 41 +- drivers/scsi/pmcraid.c | 8 +- drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 10 +- drivers/staging/wlan-ng/cfg80211.c | 4 +- drivers/target/target_core_user.c | 4 +- drivers/thermal/thermal_core.c | 6 +- drivers/vhost/net.c | 2 +- fs/dlm/netlink.c | 7 +- include/clocksource/arm_arch_timer.h | 2 +- include/dt-bindings/clock/rk3288-cru.h | 3 + include/linux/bcma/bcma_soc.h | 2 - include/linux/clocksource.h | 102 - include/linux/etherdevice.h | 4 + include/linux/fec.h | 1 + include/linux/if_bridge.h | 18 - include/linux/if_vlan.h | 14 +- include/linux/ipv6.h | 1 + include/linux/list_nulls.h | 6 +- include/linux/mlx4/cmd.h | 9 +- include/linux/mlx4/device.h | 50 +- include/linux/mmc/sdio_ids.h | 6 +- include/linux/netdev_features.h | 6 +- include/linux/netdevice.h | 23 +- include/linux/phy.h | 12 + .../linux/platform_data/irda-sa11x0.h | 0 include/linux/platform_data/st21nfca.h | 2 + include/linux/platform_data/st21nfcb.h | 4 +- include/linux/rhashtable.h | 273 +- include/linux/spinlock.h | 8 + include/linux/spinlock_api_smp.h | 2 + include/linux/spinlock_api_up.h | 1 + include/linux/timecounter.h | 139 + include/linux/types.h | 3 + include/linux/udp.h | 16 +- include/net/bluetooth/bluetooth.h | 2 +- include/net/bluetooth/hci.h | 83 +- include/net/bluetooth/hci_core.h | 41 +- include/net/bluetooth/l2cap.h | 1 + include/net/bluetooth/rfcomm.h | 2 - include/net/bond_3ad.h | 1 - include/net/bonding.h | 1 + include/net/cfg80211.h | 288 +- include/net/cfg802154.h | 10 +- include/net/genetlink.h | 21 +- include/net/geneve.h | 7 +- include/net/gro_cells.h | 29 +- include/net/ieee802154_netdev.h | 4 +- include/net/inet_connection_sock.h | 3 +- include/net/inet_sock.h | 29 +- include/net/ip.h | 7 +- include/net/ip6_fib.h | 10 +- include/net/ip6_tunnel.h | 1 + include/net/ip_fib.h | 50 +- include/net/ip_tunnels.h | 6 +- include/net/mac80211.h | 61 +- include/net/mac802154.h | 5 +- include/net/net_namespace.h | 4 + include/net/netfilter/nf_conntrack.h | 2 - include/net/netlink.h | 10 +- include/net/netns/ipv4.h | 3 +- include/net/nfc/hci.h | 25 +- include/net/nl802154.h | 45 +- include/net/pkt_sched.h | 12 + include/net/regulatory.h | 19 + include/net/route.h | 2 + include/net/rtnetlink.h | 2 + include/net/sock.h | 23 - include/net/switchdev.h | 79 +- include/net/tc_act/tc_bpf.h | 25 + include/net/tc_act/tc_connmark.h | 14 + include/net/tcp.h | 22 +- include/net/udp_tunnel.h | 16 +- include/net/vxlan.h | 103 +- include/trace/events/net.h | 8 +- include/uapi/linux/Kbuild | 1 + include/uapi/linux/if_bridge.h | 2 + include/uapi/linux/if_link.h | 4 + include/uapi/linux/in.h | 1 + include/uapi/linux/ipv6.h | 7 +- include/uapi/linux/l2tp.h | 1 + include/uapi/linux/libc-compat.h | 6 + include/uapi/linux/neighbour.h | 1 + include/uapi/linux/net_namespace.h | 23 + include/uapi/linux/nl80211.h | 187 +- include/uapi/linux/openvswitch.h | 31 + include/uapi/linux/rtnetlink.h | 8 + include/uapi/linux/tc_act/Kbuild | 1 + include/uapi/linux/tc_act/tc_bpf.h | 31 + include/uapi/linux/tc_act/tc_connmark.h | 22 + include/xen/page.h | 5 + kernel/locking/spinlock.c | 8 + kernel/taskstats.c | 13 +- kernel/time/Makefile | 2 +- kernel/time/clocksource.c | 76 - kernel/time/timecounter.c | 112 + lib/Kconfig.debug | 2 +- lib/Makefile | 1 + lib/rhashtable.c | 935 +++--- lib/test_rhashtable.c | 227 ++ net/8021q/vlan_core.c | 2 +- net/8021q/vlan_netlink.c | 8 + net/batman-adv/Kconfig | 1 + net/batman-adv/bat_iv_ogm.c | 15 +- net/batman-adv/bitarray.c | 1 - net/batman-adv/bitarray.h | 3 +- net/batman-adv/bridge_loop_avoidance.c | 17 +- net/batman-adv/debugfs.c | 2 +- net/batman-adv/distributed-arp-table.c | 1 + net/batman-adv/distributed-arp-table.h | 4 +- net/batman-adv/fragmentation.c | 1 - net/batman-adv/fragmentation.h | 3 +- net/batman-adv/gateway_client.c | 1 + net/batman-adv/main.c | 10 +- net/batman-adv/main.h | 15 +- net/batman-adv/multicast.h | 3 - net/batman-adv/network-coding.c | 3 +- net/batman-adv/originator.c | 1 - net/batman-adv/originator.h | 1 - net/batman-adv/packet.h | 5 +- net/batman-adv/routing.c | 3 +- net/batman-adv/soft-interface.c | 1 - net/batman-adv/sysfs.c | 1 - net/batman-adv/translation-table.c | 8 +- net/batman-adv/types.h | 4 +- net/bluetooth/6lowpan.c | 66 +- net/bluetooth/Kconfig | 27 + net/bluetooth/Makefile | 4 +- net/bluetooth/af_bluetooth.c | 6 + net/bluetooth/cmtp/capi.c | 6 - net/bluetooth/hci_conn.c | 21 +- net/bluetooth/hci_core.c | 1768 +--------- net/bluetooth/hci_debugfs.c | 979 ++++++ net/bluetooth/hci_debugfs.h | 26 + net/bluetooth/hci_event.c | 113 +- net/bluetooth/hci_request.c | 556 ++++ net/bluetooth/hci_request.h | 54 + net/bluetooth/hci_sock.c | 107 +- net/bluetooth/l2cap_core.c | 55 +- net/bluetooth/l2cap_sock.c | 2 + net/bluetooth/mgmt.c | 340 +- net/bluetooth/rfcomm/core.c | 4 +- net/bluetooth/rfcomm/sock.c | 2 + net/bluetooth/sco.c | 2 + net/bluetooth/selftest.c | 244 ++ net/bluetooth/selftest.h | 45 + net/bluetooth/smp.c | 466 ++- net/bluetooth/smp.h | 13 + net/bridge/br.c | 52 +- net/bridge/br_fdb.c | 48 +- net/bridge/br_if.c | 11 +- net/bridge/br_mdb.c | 5 +- net/bridge/br_netfilter.c | 12 +- net/bridge/br_netlink.c | 300 +- net/bridge/br_private.h | 12 +- net/bridge/br_vlan.c | 4 +- net/bridge/netfilter/ebt_vlan.c | 4 +- net/bridge/netfilter/ebtables.c | 2 +- net/can/gw.c | 3 +- net/core/dev.c | 155 +- net/core/ethtool.c | 45 +- net/core/fib_rules.c | 3 +- net/core/flow_dissector.c | 14 + net/core/neighbour.c | 20 +- net/core/net_namespace.c | 212 ++ net/core/netpoll.c | 2 +- net/core/rtnetlink.c | 137 +- net/core/skbuff.c | 15 +- net/decnet/dn_dev.c | 3 +- net/decnet/dn_fib.c | 3 +- net/decnet/dn_route.c | 8 +- net/decnet/dn_table.c | 7 +- net/ethernet/eth.c | 92 + net/ieee802154/6lowpan/6lowpan_i.h | 72 + net/ieee802154/6lowpan/Kconfig | 5 + net/ieee802154/6lowpan/Makefile | 3 + net/ieee802154/6lowpan/core.c | 304 ++ net/ieee802154/{ => 6lowpan}/reassembly.c | 2 +- net/ieee802154/6lowpan/rx.c | 171 + net/ieee802154/6lowpan/tx.c | 271 ++ net/ieee802154/6lowpan_rtnl.c | 729 ----- net/ieee802154/Kconfig | 18 +- net/ieee802154/Makefile | 8 +- net/ieee802154/af802154.h | 33 - net/ieee802154/af_ieee802154.c | 369 --- net/ieee802154/dgram.c | 549 ---- net/ieee802154/netlink.c | 12 +- net/ieee802154/nl-mac.c | 7 +- net/ieee802154/nl-phy.c | 3 +- net/ieee802154/nl802154.c | 52 +- net/ieee802154/raw.c | 270 -- net/ieee802154/rdev-ops.h | 7 + net/ieee802154/reassembly.h | 41 - net/ieee802154/socket.c | 1125 +++++++ net/ieee802154/sysfs.c | 2 +- net/ipv4/devinet.c | 16 +- net/ipv4/fib_frontend.c | 29 +- net/ipv4/fib_lookup.h | 1 - net/ipv4/fib_rules.c | 22 +- net/ipv4/fib_semantics.c | 35 +- net/ipv4/fib_trie.c | 1960 ++++++------ net/ipv4/fou.c | 14 +- net/ipv4/geneve.c | 211 +- net/ipv4/icmp.c | 17 +- net/ipv4/inet_diag.c | 9 +- net/ipv4/ip_gre.c | 3 + net/ipv4/ip_sockglue.c | 108 +- net/ipv4/ip_tunnel.c | 8 + net/ipv4/ip_vti.c | 1 + net/ipv4/ipconfig.c | 6 +- net/ipv4/ipip.c | 1 + net/ipv4/ipmr.c | 3 +- net/ipv4/route.c | 51 +- net/ipv4/tcp_cong.c | 121 +- net/ipv4/tcp_input.c | 44 +- net/ipv4/tcp_ipv4.c | 2 + net/ipv4/tcp_metrics.c | 3 +- net/ipv4/tcp_minisocks.c | 30 +- net/ipv4/tcp_output.c | 21 + net/ipv4/udp.c | 4 +- net/ipv4/udp_offload.c | 7 +- net/ipv4/udp_tunnel.c | 14 +- net/ipv6/addrconf.c | 46 +- net/ipv6/addrlabel.c | 5 +- net/ipv6/icmp.c | 2 +- net/ipv6/ip6_fib.c | 69 +- net/ipv6/ip6_gre.c | 2 + net/ipv6/ip6_tunnel.c | 9 + net/ipv6/ip6_udp_tunnel.c | 12 +- net/ipv6/ip6_vti.c | 1 + net/ipv6/ip6mr.c | 3 +- net/ipv6/ipv6_sockglue.c | 8 +- net/ipv6/ndisc.c | 2 +- net/ipv6/route.c | 75 +- net/ipv6/sit.c | 1 + net/ipv6/tcp_ipv6.c | 2 + net/ipv6/udp.c | 2 +- net/irda/irlap.c | 8 +- net/l2tp/l2tp_netlink.c | 107 +- net/mac80211/cfg.c | 40 +- net/mac80211/chan.c | 37 +- net/mac80211/debugfs.c | 2 - net/mac80211/driver-ops.h | 30 +- net/mac80211/ethtool.c | 26 +- net/mac80211/ibss.c | 11 +- net/mac80211/ieee80211_i.h | 8 +- net/mac80211/iface.c | 2 +- net/mac80211/key.c | 9 +- net/mac80211/main.c | 4 - net/mac80211/mesh_plink.c | 7 + net/mac80211/mlme.c | 93 +- net/mac80211/offchannel.c | 4 +- net/mac80211/pm.c | 2 +- net/mac80211/rc80211_minstrel.c | 6 +- net/mac80211/rc80211_minstrel.h | 15 +- net/mac80211/rx.c | 25 +- net/mac80211/scan.c | 8 +- net/mac80211/spectmgmt.c | 4 - net/mac80211/sta_info.c | 175 +- net/mac80211/sta_info.h | 12 + net/mac80211/status.c | 26 +- net/mac80211/tdls.c | 32 +- net/mac80211/trace.h | 33 +- net/mac80211/tx.c | 5 +- net/mac80211/util.c | 56 +- net/mac80211/vht.c | 73 +- net/mac802154/cfg.c | 26 +- net/mac802154/driver-ops.h | 5 +- net/mac802154/iface.c | 100 +- net/mac802154/mac_cmd.c | 6 +- net/mpls/mpls_gso.c | 4 +- net/netfilter/ipvs/ip_vs_ctl.c | 9 +- net/netfilter/nf_conntrack_core.c | 17 +- net/netfilter/nf_conntrack_netlink.c | 89 +- net/netfilter/nf_conntrack_seqadj.c | 6 +- net/netfilter/nf_log.c | 3 +- net/netfilter/nf_tables_api.c | 18 +- net/netfilter/nfnetlink.c | 15 +- net/netfilter/nfnetlink_cthelper.c | 4 +- net/netfilter/nft_hash.c | 92 +- net/netfilter/xt_osf.c | 169 +- net/netlabel/netlabel_cipso_v4.c | 3 +- net/netlabel/netlabel_mgmt.c | 6 +- net/netlabel/netlabel_unlabeled.c | 3 +- net/netlink/af_netlink.c | 133 +- net/netlink/af_netlink.h | 2 +- net/netlink/diag.c | 15 +- net/netlink/genetlink.c | 6 +- net/nfc/core.c | 2 - net/nfc/hci/command.c | 23 +- net/nfc/hci/core.c | 97 +- net/nfc/hci/hci.h | 10 +- net/nfc/hci/hcp.c | 11 - net/nfc/netlink.c | 12 +- net/openvswitch/actions.c | 4 +- net/openvswitch/datapath.c | 237 +- net/openvswitch/flow.c | 6 +- net/openvswitch/flow.h | 42 +- net/openvswitch/flow_netlink.c | 388 ++- net/openvswitch/flow_netlink.h | 13 +- net/openvswitch/flow_table.c | 226 +- net/openvswitch/flow_table.h | 8 +- net/openvswitch/vport-geneve.c | 32 +- net/openvswitch/vport-gre.c | 14 +- net/openvswitch/vport-vxlan.c | 110 +- net/openvswitch/vport-vxlan.h | 11 + net/openvswitch/vport.c | 12 +- net/openvswitch/vport.h | 18 + net/packet/af_packet.c | 14 +- net/packet/diag.c | 3 +- net/phonet/pn_netlink.c | 20 +- net/sched/Kconfig | 24 + net/sched/Makefile | 2 + net/sched/act_bpf.c | 208 ++ net/sched/act_connmark.c | 192 ++ net/sched/act_csum.c | 2 +- net/sched/cls_basic.c | 7 +- net/sched/cls_bpf.c | 18 +- net/sched/cls_flow.c | 8 +- net/sched/em_ipset.c | 2 +- net/sched/em_meta.c | 4 +- net/sched/sch_api.c | 2 +- net/sched/sch_dsmark.c | 6 +- net/sched/sch_fq.c | 4 +- net/sched/sch_teql.c | 11 +- net/socket.c | 63 +- net/switchdev/switchdev.c | 175 + net/tipc/Kconfig | 12 - net/tipc/addr.c | 45 +- net/tipc/addr.h | 45 +- net/tipc/bcast.c | 367 ++- net/tipc/bcast.h | 113 +- net/tipc/bearer.c | 141 +- net/tipc/bearer.h | 46 +- net/tipc/config.c | 90 +- net/tipc/config.h | 6 +- net/tipc/core.c | 144 +- net/tipc/core.h | 170 +- net/tipc/discover.c | 84 +- net/tipc/discover.h | 8 +- net/tipc/link.c | 344 +- net/tipc/link.h | 36 +- net/tipc/msg.c | 71 +- net/tipc/msg.h | 60 +- net/tipc/name_distr.c | 115 +- net/tipc/name_distr.h | 16 +- net/tipc/name_table.c | 180 +- net/tipc/name_table.h | 33 +- net/tipc/net.c | 54 +- net/tipc/net.h | 4 +- net/tipc/netlink.c | 17 +- net/tipc/netlink.h | 3 + net/tipc/node.c | 181 +- net/tipc/node.h | 35 +- net/tipc/server.c | 6 +- net/tipc/server.h | 17 +- net/tipc/socket.c | 664 ++-- net/tipc/socket.h | 19 +- net/tipc/subscr.c | 131 +- net/tipc/subscr.h | 14 +- net/unix/af_unix.c | 73 +- net/unix/diag.c | 3 +- net/wireless/core.c | 34 +- net/wireless/core.h | 11 +- net/wireless/nl80211.c | 695 ++-- net/wireless/nl80211.h | 16 +- net/wireless/reg.c | 160 +- net/wireless/reg.h | 1 + net/wireless/scan.c | 13 +- net/wireless/trace.h | 31 +- net/wireless/util.c | 29 +- net/wireless/wext-compat.c | 10 +- net/xfrm/xfrm_algo.c | 5 - net/xfrm/xfrm_user.c | 27 +- sound/pci/hda/hda_priv.h | 2 +- virt/kvm/arm/arch_timer.c | 3 +- 1022 files changed, 53796 insertions(+), 22876 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/hisilicon-hip04-net.txt create mode 100644 Documentation/devicetree/bindings/net/keystone-netcp.txt create mode 100644 Documentation/devicetree/bindings/net/rockchip-dwmac.txt create mode 100644 Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt create mode 100644 drivers/net/can/usb/peak_usb/pcan_ucan.h create mode 100644 drivers/net/can/usb/peak_usb/pcan_usb_fd.c create mode 100644 drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c create mode 100644 drivers/net/ethernet/chelsio/cxgb4/clip_tbl.h create mode 100644 drivers/net/ethernet/chelsio/cxgb4/t4_values.h create mode 100644 drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h create mode 100644 drivers/net/ethernet/hisilicon/hip04_eth.c create mode 100644 drivers/net/ethernet/hisilicon/hip04_mdio.c create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c create mode 100644 drivers/net/ethernet/ti/cpsw-common.c create mode 100644 drivers/net/ethernet/ti/netcp.h create mode 100644 drivers/net/ethernet/ti/netcp_core.c create mode 100644 drivers/net/ethernet/ti/netcp_ethss.c create mode 100644 drivers/net/ethernet/ti/netcp_sgmii.c create mode 100644 drivers/net/ethernet/ti/netcp_xgbepcsr.c create mode 100644 drivers/net/wireless/ath/ath10k/thermal.c create mode 100644 drivers/net/wireless/ath/ath10k/thermal.h create mode 100644 drivers/net/wireless/ath/ath10k/wmi-ops.h create mode 100644 drivers/net/wireless/ath/ath10k/wmi-tlv.c create mode 100644 drivers/net/wireless/ath/ath10k/wmi-tlv.h create mode 100644 drivers/net/wireless/ath/ath9k/ar956x_initvals.h create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/common.h create mode 100644 drivers/net/wireless/iwlwifi/mvm/fw-api-stats.h create mode 100644 drivers/nfc/st21nfca/st21nfca_se.c create mode 100644 drivers/nfc/st21nfca/st21nfca_se.h delete mode 100644 drivers/scsi/csiostor/csio_hw_t4.c rename arch/arm/include/asm/mach/irda.h => include/linux/platform_data/irda-sa11x0.h (100%) create mode 100644 include/linux/timecounter.h create mode 100644 include/net/tc_act/tc_bpf.h create mode 100644 include/net/tc_act/tc_connmark.h create mode 100644 include/uapi/linux/net_namespace.h create mode 100644 include/uapi/linux/tc_act/tc_bpf.h create mode 100644 include/uapi/linux/tc_act/tc_connmark.h create mode 100644 kernel/time/timecounter.c create mode 100644 lib/test_rhashtable.c create mode 100644 net/bluetooth/hci_debugfs.c create mode 100644 net/bluetooth/hci_debugfs.h create mode 100644 net/bluetooth/hci_request.c create mode 100644 net/bluetooth/hci_request.h create mode 100644 net/bluetooth/selftest.c create mode 100644 net/bluetooth/selftest.h create mode 100644 net/ieee802154/6lowpan/6lowpan_i.h create mode 100644 net/ieee802154/6lowpan/Kconfig create mode 100644 net/ieee802154/6lowpan/Makefile create mode 100644 net/ieee802154/6lowpan/core.c rename net/ieee802154/{ => 6lowpan}/reassembly.c (99%) create mode 100644 net/ieee802154/6lowpan/rx.c create mode 100644 net/ieee802154/6lowpan/tx.c delete mode 100644 net/ieee802154/6lowpan_rtnl.c delete mode 100644 net/ieee802154/af802154.h delete mode 100644 net/ieee802154/af_ieee802154.c delete mode 100644 net/ieee802154/dgram.c delete mode 100644 net/ieee802154/raw.c delete mode 100644 net/ieee802154/reassembly.h create mode 100644 net/ieee802154/socket.c create mode 100644 net/openvswitch/vport-vxlan.h create mode 100644 net/sched/act_bpf.c create mode 100644 net/sched/act_connmark.c Merging ipsec-next/master (ff660f75be36 Merge branch 'stmmac-pci') $ git merge ipsec-next/master Already up-to-date. Merging wireless-drivers-next/master (3f7bb3f34cc8 b43: AC-PHY: prepare place for developing new PHY support) $ git merge wireless-drivers-next/master Merge made by the 'recursive' strategy. drivers/bcma/bcma_private.h | 8 + drivers/bcma/driver_chipcommon.c | 10 +- drivers/bcma/driver_pci.c | 68 +- drivers/bcma/host_pci.c | 6 +- drivers/bcma/main.c | 27 +- drivers/bcma/sprom.c | 3 +- drivers/net/wireless/ath/ath9k/ar9003_calib.c | 61 +- drivers/net/wireless/ath/ath9k/ar953x_initvals.h | 4 +- .../net/wireless/ath/ath9k/ar955x_1p0_initvals.h | 4 +- drivers/net/wireless/ath/ath9k/ath9k.h | 2 +- drivers/net/wireless/ath/ath9k/gpio.c | 2 +- drivers/net/wireless/ath/ath9k/htc.h | 2 +- drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 2 +- drivers/net/wireless/ath/ath9k/htc_drv_init.c | 4 +- drivers/net/wireless/ath/ath9k/init.c | 4 +- drivers/net/wireless/ath/ath9k/reg.h | 3 + drivers/net/wireless/ath/wil6210/cfg80211.c | 112 ++- drivers/net/wireless/ath/wil6210/main.c | 73 +- drivers/net/wireless/ath/wil6210/netdev.c | 15 +- drivers/net/wireless/ath/wil6210/rx_reorder.c | 8 +- drivers/net/wireless/ath/wil6210/txrx.c | 19 +- drivers/net/wireless/ath/wil6210/wil6210.h | 25 +- drivers/net/wireless/ath/wil6210/wmi.c | 17 +- drivers/net/wireless/ath/wil6210/wmi.h | 58 +- drivers/net/wireless/b43/Kconfig | 9 + drivers/net/wireless/b43/Makefile | 1 + drivers/net/wireless/b43/b43.h | 3 + drivers/net/wireless/b43/main.c | 70 +- drivers/net/wireless/b43/phy_ac.c | 92 +++ drivers/net/wireless/b43/phy_ac.h | 38 + drivers/net/wireless/b43/phy_common.c | 9 +- drivers/net/wireless/b43/phy_common.h | 2 + drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 70 +- drivers/net/wireless/brcm80211/brcmfmac/bus.h | 24 +- drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 31 +- drivers/net/wireless/brcm80211/brcmfmac/common.c | 31 +- .../net/wireless/brcm80211/brcmfmac/commonring.h | 2 + drivers/net/wireless/brcm80211/brcmfmac/core.c | 39 +- drivers/net/wireless/brcm80211/brcmfmac/core.h | 30 + drivers/net/wireless/brcm80211/brcmfmac/firmware.c | 6 +- drivers/net/wireless/brcm80211/brcmfmac/fwil.c | 2 +- drivers/net/wireless/brcm80211/brcmfmac/fwil.h | 1 + .../net/wireless/brcm80211/brcmfmac/fwil_types.h | 41 ++ drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c | 30 +- drivers/net/wireless/brcm80211/brcmfmac/pcie.c | 2 +- drivers/net/wireless/brcm80211/brcmfmac/sdio.c | 168 ++--- drivers/net/wireless/brcm80211/brcmfmac/sdio.h | 12 +- drivers/net/wireless/brcm80211/brcmfmac/usb.c | 4 +- drivers/net/wireless/brcm80211/brcmsmac/debug.c | 2 +- drivers/net/wireless/brcm80211/brcmutil/utils.c | 32 +- .../net/wireless/brcm80211/include/brcmu_utils.h | 4 + drivers/net/wireless/mwifiex/11h.c | 198 ++++- drivers/net/wireless/mwifiex/11n.c | 4 +- drivers/net/wireless/mwifiex/11n_rxreorder.c | 2 +- drivers/net/wireless/mwifiex/cfg80211.c | 816 +++++++++++++++------ drivers/net/wireless/mwifiex/cfp.c | 4 +- drivers/net/wireless/mwifiex/cmdevt.c | 40 +- drivers/net/wireless/mwifiex/decl.h | 21 + drivers/net/wireless/mwifiex/fw.h | 58 ++ drivers/net/wireless/mwifiex/ie.c | 89 ++- drivers/net/wireless/mwifiex/init.c | 12 +- drivers/net/wireless/mwifiex/main.c | 14 +- drivers/net/wireless/mwifiex/main.h | 60 +- drivers/net/wireless/mwifiex/pcie.c | 2 + drivers/net/wireless/mwifiex/pcie.h | 3 + drivers/net/wireless/mwifiex/scan.c | 10 +- drivers/net/wireless/mwifiex/sdio.c | 7 + drivers/net/wireless/mwifiex/sdio.h | 23 + drivers/net/wireless/mwifiex/sta_cmd.c | 17 +- drivers/net/wireless/mwifiex/sta_cmdresp.c | 2 + drivers/net/wireless/mwifiex/sta_event.c | 12 +- drivers/net/wireless/mwifiex/sta_ioctl.c | 32 +- drivers/net/wireless/mwifiex/txrx.c | 2 +- drivers/net/wireless/mwifiex/uap_cmd.c | 70 ++ drivers/net/wireless/mwifiex/uap_event.c | 47 ++ drivers/net/wireless/mwifiex/usb.c | 16 + drivers/net/wireless/mwifiex/usb.h | 4 + drivers/net/wireless/mwifiex/util.c | 2 +- drivers/net/wireless/rtlwifi/core.c | 11 + drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 4 + drivers/ssb/main.c | 19 - include/linux/bcma/bcma.h | 1 + include/linux/bcma/bcma_driver_pci.h | 2 + include/linux/bcma/bcma_regs.h | 2 + include/linux/ssb/ssb_regs.h | 1 + 85 files changed, 2188 insertions(+), 711 deletions(-) create mode 100644 drivers/net/wireless/b43/phy_ac.c create mode 100644 drivers/net/wireless/b43/phy_ac.h Merging bluetooth/master (66f096f79166 Bluetooth: Remove mgmt_rp_read_local_oob_ext_data struct) $ git merge bluetooth/master Merge made by the 'recursive' strategy. drivers/bluetooth/ath3k.c | 10 + drivers/bluetooth/btusb.c | 667 ++++++++++++++++++++++++++++++++++++++- drivers/net/ieee802154/cc2520.c | 10 +- include/net/bluetooth/hci_core.h | 11 +- include/net/bluetooth/mgmt.h | 4 - net/bluetooth/hci_core.c | 169 ++++++++-- net/bluetooth/hci_debugfs.c | 79 ++++- net/bluetooth/hci_event.c | 135 ++++++-- net/bluetooth/l2cap_sock.c | 9 +- net/bluetooth/mgmt.c | 279 +++++++++++----- net/bluetooth/rfcomm/sock.c | 9 +- net/bluetooth/sco.c | 8 +- net/bluetooth/smp.c | 2 +- 13 files changed, 1207 insertions(+), 185 deletions(-) Merging infiniband/for-next (a7cfef21e3d0 Merge branches 'core', 'cxgb4', 'ipoib', 'iser', 'mlx4', 'ocrdma', 'odp' and 'srp' into for-next) $ git merge infiniband/for-next Already up-to-date. Merging mtd/master (97bf6af1f928 Linux 3.19-rc1) $ git merge mtd/master Already up-to-date. Merging l2-mtd/master (cd145af99888 mtd: nand: jz4740: Convert to GPIO descriptor API) $ git merge l2-mtd/master Merge made by the 'recursive' strategy. .../devicetree/bindings/mtd/atmel-nand.txt | 2 +- .../devicetree/bindings/mtd/fsl-quadspi.txt | 2 +- .../devicetree/bindings/mtd/gpmi-nand.txt | 2 +- .../devicetree/bindings/mtd/mtd-physmap.txt | 5 + arch/mips/include/asm/mach-jz4740/jz4740_nand.h | 2 - arch/mips/jz4740/board-qi_lb60.c | 11 +- drivers/mtd/bcm47xxpart.c | 43 ++++++- drivers/mtd/chips/map_ram.c | 1 + drivers/mtd/chips/map_rom.c | 13 +- drivers/mtd/devices/st_spi_fsm.c | 137 ++++++++++++++++++--- drivers/mtd/maps/physmap_of.c | 10 ++ drivers/mtd/mtdblock.c | 10 -- drivers/mtd/mtdcore.c | 20 +++ drivers/mtd/nand/ams-delta.c | 6 +- drivers/mtd/nand/atmel_nand.c | 31 ++++- drivers/mtd/nand/denali.c | 2 +- drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 9 -- drivers/mtd/nand/jz4740_nand.c | 29 ++--- drivers/mtd/nand/nand_base.c | 28 +++-- drivers/mtd/nand/nandsim.c | 7 +- drivers/mtd/nand/sunxi_nand.c | 2 - drivers/mtd/nftlmount.c | 18 +-- drivers/mtd/spi-nor/fsl-quadspi.c | 37 +++++- drivers/mtd/spi-nor/spi-nor.c | 63 ++++++++-- fs/jffs2/compr_rubin.c | 5 - include/linux/mtd/mtd.h | 1 + include/linux/mtd/spi-nor.h | 7 ++ 27 files changed, 381 insertions(+), 122 deletions(-) Merging crypto/master (db71f29a1c32 crypto: testmgr - mark rfc4106(gcm(aes)) as fips_allowed) $ git merge crypto/master Auto-merging drivers/crypto/ux500/cryp/cryp_core.c Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 1 + arch/mips/cavium-octeon/Makefile | 1 + arch/mips/cavium-octeon/crypto/Makefile | 7 + arch/mips/cavium-octeon/crypto/octeon-crypto.c | 66 +++ arch/mips/cavium-octeon/crypto/octeon-crypto.h | 75 +++ arch/mips/cavium-octeon/crypto/octeon-md5.c | 216 +++++++ arch/mips/cavium-octeon/executive/octeon-model.c | 6 + arch/mips/include/asm/octeon/octeon-feature.h | 17 +- arch/mips/include/asm/octeon/octeon.h | 5 - arch/sparc/crypto/aes_glue.c | 2 +- arch/sparc/crypto/camellia_glue.c | 2 +- arch/sparc/crypto/des_glue.c | 1 + arch/sparc/crypto/md5_glue.c | 2 +- arch/x86/crypto/aesni-intel_asm.S | 343 +++++------ arch/x86/crypto/aesni-intel_glue.c | 34 +- arch/x86/crypto/des3_ede_glue.c | 2 - crypto/Kconfig | 18 + crypto/Makefile | 1 + crypto/ablkcipher.c | 7 +- crypto/aead.c | 3 +- crypto/af_alg.c | 11 +- crypto/ahash.c | 3 +- crypto/algapi.c | 1 + crypto/algif_rng.c | 192 ++++++ crypto/algif_skcipher.c | 8 + crypto/cts.c | 5 +- crypto/drbg.c | 34 +- crypto/scatterwalk.c | 6 +- crypto/seqiv.c | 12 + crypto/tcrypt.c | 10 +- crypto/testmgr.c | 51 +- drivers/char/hw_random/core.c | 215 ++++--- drivers/char/hw_random/virtio-rng.c | 1 - drivers/crypto/amcc/crypto4xx_sa.c | 23 - drivers/crypto/atmel-aes.c | 2 +- drivers/crypto/atmel-sha.c | 50 +- drivers/crypto/atmel-tdes.c | 2 +- drivers/crypto/bfin_crc.c | 4 +- drivers/crypto/caam/caamalg.c | 14 +- drivers/crypto/caam/ctrl.c | 6 +- drivers/crypto/caam/error.c | 13 +- drivers/crypto/caam/jr.c | 37 +- drivers/crypto/caam/sg_sw_sec4.h | 8 +- drivers/crypto/ccp/ccp-dev.c | 1 + drivers/crypto/ixp4xx_crypto.c | 4 +- drivers/crypto/nx/nx.c | 6 +- drivers/crypto/omap-aes.c | 4 +- drivers/crypto/omap-des.c | 8 +- drivers/crypto/qat/qat_common/adf_accel_devices.h | 6 +- drivers/crypto/qat/qat_common/adf_aer.c | 24 +- drivers/crypto/qat/qat_common/adf_cfg.c | 2 + drivers/crypto/qat/qat_common/adf_common_drv.h | 2 +- drivers/crypto/qat/qat_common/adf_ctl_drv.c | 7 +- drivers/crypto/qat/qat_common/adf_init.c | 98 +++- .../crypto/qat/qat_common/adf_transport_internal.h | 1 - drivers/crypto/qat/qat_common/icp_qat_hw.h | 2 +- drivers/crypto/qat/qat_common/qat_algs.c | 642 +++++++++++++++------ drivers/crypto/qat/qat_common/qat_crypto.h | 16 +- .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 19 + drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 42 +- drivers/crypto/qce/dma.c | 6 +- drivers/crypto/qce/sha.c | 2 +- drivers/crypto/sahara.c | 2 +- drivers/crypto/talitos.c | 8 +- drivers/crypto/ux500/cryp/cryp_core.c | 10 +- include/crypto/if_alg.h | 1 + include/crypto/scatterwalk.h | 10 +- include/linux/crypto.h | 11 +- include/linux/hw_random.h | 4 + lib/string.c | 5 + 70 files changed, 1765 insertions(+), 695 deletions(-) create mode 100644 arch/mips/cavium-octeon/crypto/Makefile create mode 100644 arch/mips/cavium-octeon/crypto/octeon-crypto.c create mode 100644 arch/mips/cavium-octeon/crypto/octeon-crypto.h create mode 100644 arch/mips/cavium-octeon/crypto/octeon-md5.c create mode 100644 crypto/algif_rng.c Merging drm/drm-next (44df9c417ddd Merge branch 'msm-next' of git://people.freedesktop.org/~robclark/linux into drm-next) $ git merge drm/drm-next Removing sound/pci/hda/hda_i915.h Removing include/drm/i915_powerwell.h Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/volt/nv40.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/volt/gpio.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/volt/base.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/timer/priv.h Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/timer/nv04.h Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/timer/nv04.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/timer/gk20a.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/therm/nv50.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/therm/nv40.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/therm/ic.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/therm/gt215.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/therm/gm107.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf110.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/therm/g84.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/therm/fantog.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/therm/fanpwm.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/therm/fannil.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/therm/fan.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gt215.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk208.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk104.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf110.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf100.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gt215.fuc3.h Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gt215.fuc3 Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gk208.fuc5.h Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gk208.fuc5 Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf110.fuc4.h Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf110.fuc4 Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf100.fuc3.h Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf100.fuc3 Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/mxm/mxms.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/mxm/base.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv50.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv44.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv41.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv04.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gf100.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv50.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv4c.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv44.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv40.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/mc/gk20a.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/mc/gf106.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/mc/gf100.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/mc/g98.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/mc/g94.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/ltc/priv.h Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm107.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gk104.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gf100.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/ltc/base.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv40.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv04.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/instmem/base.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk104.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gf100.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/i2c/port.h Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padnv04.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padgm204.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padg94.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/i2c/pad.h Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/i2c/pad.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nv50.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nv4e.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nv04.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gm204.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gk104.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gf117.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gf110.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/i2c/g94.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bit.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/i2c/anx9805.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/gpio/nv50.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/gpio/nv10.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/gpio/gk104.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/gpio/gf110.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/gpio/g94.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fuse/nv50.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fuse/gm107.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fuse/gf100.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fuse/base.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/sddr3.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/sddr2.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/regsnv04.h Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramseq.h Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv50.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv4e.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv49.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv44.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv41.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv20.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv1a.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv10.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv04.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/rammcp77.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm107.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk20a.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramfuc.h Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv4e.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv49.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv47.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv46.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv44.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv41.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv40.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv36.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv35.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv30.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv25.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv20.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv1a.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv10.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv04.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/mcp89.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/mcp77.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/gt215.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm107.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk20a.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/gddr5.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/gddr3.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/g84.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv20.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv1a.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv10.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv05.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/devinit/mcp89.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gt215.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm204.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm107.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g98.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g84.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/devinit/fbmem.h Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/clk/seq.h Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/clk/pllnv04.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/clk/pllgt215.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv50.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv40.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv04.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk104.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/clk/gf100.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/clk/g84.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv50.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv31.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv04.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bus/hwsq.h Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bus/hwsq.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bus/gf100.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bus/g94.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/xpio.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/volt.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/vmap.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/timing.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/therm.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowrom.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowramin.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowpci.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowof.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowacpi.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/rammap.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/ramcfg.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/priv.h Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/pmu.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/perf.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/pcir.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/npde.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/mxm.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/image.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/i2c.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/gpio.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/fan.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/extdev.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/dp.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/disp.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/dcb.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/cstep.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/conn.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/boost.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/bit.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/P0260.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/M0209.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/M0205.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bios/M0203.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/bar/gk20a.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/vp/g84.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/sw/nv10.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/sw/nv04.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/sw/gf100.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/sec/g98.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/sec/fuc/g98.fuc0s.h Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/sec/fuc/g98.fuc0s Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/pm/gt215.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/pm/daemon.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/msvld/gk104.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/msvld/gf100.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/msppp/gf100.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/msppp/g98.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gk104.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gf100.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/mspdec/g98.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv50.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv44.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv40.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.h Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/mpeg/g84.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/regs.h Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/nv50.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.h Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/nv35.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/nv30.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/nv2a.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/nv25.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/nv04.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/gm107.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/gk208.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110b.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/gf119.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/gf117.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/gf110.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/gf108.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/gf104.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk208.fuc5.h Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk208.fuc5 Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk110.fuc3.h Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk110.fuc3 Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk104.fuc3.h Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk104.fuc3 Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf117.fuc3.h Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf117.fuc3 Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf100.fuc3.h Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf100.fuc3 Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hub.fuc Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk208.fuc5.h Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk208.fuc5 Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk110.fuc3.h Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk110.fuc3 Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk104.fuc3.h Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk104.fuc3 Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3.h Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3 Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf100.fuc3.h Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf100.fuc3 Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpc.fuc Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/com.fuc Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxnv50.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxnv40.h Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxnv40.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm107.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk20a.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk208.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk110b.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk110.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf119.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf110.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf108.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf104.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv17.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv10.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.h Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk20a.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk208.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/fifo/g84.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/falcon.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/dmaobj/nv50.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/dmaobj/nv04.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/dmaobj/gf110.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/dmaobj/gf100.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/dmaobj/base.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/vga.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/sornv50.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm204.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf110.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/piornv50.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/outpdp.h Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/outpdp.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/nv04.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigt215.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigk104.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigf110.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmig84.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf110.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/gt215.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/gt200.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/gm204.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/gm107.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/gk110.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/gf110.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/g94.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/g84.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/dport.h Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/dport.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/dacnv50.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/conn.h Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/conn.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/device/nv30.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/device/nv20.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/device/nv10.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/device/nv04.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/device/gm100.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/device/base.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/device/acpi.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/cipher/g84.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/ce/gt215.c Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gt215.fuc3.h Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gf100.fuc3.h Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/com.fuc Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/bsp/g84.c Auto-merging drivers/gpu/drm/nouveau/nvkm/core/subdev.c Auto-merging drivers/gpu/drm/nouveau/nvkm/core/ramht.c Auto-merging drivers/gpu/drm/nouveau/nvkm/core/printk.c Auto-merging drivers/gpu/drm/nouveau/nvkm/core/parent.c Auto-merging drivers/gpu/drm/nouveau/nvkm/core/option.c Auto-merging drivers/gpu/drm/nouveau/nvkm/core/object.c Auto-merging drivers/gpu/drm/nouveau/nvkm/core/notify.c Auto-merging drivers/gpu/drm/nouveau/nvkm/core/namedb.c Auto-merging drivers/gpu/drm/nouveau/nvkm/core/mm.c Auto-merging drivers/gpu/drm/nouveau/nvkm/core/ioctl.c Auto-merging drivers/gpu/drm/nouveau/nvkm/core/handle.c Auto-merging drivers/gpu/drm/nouveau/nvkm/core/event.c Auto-merging drivers/gpu/drm/nouveau/nvkm/core/enum.c Auto-merging drivers/gpu/drm/nouveau/nvkm/core/engine.c Auto-merging drivers/gpu/drm/nouveau/nvkm/core/engctx.c Auto-merging drivers/gpu/drm/nouveau/nvkm/core/client.c Removing drivers/gpu/drm/nouveau/nvif/os.h Removing drivers/gpu/drm/nouveau/nvif/device.h Auto-merging drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/xpio.h Auto-merging drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/therm.h Auto-merging drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/ramcfg.h Auto-merging drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/pmu.h Auto-merging drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/pll.h Auto-merging drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/perf.h Auto-merging drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/pcir.h Auto-merging drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/init.h Auto-merging drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/image.h Auto-merging drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/i2c.h Auto-merging drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/gpio.h Auto-merging drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/fan.h Auto-merging drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/extdev.h Auto-merging drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dcb.h Auto-merging drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/conn.h Auto-merging drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/bmp.h Auto-merging drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/bit.h Auto-merging drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0203.h Auto-merging drivers/gpu/drm/nouveau/include/nvkm/engine/device.h Auto-merging drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h Auto-merging drivers/gpu/drm/nouveau/include/nvkm/core/printk.h Auto-merging drivers/gpu/drm/nouveau/include/nvkm/core/object.h Auto-merging drivers/gpu/drm/nouveau/include/nvkm/core/notify.h Auto-merging drivers/gpu/drm/nouveau/include/nvkm/core/event.h Auto-merging drivers/gpu/drm/nouveau/include/nvkm/core/debug.h Auto-merging drivers/gpu/drm/nouveau/include/nvif/object.h Auto-merging drivers/gpu/drm/nouveau/include/nvif/client.h Auto-merging drivers/gpu/drm/nouveau/include/nvif/class.h Removing drivers/gpu/drm/nouveau/core/subdev/vm/nv04.h Removing drivers/gpu/drm/nouveau/core/subdev/vm/base.c Removing drivers/gpu/drm/nouveau/core/subdev/therm/priv.h Removing drivers/gpu/drm/nouveau/core/subdev/pwr/priv.h Removing drivers/gpu/drm/nouveau/core/subdev/pwr/memx.c Removing drivers/gpu/drm/nouveau/core/subdev/pwr/base.c Removing drivers/gpu/drm/nouveau/core/subdev/mxm/mxms.h Removing drivers/gpu/drm/nouveau/core/subdev/mc/priv.h Removing drivers/gpu/drm/nouveau/core/subdev/mc/nv04.h Removing drivers/gpu/drm/nouveau/core/subdev/instmem/priv.h Removing drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.h Removing drivers/gpu/drm/nouveau/core/subdev/i2c/priv.h Removing drivers/gpu/drm/nouveau/core/subdev/i2c/nv50.h Removing drivers/gpu/drm/nouveau/core/subdev/gpio/priv.h Removing drivers/gpu/drm/nouveau/core/subdev/fuse/priv.h Removing drivers/gpu/drm/nouveau/core/subdev/fb/priv.h Removing drivers/gpu/drm/nouveau/core/subdev/fb/nvc0.h Removing drivers/gpu/drm/nouveau/core/subdev/fb/nv50.h Removing drivers/gpu/drm/nouveau/core/subdev/fb/nv40.h Removing drivers/gpu/drm/nouveau/core/subdev/fb/nv04.h Removing drivers/gpu/drm/nouveau/core/subdev/devinit/priv.h Removing drivers/gpu/drm/nouveau/core/subdev/devinit/nv50.h Removing drivers/gpu/drm/nouveau/core/subdev/devinit/nv04.h Removing drivers/gpu/drm/nouveau/core/subdev/clock/pll.h Removing drivers/gpu/drm/nouveau/core/subdev/clock/nva3.h Removing drivers/gpu/drm/nouveau/core/subdev/clock/nv50.h Removing drivers/gpu/drm/nouveau/core/subdev/bus/nv04.h Removing drivers/gpu/drm/nouveau/core/subdev/bar/priv.h Removing drivers/gpu/drm/nouveau/core/subdev/bar/nvc0.c Removing drivers/gpu/drm/nouveau/core/subdev/bar/base.c Removing drivers/gpu/drm/nouveau/core/include/subdev/volt.h Removing drivers/gpu/drm/nouveau/core/include/subdev/vm.h Removing drivers/gpu/drm/nouveau/core/include/subdev/timer.h Removing drivers/gpu/drm/nouveau/core/include/subdev/therm.h Removing drivers/gpu/drm/nouveau/core/include/subdev/pwr.h Removing drivers/gpu/drm/nouveau/core/include/subdev/mxm.h Removing drivers/gpu/drm/nouveau/core/include/subdev/mc.h Removing drivers/gpu/drm/nouveau/core/include/subdev/ltc.h Removing drivers/gpu/drm/nouveau/core/include/subdev/instmem.h Removing drivers/gpu/drm/nouveau/core/include/subdev/ibus.h Removing drivers/gpu/drm/nouveau/core/include/subdev/i2c.h Removing drivers/gpu/drm/nouveau/core/include/subdev/gpio.h Removing drivers/gpu/drm/nouveau/core/include/subdev/fuse.h Removing drivers/gpu/drm/nouveau/core/include/subdev/fb.h Removing drivers/gpu/drm/nouveau/core/include/subdev/devinit.h Removing drivers/gpu/drm/nouveau/core/include/subdev/clock.h Removing drivers/gpu/drm/nouveau/core/include/subdev/bus.h Removing drivers/gpu/drm/nouveau/core/include/subdev/bios/volt.h Removing drivers/gpu/drm/nouveau/core/include/subdev/bios/vmap.h Removing drivers/gpu/drm/nouveau/core/include/subdev/bios/timing.h Removing drivers/gpu/drm/nouveau/core/include/subdev/bios/rammap.h Removing drivers/gpu/drm/nouveau/core/include/subdev/bios/npde.h Removing drivers/gpu/drm/nouveau/core/include/subdev/bios/mxm.h Removing drivers/gpu/drm/nouveau/core/include/subdev/bios/dp.h Removing drivers/gpu/drm/nouveau/core/include/subdev/bios/disp.h Removing drivers/gpu/drm/nouveau/core/include/subdev/bios/cstep.h Removing drivers/gpu/drm/nouveau/core/include/subdev/bios/boost.h Removing drivers/gpu/drm/nouveau/core/include/subdev/bios/P0260.h Removing drivers/gpu/drm/nouveau/core/include/subdev/bios/M0209.h Removing drivers/gpu/drm/nouveau/core/include/subdev/bios/M0205.h Removing drivers/gpu/drm/nouveau/core/include/subdev/bios.h Removing drivers/gpu/drm/nouveau/core/include/subdev/bar.h Removing drivers/gpu/drm/nouveau/core/include/nvif/unpack.h Removing drivers/gpu/drm/nouveau/core/include/nvif/ioctl.h Removing drivers/gpu/drm/nouveau/core/include/nvif/event.h Removing drivers/gpu/drm/nouveau/core/include/nvif/class.h Removing drivers/gpu/drm/nouveau/core/include/engine/xtensa.h Removing drivers/gpu/drm/nouveau/core/include/engine/vp.h Removing drivers/gpu/drm/nouveau/core/include/engine/software.h Removing drivers/gpu/drm/nouveau/core/include/engine/ppp.h Removing drivers/gpu/drm/nouveau/core/include/engine/perfmon.h Removing drivers/gpu/drm/nouveau/core/include/engine/mpeg.h Removing drivers/gpu/drm/nouveau/core/include/engine/graph.h Removing drivers/gpu/drm/nouveau/core/include/engine/fifo.h Removing drivers/gpu/drm/nouveau/core/include/engine/falcon.h Removing drivers/gpu/drm/nouveau/core/include/engine/dmaobj.h Removing drivers/gpu/drm/nouveau/core/include/engine/disp.h Removing drivers/gpu/drm/nouveau/core/include/engine/crypt.h Removing drivers/gpu/drm/nouveau/core/include/engine/copy.h Removing drivers/gpu/drm/nouveau/core/include/engine/bsp.h Removing drivers/gpu/drm/nouveau/core/include/core/ramht.h Removing drivers/gpu/drm/nouveau/core/include/core/parent.h Removing drivers/gpu/drm/nouveau/core/include/core/option.h Removing drivers/gpu/drm/nouveau/core/include/core/namedb.h Removing drivers/gpu/drm/nouveau/core/include/core/mm.h Removing drivers/gpu/drm/nouveau/core/include/core/ioctl.h Removing drivers/gpu/drm/nouveau/core/include/core/handle.h Removing drivers/gpu/drm/nouveau/core/include/core/gpuobj.h Removing drivers/gpu/drm/nouveau/core/include/core/enum.h Removing drivers/gpu/drm/nouveau/core/include/core/engine.h Removing drivers/gpu/drm/nouveau/core/include/core/engctx.h Removing drivers/gpu/drm/nouveau/core/include/core/device.h Removing drivers/gpu/drm/nouveau/core/include/core/client.h Removing drivers/gpu/drm/nouveau/core/engine/software/nv50.h Removing drivers/gpu/drm/nouveau/core/engine/perfmon/priv.h Removing drivers/gpu/drm/nouveau/core/engine/perfmon/nvf0.c Removing drivers/gpu/drm/nouveau/core/engine/perfmon/nve0.c Removing drivers/gpu/drm/nouveau/core/engine/perfmon/nvc0.h Removing drivers/gpu/drm/nouveau/core/engine/perfmon/nva3.c Removing drivers/gpu/drm/nouveau/core/engine/perfmon/nv50.c Removing drivers/gpu/drm/nouveau/core/engine/perfmon/nv40.h Removing drivers/gpu/drm/nouveau/core/engine/graph/nvc0.h Removing drivers/gpu/drm/nouveau/core/engine/graph/nv50.h Removing drivers/gpu/drm/nouveau/core/engine/graph/nv20.h Removing drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.h Removing drivers/gpu/drm/nouveau/core/engine/fifo/nve0.h Removing drivers/gpu/drm/nouveau/core/engine/fifo/nv50.h Removing drivers/gpu/drm/nouveau/core/engine/dmaobj/priv.h Removing drivers/gpu/drm/nouveau/core/engine/disp/priv.h Removing drivers/gpu/drm/nouveau/core/engine/disp/nv50.h Removing drivers/gpu/drm/nouveau/core/engine/device/priv.h Removing drivers/gpu/drm/nouveau/core/engine/device/nve0.c Removing drivers/gpu/drm/nouveau/core/engine/device/nvc0.c Removing drivers/gpu/drm/nouveau/core/engine/device/nv50.c Removing drivers/gpu/drm/nouveau/core/engine/device/acpi.h Removing drivers/gpu/drm/nouveau/core/engine/copy/nve0.c Removing drivers/gpu/drm/nouveau/core/engine/copy/nvc0.c Removing drivers/gpu/drm/nouveau/core/core/gpuobj.c Removing drivers/gpu/drm/nouveau/Makefile Auto-merging drivers/gpu/drm/i915/i915_gem.c Auto-merging drivers/gpu/drm/i915/i915_drv.h Auto-merging drivers/gpu/drm/i915/i915_drv.c Auto-merging drivers/gpu/drm/drm_fb_helper.c Auto-merging drivers/gpu/drm/bridge/dw_hdmi.h Auto-merging drivers/gpu/drm/bridge/dw_hdmi.c Auto-merging MAINTAINERS Auto-merging Documentation/devicetree/bindings/video/bridge/ptn3460.txt Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt Merge made by the 'recursive' strategy. Documentation/DocBook/drm.tmpl | 125 +- .../devicetree/bindings/drm/atmel/hlcdc-dc.txt | 53 + .../devicetree/bindings/drm/bridge/dw_hdmi.txt | 50 + Documentation/devicetree/bindings/drm/msm/hdmi.txt | 2 + .../devicetree/bindings/gpu/st,stih4xx.txt | 29 + .../devicetree/bindings/panel/avic,tm070ddh03.txt | 7 + .../bindings/panel/giantplus,gpg482739qs5.txt | 7 + .../devicetree/bindings/vendor-prefixes.txt | 3 + .../devicetree/bindings/video/bridge/ps8622.txt | 31 + .../bindings/{drm => video}/bridge/ptn3460.txt | 16 +- .../devicetree/bindings/video/dw_hdmi-rockchip.txt | 46 + .../devicetree/bindings/video/exynos_dp.txt | 12 + .../devicetree/bindings/video/renesas,du.txt | 4 + MAINTAINERS | 2 + drivers/char/agp/agp.h | 5 +- drivers/char/agp/generic.c | 11 - drivers/gpu/Makefile | 5 +- drivers/gpu/drm/Kconfig | 3 +- drivers/gpu/drm/Makefile | 3 +- drivers/gpu/drm/amd/amdkfd/Makefile | 7 +- drivers/gpu/drm/amd/amdkfd/cik_regs.h | 13 + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 39 +- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 243 +++- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 411 +++--- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 53 +- .../drm/amd/amdkfd/kfd_device_queue_manager_cik.c | 135 ++ .../drm/amd/amdkfd/kfd_device_queue_manager_vi.c | 64 + drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 4 - drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 7 +- drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 111 +- drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h | 40 +- drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_cik.c | 44 + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c | 56 + drivers/gpu/drm/amd/amdkfd/kfd_module.c | 6 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 321 +---- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 448 +++++++ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 33 + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 32 +- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 65 +- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 40 +- .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 34 +- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 155 ++- drivers/gpu/drm/amd/include/cik_structs.h | 293 +++++ drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 49 +- drivers/gpu/drm/armada/armada_crtc.c | 5 - drivers/gpu/drm/ast/ast_fb.c | 21 +- drivers/gpu/drm/atmel-hlcdc/Kconfig | 11 + drivers/gpu/drm/atmel-hlcdc/Makefile | 7 + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 406 ++++++ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 579 +++++++++ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 213 +++ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.c | 667 ++++++++++ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.h | 398 ++++++ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 319 +++++ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 856 ++++++++++++ drivers/gpu/drm/bochs/bochs_fbdev.c | 14 +- drivers/gpu/drm/bochs/bochs_kms.c | 5 - drivers/gpu/drm/bridge/Kconfig | 8 + drivers/gpu/drm/bridge/Makefile | 1 + .../gpu/drm/{imx/imx-hdmi.c => bridge/dw_hdmi.c} | 717 +++++----- .../gpu/drm/{imx/imx-hdmi.h => bridge/dw_hdmi.h} | 4 +- drivers/gpu/drm/bridge/ptn3460.c | 310 +++-- drivers/gpu/drm/cirrus/cirrus_fbdev.c | 12 +- drivers/gpu/drm/drm_atomic.c | 751 ++++++++++- drivers/gpu/drm/drm_atomic_helper.c | 321 ++++- drivers/gpu/drm/drm_bridge.c | 91 ++ drivers/gpu/drm/drm_cache.c | 13 +- drivers/gpu/drm/drm_crtc.c | 651 ++++++---- drivers/gpu/drm/drm_crtc_helper.c | 2 + drivers/gpu/drm/drm_crtc_internal.h | 6 + drivers/gpu/drm/drm_dp_helper.c | 31 + drivers/gpu/drm/drm_drv.c | 4 + drivers/gpu/drm/drm_fb_helper.c | 2 +- drivers/gpu/drm/drm_fops.c | 89 +- drivers/gpu/drm/drm_info.c | 24 - drivers/gpu/drm/drm_internal.h | 1 - drivers/gpu/drm/drm_ioctl.c | 13 + drivers/gpu/drm/drm_irq.c | 11 +- drivers/gpu/drm/drm_mipi_dsi.c | 6 +- drivers/gpu/drm/drm_modes.c | 122 +- drivers/gpu/drm/drm_plane_helper.c | 42 +- drivers/gpu/drm/drm_probe_helper.c | 97 +- drivers/gpu/drm/exynos/Kconfig | 1 - drivers/gpu/drm/exynos/exynos_dp_core.c | 53 +- drivers/gpu/drm/exynos/exynos_dp_core.h | 1 + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 185 +-- drivers/gpu/drm/exynos/exynos_drm_crtc.h | 8 +- drivers/gpu/drm/exynos/exynos_drm_drv.h | 83 +- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 196 ++- drivers/gpu/drm/exynos/exynos_drm_plane.c | 138 +- drivers/gpu/drm/exynos/exynos_drm_plane.h | 17 +- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 135 +- drivers/gpu/drm/exynos/exynos_mixer.c | 159 ++- drivers/gpu/drm/gma500/framebuffer.c | 22 +- drivers/gpu/drm/i2c/adv7511.c | 3 - drivers/gpu/drm/i915/Makefile | 3 + drivers/gpu/drm/i915/i915_cmd_parser.c | 131 +- drivers/gpu/drm/i915/i915_debugfs.c | 235 +++- drivers/gpu/drm/i915/i915_dma.c | 21 +- drivers/gpu/drm/i915/i915_drv.c | 18 +- drivers/gpu/drm/i915/i915_drv.h | 272 +++- drivers/gpu/drm/i915/i915_gem.c | 600 ++++----- drivers/gpu/drm/i915/i915_gem_batch_pool.c | 137 ++ drivers/gpu/drm/i915/i915_gem_context.c | 114 +- drivers/gpu/drm/i915/i915_gem_evict.c | 11 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 119 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 170 ++- drivers/gpu/drm/i915/i915_gem_gtt.h | 35 +- drivers/gpu/drm/i915/i915_gem_render_state.c | 2 +- drivers/gpu/drm/i915/i915_gem_tiling.c | 2 +- drivers/gpu/drm/i915/i915_gpu_error.c | 91 +- drivers/gpu/drm/i915/i915_irq.c | 84 +- drivers/gpu/drm/i915/i915_params.c | 9 +- drivers/gpu/drm/i915/i915_reg.h | 382 +++--- drivers/gpu/drm/i915/i915_suspend.c | 2 +- drivers/gpu/drm/i915/i915_trace.h | 69 +- drivers/gpu/drm/i915/intel_atomic_plane.c | 152 +++ drivers/gpu/drm/i915/intel_audio.c | 110 ++ drivers/gpu/drm/i915/intel_bios.c | 45 + drivers/gpu/drm/i915/intel_bios.h | 25 +- drivers/gpu/drm/i915/intel_ddi.c | 25 +- drivers/gpu/drm/i915/intel_display.c | 1124 ++++++++-------- drivers/gpu/drm/i915/intel_dp.c | 25 +- drivers/gpu/drm/i915/intel_drv.h | 88 +- drivers/gpu/drm/i915/intel_dsi.c | 483 ++++--- drivers/gpu/drm/i915/intel_dsi.h | 26 + drivers/gpu/drm/i915/intel_dsi_cmd.c | 141 +- drivers/gpu/drm/i915/intel_dsi_cmd.h | 46 +- drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 58 +- drivers/gpu/drm/i915/intel_dsi_pll.c | 12 +- drivers/gpu/drm/i915/intel_fbc.c | 701 ++++++++++ drivers/gpu/drm/i915/intel_lrc.c | 180 +-- drivers/gpu/drm/i915/intel_lrc.h | 2 +- drivers/gpu/drm/i915/intel_overlay.c | 44 +- drivers/gpu/drm/i915/intel_pm.c | 816 +----------- drivers/gpu/drm/i915/intel_psr.c | 278 +++- drivers/gpu/drm/i915/intel_renderstate_gen6.c | 25 + drivers/gpu/drm/i915/intel_renderstate_gen7.c | 25 + drivers/gpu/drm/i915/intel_renderstate_gen8.c | 25 + drivers/gpu/drm/i915/intel_renderstate_gen9.c | 25 + drivers/gpu/drm/i915/intel_ringbuffer.c | 244 ++-- drivers/gpu/drm/i915/intel_ringbuffer.h | 23 +- drivers/gpu/drm/i915/intel_runtime_pm.c | 58 +- drivers/gpu/drm/i915/intel_sdvo.c | 3 + drivers/gpu/drm/i915/intel_sprite.c | 354 ++--- drivers/gpu/drm/i915/intel_uncore.c | 15 +- drivers/gpu/drm/imx/Kconfig | 1 + drivers/gpu/drm/imx/Makefile | 2 +- drivers/gpu/drm/imx/dw_hdmi-imx.c | 258 ++++ drivers/gpu/drm/imx/imx-drm-core.c | 87 +- drivers/gpu/drm/imx/imx-drm.h | 2 +- drivers/gpu/drm/imx/imx-ldb.c | 8 +- drivers/gpu/drm/imx/imx-tve.c | 4 +- drivers/gpu/drm/imx/ipuv3-crtc.c | 78 +- drivers/gpu/drm/imx/parallel-display.c | 7 +- drivers/gpu/drm/mgag200/mgag200_fb.c | 12 +- drivers/gpu/drm/msm/Kconfig | 1 + drivers/gpu/drm/msm/Makefile | 9 +- drivers/gpu/drm/msm/adreno/a2xx.xml.h | 6 +- drivers/gpu/drm/msm/adreno/a3xx.xml.h | 248 ++-- drivers/gpu/drm/msm/adreno/a4xx.xml.h | 420 ++++-- drivers/gpu/drm/msm/adreno/adreno_common.xml.h | 6 +- drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h | 41 +- drivers/gpu/drm/msm/dsi/dsi.xml.h | 11 +- drivers/gpu/drm/msm/dsi/mmss_cc.xml.h | 11 +- drivers/gpu/drm/msm/dsi/sfpb.xml.h | 11 +- drivers/gpu/drm/msm/edp/edp.c | 208 +++ drivers/gpu/drm/msm/edp/edp.h | 85 ++ drivers/gpu/drm/msm/edp/edp.xml.h | 292 +++++ drivers/gpu/drm/msm/edp/edp_aux.c | 268 ++++ drivers/gpu/drm/msm/edp/edp_bridge.c | 120 ++ drivers/gpu/drm/msm/edp/edp_connector.c | 161 +++ drivers/gpu/drm/msm/edp/edp_ctrl.c | 1373 ++++++++++++++++++++ drivers/gpu/drm/msm/edp/edp_phy.c | 106 ++ drivers/gpu/drm/msm/hdmi/hdmi.c | 145 ++- drivers/gpu/drm/msm/hdmi/hdmi.h | 9 +- drivers/gpu/drm/msm/hdmi/hdmi.xml.h | 106 +- drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 14 +- drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 4 +- drivers/gpu/drm/msm/hdmi/qfprom.xml.h | 11 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h | 55 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 65 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c | 119 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 34 + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 19 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c | 154 ++- drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c | 2 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 104 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h | 245 +++- drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 230 +++- drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.c | 2 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.h | 2 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 127 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 56 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 19 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 216 ++- drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.c | 5 +- drivers/gpu/drm/msm/mdp/mdp_common.xml.h | 28 +- drivers/gpu/drm/msm/mdp/mdp_format.c | 108 +- drivers/gpu/drm/msm/mdp/mdp_kms.c | 2 +- drivers/gpu/drm/msm/mdp/mdp_kms.h | 24 +- drivers/gpu/drm/msm/msm_atomic.c | 50 +- drivers/gpu/drm/msm/msm_drv.c | 13 +- drivers/gpu/drm/msm/msm_drv.h | 14 + drivers/gpu/drm/msm/msm_fb.c | 4 +- drivers/gpu/drm/msm/msm_fbdev.c | 13 +- drivers/gpu/drm/msm/msm_kms.h | 5 + drivers/gpu/drm/nouveau/Kbuild | 66 + drivers/gpu/drm/nouveau/Kconfig | 2 +- drivers/gpu/drm/nouveau/Makefile | 400 ------ drivers/gpu/drm/nouveau/core/core/gpuobj.c | 323 ----- drivers/gpu/drm/nouveau/core/engine/copy/nvc0.c | 172 --- drivers/gpu/drm/nouveau/core/engine/copy/nve0.c | 176 --- drivers/gpu/drm/nouveau/core/engine/device/acpi.h | 9 - drivers/gpu/drm/nouveau/core/engine/device/nv50.c | 475 ------- drivers/gpu/drm/nouveau/core/engine/device/nvc0.c | 357 ----- drivers/gpu/drm/nouveau/core/engine/device/nve0.c | 324 ----- drivers/gpu/drm/nouveau/core/engine/device/priv.h | 8 - drivers/gpu/drm/nouveau/core/engine/disp/nv50.h | 252 ---- drivers/gpu/drm/nouveau/core/engine/disp/priv.h | 48 - drivers/gpu/drm/nouveau/core/engine/dmaobj/priv.h | 30 - drivers/gpu/drm/nouveau/core/engine/fifo/nv50.h | 36 - drivers/gpu/drm/nouveau/core/engine/fifo/nve0.h | 18 - .../gpu/drm/nouveau/core/engine/graph/ctxnvc0.h | 202 --- drivers/gpu/drm/nouveau/core/engine/graph/nv20.h | 31 - drivers/gpu/drm/nouveau/core/engine/graph/nv50.h | 7 - drivers/gpu/drm/nouveau/core/engine/graph/nvc0.h | 270 ---- drivers/gpu/drm/nouveau/core/engine/perfmon/nv40.h | 26 - drivers/gpu/drm/nouveau/core/engine/perfmon/nv50.c | 70 - drivers/gpu/drm/nouveau/core/engine/perfmon/nva3.c | 96 -- drivers/gpu/drm/nouveau/core/engine/perfmon/nvc0.h | 17 - drivers/gpu/drm/nouveau/core/engine/perfmon/nve0.c | 162 --- drivers/gpu/drm/nouveau/core/engine/perfmon/nvf0.c | 71 - drivers/gpu/drm/nouveau/core/engine/perfmon/priv.h | 91 -- .../gpu/drm/nouveau/core/engine/software/nv50.h | 46 - drivers/gpu/drm/nouveau/core/include/core/client.h | 57 - drivers/gpu/drm/nouveau/core/include/core/device.h | 184 --- drivers/gpu/drm/nouveau/core/include/core/engctx.h | 54 - drivers/gpu/drm/nouveau/core/include/core/engine.h | 57 - drivers/gpu/drm/nouveau/core/include/core/enum.h | 24 - drivers/gpu/drm/nouveau/core/include/core/gpuobj.h | 71 - drivers/gpu/drm/nouveau/core/include/core/handle.h | 34 - drivers/gpu/drm/nouveau/core/include/core/ioctl.h | 6 - drivers/gpu/drm/nouveau/core/include/core/mm.h | 40 - drivers/gpu/drm/nouveau/core/include/core/namedb.h | 56 - drivers/gpu/drm/nouveau/core/include/core/option.h | 20 - drivers/gpu/drm/nouveau/core/include/core/parent.h | 62 - drivers/gpu/drm/nouveau/core/include/core/ramht.h | 23 - drivers/gpu/drm/nouveau/core/include/engine/bsp.h | 9 - drivers/gpu/drm/nouveau/core/include/engine/copy.h | 13 - .../gpu/drm/nouveau/core/include/engine/crypt.h | 7 - drivers/gpu/drm/nouveau/core/include/engine/disp.h | 36 - .../gpu/drm/nouveau/core/include/engine/dmaobj.h | 31 - .../gpu/drm/nouveau/core/include/engine/falcon.h | 83 -- drivers/gpu/drm/nouveau/core/include/engine/fifo.h | 126 -- .../gpu/drm/nouveau/core/include/engine/graph.h | 86 -- drivers/gpu/drm/nouveau/core/include/engine/mpeg.h | 63 - .../gpu/drm/nouveau/core/include/engine/perfmon.h | 38 - drivers/gpu/drm/nouveau/core/include/engine/ppp.h | 7 - .../gpu/drm/nouveau/core/include/engine/software.h | 51 - drivers/gpu/drm/nouveau/core/include/engine/vp.h | 9 - .../gpu/drm/nouveau/core/include/engine/xtensa.h | 38 - drivers/gpu/drm/nouveau/core/include/nvif/class.h | 1 - drivers/gpu/drm/nouveau/core/include/nvif/event.h | 1 - drivers/gpu/drm/nouveau/core/include/nvif/ioctl.h | 1 - drivers/gpu/drm/nouveau/core/include/nvif/unpack.h | 1 - drivers/gpu/drm/nouveau/core/include/subdev/bar.h | 37 - drivers/gpu/drm/nouveau/core/include/subdev/bios.h | 35 - .../drm/nouveau/core/include/subdev/bios/M0205.h | 32 - .../drm/nouveau/core/include/subdev/bios/M0209.h | 30 - .../drm/nouveau/core/include/subdev/bios/P0260.h | 23 - .../drm/nouveau/core/include/subdev/bios/boost.h | 29 - .../drm/nouveau/core/include/subdev/bios/cstep.h | 28 - .../drm/nouveau/core/include/subdev/bios/disp.h | 48 - .../gpu/drm/nouveau/core/include/subdev/bios/dp.h | 35 - .../gpu/drm/nouveau/core/include/subdev/bios/mxm.h | 9 - .../drm/nouveau/core/include/subdev/bios/npde.h | 12 - .../drm/nouveau/core/include/subdev/bios/rammap.h | 26 - .../drm/nouveau/core/include/subdev/bios/timing.h | 14 - .../drm/nouveau/core/include/subdev/bios/vmap.h | 25 - .../drm/nouveau/core/include/subdev/bios/volt.h | 27 - drivers/gpu/drm/nouveau/core/include/subdev/bus.h | 53 - .../gpu/drm/nouveau/core/include/subdev/clock.h | 166 --- .../gpu/drm/nouveau/core/include/subdev/devinit.h | 35 - drivers/gpu/drm/nouveau/core/include/subdev/fb.h | 159 --- drivers/gpu/drm/nouveau/core/include/subdev/fuse.h | 30 - drivers/gpu/drm/nouveau/core/include/subdev/gpio.h | 47 - drivers/gpu/drm/nouveau/core/include/subdev/i2c.h | 136 -- drivers/gpu/drm/nouveau/core/include/subdev/ibus.h | 35 - .../gpu/drm/nouveau/core/include/subdev/instmem.h | 52 - drivers/gpu/drm/nouveau/core/include/subdev/ltc.h | 35 - drivers/gpu/drm/nouveau/core/include/subdev/mc.h | 31 - drivers/gpu/drm/nouveau/core/include/subdev/mxm.h | 37 - drivers/gpu/drm/nouveau/core/include/subdev/pwr.h | 56 - .../gpu/drm/nouveau/core/include/subdev/therm.h | 83 -- .../gpu/drm/nouveau/core/include/subdev/timer.h | 64 - drivers/gpu/drm/nouveau/core/include/subdev/vm.h | 135 -- drivers/gpu/drm/nouveau/core/include/subdev/volt.h | 61 - drivers/gpu/drm/nouveau/core/subdev/bar/base.c | 149 --- drivers/gpu/drm/nouveau/core/subdev/bar/nvc0.c | 220 ---- drivers/gpu/drm/nouveau/core/subdev/bar/priv.h | 32 - drivers/gpu/drm/nouveau/core/subdev/bus/nv04.h | 23 - drivers/gpu/drm/nouveau/core/subdev/clock/nv50.h | 31 - drivers/gpu/drm/nouveau/core/subdev/clock/nva3.h | 20 - drivers/gpu/drm/nouveau/core/subdev/clock/pll.h | 9 - drivers/gpu/drm/nouveau/core/subdev/devinit/nv04.h | 23 - drivers/gpu/drm/nouveau/core/subdev/devinit/nv50.h | 23 - drivers/gpu/drm/nouveau/core/subdev/devinit/priv.h | 40 - drivers/gpu/drm/nouveau/core/subdev/fb/nv04.h | 55 - drivers/gpu/drm/nouveau/core/subdev/fb/nv40.h | 17 - drivers/gpu/drm/nouveau/core/subdev/fb/nv50.h | 33 - drivers/gpu/drm/nouveau/core/subdev/fb/nvc0.h | 31 - drivers/gpu/drm/nouveau/core/subdev/fb/priv.h | 76 -- drivers/gpu/drm/nouveau/core/subdev/fuse/priv.h | 9 - drivers/gpu/drm/nouveau/core/subdev/gpio/priv.h | 67 - drivers/gpu/drm/nouveau/core/subdev/i2c/nv50.h | 34 - drivers/gpu/drm/nouveau/core/subdev/i2c/priv.h | 89 -- drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.h | 40 - drivers/gpu/drm/nouveau/core/subdev/instmem/priv.h | 56 - drivers/gpu/drm/nouveau/core/subdev/mc/nv04.h | 22 - drivers/gpu/drm/nouveau/core/subdev/mc/priv.h | 38 - drivers/gpu/drm/nouveau/core/subdev/mxm/mxms.h | 22 - drivers/gpu/drm/nouveau/core/subdev/pwr/base.c | 272 ---- drivers/gpu/drm/nouveau/core/subdev/pwr/memx.c | 201 --- drivers/gpu/drm/nouveau/core/subdev/pwr/priv.h | 44 - drivers/gpu/drm/nouveau/core/subdev/therm/priv.h | 159 --- drivers/gpu/drm/nouveau/core/subdev/vm/base.c | 483 ------- drivers/gpu/drm/nouveau/core/subdev/vm/nv04.h | 19 - .../gpu/drm/nouveau/dispnv04/{Makefile => Kbuild} | 0 drivers/gpu/drm/nouveau/dispnv04/crtc.c | 8 +- drivers/gpu/drm/nouveau/dispnv04/dac.c | 22 +- drivers/gpu/drm/nouveau/dispnv04/dfp.c | 6 +- drivers/gpu/drm/nouveau/dispnv04/disp.c | 20 +- drivers/gpu/drm/nouveau/dispnv04/disp.h | 6 +- drivers/gpu/drm/nouveau/dispnv04/hw.c | 24 +- drivers/gpu/drm/nouveau/dispnv04/hw.h | 4 +- drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 8 +- drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 10 +- drivers/gpu/drm/nouveau/{ => include}/nvif/class.h | 23 +- .../gpu/drm/nouveau/{ => include}/nvif/client.h | 6 +- drivers/gpu/drm/nouveau/include/nvif/device.h | 61 + .../gpu/drm/nouveau/{ => include}/nvif/driver.h | 0 drivers/gpu/drm/nouveau/{ => include}/nvif/event.h | 0 drivers/gpu/drm/nouveau/{ => include}/nvif/ioctl.h | 0 drivers/gpu/drm/nouveau/{ => include}/nvif/list.h | 0 .../gpu/drm/nouveau/{ => include}/nvif/notify.h | 0 .../gpu/drm/nouveau/{ => include}/nvif/object.h | 2 +- .../gpu/drm/nouveau/{core => include/nvif}/os.h | 0 .../gpu/drm/nouveau/{ => include}/nvif/unpack.h | 0 drivers/gpu/drm/nouveau/include/nvkm/core/client.h | 55 + .../{core/include => include/nvkm}/core/debug.h | 6 +- drivers/gpu/drm/nouveau/include/nvkm/core/device.h | 101 ++ drivers/gpu/drm/nouveau/include/nvkm/core/devidx.h | 62 + drivers/gpu/drm/nouveau/include/nvkm/core/engctx.h | 51 + drivers/gpu/drm/nouveau/include/nvkm/core/engine.h | 56 + drivers/gpu/drm/nouveau/include/nvkm/core/enum.h | 21 + .../{core/include => include/nvkm}/core/event.h | 27 +- drivers/gpu/drm/nouveau/include/nvkm/core/gpuobj.h | 64 + drivers/gpu/drm/nouveau/include/nvkm/core/handle.h | 34 + drivers/gpu/drm/nouveau/include/nvkm/core/ioctl.h | 7 + drivers/gpu/drm/nouveau/include/nvkm/core/mm.h | 40 + drivers/gpu/drm/nouveau/include/nvkm/core/namedb.h | 53 + .../{core/include => include/nvkm}/core/notify.h | 5 +- .../{core/include => include/nvkm}/core/object.h | 109 +- drivers/gpu/drm/nouveau/include/nvkm/core/option.h | 17 + drivers/gpu/drm/nouveau/include/nvkm/core/os.h | 4 + drivers/gpu/drm/nouveau/include/nvkm/core/parent.h | 58 + .../{core/include => include/nvkm}/core/printk.h | 13 +- drivers/gpu/drm/nouveau/include/nvkm/core/ramht.h | 20 + .../{core/include => include/nvkm}/core/subdev.h | 55 +- drivers/gpu/drm/nouveau/include/nvkm/engine/bsp.h | 5 + drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h | 13 + .../gpu/drm/nouveau/include/nvkm/engine/cipher.h | 5 + .../{core/include => include/nvkm}/engine/device.h | 3 - drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h | 32 + .../gpu/drm/nouveau/include/nvkm/engine/dmaobj.h | 26 + .../gpu/drm/nouveau/include/nvkm/engine/falcon.h | 81 ++ drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h | 126 ++ drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h | 86 ++ drivers/gpu/drm/nouveau/include/nvkm/engine/mpeg.h | 62 + .../gpu/drm/nouveau/include/nvkm/engine/mspdec.h | 7 + .../gpu/drm/nouveau/include/nvkm/engine/msppp.h | 6 + .../gpu/drm/nouveau/include/nvkm/engine/msvld.h | 7 + drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h | 34 + drivers/gpu/drm/nouveau/include/nvkm/engine/sec.h | 5 + drivers/gpu/drm/nouveau/include/nvkm/engine/sw.h | 50 + drivers/gpu/drm/nouveau/include/nvkm/engine/vp.h | 5 + .../gpu/drm/nouveau/include/nvkm/engine/xtensa.h | 35 + drivers/gpu/drm/nouveau/include/nvkm/subdev/bar.h | 33 + drivers/gpu/drm/nouveau/include/nvkm/subdev/bios.h | 32 + .../include => include/nvkm}/subdev/bios/M0203.h | 12 +- .../drm/nouveau/include/nvkm/subdev/bios/M0205.h | 29 + .../drm/nouveau/include/nvkm/subdev/bios/M0209.h | 27 + .../drm/nouveau/include/nvkm/subdev/bios/P0260.h | 21 + .../include => include/nvkm}/subdev/bios/bit.h | 4 +- .../include => include/nvkm}/subdev/bios/bmp.h | 10 +- .../drm/nouveau/include/nvkm/subdev/bios/boost.h | 27 + .../include => include/nvkm}/subdev/bios/conn.h | 10 +- .../drm/nouveau/include/nvkm/subdev/bios/cstep.h | 26 + .../include => include/nvkm}/subdev/bios/dcb.h | 16 +- .../drm/nouveau/include/nvkm/subdev/bios/disp.h | 39 + .../gpu/drm/nouveau/include/nvkm/subdev/bios/dp.h | 31 + .../include => include/nvkm}/subdev/bios/extdev.h | 9 +- .../include => include/nvkm}/subdev/bios/fan.h | 4 +- .../include => include/nvkm}/subdev/bios/gpio.h | 10 +- .../include => include/nvkm}/subdev/bios/i2c.h | 10 +- .../include => include/nvkm}/subdev/bios/image.h | 4 +- .../include => include/nvkm}/subdev/bios/init.h | 8 +- .../gpu/drm/nouveau/include/nvkm/subdev/bios/mxm.h | 6 + .../drm/nouveau/include/nvkm/subdev/bios/npde.h | 10 + .../include => include/nvkm}/subdev/bios/pcir.h | 6 +- .../include => include/nvkm}/subdev/bios/perf.h | 18 +- .../include => include/nvkm}/subdev/bios/pll.h | 10 +- .../include => include/nvkm}/subdev/bios/pmu.h | 12 +- .../include => include/nvkm}/subdev/bios/ramcfg.h | 8 +- .../drm/nouveau/include/nvkm/subdev/bios/rammap.h | 21 + .../include => include/nvkm}/subdev/bios/therm.h | 15 +- .../drm/nouveau/include/nvkm/subdev/bios/timing.h | 11 + .../drm/nouveau/include/nvkm/subdev/bios/vmap.h | 21 + .../drm/nouveau/include/nvkm/subdev/bios/volt.h | 23 + .../include => include/nvkm}/subdev/bios/xpio.h | 5 +- drivers/gpu/drm/nouveau/include/nvkm/subdev/bus.h | 50 + drivers/gpu/drm/nouveau/include/nvkm/subdev/clk.h | 161 +++ .../gpu/drm/nouveau/include/nvkm/subdev/devinit.h | 32 + drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h | 154 +++ drivers/gpu/drm/nouveau/include/nvkm/subdev/fuse.h | 28 + drivers/gpu/drm/nouveau/include/nvkm/subdev/gpio.h | 44 + drivers/gpu/drm/nouveau/include/nvkm/subdev/i2c.h | 135 ++ drivers/gpu/drm/nouveau/include/nvkm/subdev/ibus.h | 32 + .../gpu/drm/nouveau/include/nvkm/subdev/instmem.h | 48 + drivers/gpu/drm/nouveau/include/nvkm/subdev/ltc.h | 31 + drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h | 28 + drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h | 104 ++ drivers/gpu/drm/nouveau/include/nvkm/subdev/mxm.h | 34 + drivers/gpu/drm/nouveau/include/nvkm/subdev/pmu.h | 53 + .../gpu/drm/nouveau/include/nvkm/subdev/therm.h | 79 ++ .../gpu/drm/nouveau/include/nvkm/subdev/timer.h | 61 + .../{core/include => include/nvkm}/subdev/vga.h | 0 drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h | 58 + drivers/gpu/drm/nouveau/nouveau_abi16.c | 24 +- drivers/gpu/drm/nouveau/nouveau_abi16.h | 6 +- drivers/gpu/drm/nouveau/nouveau_agp.c | 4 +- drivers/gpu/drm/nouveau/nouveau_bios.c | 2 +- drivers/gpu/drm/nouveau/nouveau_bo.c | 126 +- drivers/gpu/drm/nouveau/nouveau_bo.h | 13 +- drivers/gpu/drm/nouveau/nouveau_chan.c | 22 +- drivers/gpu/drm/nouveau/nouveau_chan.h | 2 +- drivers/gpu/drm/nouveau/nouveau_connector.c | 102 +- drivers/gpu/drm/nouveau/nouveau_connector.h | 3 +- drivers/gpu/drm/nouveau/nouveau_display.c | 11 +- drivers/gpu/drm/nouveau/nouveau_display.h | 4 +- drivers/gpu/drm/nouveau/nouveau_dma.c | 2 +- drivers/gpu/drm/nouveau/nouveau_dp.c | 4 +- drivers/gpu/drm/nouveau/nouveau_drm.c | 69 +- drivers/gpu/drm/nouveau/nouveau_drm.h | 4 +- drivers/gpu/drm/nouveau/nouveau_encoder.h | 4 +- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 44 +- drivers/gpu/drm/nouveau/nouveau_fbcon.h | 1 - drivers/gpu/drm/nouveau/nouveau_fence.c | 2 +- drivers/gpu/drm/nouveau/nouveau_fence.h | 6 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 33 +- drivers/gpu/drm/nouveau/nouveau_hwmon.c | 98 +- drivers/gpu/drm/nouveau/nouveau_nvif.c | 24 +- drivers/gpu/drm/nouveau/nouveau_platform.c | 8 +- drivers/gpu/drm/nouveau/nouveau_platform.h | 5 +- drivers/gpu/drm/nouveau/nouveau_reg.h | 2 +- drivers/gpu/drm/nouveau/nouveau_sgdma.c | 17 +- drivers/gpu/drm/nouveau/nouveau_sysfs.c | 4 +- drivers/gpu/drm/nouveau/nouveau_ttm.c | 66 +- drivers/gpu/drm/nouveau/nv04_fence.c | 2 +- drivers/gpu/drm/nouveau/nv50_display.c | 165 +-- drivers/gpu/drm/nouveau/nv84_fence.c | 2 +- drivers/gpu/drm/nouveau/nvif/Kbuild | 4 + drivers/gpu/drm/nouveau/nvif/client.c | 6 +- drivers/gpu/drm/nouveau/nvif/device.c | 2 +- drivers/gpu/drm/nouveau/nvif/device.h | 62 - drivers/gpu/drm/nouveau/nvif/notify.c | 2 +- drivers/gpu/drm/nouveau/nvif/object.c | 8 +- drivers/gpu/drm/nouveau/nvif/os.h | 1 - drivers/gpu/drm/nouveau/nvkm/Kbuild | 3 + drivers/gpu/drm/nouveau/nvkm/core/Kbuild | 17 + .../gpu/drm/nouveau/{core => nvkm}/core/client.c | 93 +- .../gpu/drm/nouveau/{core => nvkm}/core/engctx.c | 130 +- .../gpu/drm/nouveau/{core => nvkm}/core/engine.c | 35 +- drivers/gpu/drm/nouveau/{core => nvkm}/core/enum.c | 14 +- .../gpu/drm/nouveau/{core => nvkm}/core/event.c | 3 +- drivers/gpu/drm/nouveau/nvkm/core/gpuobj.c | 316 +++++ .../gpu/drm/nouveau/{core => nvkm}/core/handle.c | 97 +- .../gpu/drm/nouveau/{core => nvkm}/core/ioctl.c | 170 ++- drivers/gpu/drm/nouveau/{core => nvkm}/core/mm.c | 71 +- .../gpu/drm/nouveau/{core => nvkm}/core/namedb.c | 108 +- .../gpu/drm/nouveau/{core => nvkm}/core/notify.c | 9 +- .../gpu/drm/nouveau/{core => nvkm}/core/object.c | 106 +- .../gpu/drm/nouveau/{core => nvkm}/core/option.c | 9 +- .../gpu/drm/nouveau/{core => nvkm}/core/parent.c | 56 +- .../gpu/drm/nouveau/{core => nvkm}/core/printk.c | 35 +- .../gpu/drm/nouveau/{core => nvkm}/core/ramht.c | 46 +- .../gpu/drm/nouveau/{core => nvkm}/core/subdev.c | 60 +- drivers/gpu/drm/nouveau/nvkm/engine/Kbuild | 19 + drivers/gpu/drm/nouveau/nvkm/engine/bsp/Kbuild | 1 + .../engine/bsp/nv84.c => nvkm/engine/bsp/g84.c} | 63 +- drivers/gpu/drm/nouveau/nvkm/engine/ce/Kbuild | 3 + .../fuc/nva3.fuc => nvkm/engine/ce/fuc/com.fuc} | 58 +- .../gpu/drm/nouveau/nvkm/engine/ce/fuc/gf100.fuc3 | 2 + .../nvc0.fuc.h => nvkm/engine/ce/fuc/gf100.fuc3.h} | 4 +- .../gpu/drm/nouveau/nvkm/engine/ce/fuc/gt215.fuc3 | 2 + .../nva3.fuc.h => nvkm/engine/ce/fuc/gt215.fuc3.h} | 4 +- drivers/gpu/drm/nouveau/nvkm/engine/ce/gf100.c | 166 +++ drivers/gpu/drm/nouveau/nvkm/engine/ce/gk104.c | 173 +++ .../engine/copy/nva3.c => nvkm/engine/ce/gt215.c} | 112 +- drivers/gpu/drm/nouveau/nvkm/engine/cipher/Kbuild | 1 + .../crypt/nv84.c => nvkm/engine/cipher/g84.c} | 136 +- drivers/gpu/drm/nouveau/nvkm/engine/device/Kbuild | 12 + .../nouveau/{core => nvkm}/engine/device/acpi.c | 9 +- drivers/gpu/drm/nouveau/nvkm/engine/device/acpi.h | 8 + .../nouveau/{core => nvkm}/engine/device/base.c | 287 ++-- .../nouveau/{core => nvkm}/engine/device/ctrl.c | 66 +- drivers/gpu/drm/nouveau/nvkm/engine/device/gf100.c | 358 +++++ drivers/gpu/drm/nouveau/nvkm/engine/device/gk104.c | 326 +++++ .../nouveau/{core => nvkm}/engine/device/gm100.c | 97 +- .../nouveau/{core => nvkm}/engine/device/nv04.c | 32 +- .../nouveau/{core => nvkm}/engine/device/nv10.c | 90 +- .../nouveau/{core => nvkm}/engine/device/nv20.c | 52 +- .../nouveau/{core => nvkm}/engine/device/nv30.c | 62 +- .../nouveau/{core => nvkm}/engine/device/nv40.c | 208 +-- drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c | 478 +++++++ drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h | 16 + drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild | 29 + .../drm/nouveau/{core => nvkm}/engine/disp/base.c | 84 +- .../drm/nouveau/{core => nvkm}/engine/disp/conn.c | 49 +- .../drm/nouveau/{core => nvkm}/engine/disp/conn.h | 28 +- .../nouveau/{core => nvkm}/engine/disp/dacnv50.c | 10 +- .../drm/nouveau/{core => nvkm}/engine/disp/dport.c | 30 +- .../drm/nouveau/{core => nvkm}/engine/disp/dport.h | 4 +- .../engine/disp/nv84.c => nvkm/engine/disp/g84.c} | 72 +- .../engine/disp/nv94.c => nvkm/engine/disp/g94.c} | 69 +- .../disp/nvd0.c => nvkm/engine/disp/gf110.c} | 289 ++-- .../disp/nve0.c => nvkm/engine/disp/gk104.c} | 96 +- .../disp/nvf0.c => nvkm/engine/disp/gk110.c} | 76 +- .../drm/nouveau/{core => nvkm}/engine/disp/gm107.c | 64 +- .../drm/nouveau/{core => nvkm}/engine/disp/gm204.c | 65 +- .../disp/nva0.c => nvkm/engine/disp/gt200.c} | 56 +- .../disp/nva3.c => nvkm/engine/disp/gt215.c} | 54 +- .../disp/hdanvd0.c => nvkm/engine/disp/hdagf110.c} | 12 +- .../disp/hdanva3.c => nvkm/engine/disp/hdagt215.c} | 10 +- .../disp/hdminv84.c => nvkm/engine/disp/hdmig84.c} | 8 +- .../hdminvd0.c => nvkm/engine/disp/hdmigf110.c} | 8 +- .../hdminve0.c => nvkm/engine/disp/hdmigk104.c} | 8 +- .../hdminva3.c => nvkm/engine/disp/hdmigt215.c} | 9 +- .../drm/nouveau/{core => nvkm}/engine/disp/nv04.c | 60 +- .../drm/nouveau/{core => nvkm}/engine/disp/nv50.c | 260 ++-- drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h | 226 ++++ .../drm/nouveau/{core => nvkm}/engine/disp/outp.c | 53 +- .../drm/nouveau/{core => nvkm}/engine/disp/outp.h | 31 +- .../nouveau/{core => nvkm}/engine/disp/outpdp.c | 53 +- .../nouveau/{core => nvkm}/engine/disp/outpdp.h | 21 +- .../nouveau/{core => nvkm}/engine/disp/piornv50.c | 42 +- drivers/gpu/drm/nouveau/nvkm/engine/disp/priv.h | 42 + .../disp/sornv94.c => nvkm/engine/disp/sorg94.c} | 74 +- .../disp/sornvd0.c => nvkm/engine/disp/sorgf110.c} | 63 +- .../nouveau/{core => nvkm}/engine/disp/sorgm204.c | 31 +- .../nouveau/{core => nvkm}/engine/disp/sornv50.c | 10 +- .../drm/nouveau/{core => nvkm}/engine/disp/vga.c | 9 +- drivers/gpu/drm/nouveau/nvkm/engine/dmaobj/Kbuild | 5 + .../nouveau/{core => nvkm}/engine/dmaobj/base.c | 45 +- .../dmaobj/nvc0.c => nvkm/engine/dmaobj/gf100.c} | 57 +- .../dmaobj/nvd0.c => nvkm/engine/dmaobj/gf110.c} | 57 +- .../nouveau/{core => nvkm}/engine/dmaobj/nv04.c | 44 +- .../nouveau/{core => nvkm}/engine/dmaobj/nv50.c | 32 +- drivers/gpu/drm/nouveau/nvkm/engine/dmaobj/priv.h | 28 + .../gpu/drm/nouveau/{core => nvkm}/engine/falcon.c | 51 +- drivers/gpu/drm/nouveau/nvkm/engine/fifo/Kbuild | 11 + .../drm/nouveau/{core => nvkm}/engine/fifo/base.c | 115 +- .../engine/fifo/nv84.c => nvkm/engine/fifo/g84.c} | 328 ++--- .../fifo/nvc0.c => nvkm/engine/fifo/gf100.c} | 506 ++++---- .../fifo/nve0.c => nvkm/engine/fifo/gk104.c} | 537 ++++---- drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h | 16 + .../fifo/nv108.c => nvkm/engine/fifo/gk208.c} | 17 +- .../drm/nouveau/{core => nvkm}/engine/fifo/gk20a.c | 17 +- .../drm/nouveau/{core => nvkm}/engine/fifo/nv04.c | 170 ++- .../drm/nouveau/{core => nvkm}/engine/fifo/nv04.h | 39 +- .../drm/nouveau/{core => nvkm}/engine/fifo/nv10.c | 77 +- .../drm/nouveau/{core => nvkm}/engine/fifo/nv17.c | 87 +- .../drm/nouveau/{core => nvkm}/engine/fifo/nv40.c | 101 +- .../drm/nouveau/{core => nvkm}/engine/fifo/nv50.c | 223 ++-- drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.h | 36 + drivers/gpu/drm/nouveau/nvkm/engine/gr/Kbuild | 36 + .../graph/ctxnvc0.c => nvkm/engine/gr/ctxgf100.c} | 330 ++--- drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h | 199 +++ .../graph/ctxnvc4.c => nvkm/engine/gr/ctxgf104.c} | 73 +- .../graph/ctxnvc1.c => nvkm/engine/gr/ctxgf108.c} | 175 +-- .../graph/ctxnvc8.c => nvkm/engine/gr/ctxgf110.c} | 101 +- .../graph/ctxnvd7.c => nvkm/engine/gr/ctxgf117.c} | 186 +-- .../graph/ctxnvd9.c => nvkm/engine/gr/ctxgf119.c} | 177 ++- .../graph/ctxnve4.c => nvkm/engine/gr/ctxgk104.c} | 244 ++-- .../graph/ctxnvf0.c => nvkm/engine/gr/ctxgk110.c} | 185 ++- .../engine/graph => nvkm/engine/gr}/ctxgk110b.c | 55 +- .../graph/ctxnv108.c => nvkm/engine/gr/ctxgk208.c} | 177 ++- .../engine/graph => nvkm/engine/gr}/ctxgk20a.c | 49 +- .../engine/graph => nvkm/engine/gr}/ctxgm107.c | 138 +- .../engine/graph => nvkm/engine/gr}/ctxnv40.c | 69 +- .../graph/ctx.h => nvkm/engine/gr/ctxnv40.h} | 38 +- .../engine/graph => nvkm/engine/gr}/ctxnv50.c | 324 +++-- .../engine/graph => nvkm/engine/gr}/fuc/com.fuc | 2 +- .../engine/graph => nvkm/engine/gr}/fuc/gpc.fuc | 2 +- .../engine/gr/fuc/gpcgf100.fuc3} | 4 +- .../engine/gr/fuc/gpcgf100.fuc3.h} | 4 +- .../engine/gr/fuc/gpcgf117.fuc3} | 4 +- .../engine/gr/fuc/gpcgf117.fuc3.h} | 4 +- .../engine/gr/fuc/gpcgk104.fuc3} | 4 +- .../engine/gr/fuc/gpcgk104.fuc3.h} | 4 +- .../engine/gr/fuc/gpcgk110.fuc3} | 4 +- .../engine/gr/fuc/gpcgk110.fuc3.h} | 4 +- .../engine/gr/fuc/gpcgk208.fuc5} | 4 +- .../engine/gr/fuc/gpcgk208.fuc5.h} | 4 +- .../graph => nvkm/engine/gr}/fuc/gpcgm107.fuc5 | 0 .../graph => nvkm/engine/gr}/fuc/gpcgm107.fuc5.h | 0 .../engine/graph => nvkm/engine/gr}/fuc/hub.fuc | 2 +- .../engine/gr/fuc/hubgf100.fuc3} | 4 +- .../engine/gr/fuc/hubgf100.fuc3.h} | 4 +- .../engine/gr/fuc/hubgf117.fuc3} | 4 +- .../engine/gr/fuc/hubgf117.fuc3.h} | 4 +- .../engine/gr/fuc/hubgk104.fuc3} | 4 +- .../engine/gr/fuc/hubgk104.fuc3.h} | 4 +- .../engine/gr/fuc/hubgk110.fuc3} | 4 +- .../engine/gr/fuc/hubgk110.fuc3.h} | 4 +- .../engine/gr/fuc/hubgk208.fuc5} | 4 +- .../engine/gr/fuc/hubgk208.fuc5.h} | 4 +- .../graph => nvkm/engine/gr}/fuc/hubgm107.fuc5 | 0 .../graph => nvkm/engine/gr}/fuc/hubgm107.fuc5.h | 0 .../engine/graph => nvkm/engine/gr}/fuc/macros.fuc | 0 .../{core/engine/graph => nvkm/engine/gr}/fuc/os.h | 0 .../engine/graph/nvc0.c => nvkm/engine/gr/gf100.c} | 633 ++++----- drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h | 250 ++++ .../engine/graph/nvc4.c => nvkm/engine/gr/gf104.c} | 101 +- .../engine/graph/nvc1.c => nvkm/engine/gr/gf108.c} | 115 +- .../engine/graph/nvc8.c => nvkm/engine/gr/gf110.c} | 107 +- .../engine/graph/nvd7.c => nvkm/engine/gr/gf117.c} | 131 +- .../engine/graph/nvd9.c => nvkm/engine/gr/gf119.c} | 129 +- .../engine/graph/nve4.c => nvkm/engine/gr/gk104.c} | 193 +-- .../engine/graph/nvf0.c => nvkm/engine/gr/gk110.c} | 171 +-- .../{core/engine/graph => nvkm/engine/gr}/gk110b.c | 97 +- .../graph/nv108.c => nvkm/engine/gr/gk208.c} | 163 +-- .../{core/engine/graph => nvkm/engine/gr}/gk20a.c | 35 +- .../{core/engine/graph => nvkm/engine/gr}/gm107.c | 207 +-- .../{core/engine/graph => nvkm/engine/gr}/nv04.c | 742 ++++++----- .../{core/engine/graph => nvkm/engine/gr}/nv10.c | 432 +++--- .../{core/engine/graph => nvkm/engine/gr}/nv20.c | 191 ++- drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.h | 26 + .../{core/engine/graph => nvkm/engine/gr}/nv25.c | 114 +- .../{core/engine/graph => nvkm/engine/gr}/nv2a.c | 80 +- .../{core/engine/graph => nvkm/engine/gr}/nv30.c | 130 +- .../{core/engine/graph => nvkm/engine/gr}/nv34.c | 118 +- .../{core/engine/graph => nvkm/engine/gr}/nv35.c | 116 +- .../{core/engine/graph => nvkm/engine/gr}/nv40.c | 249 ++-- .../{core/engine/graph => nvkm/engine/gr}/nv40.h | 16 +- .../{core/engine/graph => nvkm/engine/gr}/nv50.c | 326 +++-- drivers/gpu/drm/nouveau/nvkm/engine/gr/nv50.h | 9 + .../{core/engine/graph => nvkm/engine/gr}/regs.h | 4 +- drivers/gpu/drm/nouveau/nvkm/engine/mpeg/Kbuild | 5 + .../engine/mpeg/nv84.c => nvkm/engine/mpeg/g84.c} | 62 +- .../drm/nouveau/{core => nvkm}/engine/mpeg/nv31.c | 111 +- .../drm/nouveau/{core => nvkm}/engine/mpeg/nv31.h | 6 +- .../drm/nouveau/{core => nvkm}/engine/mpeg/nv40.c | 35 +- .../drm/nouveau/{core => nvkm}/engine/mpeg/nv44.c | 78 +- .../drm/nouveau/{core => nvkm}/engine/mpeg/nv50.c | 91 +- drivers/gpu/drm/nouveau/nvkm/engine/mspdec/Kbuild | 3 + .../engine/vp/nv98.c => nvkm/engine/mspdec/g98.c} | 83 +- .../vp/nvc0.c => nvkm/engine/mspdec/gf100.c} | 83 +- .../vp/nve0.c => nvkm/engine/mspdec/gk104.c} | 83 +- drivers/gpu/drm/nouveau/nvkm/engine/msppp/Kbuild | 2 + .../engine/ppp/nv98.c => nvkm/engine/msppp/g98.c} | 83 +- .../ppp/nvc0.c => nvkm/engine/msppp/gf100.c} | 83 +- drivers/gpu/drm/nouveau/nvkm/engine/msvld/Kbuild | 3 + .../engine/bsp/nv98.c => nvkm/engine/msvld/g98.c} | 85 +- .../bsp/nvc0.c => nvkm/engine/msvld/gf100.c} | 83 +- .../bsp/nve0.c => nvkm/engine/msvld/gk104.c} | 83 +- drivers/gpu/drm/nouveau/nvkm/engine/pm/Kbuild | 9 + .../{core/engine/perfmon => nvkm/engine/pm}/base.c | 205 ++- .../engine/perfmon => nvkm/engine/pm}/daemon.c | 31 +- drivers/gpu/drm/nouveau/nvkm/engine/pm/g84.c | 65 + .../perfmon/nvc0.c => nvkm/engine/pm/gf100.c} | 108 +- drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.h | 15 + drivers/gpu/drm/nouveau/nvkm/engine/pm/gk104.c | 148 +++ drivers/gpu/drm/nouveau/nvkm/engine/pm/gk110.c | 57 + .../perfmon/nv84.c => nvkm/engine/pm/gt215.c} | 69 +- .../{core/engine/perfmon => nvkm/engine/pm}/nv40.c | 85 +- drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.h | 24 + drivers/gpu/drm/nouveau/nvkm/engine/pm/nv50.c | 57 + drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h | 90 ++ drivers/gpu/drm/nouveau/nvkm/engine/sec/Kbuild | 1 + .../fuc/nv98.fuc => nvkm/engine/sec/fuc/g98.fuc0s} | 104 +- .../nv98.fuc.h => nvkm/engine/sec/fuc/g98.fuc0s.h} | 54 +- .../engine/crypt/nv98.c => nvkm/engine/sec/g98.c} | 113 +- drivers/gpu/drm/nouveau/nvkm/engine/sw/Kbuild | 4 + .../software/nvc0.c => nvkm/engine/sw/gf100.c} | 92 +- .../engine/software => nvkm/engine/sw}/nv04.c | 97 +- .../engine/software => nvkm/engine/sw}/nv10.c | 86 +- .../engine/software => nvkm/engine/sw}/nv50.c | 153 ++- drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.h | 45 + drivers/gpu/drm/nouveau/nvkm/engine/vp/Kbuild | 1 + .../engine/vp/nv84.c => nvkm/engine/vp/g84.c} | 63 +- .../gpu/drm/nouveau/{core => nvkm}/engine/xtensa.c | 70 +- drivers/gpu/drm/nouveau/nvkm/subdev/Kbuild | 19 + drivers/gpu/drm/nouveau/nvkm/subdev/bar/Kbuild | 4 + drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c | 144 ++ drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c | 219 ++++ .../drm/nouveau/{core => nvkm}/subdev/bar/gk20a.c | 26 +- .../drm/nouveau/{core => nvkm}/subdev/bar/nv50.c | 136 +- drivers/gpu/drm/nouveau/nvkm/subdev/bar/priv.h | 30 + drivers/gpu/drm/nouveau/nvkm/subdev/bios/Kbuild | 37 + .../drm/nouveau/{core => nvkm}/subdev/bios/M0203.c | 11 +- .../drm/nouveau/{core => nvkm}/subdev/bios/M0205.c | 13 +- .../drm/nouveau/{core => nvkm}/subdev/bios/M0209.c | 14 +- .../drm/nouveau/{core => nvkm}/subdev/bios/P0260.c | 12 +- .../drm/nouveau/{core => nvkm}/subdev/bios/base.c | 91 +- .../drm/nouveau/{core => nvkm}/subdev/bios/bit.c | 9 +- .../drm/nouveau/{core => nvkm}/subdev/bios/boost.c | 13 +- .../drm/nouveau/{core => nvkm}/subdev/bios/conn.c | 11 +- .../drm/nouveau/{core => nvkm}/subdev/bios/cstep.c | 13 +- .../drm/nouveau/{core => nvkm}/subdev/bios/dcb.c | 21 +- .../drm/nouveau/{core => nvkm}/subdev/bios/disp.c | 35 +- .../drm/nouveau/{core => nvkm}/subdev/bios/dp.c | 22 +- .../nouveau/{core => nvkm}/subdev/bios/extdev.c | 15 +- .../drm/nouveau/{core => nvkm}/subdev/bios/fan.c | 8 +- .../drm/nouveau/{core => nvkm}/subdev/bios/gpio.c | 10 +- .../drm/nouveau/{core => nvkm}/subdev/bios/i2c.c | 14 +- .../drm/nouveau/{core => nvkm}/subdev/bios/image.c | 5 +- .../drm/nouveau/{core => nvkm}/subdev/bios/init.c | 194 +-- .../drm/nouveau/{core => nvkm}/subdev/bios/mxm.c | 23 +- .../drm/nouveau/{core => nvkm}/subdev/bios/npde.c | 5 +- .../drm/nouveau/{core => nvkm}/subdev/bios/pcir.c | 5 +- .../drm/nouveau/{core => nvkm}/subdev/bios/perf.c | 18 +- .../drm/nouveau/{core => nvkm}/subdev/bios/pll.c | 19 +- .../drm/nouveau/{core => nvkm}/subdev/bios/pmu.c | 13 +- .../drm/nouveau/{core => nvkm}/subdev/bios/priv.h | 10 +- .../nouveau/{core => nvkm}/subdev/bios/ramcfg.c | 9 +- .../nouveau/{core => nvkm}/subdev/bios/rammap.c | 23 +- .../nouveau/{core => nvkm}/subdev/bios/shadow.c | 40 +- .../{core => nvkm}/subdev/bios/shadowacpi.c | 9 +- .../nouveau/{core => nvkm}/subdev/bios/shadowof.c | 7 +- .../nouveau/{core => nvkm}/subdev/bios/shadowpci.c | 9 +- .../{core => nvkm}/subdev/bios/shadowramin.c | 9 +- .../nouveau/{core => nvkm}/subdev/bios/shadowrom.c | 9 +- .../drm/nouveau/{core => nvkm}/subdev/bios/therm.c | 15 +- .../nouveau/{core => nvkm}/subdev/bios/timing.c | 11 +- .../drm/nouveau/{core => nvkm}/subdev/bios/vmap.c | 9 +- .../drm/nouveau/{core => nvkm}/subdev/bios/volt.c | 9 +- .../drm/nouveau/{core => nvkm}/subdev/bios/xpio.c | 10 +- drivers/gpu/drm/nouveau/nvkm/subdev/bus/Kbuild | 6 + .../subdev/bus/nv94.c => nvkm/subdev/bus/g94.c} | 17 +- .../subdev/bus/nvc0.c => nvkm/subdev/bus/gf100.c} | 23 +- .../drm/nouveau/{core => nvkm}/subdev/bus/hwsq.c | 26 +- .../drm/nouveau/{core => nvkm}/subdev/bus/hwsq.h | 24 +- .../drm/nouveau/{core => nvkm}/subdev/bus/nv04.c | 27 +- drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv04.h | 21 + .../drm/nouveau/{core => nvkm}/subdev/bus/nv31.c | 21 +- .../drm/nouveau/{core => nvkm}/subdev/bus/nv50.c | 23 +- drivers/gpu/drm/nouveau/nvkm/subdev/clk/Kbuild | 12 + .../{core/subdev/clock => nvkm/subdev/clk}/base.c | 204 ++- .../subdev/clock/nv84.c => nvkm/subdev/clk/g84.c} | 23 +- .../clock/nvc0.c => nvkm/subdev/clk/gf100.c} | 132 +- .../clock/nve0.c => nvkm/subdev/clk/gk104.c} | 142 +- .../{core/subdev/clock => nvkm/subdev/clk}/gk20a.c | 114 +- .../clock/nva3.c => nvkm/subdev/clk/gt215.c} | 153 ++- drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.h | 18 + .../clock/nvaa.c => nvkm/subdev/clk/mcp77.c} | 90 +- .../{core/subdev/clock => nvkm/subdev/clk}/nv04.c | 54 +- .../{core/subdev/clock => nvkm/subdev/clk}/nv40.c | 87 +- .../{core/subdev/clock => nvkm/subdev/clk}/nv50.c | 88 +- drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv50.h | 28 + drivers/gpu/drm/nouveau/nvkm/subdev/clk/pll.h | 11 + .../clock/pllnva3.c => nvkm/subdev/clk/pllgt215.c} | 8 +- .../subdev/clock => nvkm/subdev/clk}/pllnv04.c | 13 +- .../{core/subdev/clock => nvkm/subdev/clk}/seq.h | 3 - drivers/gpu/drm/nouveau/nvkm/subdev/devinit/Kbuild | 14 + .../nouveau/{core => nvkm}/subdev/devinit/base.c | 43 +- .../nouveau/{core => nvkm}/subdev/devinit/fbmem.h | 4 +- .../devinit/nv84.c => nvkm/subdev/devinit/g84.c} | 22 +- .../devinit/nv98.c => nvkm/subdev/devinit/g98.c} | 28 +- .../devinit/nvc0.c => nvkm/subdev/devinit/gf100.c} | 51 +- .../nouveau/{core => nvkm}/subdev/devinit/gm107.c | 22 +- .../nouveau/{core => nvkm}/subdev/devinit/gm204.c | 27 +- .../devinit/nva3.c => nvkm/subdev/devinit/gt215.c} | 44 +- .../devinit/nvaf.c => nvkm/subdev/devinit/mcp89.c} | 28 +- .../nouveau/{core => nvkm}/subdev/devinit/nv04.c | 64 +- drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.h | 22 + .../nouveau/{core => nvkm}/subdev/devinit/nv05.c | 16 +- .../nouveau/{core => nvkm}/subdev/devinit/nv10.c | 16 +- .../nouveau/{core => nvkm}/subdev/devinit/nv1a.c | 10 +- .../nouveau/{core => nvkm}/subdev/devinit/nv20.c | 14 +- .../nouveau/{core => nvkm}/subdev/devinit/nv50.c | 39 +- drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.h | 21 + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/priv.h | 34 + drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild | 45 + .../drm/nouveau/{core => nvkm}/subdev/fb/base.c | 58 +- .../subdev/fb/nv84.c => nvkm/subdev/fb/g84.c} | 9 +- .../drm/nouveau/{core => nvkm}/subdev/fb/gddr3.c | 4 +- .../drm/nouveau/{core => nvkm}/subdev/fb/gddr5.c | 4 +- .../subdev/fb/nvc0.c => nvkm/subdev/fb/gf100.c} | 60 +- drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.h | 28 + .../subdev/fb/nve0.c => nvkm/subdev/fb/gk104.c} | 21 +- .../drm/nouveau/{core => nvkm}/subdev/fb/gk20a.c | 29 +- .../drm/nouveau/{core => nvkm}/subdev/fb/gm107.c | 19 +- .../subdev/fb/nva3.c => nvkm/subdev/fb/gt215.c} | 11 +- .../subdev/fb/nvaa.c => nvkm/subdev/fb/mcp77.c} | 11 +- .../subdev/fb/nvaf.c => nvkm/subdev/fb/mcp89.c} | 11 +- .../drm/nouveau/{core => nvkm}/subdev/fb/nv04.c | 26 +- drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv04.h | 53 + .../drm/nouveau/{core => nvkm}/subdev/fb/nv10.c | 19 +- .../drm/nouveau/{core => nvkm}/subdev/fb/nv1a.c | 11 +- .../drm/nouveau/{core => nvkm}/subdev/fb/nv20.c | 27 +- .../drm/nouveau/{core => nvkm}/subdev/fb/nv25.c | 17 +- .../drm/nouveau/{core => nvkm}/subdev/fb/nv30.c | 29 +- .../drm/nouveau/{core => nvkm}/subdev/fb/nv35.c | 15 +- .../drm/nouveau/{core => nvkm}/subdev/fb/nv36.c | 15 +- .../drm/nouveau/{core => nvkm}/subdev/fb/nv40.c | 19 +- drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv40.h | 14 + .../drm/nouveau/{core => nvkm}/subdev/fb/nv41.c | 15 +- .../drm/nouveau/{core => nvkm}/subdev/fb/nv44.c | 19 +- .../drm/nouveau/{core => nvkm}/subdev/fb/nv46.c | 13 +- .../drm/nouveau/{core => nvkm}/subdev/fb/nv47.c | 9 +- .../drm/nouveau/{core => nvkm}/subdev/fb/nv49.c | 9 +- .../drm/nouveau/{core => nvkm}/subdev/fb/nv4e.c | 9 +- .../drm/nouveau/{core => nvkm}/subdev/fb/nv50.c | 98 +- drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.h | 31 + drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h | 74 ++ .../drm/nouveau/{core => nvkm}/subdev/fb/ramfuc.h | 40 +- .../fb/ramnvc0.c => nvkm/subdev/fb/ramgf100.c} | 178 ++- .../fb/ramnve0.c => nvkm/subdev/fb/ramgk104.c} | 241 ++-- .../nouveau/{core => nvkm}/subdev/fb/ramgk20a.c | 33 +- .../nouveau/{core => nvkm}/subdev/fb/ramgm107.c | 23 +- .../fb/ramnva3.c => nvkm/subdev/fb/ramgt215.c} | 202 ++- .../fb/ramnvaa.c => nvkm/subdev/fb/rammcp77.c} | 46 +- .../drm/nouveau/{core => nvkm}/subdev/fb/ramnv04.c | 27 +- .../drm/nouveau/{core => nvkm}/subdev/fb/ramnv10.c | 24 +- .../drm/nouveau/{core => nvkm}/subdev/fb/ramnv1a.c | 25 +- .../drm/nouveau/{core => nvkm}/subdev/fb/ramnv20.c | 23 +- .../drm/nouveau/{core => nvkm}/subdev/fb/ramnv40.c | 41 +- .../drm/nouveau/{core => nvkm}/subdev/fb/ramnv41.c | 21 +- .../drm/nouveau/{core => nvkm}/subdev/fb/ramnv44.c | 21 +- .../drm/nouveau/{core => nvkm}/subdev/fb/ramnv49.c | 21 +- .../drm/nouveau/{core => nvkm}/subdev/fb/ramnv4e.c | 23 +- .../drm/nouveau/{core => nvkm}/subdev/fb/ramnv50.c | 111 +- .../drm/nouveau/{core => nvkm}/subdev/fb/ramseq.h | 3 - .../{core/include => nvkm}/subdev/fb/regsnv04.h | 5 +- .../drm/nouveau/{core => nvkm}/subdev/fb/sddr2.c | 3 +- .../drm/nouveau/{core => nvkm}/subdev/fb/sddr3.c | 3 +- drivers/gpu/drm/nouveau/nvkm/subdev/fuse/Kbuild | 4 + .../drm/nouveau/{core => nvkm}/subdev/fuse/base.c | 25 +- .../drm/nouveau/{core => nvkm}/subdev/fuse/gf100.c | 29 +- .../drm/nouveau/{core => nvkm}/subdev/fuse/gm107.c | 24 +- .../subdev/fuse/g80.c => nvkm/subdev/fuse/nv50.c} | 41 +- drivers/gpu/drm/nouveau/nvkm/subdev/fuse/priv.h | 7 + drivers/gpu/drm/nouveau/nvkm/subdev/gpio/Kbuild | 6 + .../drm/nouveau/{core => nvkm}/subdev/gpio/base.c | 118 +- .../subdev/gpio/nv94.c => nvkm/subdev/gpio/g94.c} | 23 +- .../gpio/nvd0.c => nvkm/subdev/gpio/gf110.c} | 33 +- .../gpio/nve0.c => nvkm/subdev/gpio/gk104.c} | 29 +- .../drm/nouveau/{core => nvkm}/subdev/gpio/nv10.c | 23 +- .../drm/nouveau/{core => nvkm}/subdev/gpio/nv50.c | 27 +- drivers/gpu/drm/nouveau/nvkm/subdev/gpio/priv.h | 64 + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/Kbuild | 16 + .../nouveau/{core => nvkm}/subdev/i2c/anx9805.c | 70 +- .../drm/nouveau/{core => nvkm}/subdev/i2c/aux.c | 15 +- .../drm/nouveau/{core => nvkm}/subdev/i2c/base.c | 300 ++--- .../drm/nouveau/{core => nvkm}/subdev/i2c/bit.c | 35 +- .../subdev/i2c/nv94.c => nvkm/subdev/i2c/g94.c} | 89 +- .../subdev/i2c/nvd0.c => nvkm/subdev/i2c/gf110.c} | 72 +- .../drm/nouveau/{core => nvkm}/subdev/i2c/gf117.c | 17 +- .../subdev/i2c/nve0.c => nvkm/subdev/i2c/gk104.c} | 27 +- .../drm/nouveau/{core => nvkm}/subdev/i2c/gm204.c | 60 +- .../drm/nouveau/{core => nvkm}/subdev/i2c/nv04.c | 60 +- .../drm/nouveau/{core => nvkm}/subdev/i2c/nv4e.c | 60 +- .../drm/nouveau/{core => nvkm}/subdev/i2c/nv50.c | 58 +- drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nv50.h | 32 + .../drm/nouveau/{core => nvkm}/subdev/i2c/pad.c | 27 +- .../drm/nouveau/{core => nvkm}/subdev/i2c/pad.h | 32 +- .../i2c/padnv94.c => nvkm/subdev/i2c/padg94.c} | 35 +- .../nouveau/{core => nvkm}/subdev/i2c/padgm204.c | 19 +- .../nouveau/{core => nvkm}/subdev/i2c/padnv04.c | 5 +- .../drm/nouveau/{core => nvkm}/subdev/i2c/port.h | 6 +- drivers/gpu/drm/nouveau/nvkm/subdev/i2c/priv.h | 87 ++ drivers/gpu/drm/nouveau/nvkm/subdev/ibus/Kbuild | 3 + .../ibus/nvc0.c => nvkm/subdev/ibus/gf100.c} | 47 +- .../ibus/nve0.c => nvkm/subdev/ibus/gk104.c} | 53 +- .../drm/nouveau/{core => nvkm}/subdev/ibus/gk20a.c | 25 +- drivers/gpu/drm/nouveau/nvkm/subdev/instmem/Kbuild | 4 + .../nouveau/{core => nvkm}/subdev/instmem/base.c | 75 +- .../nouveau/{core => nvkm}/subdev/instmem/nv04.c | 97 +- drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv04.h | 36 + .../nouveau/{core => nvkm}/subdev/instmem/nv40.c | 51 +- .../nouveau/{core => nvkm}/subdev/instmem/nv50.c | 66 +- drivers/gpu/drm/nouveau/nvkm/subdev/instmem/priv.h | 54 + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/Kbuild | 4 + .../drm/nouveau/{core => nvkm}/subdev/ltc/base.c | 30 +- .../drm/nouveau/{core => nvkm}/subdev/ltc/gf100.c | 40 +- .../drm/nouveau/{core => nvkm}/subdev/ltc/gk104.c | 7 +- .../drm/nouveau/{core => nvkm}/subdev/ltc/gm107.c | 19 +- .../drm/nouveau/{core => nvkm}/subdev/ltc/priv.h | 46 +- drivers/gpu/drm/nouveau/nvkm/subdev/mc/Kbuild | 11 + .../drm/nouveau/{core => nvkm}/subdev/mc/base.c | 72 +- .../subdev/mc/nv94.c => nvkm/subdev/mc/g94.c} | 11 +- .../subdev/mc/nv98.c => nvkm/subdev/mc/g98.c} | 29 +- .../subdev/mc/nvc0.c => nvkm/subdev/mc/gf100.c} | 39 +- .../subdev/mc/nvc3.c => nvkm/subdev/mc/gf106.c} | 15 +- .../drm/nouveau/{core => nvkm}/subdev/mc/gk20a.c | 13 +- .../drm/nouveau/{core => nvkm}/subdev/mc/nv04.c | 25 +- drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.h | 20 + .../drm/nouveau/{core => nvkm}/subdev/mc/nv40.c | 13 +- .../drm/nouveau/{core => nvkm}/subdev/mc/nv44.c | 15 +- .../drm/nouveau/{core => nvkm}/subdev/mc/nv4c.c | 11 +- .../drm/nouveau/{core => nvkm}/subdev/mc/nv50.c | 25 +- drivers/gpu/drm/nouveau/nvkm/subdev/mc/priv.h | 36 + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/Kbuild | 6 + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c | 480 +++++++ .../subdev/vm/nvc0.c => nvkm/subdev/mmu/gf100.c} | 95 +- .../{core/subdev/vm => nvkm/subdev/mmu}/nv04.c | 70 +- drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv04.h | 19 + .../{core/subdev/vm => nvkm/subdev/mmu}/nv41.c | 74 +- .../{core/subdev/vm => nvkm/subdev/mmu}/nv44.c | 80 +- .../{core/subdev/vm => nvkm/subdev/mmu}/nv50.c | 97 +- drivers/gpu/drm/nouveau/nvkm/subdev/mxm/Kbuild | 3 + .../drm/nouveau/{core => nvkm}/subdev/mxm/base.c | 49 +- .../drm/nouveau/{core => nvkm}/subdev/mxm/mxms.c | 20 +- drivers/gpu/drm/nouveau/nvkm/subdev/mxm/mxms.h | 22 + .../drm/nouveau/{core => nvkm}/subdev/mxm/nv50.c | 40 +- drivers/gpu/drm/nouveau/nvkm/subdev/pmu/Kbuild | 8 + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c | 268 ++++ .../subdev/pwr => nvkm/subdev/pmu}/fuc/arith.fuc | 0 .../nvc0.fuc => nvkm/subdev/pmu/fuc/gf100.fuc3} | 4 +- .../subdev/pmu/fuc/gf100.fuc3.h} | 4 +- .../nvd0.fuc => nvkm/subdev/pmu/fuc/gf110.fuc4} | 4 +- .../subdev/pmu/fuc/gf110.fuc4.h} | 4 +- .../nv108.fuc => nvkm/subdev/pmu/fuc/gk208.fuc5} | 4 +- .../subdev/pmu/fuc/gk208.fuc5.h} | 4 +- .../nva3.fuc => nvkm/subdev/pmu/fuc/gt215.fuc3} | 4 +- .../subdev/pmu/fuc/gt215.fuc3.h} | 4 +- .../subdev/pwr => nvkm/subdev/pmu}/fuc/host.fuc | 0 .../subdev/pwr => nvkm/subdev/pmu}/fuc/i2c_.fuc | 0 .../subdev/pwr => nvkm/subdev/pmu}/fuc/idle.fuc | 0 .../subdev/pwr => nvkm/subdev/pmu}/fuc/kernel.fuc | 0 .../subdev/pwr => nvkm/subdev/pmu}/fuc/macros.fuc | 0 .../subdev/pwr => nvkm/subdev/pmu}/fuc/memx.fuc | 0 .../{core/subdev/pwr => nvkm/subdev/pmu}/fuc/os.h | 0 .../subdev/pwr => nvkm/subdev/pmu}/fuc/perf.fuc | 0 .../subdev/pwr => nvkm/subdev/pmu}/fuc/test.fuc | 0 .../subdev/pwr/nvc0.c => nvkm/subdev/pmu/gf100.c} | 27 +- .../subdev/pwr/nvd0.c => nvkm/subdev/pmu/gf110.c} | 27 +- .../{core/subdev/pwr => nvkm/subdev/pmu}/gk104.c | 62 +- .../subdev/pwr/nv108.c => nvkm/subdev/pmu/gk208.c} | 27 +- drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c | 229 ++++ .../subdev/pwr/nva3.c => nvkm/subdev/pmu/gt215.c} | 37 +- drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c | 200 +++ drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h | 43 + drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild | 13 + .../drm/nouveau/{core => nvkm}/subdev/therm/base.c | 199 ++- .../drm/nouveau/{core => nvkm}/subdev/therm/fan.c | 89 +- .../nouveau/{core => nvkm}/subdev/therm/fannil.c | 15 +- .../nouveau/{core => nvkm}/subdev/therm/fanpwm.c | 40 +- .../nouveau/{core => nvkm}/subdev/therm/fantog.c | 52 +- .../therm/nv84.c => nvkm/subdev/therm/g84.c} | 144 +- .../therm/nvd0.c => nvkm/subdev/therm/gf110.c} | 66 +- .../nouveau/{core => nvkm}/subdev/therm/gm107.c | 40 +- .../therm/nva3.c => nvkm/subdev/therm/gt215.c} | 51 +- .../drm/nouveau/{core => nvkm}/subdev/therm/ic.c | 22 +- .../drm/nouveau/{core => nvkm}/subdev/therm/nv40.c | 53 +- .../drm/nouveau/{core => nvkm}/subdev/therm/nv50.c | 49 +- drivers/gpu/drm/nouveau/nvkm/subdev/therm/priv.h | 153 +++ .../drm/nouveau/{core => nvkm}/subdev/therm/temp.c | 139 +- drivers/gpu/drm/nouveau/nvkm/subdev/timer/Kbuild | 3 + .../drm/nouveau/{core => nvkm}/subdev/timer/base.c | 23 +- .../nouveau/{core => nvkm}/subdev/timer/gk20a.c | 9 +- .../drm/nouveau/{core => nvkm}/subdev/timer/nv04.c | 48 +- .../drm/nouveau/{core => nvkm}/subdev/timer/nv04.h | 14 +- .../drm/nouveau/{core => nvkm}/subdev/timer/priv.h | 2 - drivers/gpu/drm/nouveau/nvkm/subdev/volt/Kbuild | 4 + .../drm/nouveau/{core => nvkm}/subdev/volt/base.c | 65 +- .../drm/nouveau/{core => nvkm}/subdev/volt/gk20a.c | 36 +- .../drm/nouveau/{core => nvkm}/subdev/volt/gpio.c | 16 +- .../drm/nouveau/{core => nvkm}/subdev/volt/nv40.c | 21 +- drivers/gpu/drm/omapdrm/omap_fbdev.c | 10 +- drivers/gpu/drm/panel/Kconfig | 2 + drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 33 +- drivers/gpu/drm/panel/panel-simple.c | 63 + drivers/gpu/drm/qxl/qxl_fb.c | 22 +- drivers/gpu/drm/radeon/Makefile | 8 +- drivers/gpu/drm/radeon/atombios_encoders.c | 29 +- drivers/gpu/drm/radeon/btc_dpm.c | 2 + drivers/gpu/drm/radeon/ci_dpm.c | 57 +- drivers/gpu/drm/radeon/ci_dpm.h | 1 + drivers/gpu/drm/radeon/ci_smc.c | 2 + drivers/gpu/drm/radeon/cik.c | 29 +- drivers/gpu/drm/radeon/cik_reg.h | 167 +-- drivers/gpu/drm/radeon/cik_sdma.c | 29 + drivers/gpu/drm/radeon/cypress_dpm.c | 2 + drivers/gpu/drm/radeon/dce3_1_afmt.c | 264 ++-- drivers/gpu/drm/radeon/dce6_afmt.c | 218 ++-- drivers/gpu/drm/radeon/evergreen.c | 7 +- drivers/gpu/drm/radeon/evergreen_cs.c | 76 ++ drivers/gpu/drm/radeon/evergreen_hdmi.c | 478 +++---- drivers/gpu/drm/radeon/evergreen_reg.h | 15 + drivers/gpu/drm/radeon/evergreend.h | 1 + drivers/gpu/drm/radeon/kv_dpm.c | 2 + drivers/gpu/drm/radeon/ni.c | 18 +- drivers/gpu/drm/radeon/ni_dpm.c | 2 + drivers/gpu/drm/radeon/r600.c | 7 +- drivers/gpu/drm/radeon/r600_hdmi.c | 399 ++---- drivers/gpu/drm/radeon/radeon.h | 15 + drivers/gpu/drm/radeon/radeon_asic.c | 36 +- drivers/gpu/drm/radeon/radeon_asic.h | 21 +- drivers/gpu/drm/radeon/radeon_audio.c | 766 +++++++++++ drivers/gpu/drm/radeon/radeon_audio.h | 84 ++ drivers/gpu/drm/radeon/radeon_connectors.c | 8 + drivers/gpu/drm/radeon/radeon_drv.c | 3 +- drivers/gpu/drm/radeon/radeon_fb.c | 31 +- drivers/gpu/drm/radeon/radeon_i2c.c | 5 - drivers/gpu/drm/radeon/radeon_kfd.c | 283 ++-- drivers/gpu/drm/radeon/radeon_kfd.h | 2 +- drivers/gpu/drm/radeon/radeon_mode.h | 4 +- drivers/gpu/drm/radeon/radeon_object.c | 6 - drivers/gpu/drm/radeon/radeon_object.h | 2 - drivers/gpu/drm/radeon/radeon_pm.c | 131 +- drivers/gpu/drm/radeon/rs600.c | 7 +- drivers/gpu/drm/radeon/rs690.c | 7 +- drivers/gpu/drm/radeon/rv770.c | 5 +- drivers/gpu/drm/radeon/rv770_dpm.c | 4 + drivers/gpu/drm/radeon/rv770_dpm.h | 2 - drivers/gpu/drm/radeon/si.c | 5 +- drivers/gpu/drm/radeon/si_dpm.c | 75 +- drivers/gpu/drm/radeon/si_dpm.h | 1 + drivers/gpu/drm/radeon/sid.h | 10 + drivers/gpu/drm/radeon/sumo_dpm.c | 4 + drivers/gpu/drm/radeon/sumo_dpm.h | 3 - drivers/gpu/drm/radeon/trinity_dpm.c | 2 + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 95 +- drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 1 + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 6 +- drivers/gpu/drm/rcar-du/rcar_du_drv.h | 2 +- drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 34 +- drivers/gpu/drm/rcar-du/rcar_du_group.c | 21 +- drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c | 2 + drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c | 18 + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 15 +- drivers/gpu/drm/rcar-du/rcar_du_plane.c | 20 +- drivers/gpu/drm/rcar-du/rcar_du_regs.h | 5 +- drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 1 + drivers/gpu/drm/rockchip/Kconfig | 12 +- drivers/gpu/drm/rockchip/Makefile | 2 + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 341 +++++ drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 1 + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 9 +- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 1 + drivers/gpu/drm/shmobile/Kconfig | 2 + drivers/gpu/drm/sti/Kconfig | 1 + drivers/gpu/drm/sti/Makefile | 4 + drivers/gpu/drm/sti/sti_awg_utils.c | 184 +++ drivers/gpu/drm/sti/sti_awg_utils.h | 34 + drivers/gpu/drm/sti/sti_drm_crtc.c | 6 - drivers/gpu/drm/sti/sti_dvo.c | 560 ++++++++ drivers/gpu/drm/sti/sti_hda.c | 11 +- drivers/gpu/drm/sti/sti_hdmi.c | 11 +- drivers/gpu/drm/sti/sti_tvout.c | 118 ++ drivers/gpu/drm/tegra/dc.c | 954 ++++++++------ drivers/gpu/drm/tegra/drm.c | 140 +- drivers/gpu/drm/tegra/drm.h | 91 +- drivers/gpu/drm/tegra/dsi.c | 578 ++++---- drivers/gpu/drm/tegra/fb.c | 25 +- drivers/gpu/drm/tegra/gem.c | 39 +- drivers/gpu/drm/tegra/hdmi.c | 327 +++-- drivers/gpu/drm/tegra/mipi-phy.c | 25 +- drivers/gpu/drm/tegra/output.c | 168 +-- drivers/gpu/drm/tegra/rgb.c | 218 ++-- drivers/gpu/drm/tegra/sor.c | 1105 ++++++++-------- drivers/gpu/drm/udl/udl_fb.c | 22 +- drivers/gpu/drm/udl/udl_modeset.c | 9 +- drivers/gpu/drm/udl/udl_transfer.c | 39 +- drivers/gpu/host1x/bus.c | 201 +-- drivers/gpu/host1x/bus.h | 4 +- drivers/gpu/host1x/dev.c | 6 +- drivers/gpu/ipu-v3/ipu-dc.c | 25 +- drivers/gpu/ipu-v3/ipu-di.c | 121 +- include/drm/bridge/dw_hdmi.h | 61 + include/drm/bridge/ptn3460.h | 8 + include/drm/drmP.h | 8 +- include/drm/drm_atomic.h | 13 +- include/drm/drm_atomic_helper.h | 43 + include/drm/drm_crtc.h | 120 +- include/drm/drm_crtc_helper.h | 59 +- include/drm/drm_dp_helper.h | 1 + include/drm/drm_fb_helper.h | 2 +- include/drm/drm_modes.h | 11 +- include/drm/drm_plane_helper.h | 5 +- include/drm/i915_component.h | 38 + include/drm/i915_powerwell.h | 37 - include/linux/host1x.h | 18 +- include/uapi/drm/drm.h | 8 + include/uapi/drm/drm_mode.h | 38 +- include/uapi/drm/i915_drm.h | 21 + include/video/imx-ipu-v3.h | 21 +- sound/pci/hda/hda_i915.c | 154 ++- sound/pci/hda/hda_i915.h | 37 - sound/pci/hda/hda_intel.c | 60 +- sound/pci/hda/hda_intel.h | 71 + 1104 files changed, 46221 insertions(+), 32004 deletions(-) create mode 100644 Documentation/devicetree/bindings/drm/atmel/hlcdc-dc.txt create mode 100644 Documentation/devicetree/bindings/drm/bridge/dw_hdmi.txt create mode 100644 Documentation/devicetree/bindings/panel/avic,tm070ddh03.txt create mode 100644 Documentation/devicetree/bindings/panel/giantplus,gpg482739qs5.txt create mode 100644 Documentation/devicetree/bindings/video/bridge/ps8622.txt rename Documentation/devicetree/bindings/{drm => video}/bridge/ptn3460.txt (65%) create mode 100644 Documentation/devicetree/bindings/video/dw_hdmi-rockchip.txt create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_cik.c create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_vi.c create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_cik.c create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c create mode 100644 drivers/gpu/drm/amd/include/cik_structs.h create mode 100644 drivers/gpu/drm/atmel-hlcdc/Kconfig create mode 100644 drivers/gpu/drm/atmel-hlcdc/Makefile create mode 100644 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c create mode 100644 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c create mode 100644 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h create mode 100644 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.c create mode 100644 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.h create mode 100644 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c create mode 100644 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c rename drivers/gpu/drm/{imx/imx-hdmi.c => bridge/dw_hdmi.c} (72%) rename drivers/gpu/drm/{imx/imx-hdmi.h => bridge/dw_hdmi.h} (99%) create mode 100644 drivers/gpu/drm/drm_bridge.c create mode 100644 drivers/gpu/drm/i915/i915_gem_batch_pool.c create mode 100644 drivers/gpu/drm/i915/intel_atomic_plane.c create mode 100644 drivers/gpu/drm/i915/intel_fbc.c create mode 100644 drivers/gpu/drm/imx/dw_hdmi-imx.c create mode 100644 drivers/gpu/drm/msm/edp/edp.c create mode 100644 drivers/gpu/drm/msm/edp/edp.h create mode 100644 drivers/gpu/drm/msm/edp/edp.xml.h create mode 100644 drivers/gpu/drm/msm/edp/edp_aux.c create mode 100644 drivers/gpu/drm/msm/edp/edp_bridge.c create mode 100644 drivers/gpu/drm/msm/edp/edp_connector.c create mode 100644 drivers/gpu/drm/msm/edp/edp_ctrl.c create mode 100644 drivers/gpu/drm/msm/edp/edp_phy.c create mode 100644 drivers/gpu/drm/nouveau/Kbuild delete mode 100644 drivers/gpu/drm/nouveau/Makefile delete mode 100644 drivers/gpu/drm/nouveau/core/core/gpuobj.c delete mode 100644 drivers/gpu/drm/nouveau/core/engine/copy/nvc0.c delete mode 100644 drivers/gpu/drm/nouveau/core/engine/copy/nve0.c delete mode 100644 drivers/gpu/drm/nouveau/core/engine/device/acpi.h delete mode 100644 drivers/gpu/drm/nouveau/core/engine/device/nv50.c delete mode 100644 drivers/gpu/drm/nouveau/core/engine/device/nvc0.c delete mode 100644 drivers/gpu/drm/nouveau/core/engine/device/nve0.c delete mode 100644 drivers/gpu/drm/nouveau/core/engine/device/priv.h delete mode 100644 drivers/gpu/drm/nouveau/core/engine/disp/nv50.h delete mode 100644 drivers/gpu/drm/nouveau/core/engine/disp/priv.h delete mode 100644 drivers/gpu/drm/nouveau/core/engine/dmaobj/priv.h delete mode 100644 drivers/gpu/drm/nouveau/core/engine/fifo/nv50.h delete mode 100644 drivers/gpu/drm/nouveau/core/engine/fifo/nve0.h delete mode 100644 drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.h delete mode 100644 drivers/gpu/drm/nouveau/core/engine/graph/nv20.h delete mode 100644 drivers/gpu/drm/nouveau/core/engine/graph/nv50.h delete mode 100644 drivers/gpu/drm/nouveau/core/engine/graph/nvc0.h delete mode 100644 drivers/gpu/drm/nouveau/core/engine/perfmon/nv40.h delete mode 100644 drivers/gpu/drm/nouveau/core/engine/perfmon/nv50.c delete mode 100644 drivers/gpu/drm/nouveau/core/engine/perfmon/nva3.c delete mode 100644 drivers/gpu/drm/nouveau/core/engine/perfmon/nvc0.h delete mode 100644 drivers/gpu/drm/nouveau/core/engine/perfmon/nve0.c delete mode 100644 drivers/gpu/drm/nouveau/core/engine/perfmon/nvf0.c delete mode 100644 drivers/gpu/drm/nouveau/core/engine/perfmon/priv.h delete mode 100644 drivers/gpu/drm/nouveau/core/engine/software/nv50.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/core/client.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/core/device.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/core/engctx.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/core/engine.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/core/enum.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/core/gpuobj.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/core/handle.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/core/ioctl.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/core/mm.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/core/namedb.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/core/option.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/core/parent.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/core/ramht.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/engine/bsp.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/engine/copy.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/engine/crypt.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/engine/disp.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/engine/dmaobj.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/engine/falcon.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/engine/fifo.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/engine/graph.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/engine/mpeg.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/engine/perfmon.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/engine/ppp.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/engine/software.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/engine/vp.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/engine/xtensa.h delete mode 120000 drivers/gpu/drm/nouveau/core/include/nvif/class.h delete mode 120000 drivers/gpu/drm/nouveau/core/include/nvif/event.h delete mode 120000 drivers/gpu/drm/nouveau/core/include/nvif/ioctl.h delete mode 120000 drivers/gpu/drm/nouveau/core/include/nvif/unpack.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/bar.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/bios.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/bios/M0205.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/bios/M0209.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/bios/P0260.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/bios/boost.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/bios/cstep.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/bios/disp.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/bios/dp.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/bios/mxm.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/bios/npde.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/bios/rammap.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/bios/timing.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/bios/vmap.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/bios/volt.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/bus.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/clock.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/devinit.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/fb.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/fuse.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/gpio.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/i2c.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/ibus.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/instmem.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/ltc.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/mc.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/mxm.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/pwr.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/therm.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/timer.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/vm.h delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/volt.h delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/bar/base.c delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/bar/nvc0.c delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/bar/priv.h delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/bus/nv04.h delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/clock/nv50.h delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/clock/nva3.h delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/clock/pll.h delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/devinit/nv04.h delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/devinit/nv50.h delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/devinit/priv.h delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/nv04.h delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/nv40.h delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/nv50.h delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/nvc0.h delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/priv.h delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/fuse/priv.h delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/gpio/priv.h delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/i2c/nv50.h delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/i2c/priv.h delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.h delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/instmem/priv.h delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/mc/nv04.h delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/mc/priv.h delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/mxm/mxms.h delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/pwr/base.c delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/pwr/memx.c delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/pwr/priv.h delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/therm/priv.h delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/vm/base.c delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/vm/nv04.h rename drivers/gpu/drm/nouveau/dispnv04/{Makefile => Kbuild} (100%) rename drivers/gpu/drm/nouveau/{ => include}/nvif/class.h (96%) rename drivers/gpu/drm/nouveau/{ => include}/nvif/client.h (92%) create mode 100644 drivers/gpu/drm/nouveau/include/nvif/device.h rename drivers/gpu/drm/nouveau/{ => include}/nvif/driver.h (100%) rename drivers/gpu/drm/nouveau/{ => include}/nvif/event.h (100%) rename drivers/gpu/drm/nouveau/{ => include}/nvif/ioctl.h (100%) rename drivers/gpu/drm/nouveau/{ => include}/nvif/list.h (100%) rename drivers/gpu/drm/nouveau/{ => include}/nvif/notify.h (100%) rename drivers/gpu/drm/nouveau/{ => include}/nvif/object.h (97%) rename drivers/gpu/drm/nouveau/{core => include/nvif}/os.h (100%) rename drivers/gpu/drm/nouveau/{ => include}/nvif/unpack.h (100%) create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/core/client.h rename drivers/gpu/drm/nouveau/{core/include => include/nvkm}/core/debug.h (87%) create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/core/device.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/core/devidx.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/core/engctx.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/core/engine.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/core/enum.h rename drivers/gpu/drm/nouveau/{core/include => include/nvkm}/core/event.h (75%) create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/core/gpuobj.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/core/handle.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/core/ioctl.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/core/mm.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/core/namedb.h rename drivers/gpu/drm/nouveau/{core/include => include/nvkm}/core/notify.h (90%) rename drivers/gpu/drm/nouveau/{core/include => include/nvkm}/core/object.h (53%) create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/core/option.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/core/os.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/core/parent.h rename drivers/gpu/drm/nouveau/{core/include => include/nvkm}/core/printk.h (82%) create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/core/ramht.h rename drivers/gpu/drm/nouveau/{core/include => include/nvkm}/core/subdev.h (62%) create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/engine/bsp.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/engine/cipher.h rename drivers/gpu/drm/nouveau/{core/include => include/nvkm}/engine/device.h (94%) create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/engine/dmaobj.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/engine/mpeg.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/engine/mspdec.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/engine/msppp.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/engine/msvld.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/engine/sec.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/engine/sw.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/engine/vp.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/engine/xtensa.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/bar.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/bios.h rename drivers/gpu/drm/nouveau/{core/include => include/nvkm}/subdev/bios/M0203.h (54%) create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0205.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0209.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/P0260.h rename drivers/gpu/drm/nouveau/{core/include => include/nvkm}/subdev/bios/bit.h (65%) rename drivers/gpu/drm/nouveau/{core/include => include/nvkm}/subdev/bios/bmp.h (76%) create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/boost.h rename drivers/gpu/drm/nouveau/{core/include => include/nvkm}/subdev/bios/conn.h (72%) create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/cstep.h rename drivers/gpu/drm/nouveau/{core/include => include/nvkm}/subdev/bios/dcb.h (71%) create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/disp.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dp.h rename drivers/gpu/drm/nouveau/{core/include => include/nvkm}/subdev/bios/extdev.h (73%) rename drivers/gpu/drm/nouveau/{core/include => include/nvkm}/subdev/bios/fan.h (52%) rename drivers/gpu/drm/nouveau/{core/include => include/nvkm}/subdev/bios/gpio.h (76%) rename drivers/gpu/drm/nouveau/{core/include => include/nvkm}/subdev/bios/i2c.h (61%) rename drivers/gpu/drm/nouveau/{core/include => include/nvkm}/subdev/bios/image.h (65%) rename drivers/gpu/drm/nouveau/{core/include => include/nvkm}/subdev/bios/init.h (70%) create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/mxm.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/npde.h rename drivers/gpu/drm/nouveau/{core/include => include/nvkm}/subdev/bios/pcir.h (63%) rename drivers/gpu/drm/nouveau/{core/include => include/nvkm}/subdev/bios/perf.h (59%) rename drivers/gpu/drm/nouveau/{core/include => include/nvkm}/subdev/bios/pll.h (88%) rename drivers/gpu/drm/nouveau/{core/include => include/nvkm}/subdev/bios/pmu.h (52%) rename drivers/gpu/drm/nouveau/{core/include => include/nvkm}/subdev/bios/ramcfg.h (96%) create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/rammap.h rename drivers/gpu/drm/nouveau/{core/include => include/nvkm}/subdev/bios/therm.h (78%) create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/timing.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vmap.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/volt.h rename drivers/gpu/drm/nouveau/{core/include => include/nvkm}/subdev/bios/xpio.h (76%) create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/bus.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/clk.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/devinit.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/fuse.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/gpio.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/i2c.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/ibus.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/instmem.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/ltc.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/mxm.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/pmu.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h rename drivers/gpu/drm/nouveau/{core/include => include/nvkm}/subdev/vga.h (100%) create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h create mode 100644 drivers/gpu/drm/nouveau/nvif/Kbuild delete mode 100644 drivers/gpu/drm/nouveau/nvif/device.h delete mode 120000 drivers/gpu/drm/nouveau/nvif/os.h create mode 100644 drivers/gpu/drm/nouveau/nvkm/Kbuild create mode 100644 drivers/gpu/drm/nouveau/nvkm/core/Kbuild rename drivers/gpu/drm/nouveau/{core => nvkm}/core/client.c (71%) rename drivers/gpu/drm/nouveau/{core => nvkm}/core/engctx.c (56%) rename drivers/gpu/drm/nouveau/{core => nvkm}/core/engine.c (70%) rename drivers/gpu/drm/nouveau/{core => nvkm}/core/enum.c (83%) rename drivers/gpu/drm/nouveau/{core => nvkm}/core/event.c (99%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/core/gpuobj.c rename drivers/gpu/drm/nouveau/{core => nvkm}/core/handle.c (64%) rename drivers/gpu/drm/nouveau/{core => nvkm}/core/ioctl.c (69%) rename drivers/gpu/drm/nouveau/{core => nvkm}/core/mm.c (79%) rename drivers/gpu/drm/nouveau/{core => nvkm}/core/namedb.c (54%) rename drivers/gpu/drm/nouveau/{core => nvkm}/core/notify.c (96%) rename drivers/gpu/drm/nouveau/{core => nvkm}/core/object.c (70%) rename drivers/gpu/drm/nouveau/{core => nvkm}/core/option.c (92%) rename drivers/gpu/drm/nouveau/{core => nvkm}/core/parent.c (70%) rename drivers/gpu/drm/nouveau/{core => nvkm}/core/printk.c (82%) rename drivers/gpu/drm/nouveau/{core => nvkm}/core/ramht.c (65%) rename drivers/gpu/drm/nouveau/{core => nvkm}/core/subdev.c (56%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/Kbuild create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/bsp/Kbuild rename drivers/gpu/drm/nouveau/{core/engine/bsp/nv84.c => nvkm/engine/bsp/g84.c} (66%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/ce/Kbuild rename drivers/gpu/drm/nouveau/{core/engine/copy/fuc/nva3.fuc => nvkm/engine/ce/fuc/com.fuc} (97%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gf100.fuc3 rename drivers/gpu/drm/nouveau/{core/engine/copy/fuc/nvc0.fuc.h => nvkm/engine/ce/fuc/gf100.fuc3.h} (99%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gt215.fuc3 rename drivers/gpu/drm/nouveau/{core/engine/copy/fuc/nva3.fuc.h => nvkm/engine/ce/fuc/gt215.fuc3.h} (99%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/ce/gf100.c create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/ce/gk104.c rename drivers/gpu/drm/nouveau/{core/engine/copy/nva3.c => nvkm/engine/ce/gt215.c} (57%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/cipher/Kbuild rename drivers/gpu/drm/nouveau/{core/engine/crypt/nv84.c => nvkm/engine/cipher/g84.c} (54%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/device/Kbuild rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/device/acpi.c (91%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/device/acpi.h rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/device/base.c (70%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/device/ctrl.c (76%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/device/gf100.c create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/device/gk104.c rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/device/gm100.c (57%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/device/nv04.c (78%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/device/nv10.c (73%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/device/nv20.c (75%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/device/nv30.c (75%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/device/nv40.c (71%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/disp/base.c (71%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/disp/conn.c (80%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/disp/conn.h (68%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/disp/dacnv50.c (98%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/disp/dport.c (94%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/disp/dport.h (98%) rename drivers/gpu/drm/nouveau/{core/engine/disp/nv84.c => nvkm/engine/disp/g84.c} (82%) rename drivers/gpu/drm/nouveau/{core/engine/disp/nv94.c => nvkm/engine/disp/g94.c} (72%) rename drivers/gpu/drm/nouveau/{core/engine/disp/nvd0.c => nvkm/engine/disp/gf110.c} (83%) rename drivers/gpu/drm/nouveau/{core/engine/disp/nve0.c => nvkm/engine/disp/gk104.c} (73%) rename drivers/gpu/drm/nouveau/{core/engine/disp/nvf0.c => nvkm/engine/disp/gk110.c} (56%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/disp/gm107.c (62%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/disp/gm204.c (64%) rename drivers/gpu/drm/nouveau/{core/engine/disp/nva0.c => nvkm/engine/disp/gt200.c} (78%) rename drivers/gpu/drm/nouveau/{core/engine/disp/nva3.c => nvkm/engine/disp/gt215.c} (73%) rename drivers/gpu/drm/nouveau/{core/engine/disp/hdanvd0.c => nvkm/engine/disp/hdagf110.c} (95%) rename drivers/gpu/drm/nouveau/{core/engine/disp/hdanva3.c => nvkm/engine/disp/hdagt215.c} (97%) rename drivers/gpu/drm/nouveau/{core/engine/disp/hdminv84.c => nvkm/engine/disp/hdmig84.c} (98%) rename drivers/gpu/drm/nouveau/{core/engine/disp/hdminvd0.c => nvkm/engine/disp/hdmigf110.c} (98%) rename drivers/gpu/drm/nouveau/{core/engine/disp/hdminve0.c => nvkm/engine/disp/hdmigk104.c} (98%) rename drivers/gpu/drm/nouveau/{core/engine/disp/hdminva3.c => nvkm/engine/disp/hdmigt215.c} (98%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/disp/nv04.c (79%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/disp/nv50.c (89%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/disp/outp.c (73%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/disp/outp.h (68%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/disp/outpdp.c (87%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/disp/outpdp.h (78%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/disp/piornv50.c (85%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/priv.h rename drivers/gpu/drm/nouveau/{core/engine/disp/sornv94.c => nvkm/engine/disp/sorg94.c} (65%) rename drivers/gpu/drm/nouveau/{core/engine/disp/sornvd0.c => nvkm/engine/disp/sorgf110.c} (66%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/disp/sorgm204.c (85%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/disp/sornv50.c (97%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/disp/vga.c (97%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/dmaobj/Kbuild rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/dmaobj/base.c (79%) rename drivers/gpu/drm/nouveau/{core/engine/dmaobj/nvc0.c => nvkm/engine/dmaobj/gf100.c} (78%) rename drivers/gpu/drm/nouveau/{core/engine/dmaobj/nvd0.c => nvkm/engine/dmaobj/gf110.c} (78%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/dmaobj/nv04.c (80%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/dmaobj/nv50.c (89%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/dmaobj/priv.h rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/falcon.c (85%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/Kbuild rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/fifo/base.c (63%) rename drivers/gpu/drm/nouveau/{core/engine/fifo/nv84.c => nvkm/engine/fifo/g84.c} (53%) rename drivers/gpu/drm/nouveau/{core/engine/fifo/nvc0.c => nvkm/engine/fifo/gf100.c} (58%) rename drivers/gpu/drm/nouveau/{core/engine/fifo/nve0.c => nvkm/engine/fifo/gk104.c} (62%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h rename drivers/gpu/drm/nouveau/{core/engine/fifo/nv108.c => nvkm/engine/fifo/gk208.c} (83%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/fifo/gk20a.c (83%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/fifo/nv04.c (80%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/fifo/nv04.h (91%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/fifo/nv10.c (75%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/fifo/nv17.c (76%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/fifo/nv40.c (80%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/fifo/nv50.c (69%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.h create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/gr/Kbuild rename drivers/gpu/drm/nouveau/{core/engine/graph/ctxnvc0.c => nvkm/engine/gr/ctxgf100.c} (86%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h rename drivers/gpu/drm/nouveau/{core/engine/graph/ctxnvc4.c => nvkm/engine/gr/ctxgf104.c} (68%) rename drivers/gpu/drm/nouveau/{core/engine/graph/ctxnvc1.c => nvkm/engine/gr/ctxgf108.c} (89%) rename drivers/gpu/drm/nouveau/{core/engine/graph/ctxnvc8.c => nvkm/engine/gr/ctxgf110.c} (87%) rename drivers/gpu/drm/nouveau/{core/engine/graph/ctxnvd7.c => nvkm/engine/gr/ctxgf117.c} (63%) rename drivers/gpu/drm/nouveau/{core/engine/graph/ctxnvd9.c => nvkm/engine/gr/ctxgf119.c} (84%) rename drivers/gpu/drm/nouveau/{core/engine/graph/ctxnve4.c => nvkm/engine/gr/ctxgk104.c} (87%) rename drivers/gpu/drm/nouveau/{core/engine/graph/ctxnvf0.c => nvkm/engine/gr/ctxgk110.c} (90%) rename drivers/gpu/drm/nouveau/{core/engine/graph => nvkm/engine/gr}/ctxgk110b.c (75%) rename drivers/gpu/drm/nouveau/{core/engine/graph/ctxnv108.c => nvkm/engine/gr/ctxgk208.c} (85%) rename drivers/gpu/drm/nouveau/{core/engine/graph => nvkm/engine/gr}/ctxgk20a.c (63%) rename drivers/gpu/drm/nouveau/{core/engine/graph => nvkm/engine/gr}/ctxgm107.c (92%) rename drivers/gpu/drm/nouveau/{core/engine/graph => nvkm/engine/gr}/ctxnv40.c (92%) rename drivers/gpu/drm/nouveau/{core/engine/graph/ctx.h => nvkm/engine/gr/ctxnv40.h} (74%) rename drivers/gpu/drm/nouveau/{core/engine/graph => nvkm/engine/gr}/ctxnv50.c (93%) rename drivers/gpu/drm/nouveau/{core/engine/graph => nvkm/engine/gr}/fuc/com.fuc (99%) rename drivers/gpu/drm/nouveau/{core/engine/graph => nvkm/engine/gr}/fuc/gpc.fuc (99%) rename drivers/gpu/drm/nouveau/{core/engine/graph/fuc/gpcnvc0.fuc => nvkm/engine/gr/fuc/gpcgf100.fuc3} (96%) rename drivers/gpu/drm/nouveau/{core/engine/graph/fuc/gpcnvc0.fuc.h => nvkm/engine/gr/fuc/gpcgf100.fuc3.h} (99%) rename drivers/gpu/drm/nouveau/{core/engine/graph/fuc/gpcnvd7.fuc => nvkm/engine/gr/fuc/gpcgf117.fuc3} (96%) rename drivers/gpu/drm/nouveau/{core/engine/graph/fuc/gpcnve0.fuc.h => nvkm/engine/gr/fuc/gpcgf117.fuc3.h} (99%) rename drivers/gpu/drm/nouveau/{core/engine/graph/fuc/gpcnve0.fuc => nvkm/engine/gr/fuc/gpcgk104.fuc3} (96%) rename drivers/gpu/drm/nouveau/{core/engine/graph/fuc/gpcnvd7.fuc.h => nvkm/engine/gr/fuc/gpcgk104.fuc3.h} (99%) rename drivers/gpu/drm/nouveau/{core/engine/graph/fuc/gpcnvf0.fuc => nvkm/engine/gr/fuc/gpcgk110.fuc3} (96%) rename drivers/gpu/drm/nouveau/{core/engine/graph/fuc/gpcnvf0.fuc.h => nvkm/engine/gr/fuc/gpcgk110.fuc3.h} (99%) rename drivers/gpu/drm/nouveau/{core/engine/graph/fuc/gpcnv108.fuc5 => nvkm/engine/gr/fuc/gpcgk208.fuc5} (96%) rename drivers/gpu/drm/nouveau/{core/engine/graph/fuc/gpcnv108.fuc5.h => nvkm/engine/gr/fuc/gpcgk208.fuc5.h} (99%) rename drivers/gpu/drm/nouveau/{core/engine/graph => nvkm/engine/gr}/fuc/gpcgm107.fuc5 (100%) rename drivers/gpu/drm/nouveau/{core/engine/graph => nvkm/engine/gr}/fuc/gpcgm107.fuc5.h (100%) rename drivers/gpu/drm/nouveau/{core/engine/graph => nvkm/engine/gr}/fuc/hub.fuc (99%) rename drivers/gpu/drm/nouveau/{core/engine/graph/fuc/hubnvc0.fuc => nvkm/engine/gr/fuc/hubgf100.fuc3} (96%) rename drivers/gpu/drm/nouveau/{core/engine/graph/fuc/hubnvd7.fuc.h => nvkm/engine/gr/fuc/hubgf100.fuc3.h} (99%) rename drivers/gpu/drm/nouveau/{core/engine/graph/fuc/hubnvd7.fuc => nvkm/engine/gr/fuc/hubgf117.fuc3} (96%) rename drivers/gpu/drm/nouveau/{core/engine/graph/fuc/hubnvc0.fuc.h => nvkm/engine/gr/fuc/hubgf117.fuc3.h} (99%) rename drivers/gpu/drm/nouveau/{core/engine/graph/fuc/hubnve0.fuc => nvkm/engine/gr/fuc/hubgk104.fuc3} (96%) rename drivers/gpu/drm/nouveau/{core/engine/graph/fuc/hubnve0.fuc.h => nvkm/engine/gr/fuc/hubgk104.fuc3.h} (99%) rename drivers/gpu/drm/nouveau/{core/engine/graph/fuc/hubnvf0.fuc => nvkm/engine/gr/fuc/hubgk110.fuc3} (96%) rename drivers/gpu/drm/nouveau/{core/engine/graph/fuc/hubnvf0.fuc.h => nvkm/engine/gr/fuc/hubgk110.fuc3.h} (99%) rename drivers/gpu/drm/nouveau/{core/engine/graph/fuc/hubnv108.fuc5 => nvkm/engine/gr/fuc/hubgk208.fuc5} (96%) rename drivers/gpu/drm/nouveau/{core/engine/graph/fuc/hubnv108.fuc5.h => nvkm/engine/gr/fuc/hubgk208.fuc5.h} (99%) rename drivers/gpu/drm/nouveau/{core/engine/graph => nvkm/engine/gr}/fuc/hubgm107.fuc5 (100%) rename drivers/gpu/drm/nouveau/{core/engine/graph => nvkm/engine/gr}/fuc/hubgm107.fuc5.h (100%) rename drivers/gpu/drm/nouveau/{core/engine/graph => nvkm/engine/gr}/fuc/macros.fuc (100%) rename drivers/gpu/drm/nouveau/{core/engine/graph => nvkm/engine/gr}/fuc/os.h (100%) rename drivers/gpu/drm/nouveau/{core/engine/graph/nvc0.c => nvkm/engine/gr/gf100.c} (72%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h rename drivers/gpu/drm/nouveau/{core/engine/graph/nvc4.c => nvkm/engine/gr/gf104.c} (64%) rename drivers/gpu/drm/nouveau/{core/engine/graph/nvc1.c => nvkm/engine/gr/gf108.c} (58%) rename drivers/gpu/drm/nouveau/{core/engine/graph/nvc8.c => nvkm/engine/gr/gf110.c} (57%) rename drivers/gpu/drm/nouveau/{core/engine/graph/nvd7.c => nvkm/engine/gr/gf117.c} (52%) rename drivers/gpu/drm/nouveau/{core/engine/graph/nvd9.c => nvkm/engine/gr/gf119.c} (66%) rename drivers/gpu/drm/nouveau/{core/engine/graph/nve4.c => nvkm/engine/gr/gk104.c} (71%) rename drivers/gpu/drm/nouveau/{core/engine/graph/nvf0.c => nvkm/engine/gr/gk110.c} (63%) rename drivers/gpu/drm/nouveau/{core/engine/graph => nvkm/engine/gr}/gk110b.c (63%) rename drivers/gpu/drm/nouveau/{core/engine/graph/nv108.c => nvkm/engine/gr/gk208.c} (61%) rename drivers/gpu/drm/nouveau/{core/engine/graph => nvkm/engine/gr}/gk20a.c (68%) rename drivers/gpu/drm/nouveau/{core/engine/graph => nvkm/engine/gr}/gm107.c (75%) rename drivers/gpu/drm/nouveau/{core/engine/graph => nvkm/engine/gr}/nv04.c (55%) rename drivers/gpu/drm/nouveau/{core/engine/graph => nvkm/engine/gr}/nv10.c (74%) rename drivers/gpu/drm/nouveau/{core/engine/graph => nvkm/engine/gr}/nv20.c (66%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.h rename drivers/gpu/drm/nouveau/{core/engine/graph => nvkm/engine/gr}/nv25.c (54%) rename drivers/gpu/drm/nouveau/{core/engine/graph => nvkm/engine/gr}/nv2a.c (59%) rename drivers/gpu/drm/nouveau/{core/engine/graph => nvkm/engine/gr}/nv30.c (64%) rename drivers/gpu/drm/nouveau/{core/engine/graph => nvkm/engine/gr}/nv34.c (52%) rename drivers/gpu/drm/nouveau/{core/engine/graph => nvkm/engine/gr}/nv35.c (52%) rename drivers/gpu/drm/nouveau/{core/engine/graph => nvkm/engine/gr}/nv40.c (64%) rename drivers/gpu/drm/nouveau/{core/engine/graph => nvkm/engine/gr}/nv40.h (51%) rename drivers/gpu/drm/nouveau/{core/engine/graph => nvkm/engine/gr}/nv50.c (76%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/gr/nv50.h rename drivers/gpu/drm/nouveau/{core/engine/graph => nvkm/engine/gr}/regs.h (99%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/mpeg/Kbuild rename drivers/gpu/drm/nouveau/{core/engine/mpeg/nv84.c => nvkm/engine/mpeg/g84.c} (65%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/mpeg/nv31.c (73%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/mpeg/nv31.h (74%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/mpeg/nv40.c (81%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/mpeg/nv44.c (70%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/mpeg/nv50.c (71%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/mspdec/Kbuild rename drivers/gpu/drm/nouveau/{core/engine/vp/nv98.c => nvkm/engine/mspdec/g98.c} (58%) rename drivers/gpu/drm/nouveau/{core/engine/vp/nvc0.c => nvkm/engine/mspdec/gf100.c} (57%) rename drivers/gpu/drm/nouveau/{core/engine/vp/nve0.c => nvkm/engine/mspdec/gk104.c} (57%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/msppp/Kbuild rename drivers/gpu/drm/nouveau/{core/engine/ppp/nv98.c => nvkm/engine/msppp/g98.c} (57%) rename drivers/gpu/drm/nouveau/{core/engine/ppp/nvc0.c => nvkm/engine/msppp/gf100.c} (57%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/msvld/Kbuild rename drivers/gpu/drm/nouveau/{core/engine/bsp/nv98.c => nvkm/engine/msvld/g98.c} (57%) rename drivers/gpu/drm/nouveau/{core/engine/bsp/nvc0.c => nvkm/engine/msvld/gf100.c} (58%) rename drivers/gpu/drm/nouveau/{core/engine/bsp/nve0.c => nvkm/engine/msvld/gk104.c} (57%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/Kbuild rename drivers/gpu/drm/nouveau/{core/engine/perfmon => nvkm/engine/pm}/base.c (63%) rename drivers/gpu/drm/nouveau/{core/engine/perfmon => nvkm/engine/pm}/daemon.c (80%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/g84.c rename drivers/gpu/drm/nouveau/{core/engine/perfmon/nvc0.c => nvkm/engine/pm/gf100.c} (50%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.h create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/gk104.c create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/gk110.c rename drivers/gpu/drm/nouveau/{core/engine/perfmon/nv84.c => nvkm/engine/pm/gt215.c} (53%) rename drivers/gpu/drm/nouveau/{core/engine/perfmon => nvkm/engine/pm}/nv40.c (52%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.h create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/nv50.c create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/sec/Kbuild rename drivers/gpu/drm/nouveau/{core/engine/crypt/fuc/nv98.fuc => nvkm/engine/sec/fuc/g98.fuc0s} (88%) rename drivers/gpu/drm/nouveau/{core/engine/crypt/fuc/nv98.fuc.h => nvkm/engine/sec/fuc/g98.fuc0s.h} (90%) rename drivers/gpu/drm/nouveau/{core/engine/crypt/nv98.c => nvkm/engine/sec/g98.c} (56%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/sw/Kbuild rename drivers/gpu/drm/nouveau/{core/engine/software/nvc0.c => nvkm/engine/sw/gf100.c} (58%) rename drivers/gpu/drm/nouveau/{core/engine/software => nvkm/engine/sw}/nv04.c (51%) rename drivers/gpu/drm/nouveau/{core/engine/software => nvkm/engine/sw}/nv10.c (53%) rename drivers/gpu/drm/nouveau/{core/engine/software => nvkm/engine/sw}/nv50.c (52%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.h create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/vp/Kbuild rename drivers/gpu/drm/nouveau/{core/engine/vp/nv84.c => nvkm/engine/vp/g84.c} (66%) rename drivers/gpu/drm/nouveau/{core => nvkm}/engine/xtensa.c (68%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/Kbuild create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/bar/Kbuild create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bar/gk20a.c (73%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bar/nv50.c (62%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/bar/priv.h create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/bios/Kbuild rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/M0203.c (89%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/M0205.c (90%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/M0209.c (90%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/P0260.c (88%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/base.c (66%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/bit.c (91%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/boost.c (91%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/conn.c (89%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/cstep.c (88%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/dcb.c (91%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/disp.c (80%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/dp.c (90%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/extdev.c (86%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/fan.c (91%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/gpio.c (92%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/i2c.c (93%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/image.c (93%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/init.c (91%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/mxm.c (89%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/npde.c (93%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/pcir.c (94%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/perf.c (92%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/pll.c (96%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/pmu.c (89%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/priv.h (69%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/ramcfg.c (91%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/rammap.c (93%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/shadow.c (85%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/shadowacpi.c (92%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/shadowof.c (93%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/shadowpci.c (92%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/shadowramin.c (94%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/shadowrom.c (91%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/therm.c (93%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/timing.c (95%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/vmap.c (90%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/volt.c (91%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bios/xpio.c (89%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/bus/Kbuild rename drivers/gpu/drm/nouveau/{core/subdev/bus/nv94.c => nvkm/subdev/bus/g94.c} (87%) rename drivers/gpu/drm/nouveau/{core/subdev/bus/nvc0.c => nvkm/subdev/bus/gf100.c} (84%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bus/hwsq.c (83%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bus/hwsq.h (76%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bus/nv04.c (79%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv04.h rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bus/nv31.c (85%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/bus/nv50.c (86%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/clk/Kbuild rename drivers/gpu/drm/nouveau/{core/subdev/clock => nvkm/subdev/clk}/base.c (70%) rename drivers/gpu/drm/nouveau/{core/subdev/clock/nv84.c => nvkm/subdev/clk/g84.c} (80%) rename drivers/gpu/drm/nouveau/{core/subdev/clock/nvc0.c => nvkm/subdev/clk/gf100.c} (74%) rename drivers/gpu/drm/nouveau/{core/subdev/clock/nve0.c => nvkm/subdev/clk/gk104.c} (73%) rename drivers/gpu/drm/nouveau/{core/subdev/clock => nvkm/subdev/clk}/gk20a.c (86%) rename drivers/gpu/drm/nouveau/{core/subdev/clock/nva3.c => nvkm/subdev/clk/gt215.c} (74%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.h rename drivers/gpu/drm/nouveau/{core/subdev/clock/nvaa.c => nvkm/subdev/clk/mcp77.c} (84%) rename drivers/gpu/drm/nouveau/{core/subdev/clock => nvkm/subdev/clk}/nv04.c (64%) rename drivers/gpu/drm/nouveau/{core/subdev/clock => nvkm/subdev/clk}/nv40.c (71%) rename drivers/gpu/drm/nouveau/{core/subdev/clock => nvkm/subdev/clk}/nv50.c (88%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv50.h create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/clk/pll.h rename drivers/gpu/drm/nouveau/{core/subdev/clock/pllnva3.c => nvkm/subdev/clk/pllgt215.c} (94%) rename drivers/gpu/drm/nouveau/{core/subdev/clock => nvkm/subdev/clk}/pllnv04.c (94%) rename drivers/gpu/drm/nouveau/{core/subdev/clock => nvkm/subdev/clk}/seq.h (96%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/devinit/Kbuild rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/devinit/base.c (64%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/devinit/fbmem.h (98%) rename drivers/gpu/drm/nouveau/{core/subdev/devinit/nv84.c => nvkm/subdev/devinit/g84.c} (82%) rename drivers/gpu/drm/nouveau/{core/subdev/devinit/nv98.c => nvkm/subdev/devinit/g98.c} (76%) rename drivers/gpu/drm/nouveau/{core/subdev/devinit/nvc0.c => nvkm/subdev/devinit/gf100.c} (68%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/devinit/gm107.c (80%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/devinit/gm204.c (88%) rename drivers/gpu/drm/nouveau/{core/subdev/devinit/nva3.c => nvkm/subdev/devinit/gt215.c} (79%) rename drivers/gpu/drm/nouveau/{core/subdev/devinit/nvaf.c => nvkm/subdev/devinit/mcp89.c} (76%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/devinit/nv04.c (89%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.h rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/devinit/nv05.c (94%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/devinit/nv10.c (92%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/devinit/nv1a.c (89%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/devinit/nv20.c (89%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/devinit/nv50.c (82%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.h create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/devinit/priv.h create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/base.c (70%) rename drivers/gpu/drm/nouveau/{core/subdev/fb/nv84.c => nvkm/subdev/fb/g84.c} (90%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/gddr3.c (97%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/gddr5.c (97%) rename drivers/gpu/drm/nouveau/{core/subdev/fb/nvc0.c => nvkm/subdev/fb/gf100.c} (64%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.h rename drivers/gpu/drm/nouveau/{core/subdev/fb/nve0.c => nvkm/subdev/fb/gk104.c} (80%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/gk20a.c (74%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/gm107.c (82%) rename drivers/gpu/drm/nouveau/{core/subdev/fb/nva3.c => nvkm/subdev/fb/gt215.c} (88%) rename drivers/gpu/drm/nouveau/{core/subdev/fb/nvaa.c => nvkm/subdev/fb/mcp77.c} (88%) rename drivers/gpu/drm/nouveau/{core/subdev/fb/nvaf.c => nvkm/subdev/fb/mcp89.c} (88%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/nv04.c (79%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv04.h rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/nv10.c (81%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/nv1a.c (90%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/nv20.c (78%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/nv25.c (85%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/nv30.c (84%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/nv35.c (86%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/nv36.c (86%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/nv40.c (84%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv40.h rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/nv41.c (87%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/nv44.c (83%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/nv46.c (87%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/nv47.c (92%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/nv49.c (92%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/nv4e.c (92%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/nv50.c (76%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.h create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/ramfuc.h (80%) rename drivers/gpu/drm/nouveau/{core/subdev/fb/ramnvc0.c => nvkm/subdev/fb/ramgf100.c} (83%) rename drivers/gpu/drm/nouveau/{core/subdev/fb/ramnve0.c => nvkm/subdev/fb/ramgk104.c} (89%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/ramgk20a.c (84%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/ramgm107.c (75%) rename drivers/gpu/drm/nouveau/{core/subdev/fb/ramnva3.c => nvkm/subdev/fb/ramgt215.c} (86%) rename drivers/gpu/drm/nouveau/{core/subdev/fb/ramnvaa.c => nvkm/subdev/fb/rammcp77.c} (73%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/ramnv04.c (80%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/ramnv10.c (77%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/ramnv1a.c (79%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/ramnv20.c (79%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/ramnv40.c (88%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/ramnv41.c (81%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/ramnv44.c (80%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/ramnv49.c (81%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/ramnv4e.c (75%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/ramnv50.c (82%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/ramseq.h (96%) rename drivers/gpu/drm/nouveau/{core/include => nvkm}/subdev/fb/regsnv04.h (89%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/sddr2.c (98%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fb/sddr3.c (98%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fuse/Kbuild rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fuse/base.c (69%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fuse/gf100.c (78%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/fuse/gm107.c (76%) rename drivers/gpu/drm/nouveau/{core/subdev/fuse/g80.c => nvkm/subdev/fuse/nv50.c} (70%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fuse/priv.h create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gpio/Kbuild rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/gpio/base.c (54%) rename drivers/gpu/drm/nouveau/{core/subdev/gpio/nv94.c => nvkm/subdev/gpio/g94.c} (82%) rename drivers/gpu/drm/nouveau/{core/subdev/gpio/nvd0.c => nvkm/subdev/gpio/gf110.c} (77%) rename drivers/gpu/drm/nouveau/{core/subdev/gpio/nve0.c => nvkm/subdev/gpio/gk104.c} (79%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/gpio/nv10.c (84%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/gpio/nv50.c (83%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gpio/priv.h create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/i2c/Kbuild rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/i2c/anx9805.c (80%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/i2c/aux.c (86%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/i2c/base.c (58%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/i2c/bit.c (82%) rename drivers/gpu/drm/nouveau/{core/subdev/i2c/nv94.c => nvkm/subdev/i2c/g94.c} (76%) rename drivers/gpu/drm/nouveau/{core/subdev/i2c/nvd0.c => nvkm/subdev/i2c/gf110.c} (58%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/i2c/gf117.c (83%) rename drivers/gpu/drm/nouveau/{core/subdev/i2c/nve0.c => nvkm/subdev/i2c/gk104.c} (79%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/i2c/gm204.c (81%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/i2c/nv04.c (65%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/i2c/nv4e.c (64%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/i2c/nv50.c (66%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nv50.h rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/i2c/pad.c (73%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/i2c/pad.h (67%) rename drivers/gpu/drm/nouveau/{core/subdev/i2c/padnv94.c => nvkm/subdev/i2c/padg94.c} (73%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/i2c/padgm204.c (83%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/i2c/padnv04.c (95%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/i2c/port.h (66%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/i2c/priv.h create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/ibus/Kbuild rename drivers/gpu/drm/nouveau/{core/subdev/ibus/nvc0.c => nvkm/subdev/ibus/gf100.c} (75%) rename drivers/gpu/drm/nouveau/{core/subdev/ibus/nve0.c => nvkm/subdev/ibus/gk104.c} (75%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/ibus/gk20a.c (81%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/instmem/Kbuild rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/instmem/base.c (61%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/instmem/nv04.c (58%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv04.h rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/instmem/nv40.c (73%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/instmem/nv50.c (70%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/instmem/priv.h create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/ltc/Kbuild rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/ltc/base.c (77%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/ltc/gf100.c (86%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/ltc/gk104.c (94%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/ltc/gm107.c (90%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/ltc/priv.h (61%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mc/Kbuild rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/mc/base.c (63%) rename drivers/gpu/drm/nouveau/{core/subdev/mc/nv94.c => nvkm/subdev/mc/g94.c} (88%) rename drivers/gpu/drm/nouveau/{core/subdev/mc/nv98.c => nvkm/subdev/mc/g98.c} (77%) rename drivers/gpu/drm/nouveau/{core/subdev/mc/nvc0.c => nvkm/subdev/mc/gf100.c} (75%) rename drivers/gpu/drm/nouveau/{core/subdev/mc/nvc3.c => nvkm/subdev/mc/gf106.c} (85%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/mc/gk20a.c (86%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/mc/nv04.c (79%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.h rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/mc/nv40.c (86%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/mc/nv44.c (86%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/mc/nv4c.c (88%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/mc/nv50.c (83%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mc/priv.h create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/Kbuild create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c rename drivers/gpu/drm/nouveau/{core/subdev/vm/nvc0.c => nvkm/subdev/mmu/gf100.c} (73%) rename drivers/gpu/drm/nouveau/{core/subdev/vm => nvkm/subdev/mmu}/nv04.c (68%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv04.h rename drivers/gpu/drm/nouveau/{core/subdev/vm => nvkm/subdev/mmu}/nv41.c (67%) rename drivers/gpu/drm/nouveau/{core/subdev/vm => nvkm/subdev/mmu}/nv44.c (76%) rename drivers/gpu/drm/nouveau/{core/subdev/vm => nvkm/subdev/mmu}/nv50.c (69%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mxm/Kbuild rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/mxm/base.c (85%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/mxm/mxms.c (90%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mxm/mxms.h rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/mxm/nv50.c (86%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/pmu/Kbuild create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c rename drivers/gpu/drm/nouveau/{core/subdev/pwr => nvkm/subdev/pmu}/fuc/arith.fuc (100%) rename drivers/gpu/drm/nouveau/{core/subdev/pwr/fuc/nvc0.fuc => nvkm/subdev/pmu/fuc/gf100.fuc3} (97%) rename drivers/gpu/drm/nouveau/{core/subdev/pwr/fuc/nvc0.fuc.h => nvkm/subdev/pmu/fuc/gf100.fuc3.h} (99%) rename drivers/gpu/drm/nouveau/{core/subdev/pwr/fuc/nvd0.fuc => nvkm/subdev/pmu/fuc/gf110.fuc4} (97%) rename drivers/gpu/drm/nouveau/{core/subdev/pwr/fuc/nvd0.fuc.h => nvkm/subdev/pmu/fuc/gf110.fuc4.h} (99%) rename drivers/gpu/drm/nouveau/{core/subdev/pwr/fuc/nv108.fuc => nvkm/subdev/pmu/fuc/gk208.fuc5} (97%) rename drivers/gpu/drm/nouveau/{core/subdev/pwr/fuc/nv108.fuc.h => nvkm/subdev/pmu/fuc/gk208.fuc5.h} (99%) rename drivers/gpu/drm/nouveau/{core/subdev/pwr/fuc/nva3.fuc => nvkm/subdev/pmu/fuc/gt215.fuc3} (97%) rename drivers/gpu/drm/nouveau/{core/subdev/pwr/fuc/nva3.fuc.h => nvkm/subdev/pmu/fuc/gt215.fuc3.h} (99%) rename drivers/gpu/drm/nouveau/{core/subdev/pwr => nvkm/subdev/pmu}/fuc/host.fuc (100%) rename drivers/gpu/drm/nouveau/{core/subdev/pwr => nvkm/subdev/pmu}/fuc/i2c_.fuc (100%) rename drivers/gpu/drm/nouveau/{core/subdev/pwr => nvkm/subdev/pmu}/fuc/idle.fuc (100%) rename drivers/gpu/drm/nouveau/{core/subdev/pwr => nvkm/subdev/pmu}/fuc/kernel.fuc (100%) rename drivers/gpu/drm/nouveau/{core/subdev/pwr => nvkm/subdev/pmu}/fuc/macros.fuc (100%) rename drivers/gpu/drm/nouveau/{core/subdev/pwr => nvkm/subdev/pmu}/fuc/memx.fuc (100%) rename drivers/gpu/drm/nouveau/{core/subdev/pwr => nvkm/subdev/pmu}/fuc/os.h (100%) rename drivers/gpu/drm/nouveau/{core/subdev/pwr => nvkm/subdev/pmu}/fuc/perf.fuc (100%) rename drivers/gpu/drm/nouveau/{core/subdev/pwr => nvkm/subdev/pmu}/fuc/test.fuc (100%) rename drivers/gpu/drm/nouveau/{core/subdev/pwr/nvc0.c => nvkm/subdev/pmu/gf100.c} (73%) rename drivers/gpu/drm/nouveau/{core/subdev/pwr/nvd0.c => nvkm/subdev/pmu/gf110.c} (73%) rename drivers/gpu/drm/nouveau/{core/subdev/pwr => nvkm/subdev/pmu}/gk104.c (50%) rename drivers/gpu/drm/nouveau/{core/subdev/pwr/nv108.c => nvkm/subdev/pmu/gk208.c} (73%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c rename drivers/gpu/drm/nouveau/{core/subdev/pwr/nva3.c => nvkm/subdev/pmu/gt215.c} (65%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/therm/base.c (57%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/therm/fan.c (72%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/therm/fannil.c (81%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/therm/fanpwm.c (75%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/therm/fantog.c (66%) rename drivers/gpu/drm/nouveau/{core/subdev/therm/nv84.c => nvkm/subdev/therm/g84.c} (60%) rename drivers/gpu/drm/nouveau/{core/subdev/therm/nvd0.c => nvkm/subdev/therm/gf110.c} (70%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/therm/gm107.c (68%) rename drivers/gpu/drm/nouveau/{core/subdev/therm/nva3.c => nvkm/subdev/therm/gt215.c} (69%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/therm/ic.c (89%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/therm/nv40.c (79%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/therm/nv50.c (78%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/therm/priv.h rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/therm/temp.c (57%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/timer/Kbuild rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/timer/base.c (75%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/timer/gk20a.c (92%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/timer/nv04.c (84%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/timer/nv04.h (62%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/timer/priv.h (97%) create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/volt/Kbuild rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/volt/base.c (72%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/volt/gk20a.c (87%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/volt/gpio.c (89%) rename drivers/gpu/drm/nouveau/{core => nvkm}/subdev/volt/nv40.c (77%) create mode 100644 drivers/gpu/drm/radeon/radeon_audio.c create mode 100644 drivers/gpu/drm/radeon/radeon_audio.h create mode 100644 drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c create mode 100644 drivers/gpu/drm/sti/sti_awg_utils.c create mode 100644 drivers/gpu/drm/sti/sti_awg_utils.h create mode 100644 drivers/gpu/drm/sti/sti_dvo.c create mode 100644 include/drm/bridge/dw_hdmi.h create mode 100644 include/drm/i915_component.h delete mode 100644 include/drm/i915_powerwell.h delete mode 100644 sound/pci/hda/hda_i915.h create mode 100644 sound/pci/hda/hda_intel.h Merging drm-panel/drm/panel/for-next (23923ebaac52 drm: Remove unused DRM_MODE_OBJECT_BRIDGE) $ git merge drm-panel/drm/panel/for-next Merge made by the 'recursive' strategy. drivers/gpu/drm/bridge/Kconfig | 11 + drivers/gpu/drm/bridge/Makefile | 1 + drivers/gpu/drm/bridge/ps8622.c | 684 +++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/bridge/ptn3460.c | 2 +- include/drm/drm_crtc.h | 1 - 5 files changed, 697 insertions(+), 2 deletions(-) create mode 100644 drivers/gpu/drm/bridge/ps8622.c Merging drm-intel/for-linux-next (1293eaa3ebf9 drm/i915: Update DRIVER_DATE to 20150130) $ git merge drm-intel/for-linux-next Auto-merging drivers/gpu/drm/i915/intel_panel.c Removing drivers/gpu/drm/i915/intel_dsi_cmd.c Auto-merging drivers/gpu/drm/i915/i915_gem.c Auto-merging drivers/gpu/drm/i915/i915_drv.h Auto-merging drivers/gpu/drm/i915/i915_drv.c Merge made by the 'recursive' strategy. Documentation/DocBook/drm.tmpl | 1 + drivers/char/agp/intel-gtt.c | 14 +- drivers/gpu/drm/i915/Kconfig | 2 + drivers/gpu/drm/i915/Makefile | 2 +- drivers/gpu/drm/i915/i915_debugfs.c | 195 +++-- drivers/gpu/drm/i915/i915_dma.c | 28 +- drivers/gpu/drm/i915/i915_drv.c | 15 +- drivers/gpu/drm/i915/i915_drv.h | 176 +++-- drivers/gpu/drm/i915/i915_gem.c | 72 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 26 +- drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- drivers/gpu/drm/i915/i915_irq.c | 80 +- drivers/gpu/drm/i915/i915_params.c | 5 + drivers/gpu/drm/i915/i915_reg.h | 28 + drivers/gpu/drm/i915/i915_sysfs.c | 133 ++-- drivers/gpu/drm/i915/intel_atomic.c | 237 ++++++ drivers/gpu/drm/i915/intel_atomic_plane.c | 116 ++- drivers/gpu/drm/i915/intel_audio.c | 2 +- drivers/gpu/drm/i915/intel_crt.c | 19 +- drivers/gpu/drm/i915/intel_ddi.c | 105 +-- drivers/gpu/drm/i915/intel_display.c | 1071 +++++++++++++++----------- drivers/gpu/drm/i915/intel_dp.c | 232 ++++-- drivers/gpu/drm/i915/intel_dp_mst.c | 19 +- drivers/gpu/drm/i915/intel_drv.h | 115 +-- drivers/gpu/drm/i915/intel_dsi.c | 359 +++++++-- drivers/gpu/drm/i915/intel_dsi.h | 69 +- drivers/gpu/drm/i915/intel_dsi_cmd.c | 432 ----------- drivers/gpu/drm/i915/intel_dsi_cmd.h | 78 -- drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 290 +++---- drivers/gpu/drm/i915/intel_dvo.c | 23 +- drivers/gpu/drm/i915/intel_fbc.c | 12 +- drivers/gpu/drm/i915/intel_fbdev.c | 15 +- drivers/gpu/drm/i915/intel_fifo_underrun.c | 2 +- drivers/gpu/drm/i915/intel_frontbuffer.c | 2 + drivers/gpu/drm/i915/intel_hdmi.c | 51 +- drivers/gpu/drm/i915/intel_lrc.c | 187 ++--- drivers/gpu/drm/i915/intel_lrc.h | 41 +- drivers/gpu/drm/i915/intel_lvds.c | 19 +- drivers/gpu/drm/i915/intel_overlay.c | 2 +- drivers/gpu/drm/i915/intel_panel.c | 16 +- drivers/gpu/drm/i915/intel_pm.c | 262 ++++--- drivers/gpu/drm/i915/intel_psr.c | 34 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 22 +- drivers/gpu/drm/i915/intel_ringbuffer.h | 14 +- drivers/gpu/drm/i915/intel_runtime_pm.c | 15 + drivers/gpu/drm/i915/intel_sdvo.c | 31 +- drivers/gpu/drm/i915/intel_sideband.c | 4 +- drivers/gpu/drm/i915/intel_sprite.c | 62 +- drivers/gpu/drm/i915/intel_tv.c | 13 +- drivers/gpu/drm/i915/intel_uncore.c | 1126 +++++++++++++--------------- include/uapi/drm/i915_drm.h | 9 +- 51 files changed, 3196 insertions(+), 2689 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_atomic.c delete mode 100644 drivers/gpu/drm/i915/intel_dsi_cmd.c Merging drm-tegra/drm/tegra/for-next (31f40f86526b drm/tegra: Use correct relocation target offsets) $ git merge drm-tegra/drm/tegra/for-next Already up-to-date. Merging drm-misc/topic/core-stuff (eb2ed66fe56f drm/irq: Don't disable vblank interrupts when already disabled) $ git merge drm-misc/topic/core-stuff Merge made by the 'recursive' strategy. drivers/gpu/drm/drm_irq.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) Merging sound/for-next (58647286abcd ALSA: line6: Remove unused line6_midibuf_skip_message()) $ git merge sound/for-next Auto-merging sound/usb/line6/variax.c Auto-merging sound/usb/line6/toneport.c Auto-merging sound/usb/line6/pod.c Auto-merging sound/usb/line6/playback.h Auto-merging sound/usb/line6/playback.c Auto-merging sound/usb/line6/midibuf.h Auto-merging sound/usb/line6/midibuf.c Auto-merging sound/usb/line6/midi.h Auto-merging sound/usb/line6/midi.c Auto-merging sound/usb/line6/driver.h Auto-merging sound/usb/line6/capture.h Removing sound/isa/gus/gus_instr.c Removing drivers/staging/line6/variax.h Removing drivers/staging/line6/usbdefs.h Removing drivers/staging/line6/toneport.h Removing drivers/staging/line6/revision.h Removing drivers/staging/line6/podhd.h Removing drivers/staging/line6/podhd.c Removing drivers/staging/line6/pod.h Removing drivers/staging/line6/pcm.h Removing drivers/staging/line6/pcm.c Removing drivers/staging/line6/driver.c Removing drivers/staging/line6/capture.c Removing drivers/staging/line6/audio.h Removing drivers/staging/line6/audio.c Removing drivers/staging/line6/Makefile Removing drivers/staging/line6/Kconfig Merge made by the 'recursive' strategy. .../devicetree/bindings/sound/pcm512x.txt | 3 +- drivers/staging/Kconfig | 2 - drivers/staging/Makefile | 1 - drivers/staging/line6/Kconfig | 38 - drivers/staging/line6/Makefile | 14 - drivers/staging/line6/audio.c | 71 -- drivers/staging/line6/audio.h | 21 - drivers/staging/line6/capture.c | 432 -------- drivers/staging/line6/driver.c | 1162 -------------------- drivers/staging/line6/pcm.c | 576 ---------- drivers/staging/line6/pcm.h | 382 ------- drivers/staging/line6/pod.h | 102 -- drivers/staging/line6/podhd.c | 154 --- drivers/staging/line6/podhd.h | 30 - drivers/staging/line6/revision.h | 4 - drivers/staging/line6/toneport.h | 52 - drivers/staging/line6/usbdefs.h | 116 -- drivers/staging/line6/variax.h | 72 -- include/sound/ad1816a.h | 5 +- include/sound/ak4113.h | 9 + include/sound/ak4114.h | 9 + include/sound/compress_driver.h | 1 + include/sound/emu10k1.h | 16 +- include/sound/es1688.h | 3 +- include/sound/gus.h | 6 +- include/sound/pcm.h | 11 +- include/sound/pcm_params.h | 96 +- include/sound/sb.h | 8 +- include/sound/seq_kernel.h | 9 +- include/sound/soc-dapm.h | 1 - include/sound/wss.h | 6 +- include/uapi/sound/asound.h | 1 + include/uapi/sound/usb_stream.h | 76 ++ sound/aoa/soundbus/i2sbus/control.c | 2 +- sound/aoa/soundbus/i2sbus/core.c | 19 +- sound/aoa/soundbus/i2sbus/pcm.c | 2 +- sound/arm/aaci.c | 4 +- sound/atmel/ac97c.c | 51 +- sound/core/memory.c | 4 +- sound/core/oss/pcm_oss.c | 6 +- sound/core/pcm_lib.c | 15 +- sound/core/pcm_memory.c | 2 +- sound/core/pcm_native.c | 12 +- sound/core/seq/oss/seq_oss_midi.c | 6 +- sound/core/seq/seq_clientmgr.c | 3 +- sound/core/seq/seq_midi.c | 3 +- sound/core/seq/seq_ports.c | 9 +- sound/core/seq/seq_ports.h | 1 - sound/core/timer.c | 4 +- sound/drivers/aloop.c | 3 +- sound/drivers/dummy.c | 10 +- sound/drivers/ml403-ac97cr.c | 12 +- sound/drivers/mpu401/mpu401_uart.c | 13 +- sound/drivers/mtpav.c | 12 +- sound/drivers/opl3/opl3_lib.c | 2 +- sound/drivers/opl3/opl3_midi.c | 11 +- sound/drivers/opl3/opl3_seq.c | 4 +- sound/drivers/opl4/opl4_lib.c | 2 +- sound/drivers/opl4/opl4_synth.c | 2 +- sound/drivers/pcsp/pcsp.c | 2 +- sound/drivers/pcsp/pcsp_input.c | 2 +- sound/drivers/pcsp/pcsp_lib.c | 2 +- sound/drivers/serial-u16550.c | 11 +- sound/drivers/vx/vx_core.c | 2 +- sound/i2c/other/ak4113.c | 19 + sound/i2c/other/ak4114.c | 30 +- sound/i2c/other/ak4117.c | 10 +- sound/i2c/other/ak4xxx-adda.c | 2 +- sound/isa/ad1816a/ad1816a.c | 5 +- sound/isa/ad1816a/ad1816a_lib.c | 11 +- sound/isa/ad1848/ad1848.c | 7 +- sound/isa/als100.c | 2 +- sound/isa/azt2320.c | 6 +- sound/isa/cmi8328.c | 4 +- sound/isa/cs423x/cs4231.c | 9 +- sound/isa/cs423x/cs4236.c | 13 +- sound/isa/cs423x/cs4236_lib.c | 11 +- sound/isa/es1688/es1688.c | 7 +- sound/isa/es1688/es1688_lib.c | 8 +- sound/isa/es18xx.c | 12 +- sound/isa/galaxy/galaxy.c | 4 +- sound/isa/gus/gus_instr.c | 172 --- sound/isa/gus/gus_pcm.c | 6 +- sound/isa/gus/gus_uart.c | 6 +- sound/isa/gus/gusclassic.c | 4 +- sound/isa/gus/gusextreme.c | 4 +- sound/isa/gus/gusmax.c | 8 +- sound/isa/gus/interwave.c | 14 +- sound/isa/msnd/msnd.c | 6 +- sound/isa/msnd/msnd.h | 2 +- sound/isa/msnd/msnd_pinnacle.c | 5 +- sound/isa/opl3sa2.c | 7 +- sound/isa/opti9xx/miro.c | 14 +- sound/isa/opti9xx/opti92x-ad1848.c | 15 +- sound/isa/sb/emu8000.c | 37 +- sound/isa/sb/emu8000_patch.c | 2 +- sound/isa/sb/emu8000_pcm.c | 10 +- sound/isa/sb/emu8000_synth.c | 3 +- sound/isa/sb/jazz16.c | 2 +- sound/isa/sb/sb16.c | 2 +- sound/isa/sb/sb16_main.c | 10 +- sound/isa/sb/sb8.c | 4 +- sound/isa/sb/sb8_main.c | 8 +- sound/isa/sb/sb8_midi.c | 20 +- sound/isa/sb/sb_common.c | 2 +- sound/isa/sb/sb_mixer.c | 2 +- sound/isa/sc6000.c | 2 +- sound/isa/sscape.c | 6 +- sound/isa/wavefront/wavefront.c | 4 +- sound/isa/wavefront/wavefront_fx.c | 2 +- sound/isa/wavefront/wavefront_midi.c | 14 +- sound/isa/wavefront/wavefront_synth.c | 2 +- sound/isa/wss/wss_lib.c | 10 +- sound/oss/msnd_pinnacle.c | 4 +- sound/oss/pss.c | 2 +- sound/oss/swarm_cs4297a.c | 2 +- sound/oss/trix.c | 2 +- sound/parisc/harmony.c | 6 +- sound/pci/Kconfig | 9 + sound/pci/ad1889.c | 18 +- sound/pci/ali5451/ali5451.c | 17 +- sound/pci/als300.c | 18 +- sound/pci/als4000.c | 17 +- sound/pci/asihpi/asihpi.c | 22 +- sound/pci/asihpi/hpi6000.c | 7 +- sound/pci/asihpi/hpioctl.c | 10 +- sound/pci/atiixp.c | 20 +- sound/pci/atiixp_modem.c | 20 +- sound/pci/au88x0/au88x0.h | 4 +- sound/pci/aw2/aw2-alsa.c | 4 +- sound/pci/aw2/aw2-saa7146.c | 2 +- sound/pci/azt3328.c | 17 +- sound/pci/bt87x.c | 5 +- sound/pci/ca0106/ca0106_main.c | 16 - sound/pci/ca0106/ca0106_mixer.c | 2 +- sound/pci/ca0106/ca0106_proc.c | 2 +- sound/pci/cmipci.c | 17 +- sound/pci/cs4281.c | 41 +- sound/pci/cs46xx/cs46xx.c | 10 +- sound/pci/cs46xx/cs46xx.h | 10 +- sound/pci/cs46xx/cs46xx_lib.c | 62 +- sound/pci/cs46xx/dsp_spos.c | 2 +- sound/pci/cs46xx/dsp_spos_scb_lib.c | 2 +- sound/pci/cs5530.c | 2 +- sound/pci/cs5535audio/cs5535audio.c | 2 +- sound/pci/cs5535audio/cs5535audio_pm.c | 18 - sound/pci/ctxfi/cthw20k1.c | 14 +- sound/pci/ctxfi/cthw20k2.c | 17 +- sound/pci/echoaudio/darla20.c | 2 +- sound/pci/echoaudio/darla24.c | 2 +- sound/pci/echoaudio/echo3g.c | 2 +- sound/pci/echoaudio/echoaudio.c | 11 +- sound/pci/echoaudio/gina20.c | 2 +- sound/pci/echoaudio/gina24.c | 2 +- sound/pci/echoaudio/indigo.c | 2 +- sound/pci/echoaudio/indigodj.c | 2 +- sound/pci/echoaudio/indigoio.c | 2 +- sound/pci/echoaudio/layla20.c | 2 +- sound/pci/echoaudio/layla24.c | 2 +- sound/pci/echoaudio/mia.c | 2 +- sound/pci/echoaudio/midi.c | 5 +- sound/pci/echoaudio/mona.c | 2 +- sound/pci/emu10k1/emu10k1.c | 27 +- sound/pci/emu10k1/emu10k1x.c | 19 +- sound/pci/emu10k1/emufx.c | 7 +- sound/pci/emu10k1/emupcm.c | 33 +- sound/pci/emu10k1/p16v.c | 14 +- sound/pci/ens1370.c | 54 +- sound/pci/es1938.c | 15 +- sound/pci/es1968.c | 18 +- sound/pci/fm801.c | 66 +- sound/pci/hda/Kconfig | 1 + sound/pci/hda/hda_auto_parser.c | 18 +- sound/pci/hda/hda_controller.c | 2 +- sound/pci/hda/hda_intel.c | 16 +- sound/pci/hda/patch_analog.c | 33 - sound/pci/hda/patch_realtek.c | 94 ++ sound/pci/ice1712/ak4xxx.c | 2 +- sound/pci/ice1712/ice1712.c | 42 +- sound/pci/ice1712/ice1724.c | 16 - sound/pci/ice1712/juli.c | 4 +- sound/pci/ice1712/wm8766.c | 16 - sound/pci/ice1712/wm8766.h | 2 - sound/pci/ice1712/wm8776.c | 15 - sound/pci/ice1712/wm8776.h | 3 - sound/pci/intel8x0.c | 17 +- sound/pci/intel8x0m.c | 14 +- sound/pci/korg1212/korg1212.c | 14 +- sound/pci/lola/lola.c | 6 +- sound/pci/maestro3.c | 17 +- sound/pci/mixart/mixart.c | 7 +- sound/pci/mixart/mixart_core.c | 2 +- sound/pci/mixart/mixart_hwdep.c | 2 +- sound/pci/nm256/nm256.c | 22 +- sound/pci/oxygen/Makefile | 2 + sound/pci/oxygen/oxygen.h | 2 +- sound/pci/oxygen/oxygen_io.c | 2 +- sound/pci/oxygen/oxygen_lib.c | 44 +- sound/pci/oxygen/oxygen_mixer.c | 36 + sound/pci/oxygen/oxygen_pcm.c | 53 +- sound/pci/oxygen/se6x.c | 160 +++ sound/pci/pcxhr/pcxhr_core.c | 2 +- sound/pci/pcxhr/pcxhr_hwdep.c | 2 +- sound/pci/riptide/riptide.c | 25 +- sound/pci/rme32.c | 5 +- sound/pci/rme96.c | 22 +- sound/pci/rme9652/hdsp.c | 20 +- sound/pci/rme9652/hdspm.c | 20 +- sound/pci/rme9652/rme9652.c | 5 +- sound/pci/sis7019.c | 18 +- sound/pci/sonicvibes.c | 10 +- sound/pci/trident/trident.c | 6 +- sound/pci/trident/trident.h | 6 +- sound/pci/trident/trident_main.c | 39 +- sound/pci/trident/trident_memory.c | 2 +- sound/pci/via82xx.c | 16 +- sound/pci/via82xx_modem.c | 17 +- sound/pci/vx222/vx222.c | 17 +- sound/pci/vx222/vx222_ops.c | 2 +- sound/pci/ymfpci/ymfpci.c | 8 +- sound/pci/ymfpci/ymfpci.h | 8 +- sound/pci/ymfpci/ymfpci_main.c | 55 +- sound/ppc/awacs.c | 2 +- sound/ppc/beep.c | 2 +- sound/ppc/burgundy.c | 2 +- sound/ppc/pmac.c | 17 +- sound/ppc/snd_ps3.c | 4 +- sound/ppc/tumbler.c | 2 +- sound/sh/aica.c | 10 +- sound/soc/codecs/pcm512x-i2c.c | 4 + sound/soc/codecs/pcm512x-spi.c | 4 + sound/soc/codecs/rt5670.c | 38 + sound/soc/codecs/rt5677.c | 195 +++- sound/soc/codecs/wm8750.c | 2 +- sound/soc/dwc/designware_i2s.c | 86 +- sound/soc/intel/Kconfig | 4 +- sound/soc/intel/bytcr_dpcm_rt5640.c | 1 - sound/soc/intel/cht_bsw_rt5672.c | 1 - sound/soc/intel/sst-firmware.c | 1 + sound/soc/intel/sst/sst_acpi.c | 5 +- sound/soc/omap/omap-hdmi-audio.c | 1 - sound/soc/pxa/spitz.c | 1 - sound/soc/rockchip/rockchip_i2s.c | 4 + sound/soc/samsung/arndale_rt5631.c | 1 - sound/soc/soc-core.c | 3 - sound/soc/soc-dapm.c | 105 +- sound/soc/soc-pcm.c | 33 +- sound/sparc/amd7930.c | 2 +- sound/synth/emux/emux.c | 10 +- sound/synth/emux/emux_hwdep.c | 2 +- sound/synth/emux/emux_oss.c | 2 +- sound/synth/emux/emux_synth.c | 6 +- sound/synth/emux/soundfont.c | 2 +- sound/usb/Kconfig | 2 + sound/usb/Makefile | 1 + sound/usb/line6/Kconfig | 42 + sound/usb/line6/Makefile | 18 + sound/usb/line6/capture.c | 275 +++++ {drivers/staging => sound/usb}/line6/capture.h | 8 +- sound/usb/line6/driver.c | 642 +++++++++++ {drivers/staging => sound/usb}/line6/driver.h | 163 ++- {drivers/staging => sound/usb}/line6/midi.c | 97 +- {drivers/staging => sound/usb}/line6/midi.h | 41 +- {drivers/staging => sound/usb}/line6/midibuf.c | 22 +- {drivers/staging => sound/usb}/line6/midibuf.h | 5 +- sound/usb/line6/pcm.c | 588 ++++++++++ sound/usb/line6/pcm.h | 197 ++++ {drivers/staging => sound/usb}/line6/playback.c | 337 ++---- {drivers/staging => sound/usb}/line6/playback.h | 8 +- {drivers/staging => sound/usb}/line6/pod.c | 297 +++-- sound/usb/line6/podhd.c | 192 ++++ {drivers/staging => sound/usb}/line6/toneport.c | 453 +++++--- {drivers/staging => sound/usb}/line6/variax.c | 153 ++- sound/usb/midi.c | 5 +- sound/usb/quirks-table.h | 22 + sound/usb/usx2y/usb_stream.h | 78 +- 276 files changed, 4202 insertions(+), 5968 deletions(-) delete mode 100644 drivers/staging/line6/Kconfig delete mode 100644 drivers/staging/line6/Makefile delete mode 100644 drivers/staging/line6/audio.c delete mode 100644 drivers/staging/line6/audio.h delete mode 100644 drivers/staging/line6/capture.c delete mode 100644 drivers/staging/line6/driver.c delete mode 100644 drivers/staging/line6/pcm.c delete mode 100644 drivers/staging/line6/pcm.h delete mode 100644 drivers/staging/line6/pod.h delete mode 100644 drivers/staging/line6/podhd.c delete mode 100644 drivers/staging/line6/podhd.h delete mode 100644 drivers/staging/line6/revision.h delete mode 100644 drivers/staging/line6/toneport.h delete mode 100644 drivers/staging/line6/usbdefs.h delete mode 100644 drivers/staging/line6/variax.h create mode 100644 include/uapi/sound/usb_stream.h delete mode 100644 sound/isa/gus/gus_instr.c create mode 100644 sound/pci/oxygen/se6x.c create mode 100644 sound/usb/line6/Kconfig create mode 100644 sound/usb/line6/Makefile create mode 100644 sound/usb/line6/capture.c rename {drivers/staging => sound/usb}/line6/capture.h (64%) create mode 100644 sound/usb/line6/driver.c rename {drivers/staging => sound/usb}/line6/driver.h (58%) rename {drivers/staging => sound/usb}/line6/midi.c (76%) rename {drivers/staging => sound/usb}/line6/midi.h (58%) rename {drivers/staging => sound/usb}/line6/midibuf.c (90%) rename {drivers/staging => sound/usb}/line6/midibuf.h (84%) create mode 100644 sound/usb/line6/pcm.c create mode 100644 sound/usb/line6/pcm.h rename {drivers/staging => sound/usb}/line6/playback.c (51%) rename {drivers/staging => sound/usb}/line6/playback.h (71%) rename {drivers/staging => sound/usb}/line6/pod.c (63%) create mode 100644 sound/usb/line6/podhd.c rename {drivers/staging => sound/usb}/line6/toneport.c (50%) rename {drivers/staging => sound/usb}/line6/variax.c (60%) Merging sound-asoc/for-next (25b548f34e46 Merge remote-tracking branches 'asoc/topic/wm8988' and 'asoc/topic/xtfpga' into asoc-next) $ git merge sound-asoc/for-next Auto-merging sound/soc/soc-generic-dmaengine-pcm.c Auto-merging sound/core/pcm_lib.c Auto-merging include/sound/pcm.h Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. .../devicetree/bindings/sound/cdns,xtfpga-i2s.txt | 18 + .../devicetree/bindings/sound/designware-i2s.txt | 31 + .../bindings/sound/nvidia,tegra-audio-rt5677.txt | 67 ++ .../devicetree/bindings/sound/pcm512x.txt | 25 +- .../devicetree/bindings/sound/samsung-i2s.txt | 22 + .../devicetree/bindings/sound/simple-card.txt | 5 + .../devicetree/bindings/sound/st,sta32x.txt | 92 ++ .../devicetree/bindings/sound/ts3a227e.txt | 5 + Documentation/devicetree/bindings/sound/wm8904.txt | 2 +- MAINTAINERS | 11 + include/dt-bindings/sound/samsung-i2s.h | 8 + include/sound/pcm.h | 12 + include/sound/rcar_snd.h | 1 + include/sound/rt5677.h | 3 + include/sound/simple_card.h | 1 + include/sound/soc-dapm.h | 3 +- include/sound/soc.h | 4 + include/sound/sta32x.h | 18 +- sound/core/pcm_lib.c | 85 ++ sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/atmel/Kconfig | 2 +- sound/soc/atmel/atmel-pcm-dma.c | 12 +- sound/soc/atmel/atmel_ssc_dai.c | 132 +-- sound/soc/atmel/sam9g20_wm8731.c | 31 +- sound/soc/au1x/db1200.c | 19 +- sound/soc/au1x/dbdma2.c | 6 - sound/soc/au1x/dma.c | 6 - sound/soc/codecs/88pm860x-codec.c | 4 +- sound/soc/codecs/Kconfig | 6 +- sound/soc/codecs/ad193x.c | 4 +- sound/soc/codecs/ak4671.c | 2 +- sound/soc/codecs/alc5623.c | 8 +- sound/soc/codecs/alc5632.c | 12 +- sound/soc/codecs/arizona.c | 78 +- sound/soc/codecs/arizona.h | 5 + sound/soc/codecs/bt-sco.c | 2 +- sound/soc/codecs/cs35l32.c | 4 +- sound/soc/codecs/cs42l52.c | 4 +- sound/soc/codecs/cs42l56.c | 4 +- sound/soc/codecs/cs42l73.c | 4 +- sound/soc/codecs/da732x.c | 4 +- sound/soc/codecs/mc13783.c | 10 +- sound/soc/codecs/pcm3008.c | 4 +- sound/soc/codecs/pcm512x.c | 932 ++++++++++++++++++++- sound/soc/codecs/pcm512x.h | 109 ++- sound/soc/codecs/rt286.c | 51 +- sound/soc/codecs/rt5631.c | 28 +- sound/soc/codecs/rt5640.c | 12 +- sound/soc/codecs/rt5645.c | 174 +++- sound/soc/codecs/rt5645.h | 15 + sound/soc/codecs/rt5651.c | 18 +- sound/soc/codecs/rt5670.c | 99 ++- sound/soc/codecs/rt5670.h | 80 +- sound/soc/codecs/rt5677.c | 50 +- sound/soc/codecs/sgtl5000.c | 24 +- sound/soc/codecs/sn95031.c | 33 +- sound/soc/codecs/sta32x.c | 534 +++++++----- sound/soc/codecs/sta32x.h | 2 +- sound/soc/codecs/tlv320aic31xx.c | 9 +- sound/soc/codecs/tlv320aic3x.c | 4 +- sound/soc/codecs/tlv320dac33.c | 9 +- sound/soc/codecs/ts3a227e.c | 33 +- sound/soc/codecs/twl4030.c | 55 +- sound/soc/codecs/twl6040.c | 4 +- sound/soc/codecs/wm2000.c | 2 +- sound/soc/codecs/wm5100.c | 5 +- sound/soc/codecs/wm5102.c | 23 +- sound/soc/codecs/wm5110.c | 20 +- sound/soc/codecs/wm8350.c | 2 +- sound/soc/codecs/wm8400.c | 9 +- sound/soc/codecs/wm8731.c | 5 +- sound/soc/codecs/wm8770.c | 8 +- sound/soc/codecs/wm8804.c | 4 +- sound/soc/codecs/wm8900.c | 2 +- sound/soc/codecs/wm8903.c | 2 +- sound/soc/codecs/wm8904.c | 35 +- sound/soc/codecs/wm8955.c | 2 +- sound/soc/codecs/wm8958-dsp2.c | 2 +- sound/soc/codecs/wm8960.c | 51 +- sound/soc/codecs/wm8961.c | 4 +- sound/soc/codecs/wm8962.c | 6 +- sound/soc/codecs/wm8988.c | 6 +- sound/soc/codecs/wm8990.c | 9 +- sound/soc/codecs/wm8991.c | 9 +- sound/soc/codecs/wm8993.c | 2 +- sound/soc/codecs/wm8994.c | 23 +- sound/soc/codecs/wm8995.c | 20 +- sound/soc/codecs/wm8996.c | 8 +- sound/soc/codecs/wm8997.c | 11 +- sound/soc/codecs/wm9081.c | 2 +- sound/soc/codecs/wm9090.c | 2 +- sound/soc/codecs/wm9705.c | 16 +- sound/soc/codecs/wm9712.c | 12 +- sound/soc/codecs/wm9713.c | 14 +- sound/soc/codecs/wm_adsp.c | 6 +- sound/soc/codecs/wm_hubs.c | 10 +- sound/soc/davinci/Kconfig | 3 +- sound/soc/davinci/davinci-evm.c | 6 - sound/soc/davinci/davinci-mcasp.c | 103 ++- sound/soc/dwc/Kconfig | 1 + sound/soc/dwc/designware_i2s.c | 281 +++++-- sound/soc/fsl/eukrea-tlv320.c | 23 +- sound/soc/fsl/fsl_asrc.c | 5 +- sound/soc/fsl/fsl_asrc.h | 3 - sound/soc/fsl/fsl_esai.c | 2 +- sound/soc/fsl/fsl_sai.c | 2 +- sound/soc/fsl/fsl_spdif.c | 17 +- sound/soc/fsl/fsl_ssi.c | 10 +- sound/soc/fsl/fsl_utils.c | 27 - sound/soc/fsl/fsl_utils.h | 3 - sound/soc/fsl/imx-mc13783.c | 5 +- sound/soc/fsl/imx-spdif.c | 1 + sound/soc/fsl/imx-ssi.c | 5 +- sound/soc/fsl/mx27vis-aic32x4.c | 12 +- sound/soc/fsl/wm1133-ev1.c | 16 +- sound/soc/generic/simple-card.c | 34 + sound/soc/intel/broadwell.c | 10 - sound/soc/intel/byt-rt5640.c | 12 +- sound/soc/intel/cht_bsw_rt5672.c | 14 + sound/soc/intel/sst-baytrail-pcm.c | 6 - sound/soc/intel/sst-dsp.c | 3 +- sound/soc/intel/sst-haswell-dsp.c | 17 +- sound/soc/intel/sst-haswell-ipc.c | 9 +- sound/soc/intel/sst-haswell-pcm.c | 105 ++- sound/soc/intel/sst-mfld-platform-pcm.c | 7 - sound/soc/intel/sst/sst_acpi.c | 2 + sound/soc/intel/sst/sst_loader.c | 3 +- sound/soc/mxs/mxs-saif.c | 10 +- sound/soc/mxs/mxs-saif.h | 1 - sound/soc/mxs/mxs-sgtl5000.c | 27 +- sound/soc/nuc900/nuc900-pcm.c | 6 - sound/soc/omap/ams-delta.c | 18 +- sound/soc/omap/omap-twl4030.c | 20 +- sound/soc/omap/rx51.c | 8 +- sound/soc/pxa/Kconfig | 2 +- sound/soc/pxa/corgi.c | 16 +- sound/soc/pxa/e740_wm9705.c | 20 +- sound/soc/pxa/e750_wm9705.c | 20 +- sound/soc/pxa/hx4700.c | 8 +- sound/soc/pxa/magician.c | 21 +- sound/soc/pxa/mioa701_wm9713.c | 2 +- sound/soc/pxa/palm27x.c | 15 +- sound/soc/pxa/raumfeld.c | 35 +- sound/soc/pxa/spitz.c | 22 +- sound/soc/pxa/ttc-dkb.c | 4 - sound/soc/pxa/zylonite.c | 12 +- sound/soc/samsung/Kconfig | 4 +- sound/soc/samsung/goni_wm8994.c | 23 +- sound/soc/samsung/h1940_uda1380.c | 15 +- sound/soc/samsung/i2s.c | 362 ++++---- sound/soc/samsung/jive_wm8750.c | 34 +- sound/soc/samsung/neo1973_wm8753.c | 25 +- sound/soc/samsung/odroidx2_max98090.c | 6 +- sound/soc/samsung/rx1950_uda1380.c | 15 +- sound/soc/samsung/s3c24xx_simtec.c | 20 +- sound/soc/samsung/s3c24xx_uda134x.c | 12 +- sound/soc/samsung/smartq_wm8987.c | 16 +- sound/soc/samsung/smdk_wm8580.c | 26 +- sound/soc/samsung/smdk_wm8580pcm.c | 19 +- sound/soc/samsung/smdk_wm8994pcm.c | 16 +- sound/soc/sh/dma-sh7760.c | 6 - sound/soc/sh/fsi.c | 15 +- sound/soc/sh/migor.c | 12 +- sound/soc/sh/rcar/adg.c | 14 +- sound/soc/sh/rcar/core.c | 111 ++- sound/soc/sh/rcar/dvc.c | 63 +- sound/soc/sh/rcar/gen.c | 15 + sound/soc/sh/rcar/rsnd.h | 81 +- sound/soc/sh/rcar/src.c | 269 ++++-- sound/soc/sh/rcar/ssi.c | 100 +-- sound/soc/sh/siu_pcm.c | 1 - sound/soc/soc-ac97.c | 36 +- sound/soc/soc-core.c | 204 +++-- sound/soc/soc-dapm.c | 20 +- sound/soc/soc-devres.c | 2 +- sound/soc/soc-generic-dmaengine-pcm.c | 15 +- sound/soc/tegra/Kconfig | 10 + sound/soc/tegra/Makefile | 2 + sound/soc/tegra/tegra_rt5677.c | 347 ++++++++ sound/soc/txx9/txx9aclc.c | 6 - sound/soc/ux500/mop500_ab8500.c | 16 +- sound/soc/xtensa/Kconfig | 7 + sound/soc/xtensa/Makefile | 3 + sound/soc/xtensa/xtfpga-i2s.c | 675 +++++++++++++++ 185 files changed, 5038 insertions(+), 1984 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/cdns,xtfpga-i2s.txt create mode 100644 Documentation/devicetree/bindings/sound/designware-i2s.txt create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5677.txt create mode 100644 Documentation/devicetree/bindings/sound/st,sta32x.txt create mode 100644 include/dt-bindings/sound/samsung-i2s.h create mode 100644 sound/soc/tegra/tegra_rt5677.c create mode 100644 sound/soc/xtensa/Kconfig create mode 100644 sound/soc/xtensa/Makefile create mode 100644 sound/soc/xtensa/xtfpga-i2s.c Merging modules/modules-next (97bf6af1f928 Linux 3.19-rc1) $ git merge modules/modules-next Already up-to-date. Merging virtio/virtio-next (76545f066d2a virtio_pci_modern: drop an unused function) $ git merge virtio/virtio-next Auto-merging drivers/net/virtio_net.c Removing arch/mn10300/unit-asb2305/pci-iomap.c Merge made by the 'recursive' strategy. arch/mn10300/unit-asb2305/pci-iomap.c | 35 -- arch/s390/include/asm/pci_io.h | 1 + arch/s390/pci/pci.c | 34 +- drivers/block/virtio_blk.c | 12 +- drivers/char/virtio_console.c | 6 + drivers/net/virtio_net.c | 6 + drivers/scsi/virtio_scsi.c | 6 + drivers/virtio/Kconfig | 24 +- drivers/virtio/Makefile | 3 +- drivers/virtio/virtio_balloon.c | 9 +- drivers/virtio/virtio_pci_common.c | 94 ++++- drivers/virtio/virtio_pci_common.h | 43 ++- drivers/virtio/virtio_pci_legacy.c | 76 +--- drivers/virtio/virtio_pci_modern.c | 695 ++++++++++++++++++++++++++++++++++ drivers/virtio/virtio_ring.c | 3 +- include/asm-generic/pci_iomap.h | 10 + include/uapi/linux/virtio_balloon.h | 3 +- include/uapi/linux/virtio_pci.h | 91 ++++- lib/pci_iomap.c | 35 +- net/9p/trans_virtio.c | 6 + 20 files changed, 1053 insertions(+), 139 deletions(-) delete mode 100644 arch/mn10300/unit-asb2305/pci-iomap.c create mode 100644 drivers/virtio/virtio_pci_modern.c Merging input/next (448c7f3830ca Input: MT - add support for balanced slot assignment) $ git merge input/next Auto-merging drivers/input/mouse/synaptics.c Auto-merging MAINTAINERS Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt Merge made by the 'recursive' strategy. .../ABI/testing/sysfs-driver-input-axp-pek | 11 + .../devicetree/bindings/input/e3x0-button.txt | 25 + .../devicetree/bindings/input/regulator-haptic.txt | 21 + .../devicetree/bindings/input/sun4i-lradc-keys.txt | 62 + .../bindings/input/touchscreen/sun4i.txt | 4 +- .../bindings/input/tps65218-pwrbutton.txt | 17 + .../bindings/serio/allwinner,sun4i-ps2.txt | 23 + .../devicetree/bindings/vendor-prefixes.txt | 1 + MAINTAINERS | 15 + drivers/input/evdev.c | 55 +- drivers/input/input-mt.c | 31 +- drivers/input/input.c | 38 +- drivers/input/keyboard/Kconfig | 10 + drivers/input/keyboard/Makefile | 1 + drivers/input/keyboard/atakbd.c | 2 +- drivers/input/keyboard/cap11xx.c | 1 - drivers/input/keyboard/imx_keypad.c | 3 +- drivers/input/keyboard/sun4i-lradc-keys.c | 286 ++ drivers/input/misc/Kconfig | 43 + drivers/input/misc/Makefile | 4 + drivers/input/misc/axp20x-pek.c | 290 ++ drivers/input/misc/drv260x.c | 1 - drivers/input/misc/drv2667.c | 1 - drivers/input/misc/e3x0-button.c | 157 ++ drivers/input/misc/regulator-haptic.c | 266 ++ drivers/input/misc/tps65218-pwrbutton.c | 126 + drivers/input/mouse/Kconfig | 22 +- drivers/input/mouse/Makefile | 3 +- drivers/input/mouse/alps.c | 42 +- drivers/input/mouse/bcm5974.c | 2 +- drivers/input/mouse/cyapa.c | 1722 +++++++----- drivers/input/mouse/cyapa.h | 301 +++ drivers/input/mouse/cyapa_gen3.c | 1247 +++++++++ drivers/input/mouse/cyapa_gen5.c | 2777 ++++++++++++++++++++ drivers/input/mouse/cypress_ps2.c | 2 +- drivers/input/mouse/elan_i2c.h | 6 +- drivers/input/mouse/elan_i2c_core.c | 21 +- drivers/input/mouse/elan_i2c_i2c.c | 1 - drivers/input/mouse/elan_i2c_smbus.c | 1 - drivers/input/mouse/focaltech.c | 408 ++- drivers/input/mouse/focaltech.h | 2 + drivers/input/mouse/psmouse-base.c | 32 +- drivers/input/mouse/psmouse.h | 1 + drivers/input/mouse/synaptics.c | 435 +-- drivers/input/mouse/synaptics.h | 18 +- drivers/input/serio/Kconfig | 10 + drivers/input/serio/Makefile | 1 + drivers/input/serio/sun4i-ps2.c | 340 +++ drivers/input/tablet/gtco.c | 20 +- drivers/input/touchscreen/elants_i2c.c | 2 - drivers/input/touchscreen/pixcir_i2c_ts.c | 2 +- drivers/input/touchscreen/sun4i-ts.c | 78 +- include/linux/input/mt.h | 3 +- include/linux/platform_data/regulator-haptic.h | 29 + 54 files changed, 7812 insertions(+), 1210 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-driver-input-axp-pek create mode 100644 Documentation/devicetree/bindings/input/e3x0-button.txt create mode 100644 Documentation/devicetree/bindings/input/regulator-haptic.txt create mode 100644 Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt create mode 100644 Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt create mode 100644 Documentation/devicetree/bindings/serio/allwinner,sun4i-ps2.txt create mode 100644 drivers/input/keyboard/sun4i-lradc-keys.c create mode 100644 drivers/input/misc/axp20x-pek.c create mode 100644 drivers/input/misc/e3x0-button.c create mode 100644 drivers/input/misc/regulator-haptic.c create mode 100644 drivers/input/misc/tps65218-pwrbutton.c create mode 100644 drivers/input/mouse/cyapa.h create mode 100644 drivers/input/mouse/cyapa_gen3.c create mode 100644 drivers/input/mouse/cyapa_gen5.c create mode 100644 drivers/input/serio/sun4i-ps2.c create mode 100644 include/linux/platform_data/regulator-haptic.h Merging block/for-next (c57c7311d88e Merge branch 'for-3.20/bdi' into for-next) $ git merge block/for-next Resolved 'drivers/ata/libata-core.c' using previous resolution. Resolved 'drivers/mtd/mtdcore.c' using previous resolution. Auto-merging mm/vmscan.c Auto-merging mm/backing-dev.c Auto-merging include/trace/events/writeback.h Auto-merging include/linux/mtd/mtd.h Auto-merging include/linux/libata.h Auto-merging include/linux/fs.h Auto-merging include/linux/backing-dev.h Auto-merging fs/xfs/xfs_file.c Auto-merging fs/ubifs/super.c Auto-merging fs/ubifs/dir.c Auto-merging fs/nfs/write.c Auto-merging fs/nfs/internal.h Auto-merging fs/nfs/inode.c Auto-merging fs/inode.c Auto-merging fs/gfs2/glock.c Auto-merging fs/fs-writeback.c Auto-merging fs/ext4/super.c Auto-merging drivers/staging/lustre/lustre/llite/llite_lib.c Auto-merging drivers/scsi/scsi_lib.c Auto-merging drivers/s390/block/dcssblk.c Auto-merging drivers/mtd/mtdcore.c CONFLICT (content): Merge conflict in drivers/mtd/mtdcore.c Auto-merging drivers/md/dm.c Auto-merging drivers/block/nvme-core.c Auto-merging drivers/ata/sata_sil24.c Auto-merging drivers/ata/libata.h Auto-merging drivers/ata/libata-scsi.c Auto-merging drivers/ata/libata-core.c CONFLICT (content): Merge conflict in drivers/ata/libata-core.c Auto-merging block/blk-mq.c Auto-merging MAINTAINERS Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master e74323807651] Merge remote-tracking branch 'block/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/filesystems/xip.txt | 15 +- Documentation/nommu-mmap.txt | 8 +- MAINTAINERS | 3 +- arch/powerpc/sysdev/axonram.c | 19 +- block/blk-core.c | 13 +- block/blk-lib.c | 30 +- block/blk-mq-tag.c | 80 +++-- block/blk-mq-tag.h | 4 +- block/blk-mq.c | 4 +- block/blk-tag.c | 33 +- block/cfq-iosched.c | 9 +- block/ioctl.c | 2 +- block/partitions/check.c | 12 +- drivers/ata/libata-core.c | 70 +--- drivers/ata/libata-scsi.c | 30 +- drivers/ata/libata.h | 4 +- drivers/ata/sata_sil24.c | 1 + drivers/block/brd.c | 123 +++---- drivers/block/drbd/drbd_receiver.c | 2 +- drivers/block/loop.c | 416 ++++++++++++------------ drivers/block/loop.h | 18 +- drivers/block/null_blk.c | 2 +- drivers/block/nvme-core.c | 128 +++++--- drivers/block/osdblk.c | 2 +- drivers/char/mem.c | 64 ++-- drivers/char/raw.c | 4 +- drivers/md/dm.c | 1 + drivers/mtd/mtdchar.c | 72 +--- drivers/mtd/mtdconcat.c | 10 - drivers/mtd/mtdcore.c | 81 ++--- drivers/mtd/mtdpart.c | 1 - drivers/s390/block/dcssblk.c | 21 +- drivers/scsi/scsi_lib.c | 2 + drivers/scsi/scsi_scan.c | 3 +- drivers/staging/lustre/lustre/llite/llite_lib.c | 6 +- fs/9p/v9fs.c | 2 +- fs/afs/volume.c | 2 +- fs/aio.c | 13 - fs/block_dev.c | 77 +++-- fs/btrfs/disk-io.c | 6 +- fs/btrfs/file.c | 2 +- fs/btrfs/inode.c | 6 - fs/ceph/file.c | 2 +- fs/ceph/inode.c | 2 - fs/ceph/super.c | 20 +- fs/char_dev.c | 24 -- fs/cifs/connect.c | 2 +- fs/cifs/inode.c | 2 - fs/coda/inode.c | 2 +- fs/configfs/configfs_internal.h | 2 - fs/configfs/inode.c | 17 - fs/configfs/mount.c | 11 +- fs/ecryptfs/inode.c | 1 - fs/ecryptfs/main.c | 2 +- fs/exofs/inode.c | 2 - fs/exofs/super.c | 2 +- fs/ext2/ialloc.c | 2 +- fs/ext2/xip.c | 31 +- fs/ext4/super.c | 2 +- fs/fs-writeback.c | 14 +- fs/fuse/file.c | 10 +- fs/fuse/inode.c | 1 - fs/gfs2/aops.c | 2 +- fs/gfs2/glock.c | 1 - fs/gfs2/ops_fstype.c | 1 - fs/gfs2/super.c | 2 +- fs/hugetlbfs/inode.c | 13 - fs/inode.c | 13 - fs/kernfs/inode.c | 13 - fs/kernfs/kernfs-internal.h | 1 - fs/kernfs/mount.c | 1 - fs/ncpfs/inode.c | 3 +- fs/nfs/filelayout/filelayout.c | 2 +- fs/nfs/inode.c | 1 - fs/nfs/internal.h | 1 - fs/nfs/nfs4super.c | 1 - fs/nfs/super.c | 24 +- fs/nfs/write.c | 6 +- fs/nilfs2/gcinode.c | 1 - fs/nilfs2/mdt.c | 6 +- fs/nilfs2/page.c | 4 +- fs/nilfs2/page.h | 3 +- fs/nilfs2/super.c | 6 +- fs/ntfs/file.c | 3 +- fs/ocfs2/dlmfs/dlmfs.c | 14 - fs/ocfs2/file.c | 2 +- fs/ramfs/file-nommu.c | 7 + fs/ramfs/inode.c | 21 +- fs/romfs/mmap-nommu.c | 10 + fs/romfs/super.c | 3 - fs/super.c | 12 +- fs/ubifs/dir.c | 2 - fs/ubifs/super.c | 5 +- fs/xfs/xfs_file.c | 2 +- include/linux/backing-dev.h | 53 +-- include/linux/blk-mq.h | 9 + include/linux/blkdev.h | 19 +- include/linux/cdev.h | 2 - include/linux/fs.h | 28 +- include/linux/libata.h | 5 +- include/linux/mtd/mtd.h | 2 + include/linux/nvme.h | 3 +- include/scsi/scsi_host.h | 3 + include/scsi/scsi_tcq.h | 3 +- include/trace/events/writeback.h | 12 +- mm/backing-dev.c | 107 ++---- mm/fadvise.c | 4 +- mm/filemap.c | 4 +- mm/filemap_xip.c | 3 +- mm/madvise.c | 17 +- mm/nommu.c | 69 ++-- mm/page-writeback.c | 29 +- mm/readahead.c | 4 +- mm/shmem.c | 24 +- mm/swap.c | 2 - mm/swap_state.c | 6 - mm/truncate.c | 2 +- mm/vmscan.c | 4 +- security/security.c | 13 +- 119 files changed, 959 insertions(+), 1206 deletions(-) $ git am -3 ../patches/0001-libata-fix-for-move-of-sas-tag-allocation-code.patch Applying: libata: fix for move of sas tag allocation code $ git reset HEAD^ Unstaged changes after reset: M drivers/ata/libata-scsi.c $ git add -A . $ git commit -v -a --amend [master 5cc86c745736] Merge remote-tracking branch 'block/for-next' Date: Tue Feb 3 12:56:46 2015 +1100 Merging device-mapper/for-next (f7b2d0c5f5f1 Merge tag 'dm-3.19-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm into dm-for-3.20) $ git merge device-mapper/for-next Merge made by the 'recursive' strategy. drivers/md/dm-mpath.c | 63 ++++++-- drivers/md/dm-table.c | 59 +++++-- drivers/md/dm-target.c | 15 +- drivers/md/dm.c | 347 +++++++++++++++++++++++++++++------------- drivers/md/dm.h | 11 +- include/linux/device-mapper.h | 10 +- include/uapi/linux/dm-ioctl.h | 4 +- 7 files changed, 362 insertions(+), 147 deletions(-) Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet) $ git merge mmc/mmc-next Already up-to-date. Merging mmc-uh/next (c13045b1e939 mmc: pwrseq_simple: Add optional reference clock support) $ git merge mmc-uh/next Resolved 'drivers/mmc/host/sunxi-mmc.c' using previous resolution. Auto-merging drivers/mmc/host/sunxi-mmc.c CONFLICT (content): Merge conflict in drivers/mmc/host/sunxi-mmc.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 5881b8a9a47a] Merge remote-tracking branch 'mmc-uh/next' $ git diff -M --stat --summary HEAD^.. .../devicetree/bindings/mmc/mmc-pwrseq-simple.txt | 25 + Documentation/devicetree/bindings/mmc/mmc.txt | 62 ++- .../devicetree/bindings/mmc/sdhci-fujitsu.txt | 30 ++ .../devicetree/bindings/mmc/sdhci-pxa.txt | 15 +- arch/arm/mach-omap2/board-omap3pandora.c | 14 +- drivers/mmc/card/block.c | 6 +- drivers/mmc/card/mmc_test.c | 18 +- drivers/mmc/core/Makefile | 2 +- drivers/mmc/core/bus.c | 4 + drivers/mmc/core/core.c | 152 +++--- drivers/mmc/core/core.h | 7 + drivers/mmc/core/host.c | 65 +-- drivers/mmc/core/mmc.c | 101 ++-- drivers/mmc/core/mmc_ops.c | 30 ++ drivers/mmc/core/pwrseq.c | 109 +++++ drivers/mmc/core/pwrseq.h | 42 ++ drivers/mmc/core/pwrseq_simple.c | 145 ++++++ drivers/mmc/core/sd.c | 27 +- drivers/mmc/core/sdio.c | 14 +- drivers/mmc/core/sdio_bus.c | 11 + drivers/mmc/core/slot-gpio.c | 182 ++----- drivers/mmc/core/slot-gpio.h | 13 + drivers/mmc/host/Kconfig | 15 + drivers/mmc/host/Makefile | 1 + drivers/mmc/host/dw_mmc-exynos.c | 113 +---- drivers/mmc/host/dw_mmc-exynos.h | 56 +++ drivers/mmc/host/dw_mmc-rockchip.c | 2 +- drivers/mmc/host/dw_mmc.c | 124 +++-- drivers/mmc/host/dw_mmc.h | 9 +- drivers/mmc/host/mmci.c | 7 +- drivers/mmc/host/moxart-mmc.c | 4 +- drivers/mmc/host/mvsdio.c | 10 - drivers/mmc/host/mxs-mmc.c | 3 +- drivers/mmc/host/omap_hsmmc.c | 150 +----- drivers/mmc/host/rtsx_pci_sdmmc.c | 542 ++++++++++++--------- drivers/mmc/host/sdhci-acpi.c | 13 +- drivers/mmc/host/sdhci-bcm-kona.c | 4 +- drivers/mmc/host/sdhci-esdhc-imx.c | 17 +- drivers/mmc/host/sdhci-of-esdhc.c | 20 +- drivers/mmc/host/sdhci-pci.c | 7 +- drivers/mmc/host/sdhci-pxav3.c | 119 ++++- drivers/mmc/host/sdhci-s3c.c | 4 +- drivers/mmc/host/sdhci-sirf.c | 74 ++- drivers/mmc/host/sdhci-st.c | 4 +- drivers/mmc/host/sdhci-tegra.c | 30 +- drivers/mmc/host/sdhci.c | 125 ++++- drivers/mmc/host/sdhci.h | 1 + drivers/mmc/host/sdhci_f_sdh30.c | 237 +++++++++ drivers/mmc/host/sh_mobile_sdhi.c | 117 +++-- drivers/mmc/host/sunxi-mmc.c | 19 +- drivers/mmc/host/tmio_mmc.c | 15 +- drivers/mmc/host/tmio_mmc.h | 43 +- drivers/mmc/host/tmio_mmc_dma.c | 38 +- drivers/mmc/host/tmio_mmc_pio.c | 61 ++- drivers/mmc/host/toshsd.c | 17 +- drivers/mmc/host/vub300.c | 4 +- include/linux/mfd/tmio.h | 28 +- include/linux/mmc/card.h | 2 +- include/linux/mmc/core.h | 1 - include/linux/mmc/dw_mmc.h | 6 + include/linux/mmc/host.h | 4 +- include/linux/mmc/mmc.h | 10 +- include/linux/mmc/sdhci.h | 10 + include/linux/mmc/sh_mobile_sdhi.h | 15 - include/linux/mmc/slot-gpio.h | 5 +- include/linux/platform_data/mmc-omap.h | 4 - 66 files changed, 2004 insertions(+), 1160 deletions(-) create mode 100644 Documentation/devicetree/bindings/mmc/mmc-pwrseq-simple.txt create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-fujitsu.txt create mode 100644 drivers/mmc/core/pwrseq.c create mode 100644 drivers/mmc/core/pwrseq.h create mode 100644 drivers/mmc/core/pwrseq_simple.c create mode 100644 drivers/mmc/core/slot-gpio.h create mode 100644 drivers/mmc/host/dw_mmc-exynos.h create mode 100644 drivers/mmc/host/sdhci_f_sdh30.c Merging kgdb/kgdb-next (c7d9ebf81c45 kdb: Fix off by one error in kdb_cpu()) $ git merge kgdb/kgdb-next Auto-merging kernel/debug/kdb/kdb_main.c Merge made by the 'recursive' strategy. kernel/debug/debug_core.c | 2 +- kernel/debug/kdb/kdb_main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) Merging md/for-next (d4d986e23d87 md: wakeup thread upon rdev_dec_pending()) $ git merge md/for-next Merge made by the 'recursive' strategy. arch/x86/Makefile | 1 + drivers/md/bitmap.c | 28 +- drivers/md/dm-raid.c | 8 +- drivers/md/faulty.c | 8 +- drivers/md/linear.c | 67 ++-- drivers/md/md.c | 814 ++++++++++++++++++++++++++++++------------------ drivers/md/md.h | 57 +++- drivers/md/multipath.c | 22 +- drivers/md/raid0.c | 29 +- drivers/md/raid1.c | 52 +--- drivers/md/raid1.h | 3 - drivers/md/raid10.c | 37 +-- drivers/md/raid10.h | 3 - drivers/md/raid5.c | 357 +++++++++++++-------- drivers/md/raid5.h | 1 - lib/raid6/algos.c | 2 +- lib/raid6/recov_avx2.c | 2 +- lib/raid6/recov_ssse3.c | 6 + 18 files changed, 884 insertions(+), 613 deletions(-) Merging mfd/for-mfd-next (bb400d2120bd mfd: rtsx_usb: Defer autosuspend while card exists) $ git merge mfd/for-mfd-next Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/mfd/da9063.txt | 93 ++ Documentation/devicetree/bindings/mfd/qcom-rpm.txt | 70 ++ drivers/mfd/88pm860x-core.c | 2 +- drivers/mfd/Kconfig | 39 + drivers/mfd/Makefile | 4 +- drivers/mfd/da9063-core.c | 2 + drivers/mfd/da9063-i2c.c | 9 + drivers/mfd/da9150-core.c | 413 +++++++ drivers/mfd/davinci_voicecodec.c | 2 +- drivers/mfd/db8500-prcmu.c | 9 - drivers/mfd/dln2.c | 71 +- drivers/mfd/hi6421-pmic-core.c | 2 +- drivers/mfd/intel_soc_pmic_core.h | 2 +- drivers/mfd/intel_soc_pmic_crc.c | 2 +- drivers/mfd/lm3533-core.c | 2 +- drivers/mfd/lpc_sch.c | 1 + drivers/mfd/max77686.c | 29 +- drivers/mfd/mc13xxx-i2c.c | 2 +- drivers/mfd/mc13xxx-spi.c | 2 +- drivers/mfd/omap-usb-host.c | 10 - drivers/mfd/pcf50633-core.c | 2 +- drivers/mfd/qcom_rpm.c | 581 ++++++++++ drivers/mfd/retu-mfd.c | 2 +- drivers/mfd/rt5033.c | 142 +++ drivers/mfd/rtsx_usb.c | 18 + drivers/mfd/smsc-ece1099.c | 2 +- drivers/mfd/sun6i-prcm.c | 14 + drivers/mfd/tps65217.c | 2 +- drivers/mfd/tps65218.c | 2 +- drivers/mfd/twl-core.c | 8 +- drivers/mfd/twl6040.c | 4 +- drivers/mfd/wm8994-core.c | 6 +- drivers/regulator/qcom_rpm-regulator.c | 1 + include/dt-bindings/mfd/qcom-rpm.h | 154 +++ include/linux/mfd/axp20x.h | 43 +- include/linux/mfd/da9063/core.h | 1 + include/linux/mfd/da9150/core.h | 68 ++ include/linux/mfd/da9150/registers.h | 1155 ++++++++++++++++++++ include/linux/mfd/max77686-private.h | 1 - include/linux/mfd/max77686.h | 28 - include/linux/mfd/qcom_rpm.h | 13 + include/linux/mfd/rt5033-private.h | 260 +++++ include/linux/mfd/rt5033.h | 62 ++ 43 files changed, 3226 insertions(+), 109 deletions(-) create mode 100644 Documentation/devicetree/bindings/mfd/da9063.txt create mode 100644 Documentation/devicetree/bindings/mfd/qcom-rpm.txt create mode 100644 drivers/mfd/da9150-core.c create mode 100644 drivers/mfd/qcom_rpm.c create mode 100644 drivers/mfd/rt5033.c create mode 100644 include/dt-bindings/mfd/qcom-rpm.h create mode 100644 include/linux/mfd/da9150/core.h create mode 100644 include/linux/mfd/da9150/registers.h create mode 100644 include/linux/mfd/qcom_rpm.h create mode 100644 include/linux/mfd/rt5033-private.h create mode 100644 include/linux/mfd/rt5033.h Merging backlight/for-backlight-next (3d6969a641d0 MAINTAINERS: Remove my name from Backlight subsystem) $ git merge backlight/for-backlight-next Already up-to-date. Merging battery/master (24727b45b484 power_supply: 88pm860x: Fix leaked power supply on probe fail) $ git merge battery/master Removing drivers/power/reset/sun6i-reboot.c Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. Documentation/ABI/testing/sysfs-class-power | 42 ++ .../devicetree/bindings/arm/brcm-brcmstb.txt | 4 +- Documentation/devicetree/bindings/mfd/max77693.txt | 45 ++ .../devicetree/bindings/power/ltc2941.txt | 27 + .../bindings/power/reset/ltc2952-poweroff.txt | 13 +- MAINTAINERS | 7 + drivers/power/88pm860x_charger.c | 1 + drivers/power/Kconfig | 25 +- drivers/power/Makefile | 3 + drivers/power/ab8500_fg.c | 14 - drivers/power/bq24190_charger.c | 4 +- drivers/power/bq27x00_battery.c | 19 +- drivers/power/charger-manager.c | 289 +++----- drivers/power/collie_battery.c | 24 +- drivers/power/gpio-charger.c | 4 +- drivers/power/ltc2941-battery-gauge.c | 547 +++++++++++++++ drivers/power/max17042_battery.c | 2 +- drivers/power/max77693_charger.c | 753 +++++++++++++++++++++ drivers/power/reset/Kconfig | 26 +- drivers/power/reset/Makefile | 2 +- drivers/power/reset/arm-versatile-reboot.c | 49 +- drivers/power/reset/at91-poweroff.c | 7 +- drivers/power/reset/at91-reset.c | 28 +- drivers/power/reset/brcmstb-reboot.c | 41 +- drivers/power/reset/ltc2952-poweroff.c | 290 ++++---- drivers/power/reset/restart-poweroff.c | 1 - drivers/power/reset/rmobile-reset.c | 91 +++ drivers/power/reset/st-poweroff.c | 17 +- drivers/power/reset/sun6i-reboot.c | 85 --- drivers/power/reset/vexpress-poweroff.c | 17 +- drivers/power/rt5033_battery.c | 177 +++++ drivers/power/test_power.c | 33 +- include/linux/mfd/abx500/ab8500-bm.h | 1 - include/linux/mfd/max77693-private.h | 108 +++ include/linux/power/charger-manager.h | 32 +- 35 files changed, 2224 insertions(+), 604 deletions(-) create mode 100644 Documentation/devicetree/bindings/power/ltc2941.txt create mode 100644 drivers/power/ltc2941-battery-gauge.c create mode 100644 drivers/power/max77693_charger.c create mode 100644 drivers/power/reset/rmobile-reset.c delete mode 100644 drivers/power/reset/sun6i-reboot.c create mode 100644 drivers/power/rt5033_battery.c Merging omap_dss2/for-next (7efc436cd45c Merge branches '3.20/fbdev' and '3.20/omapdss' into for-next) $ git merge omap_dss2/for-next Merge made by the 'recursive' strategy. .../devicetree/bindings/video/ti,opa362.txt | 38 +++ drivers/video/console/Kconfig | 16 +- drivers/video/console/dummycon.c | 5 +- drivers/video/fbdev/Kconfig | 1 - drivers/video/fbdev/aty/atyfb_base.c | 9 +- drivers/video/fbdev/core/fbmon.c | 103 ++++---- drivers/video/fbdev/core/modedb.c | 111 ++++++++ drivers/video/fbdev/geode/gx1fb_core.c | 6 +- drivers/video/fbdev/geode/gxfb_core.c | 6 +- drivers/video/fbdev/geode/lxfb_core.c | 6 +- drivers/video/fbdev/ocfb.c | 2 +- drivers/video/fbdev/omap2/displays-new/Kconfig | 6 + drivers/video/fbdev/omap2/displays-new/Makefile | 1 + .../fbdev/omap2/displays-new/connector-analog-tv.c | 2 +- .../fbdev/omap2/displays-new/encoder-opa362.c | 285 +++++++++++++++++++++ drivers/video/fbdev/savage/savagefb.h | 12 +- drivers/video/fbdev/ssd1307fb.c | 19 +- drivers/video/fbdev/vt8500lcdfb.c | 4 +- drivers/video/vgastate.c | 82 +++--- include/linux/fb.h | 12 +- 20 files changed, 583 insertions(+), 143 deletions(-) create mode 100644 Documentation/devicetree/bindings/video/ti,opa362.txt create mode 100644 drivers/video/fbdev/omap2/displays-new/encoder-opa362.c Merging regulator/for-next (8966da9ce0c8 Merge remote-tracking branches 'regulator/topic/rpm', 'regulator/topic/rt5033' and 'regulator/topic/tps65023' into regulator-next) $ git merge regulator/for-next Auto-merging drivers/regulator/qcom_rpm-regulator.c Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/mfd/max77686.txt | 14 + .../devicetree/bindings/regulator/da9211.txt | 7 +- .../devicetree/bindings/regulator/isl9305.txt | 4 +- .../bindings/regulator/mt6397-regulator.txt | 217 ++++++++++++ .../devicetree/bindings/regulator/pfuze100.txt | 94 +++++- drivers/regulator/Kconfig | 9 + drivers/regulator/Makefile | 1 + drivers/regulator/axp20x-regulator.c | 93 ++--- drivers/regulator/core.c | 375 +++++++++------------ drivers/regulator/da9211-regulator.c | 16 +- drivers/regulator/fan53555.c | 4 +- drivers/regulator/internal.h | 2 + drivers/regulator/isl9305.c | 6 +- drivers/regulator/lp872x.c | 24 +- drivers/regulator/max14577.c | 62 +--- drivers/regulator/max77686.c | 70 +++- drivers/regulator/max8649.c | 4 +- drivers/regulator/mt6397-regulator.c | 332 ++++++++++++++++++ drivers/regulator/of_regulator.c | 11 + drivers/regulator/pfuze100-regulator.c | 134 +++++++- drivers/regulator/qcom_rpm-regulator.c | 15 +- drivers/regulator/rk808-regulator.c | 6 +- drivers/regulator/rt5033-regulator.c | 8 +- drivers/regulator/tps65023-regulator.c | 6 +- include/linux/regulator/da9211.h | 2 + include/linux/regulator/driver.h | 13 + include/linux/regulator/mt6397-regulator.h | 49 +++ include/linux/regulator/pfuze100.h | 14 + 28 files changed, 1219 insertions(+), 373 deletions(-) create mode 100644 Documentation/devicetree/bindings/regulator/mt6397-regulator.txt create mode 100644 drivers/regulator/mt6397-regulator.c create mode 100644 include/linux/regulator/mt6397-regulator.h Merging security/next (11cd64a234d5 ima: /proc/keys is now mandatory) $ git merge security/next Auto-merging kernel/Makefile Auto-merging include/linux/platform_data/tpm_stm_st33.h Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. Documentation/ABI/stable/sysfs-class-tpm | 22 +- .../bindings/security/tpm/st33zp24-i2c.txt | 36 ++ Documentation/security/keys.txt | 2 - MAINTAINERS | 12 +- drivers/char/tpm/Kconfig | 15 +- drivers/char/tpm/Makefile | 5 +- drivers/char/tpm/tpm-chip.c | 256 ++++++++ drivers/char/tpm/tpm-dev.c | 42 +- drivers/char/tpm/tpm-interface.c | 263 +++----- drivers/char/tpm/tpm-sysfs.c | 29 +- drivers/char/tpm/tpm.h | 124 +++- drivers/char/tpm/tpm2-cmd.c | 617 +++++++++++++++++++ drivers/char/tpm/tpm_atmel.c | 25 +- drivers/char/tpm/tpm_crb.c | 354 +++++++++++ drivers/char/tpm/tpm_i2c_atmel.c | 52 +- drivers/char/tpm/tpm_i2c_infineon.c | 43 +- drivers/char/tpm/tpm_i2c_nuvoton.c | 69 +-- drivers/char/tpm/tpm_i2c_stm_st33.c | 666 +++++++++++---------- drivers/char/tpm/tpm_ibmvtpm.c | 27 +- drivers/char/tpm/tpm_ibmvtpm.h | 2 +- drivers/char/tpm/tpm_infineon.c | 51 +- drivers/char/tpm/tpm_nsc.c | 34 +- drivers/char/tpm/tpm_of.c | 2 +- drivers/char/tpm/tpm_ppi.c | 141 +++-- drivers/char/tpm/tpm_tis.c | 276 ++++++--- drivers/char/tpm/xen-tpmfront.c | 14 +- .../linux/platform_data/tpm_stm_st33.h | 38 +- kernel/Makefile | 2 +- lib/mpi/mpi-cmp.c | 10 +- lib/mpi/mpi-internal.h | 2 +- scripts/asn1_compiler.c | 30 +- security/integrity/ima/Kconfig | 1 - security/keys/Kconfig | 18 - security/keys/proc.c | 8 - security/smack/Kconfig | 12 + security/smack/Makefile | 1 + security/smack/smack.h | 11 + security/smack/smack_lsm.c | 199 ++++-- security/smack/smack_netfilter.c | 96 +++ 39 files changed, 2588 insertions(+), 1019 deletions(-) create mode 100644 Documentation/devicetree/bindings/security/tpm/st33zp24-i2c.txt create mode 100644 drivers/char/tpm/tpm-chip.c create mode 100644 drivers/char/tpm/tpm2-cmd.c create mode 100644 drivers/char/tpm/tpm_crb.c rename drivers/char/tpm/tpm_i2c_stm_st33.h => include/linux/platform_data/tpm_stm_st33.h (53%) create mode 100644 security/smack/smack_netfilter.c Merging integrity/next (7bea7ff67e0c ima: /proc/keys is now mandatory) $ git merge integrity/next Merge made by the 'recursive' strategy. Merging selinux/next (7c596bd904b3 SELinux: fix error code in policydb_init()) $ git merge selinux/next Auto-merging security/selinux/hooks.c Merge made by the 'recursive' strategy. security/selinux/avc.c | 5 ----- security/selinux/hooks.c | 29 ++++++++--------------------- security/selinux/ss/policydb.c | 8 ++++++-- 3 files changed, 14 insertions(+), 28 deletions(-) Merging lblnet/next (b2776bf7149b Linux 3.18) $ git merge lblnet/next Already up-to-date. Merging watchdog/master (e36f014edff7 Linux 3.19-rc7) $ git merge watchdog/master Already up-to-date. Merging iommu/next (dfc4940c0347 Merge branches 'iommu/fixes', 'arm/renesas', 'arm/exynos', 'arm/omap', 'ppc/pamu' and 'core' into next) $ git merge iommu/next Removing include/linux/platform_data/ipmmu-vmsa.h Auto-merging arch/arm64/Kconfig Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. .../bindings/iommu/renesas,ipmmu-vmsa.txt | 41 + MAINTAINERS | 1 + arch/arm64/Kconfig | 1 - drivers/iommu/Kconfig | 52 +- drivers/iommu/Makefile | 5 +- drivers/iommu/arm-smmu.c | 935 +++++++------------ drivers/iommu/fsl_pamu.c | 19 +- drivers/iommu/intel-iommu.c | 45 +- drivers/iommu/io-pgtable-arm.c | 986 +++++++++++++++++++++ drivers/iommu/io-pgtable.c | 82 ++ drivers/iommu/io-pgtable.h | 143 +++ drivers/iommu/iommu.c | 5 +- drivers/iommu/iova.c | 53 +- drivers/iommu/ipmmu-vmsa.c | 674 ++++---------- drivers/iommu/omap-iommu.c | 2 +- include/linux/iopoll.h | 144 +++ include/linux/iova.h | 41 +- include/linux/platform_data/ipmmu-vmsa.h | 24 - include/trace/events/iommu.h | 31 +- 19 files changed, 2041 insertions(+), 1243 deletions(-) create mode 100644 Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt create mode 100644 drivers/iommu/io-pgtable-arm.c create mode 100644 drivers/iommu/io-pgtable.c create mode 100644 drivers/iommu/io-pgtable.h create mode 100644 include/linux/iopoll.h delete mode 100644 include/linux/platform_data/ipmmu-vmsa.h Merging dwmw2-iommu/master (1860e379875d Linux 3.15) $ git merge dwmw2-iommu/master Already up-to-date. Merging vfio/next (5e9f36c59a48 drivers/vfio: allow type-1 IOMMU instantiation on top of an ARM SMMU) $ git merge vfio/next Already up-to-date. Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentation) $ git merge osd/linux-next Already up-to-date. Merging jc_docs/docs-next (202799be447b doc: brief user documentation for completion) $ git merge jc_docs/docs-next Auto-merging MAINTAINERS Auto-merging Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt Merge made by the 'recursive' strategy. Documentation/00-INDEX | 28 +- Documentation/Changes | 6 +- Documentation/CodingStyle | 1 + Documentation/DocBook/Makefile | 2 +- Documentation/SubmittingPatches | 452 ++++++++++----------- Documentation/arm/00-INDEX | 12 +- Documentation/blackfin/Makefile | 2 + Documentation/cgroups/00-INDEX | 2 + .../devicetree/bindings/arm/msm/timer.txt | 2 +- .../bindings/ata/cavium-compact-flash.txt | 2 +- Documentation/devicetree/bindings/c6x/dscr.txt | 2 +- .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 2 +- .../devicetree/bindings/gpio/gpio-pcf857x.txt | 2 +- .../devicetree/bindings/iio/adc/xilinx-xadc.txt | 2 +- .../devicetree/bindings/mtd/fsmc-nand.txt | 2 +- .../bindings/net/broadcom-systemport.txt | 2 +- .../bindings/power/rockchip-io-domain.txt | 2 +- Documentation/devicetree/overlay-notes.txt | 4 +- Documentation/dmaengine/00-INDEX | 8 + Documentation/driver-model/bus.txt | 2 +- Documentation/filesystems/proc.txt | 2 +- Documentation/filesystems/seq_file.txt | 12 +- Documentation/gpio/board.txt | 2 +- Documentation/locking/00-INDEX | 16 + Documentation/locking/lockstat.txt | 5 + Documentation/misc-devices/mei/mei-client-bus.txt | 17 +- Documentation/misc-devices/mei/mei.txt | 126 +++--- Documentation/networking/00-INDEX | 8 +- Documentation/scheduler/completion.txt | 236 +++++++++++ Documentation/sysctl/vm.txt | 2 +- MAINTAINERS | 1 + 31 files changed, 620 insertions(+), 344 deletions(-) create mode 100644 Documentation/dmaengine/00-INDEX create mode 100644 Documentation/locking/00-INDEX create mode 100644 Documentation/scheduler/completion.txt Merging trivial/for-next (edb0ec0725bb kexec, Kconfig: spell "architecture" properly) $ git merge trivial/for-next Auto-merging lib/dynamic_debug.c Auto-merging lib/Kconfig.debug Auto-merging kernel/kexec.c Auto-merging drivers/staging/speakup/speakup_dtlk.c Auto-merging drivers/scsi/pmcraid.c Auto-merging arch/x86/mm/init.c Auto-merging arch/arm/mm/cache-l2x0.c Merge made by the 'recursive' strategy. Documentation/usb/usbmon.txt | 2 +- Documentation/vm/cleancache.txt | 2 +- arch/arm/mm/cache-l2x0.c | 4 ++-- arch/blackfin/mach-common/ints-priority.c | 8 -------- arch/x86/mm/init.c | 2 +- drivers/scsi/aic7xxx/aic79xx_core.c | 2 +- drivers/scsi/pmcraid.c | 2 +- drivers/staging/speakup/speakup_dtlk.c | 7 ++++--- include/uapi/linux/msdos_fs.h | 4 ++-- kernel/kexec.c | 2 +- lib/Kconfig.debug | 2 +- lib/dynamic_debug.c | 2 +- mm/cleancache.c | 2 +- 13 files changed, 17 insertions(+), 24 deletions(-) Merging audit/next (2fded7f44b8f audit: remove vestiges of vers_ops) $ git merge audit/next Auto-merging kernel/auditfilter.c Auto-merging include/linux/audit.h Merge made by the 'recursive' strategy. include/linux/audit.h | 1 - kernel/auditfilter.c | 2 -- 2 files changed, 3 deletions(-) Merging devicetree/devicetree/next (fca8ba4ee24d of/unittest: Remove obsolete code) $ git merge devicetree/devicetree/next Auto-merging drivers/of/unittest.c Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt Merge made by the 'recursive' strategy. .../bindings/fpga/altera-socfpga-fpga-mgr.txt | 17 +++++ .../devicetree/bindings/pinctrl/ste,nomadik.txt | 35 +++++---- .../devicetree/bindings/vendor-prefixes.txt | 6 +- drivers/of/Kconfig | 1 - drivers/of/of_reserved_mem.c | 2 + drivers/of/unittest.c | 85 +++------------------- 6 files changed, 55 insertions(+), 91 deletions(-) create mode 100644 Documentation/devicetree/bindings/fpga/altera-socfpga-fpga-mgr.txt Merging dt-rh/for-next (e94fbe607f8c dt-bindings: use isil prefix for Intersil in vendor-prefixes.txt) $ git merge dt-rh/for-next Already up-to-date. Merging mailbox/mailbox-for-next (9f3e3cacb2ff dt: mailbox: add generic bindings) $ git merge mailbox/mailbox-for-next Already up-to-date. Merging spi/for-next (f683674dd137 Merge remote-tracking branches 'spi/topic/st-ssc' and 'spi/topic/xilinx' into spi-next) $ git merge spi/for-next Auto-merging drivers/spi/Kconfig Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/spi/sh-msiof.txt | 16 + Documentation/devicetree/bindings/spi/spi-sirf.txt | 41 + .../devicetree/bindings/spi/spi-st-ssc.txt | 40 + arch/x86/pci/intel_mid_pci.c | 1 - drivers/spi/Kconfig | 24 +- drivers/spi/Makefile | 2 + drivers/spi/spi-au1550.c | 4 - drivers/spi/spi-bcm2835.c | 4 - drivers/spi/spi-bcm63xx.c | 4 - drivers/spi/spi-bitbang.c | 4 - drivers/spi/spi-butterfly.c | 4 - drivers/spi/spi-coldfire-qspi.c | 5 - drivers/spi/spi-davinci.c | 4 - drivers/spi/spi-dln2.c | 881 +++++++++++++++++++++ drivers/spi/spi-dw-mid.c | 15 +- drivers/spi/spi-dw-pci.c | 38 +- drivers/spi/spi-dw.c | 9 +- drivers/spi/spi-falcon.c | 12 - drivers/spi/spi-fsl-cpm.c | 9 + drivers/spi/spi-fsl-dspi.c | 163 ++-- drivers/spi/spi-fsl-lib.c | 16 +- drivers/spi/spi-fsl-lib.h | 4 +- drivers/spi/spi-gpio.c | 8 +- drivers/spi/spi-img-spfi.c | 49 +- drivers/spi/spi-imx.c | 13 +- drivers/spi/spi-lm70llp.c | 4 - drivers/spi/spi-meson-spifc.c | 2 +- drivers/spi/spi-omap-100k.c | 5 - drivers/spi/spi-omap-uwire.c | 4 - drivers/spi/spi-omap2-mcspi.c | 5 - drivers/spi/spi-orion.c | 88 +- drivers/spi/spi-pxa2xx-dma.c | 17 +- drivers/spi/spi-pxa2xx-pxadma.c | 33 +- drivers/spi/spi-pxa2xx.c | 207 +++-- drivers/spi/spi-pxa2xx.h | 34 +- drivers/spi/spi-qup.c | 11 +- drivers/spi/spi-rockchip.c | 6 +- drivers/spi/spi-rspi.c | 5 - drivers/spi/spi-s3c64xx.c | 4 - drivers/spi/spi-sc18is602.c | 4 - drivers/spi/spi-sh-hspi.c | 5 - drivers/spi/spi-sh-msiof.c | 85 +- drivers/spi/spi-sh.c | 5 - drivers/spi/spi-sirf.c | 1 - drivers/spi/spi-st-ssc4.c | 504 ++++++++++++ drivers/spi/spi-topcliff-pch.c | 4 - drivers/spi/spi-xilinx.c | 298 +++---- drivers/spi/spi.c | 118 ++- drivers/spi/spidev.c | 125 ++- include/linux/pxa2xx_ssp.h | 1 + include/linux/spi/at86rf230.h | 4 - include/linux/spi/l4f00242t03.h | 4 - include/linux/spi/lms283gf05.h | 4 - include/linux/spi/mxs-spi.h | 4 - include/linux/spi/pxa2xx_spi.h | 4 - include/linux/spi/rspi.h | 5 - include/linux/spi/sh_hspi.h | 4 - include/linux/spi/sh_msiof.h | 2 + include/linux/spi/spi.h | 6 +- include/linux/spi/tle62x0.h | 4 - include/linux/spi/tsc2005.h | 5 - 61 files changed, 2283 insertions(+), 708 deletions(-) create mode 100644 Documentation/devicetree/bindings/spi/spi-sirf.txt create mode 100644 Documentation/devicetree/bindings/spi/spi-st-ssc.txt create mode 100644 drivers/spi/spi-dln2.c create mode 100644 drivers/spi/spi-st-ssc4.c Merging tip/auto-latest (2619a5bcf0c8 manual merge of x86/ras) $ git merge tip/auto-latest Auto-merging mm/Kconfig Auto-merging lib/Kconfig.debug Auto-merging kernel/sched/core.c Auto-merging kernel/locking/osq_lock.c Auto-merging kernel/locking/Makefile Auto-merging init/Kconfig Auto-merging include/linux/compiler.h Auto-merging drivers/md/Kconfig Auto-merging drivers/devfreq/Kconfig Auto-merging arch/x86/pci/mmconfig-shared.c Auto-merging arch/x86/include/uapi/asm/msr-index.h Removing arch/x86/include/asm/smpboot_hooks.h Auto-merging arch/x86/Kconfig Merge made by the 'recursive' strategy. .../testing/sysfs-bus-event_source-devices-events | 6 + Documentation/RCU/stallwarn.txt | 16 +- Documentation/RCU/trace.txt | 32 +- Documentation/devicetree/bindings/arm/gic.txt | 8 +- .../bindings/interrupt-controller/digicolor-ic.txt | 21 + .../interrupt-controller/renesas,intc-irqpin.txt | 5 + .../interrupt-controller/ti,omap-intc-irq.txt | 28 ++ Documentation/futex-requeue-pi.txt | 8 +- Documentation/locking/lockdep-design.txt | 2 +- Documentation/memory-barriers.txt | 46 ++- Documentation/x86/entry_64.txt | 18 +- Documentation/x86/x86_64/kernel-stacks | 8 +- arch/arm/kvm/Kconfig | 1 + arch/arm64/kvm/Kconfig | 1 + arch/mips/kvm/Kconfig | 1 + arch/powerpc/kvm/Kconfig | 1 + arch/s390/kvm/Kconfig | 1 + arch/tile/kvm/Kconfig | 1 + arch/x86/Kconfig | 5 + arch/x86/boot/ctype.h | 5 +- arch/x86/boot/early_serial_console.c | 6 +- arch/x86/ia32/ia32entry.S | 4 +- arch/x86/include/asm/apic.h | 58 +-- arch/x86/include/asm/calling.h | 1 - arch/x86/include/asm/cpufeature.h | 2 + arch/x86/include/asm/debugreg.h | 5 + arch/x86/include/asm/fpu-internal.h | 10 +- arch/x86/include/asm/hw_breakpoint.h | 1 + arch/x86/include/asm/i387.h | 6 +- arch/x86/include/asm/io_apic.h | 5 + arch/x86/include/asm/irq_remapping.h | 4 - arch/x86/include/asm/mce.h | 1 - arch/x86/include/asm/pmc_atom.h | 22 + arch/x86/include/asm/smpboot_hooks.h | 68 --- arch/x86/include/asm/thread_info.h | 15 +- arch/x86/include/asm/traps.h | 6 + arch/x86/include/uapi/asm/msr-index.h | 4 + arch/x86/kernel/acpi/boot.c | 2 + arch/x86/kernel/apb_timer.c | 8 - arch/x86/kernel/apic/apic.c | 456 +++++++++++---------- arch/x86/kernel/apic/io_apic.c | 13 +- arch/x86/kernel/cpu/amd.c | 19 + arch/x86/kernel/cpu/common.c | 15 +- arch/x86/kernel/cpu/intel.c | 6 +- arch/x86/kernel/cpu/mcheck/mce.c | 137 ++----- arch/x86/kernel/cpu/mcheck/p5.c | 6 + arch/x86/kernel/cpu/mcheck/winchip.c | 5 + arch/x86/kernel/e820.c | 26 +- arch/x86/kernel/entry_64.S | 211 ++++------ arch/x86/kernel/hw_breakpoint.c | 45 +- arch/x86/kernel/i387.c | 39 +- arch/x86/kernel/irq_32.c | 13 +- arch/x86/kernel/pmc_atom.c | 81 +++- arch/x86/kernel/rtc.c | 2 +- arch/x86/kernel/setup.c | 8 +- arch/x86/kernel/signal.c | 6 - arch/x86/kernel/smpboot.c | 113 ++--- arch/x86/kernel/traps.c | 120 ++++-- arch/x86/kvm/Kconfig | 1 + arch/x86/pci/mmconfig-shared.c | 28 ++ drivers/acpi/apei/apei-base.c | 32 +- drivers/clk/Kconfig | 1 + drivers/cpufreq/Kconfig | 1 + drivers/devfreq/Kconfig | 1 + drivers/iommu/amd_iommu.c | 1 - drivers/iommu/amd_iommu_init.c | 15 +- drivers/iommu/amd_iommu_proto.h | 1 - drivers/iommu/intel_irq_remapping.c | 96 +++-- drivers/iommu/irq_remapping.c | 74 ++-- drivers/iommu/irq_remapping.h | 5 - drivers/irqchip/Makefile | 1 + drivers/irqchip/irq-digicolor.c | 120 ++++++ drivers/irqchip/irq-gic-common.c | 18 +- drivers/irqchip/irq-gic-common.h | 2 +- drivers/irqchip/irq-gic-v3.c | 8 +- drivers/irqchip/irq-gic.c | 9 +- drivers/irqchip/irq-hip04.c | 9 +- drivers/irqchip/irq-mips-gic.c | 44 +- drivers/irqchip/irq-mtk-sysirq.c | 18 +- drivers/irqchip/irq-omap-intc.c | 22 +- drivers/irqchip/irq-renesas-intc-irqpin.c | 50 ++- drivers/md/Kconfig | 1 + drivers/net/Kconfig | 1 + drivers/rtc/hctosys.c | 18 +- drivers/rtc/interface.c | 22 +- drivers/rtc/rtc-dev.c | 8 +- drivers/rtc/systohc.c | 6 +- fs/btrfs/Kconfig | 1 + fs/notify/Kconfig | 1 + fs/quota/Kconfig | 1 + include/linux/bitops.h | 33 ++ include/linux/compiler.h | 2 +- include/linux/ftrace_event.h | 2 +- include/linux/hrtimer.h | 2 + include/linux/irqchip/irq-omap-intc.h | 2 - include/linux/ktime.h | 17 +- include/linux/osq_lock.h | 12 +- include/linux/perf_event.h | 28 +- include/linux/rculist.h | 16 +- include/linux/rcupdate.h | 13 +- include/linux/rcutiny.h | 45 +- include/linux/rcutree.h | 11 +- include/linux/rtc.h | 2 +- include/linux/smp.h | 7 + include/linux/srcu.h | 14 +- include/linux/timekeeping.h | 21 +- include/trace/ftrace.h | 7 +- init/Kconfig | 18 +- init/main.c | 13 - kernel/Kconfig.locks | 4 + kernel/cpu.c | 56 ++- kernel/events/core.c | 23 +- kernel/futex.c | 6 +- kernel/irq/manage.c | 2 + kernel/locking/Makefile | 3 +- kernel/locking/mcs_spinlock.h | 16 - kernel/locking/mutex.c | 58 +-- kernel/locking/{mcs_spinlock.c => osq_lock.c} | 9 +- kernel/notifier.c | 3 + kernel/power/Kconfig | 1 + kernel/rcu/Makefile | 3 +- kernel/rcu/rcu.h | 6 + kernel/rcu/rcutorture.c | 66 +-- kernel/rcu/srcu.c | 2 +- kernel/rcu/tiny.c | 113 +---- kernel/rcu/tiny_plugin.h | 9 +- kernel/rcu/tree.c | 355 +++++++++++----- kernel/rcu/tree.h | 62 +-- kernel/rcu/tree_plugin.h | 271 ++++-------- kernel/rcu/tree_trace.c | 8 +- kernel/sched/core.c | 40 +- kernel/sched/debug.c | 1 + kernel/sched/fair.c | 9 +- kernel/sched/rt.c | 9 +- kernel/sched/sched.h | 22 +- kernel/smpboot.c | 2 + kernel/softirq.c | 9 +- kernel/time/hrtimer.c | 112 +++-- kernel/time/ntp.c | 4 +- kernel/time/timekeeping.c | 12 +- kernel/trace/trace_event_perf.c | 4 +- kernel/trace/trace_kprobe.c | 4 +- kernel/trace/trace_syscalls.c | 4 +- kernel/trace/trace_uprobe.c | 2 +- lib/Kconfig.debug | 3 +- mm/Kconfig | 1 + security/tomoyo/Kconfig | 1 + tools/lib/api/fs/debugfs.c | 43 ++ tools/lib/api/fs/debugfs.h | 3 + tools/lib/traceevent/event-parse.c | 328 +++++++++++++++ tools/perf/Documentation/perf-buildid-cache.txt | 2 +- tools/perf/Documentation/perf-list.txt | 13 + tools/perf/Documentation/perf-mem.txt | 9 +- tools/perf/Documentation/perf-record.txt | 19 +- tools/perf/Documentation/perf-script.txt | 28 +- tools/perf/Documentation/perf-stat.txt | 20 +- tools/perf/builtin-buildid-cache.c | 4 +- tools/perf/builtin-diff.c | 248 +++++++---- tools/perf/builtin-mem.c | 131 ++++-- tools/perf/builtin-report.c | 16 +- tools/perf/builtin-stat.c | 2 +- tools/perf/builtin-top.c | 2 +- tools/perf/builtin-trace.c | 106 ++--- tools/perf/tests/attr.py | 1 - tools/perf/tests/hists_cumulate.c | 2 +- tools/perf/tests/hists_output.c | 2 +- tools/perf/tests/make | 1 - tools/perf/tests/parse-events.c | 60 ++- tools/perf/tests/sample-parsing.c | 2 +- tools/perf/ui/browsers/annotate.c | 3 +- tools/perf/ui/hist.c | 12 +- tools/perf/ui/progress.h | 4 +- tools/perf/ui/tui/helpline.c | 3 + tools/perf/ui/tui/setup.c | 3 +- tools/perf/util/annotate.c | 2 +- tools/perf/util/color.c | 126 ------ tools/perf/util/color.h | 2 - tools/perf/util/evlist.c | 27 -- tools/perf/util/evlist.h | 1 - tools/perf/util/hist.c | 48 ++- tools/perf/util/hist.h | 11 +- tools/perf/util/parse-events.c | 27 +- tools/perf/util/parse-events.h | 3 +- tools/perf/util/parse-events.l | 1 + tools/perf/util/parse-events.y | 26 +- tools/perf/util/parse-options.c | 2 +- tools/perf/util/pmu.c | 102 ++++- tools/perf/util/python.c | 2 +- .../util/scripting-engines/trace-event-python.c | 2 +- tools/perf/util/session.c | 2 +- tools/perf/util/sort.c | 37 +- tools/perf/util/symbol.c | 2 +- tools/testing/selftests/rcutorture/bin/cpus2use.sh | 2 +- .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 18 + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 9 +- .../selftests/rcutorture/bin/parse-build.sh | 20 +- .../selftests/rcutorture/bin/parse-console.sh | 2 +- 197 files changed, 3285 insertions(+), 2215 deletions(-) create mode 100644 Documentation/devicetree/bindings/interrupt-controller/digicolor-ic.txt create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,omap-intc-irq.txt delete mode 100644 arch/x86/include/asm/smpboot_hooks.h create mode 100644 drivers/irqchip/irq-digicolor.c rename kernel/locking/{mcs_spinlock.c => osq_lock.c} (98%) Merging clockevents/clockevents/next (4c8305221193 clocksource: Driver for Conexant Digicolor SoC timer) $ git merge clockevents/clockevents/next Resolved 'drivers/clocksource/Kconfig' using previous resolution. Auto-merging drivers/clocksource/timer-atlas7.c Auto-merging drivers/clocksource/Makefile Auto-merging drivers/clocksource/Kconfig CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig Auto-merging MAINTAINERS Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 8a707d42203b] Merge remote-tracking branch 'clockevents/clockevents/next' $ git diff -M --stat --summary HEAD^.. .../devicetree/bindings/timer/digicolor-timer.txt | 18 ++ .../bindings/timer/rockchip,rk3288-timer.txt | 18 ++ MAINTAINERS | 2 +- arch/arm/mach-rockchip/Kconfig | 1 + drivers/clocksource/Kconfig | 17 ++ drivers/clocksource/Makefile | 5 +- drivers/clocksource/asm9260_timer.c | 220 +++++++++++++++++++++ drivers/clocksource/rockchip_timer.c | 180 +++++++++++++++++ .../clocksource/{timer-marco.c => timer-atlas7.c} | 15 +- drivers/clocksource/timer-digicolor.c | 199 +++++++++++++++++++ 10 files changed, 665 insertions(+), 10 deletions(-) create mode 100644 Documentation/devicetree/bindings/timer/digicolor-timer.txt create mode 100644 Documentation/devicetree/bindings/timer/rockchip,rk3288-timer.txt create mode 100644 drivers/clocksource/asm9260_timer.c create mode 100644 drivers/clocksource/rockchip_timer.c rename drivers/clocksource/{timer-marco.c => timer-atlas7.c} (95%) create mode 100644 drivers/clocksource/timer-digicolor.c Merging edac/linux_next (fec53af531dd sb_edac: Fix typo computing number of banks) $ git merge edac/linux_next Already up-to-date. Merging edac-amd/for-next (30263b4052c6 EDAC, mv64x60_edac: Fix an error code in probe()) $ git merge edac-amd/for-next Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 1 + drivers/edac/Kconfig | 7 + drivers/edac/Makefile | 1 + drivers/edac/edac_mc_sysfs.c | 51 +++-- drivers/edac/i5100_edac.c | 5 - drivers/edac/mce_amd_inj.c | 2 +- drivers/edac/mpc85xx_edac.c | 2 +- drivers/edac/mpc85xx_edac.h | 2 +- drivers/edac/mv64x60_edac.c | 3 +- drivers/edac/synopsys_edac.c | 535 +++++++++++++++++++++++++++++++++++++++++++ 10 files changed, 576 insertions(+), 33 deletions(-) create mode 100644 drivers/edac/synopsys_edac.c Merging irqchip/irqchip/for-next (91d117921216 irqchip: atmel-aic-common: Prevent clobbering of priority when changing IRQ type) $ git merge irqchip/irqchip/for-next Already up-to-date. Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1) $ git merge tiny/tiny/next Already up-to-date. Merging ftrace/for-next (14a5ae40f0de tracing: Use IS_ERR() check for return value of tracing_init_dentry()) $ git merge ftrace/for-next Auto-merging kernel/trace/trace_uprobe.c Auto-merging kernel/trace/trace_kprobe.c Auto-merging kernel/trace/trace_events.c Auto-merging kernel/trace/trace.c Auto-merging kernel/trace/ftrace.c Merge made by the 'recursive' strategy. kernel/trace/ftrace.c | 2 +- kernel/trace/ring_buffer.c | 2 - kernel/trace/trace.c | 134 ++++++++++++----------------------- kernel/trace/trace.h | 1 + kernel/trace/trace_branch.c | 1 - kernel/trace/trace_events.c | 2 +- kernel/trace/trace_export.c | 2 - kernel/trace/trace_functions_graph.c | 2 +- kernel/trace/trace_irqsoff.c | 2 - kernel/trace/trace_kprobe.c | 2 +- kernel/trace/trace_nop.c | 2 - kernel/trace/trace_printk.c | 4 +- kernel/trace/trace_sched_switch.c | 2 - kernel/trace/trace_sched_wakeup.c | 2 - kernel/trace/trace_stack.c | 4 +- kernel/trace/trace_stat.c | 2 +- kernel/trace/trace_uprobe.c | 2 +- 17 files changed, 56 insertions(+), 112 deletions(-) Merging rcu/rcu/next (83f019eafc4b rcu: Reverse rcu_dereference_check() conditions) $ git merge rcu/rcu/next Auto-merging lib/Kconfig.debug Auto-merging arch/x86/kernel/smpboot.c Auto-merging Documentation/kernel-parameters.txt Merge made by the 'recursive' strategy. Documentation/atomic_ops.txt | 45 +-- Documentation/kernel-parameters.txt | 20 +- Documentation/kernel-per-CPU-kthreads.txt | 34 ++- Documentation/timers/NO_HZ.txt | 10 +- arch/x86/kernel/smpboot.c | 10 +- include/linux/cpu.h | 4 + include/linux/lockdep.h | 7 +- include/linux/rcupdate.h | 19 +- include/linux/srcu.h | 2 +- kernel/cpu.c | 4 +- kernel/rcu/srcu.c | 17 -- kernel/rcu/tree.c | 311 ++++++++++++++------- kernel/rcu/tree.h | 10 +- kernel/rcu/tree_plugin.h | 146 +++++----- kernel/rcu/tree_trace.c | 3 +- kernel/rcu/update.c | 15 +- kernel/sched/idle.c | 9 +- lib/Kconfig.debug | 35 ++- .../selftests/rcutorture/configs/rcu/CFcommon | 1 + 19 files changed, 429 insertions(+), 273 deletions(-) Merging kvm/linux-next (8fff5e374a2f Merge tag 'kvm-s390-next-20150122' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-next) $ git merge kvm/linux-next Resolved 'arch/arm/kvm/Kconfig' using previous resolution. Resolved 'arch/arm/kvm/mmu.c' using previous resolution. Resolved 'arch/arm64/kvm/sys_regs.c' using previous resolution. Auto-merging drivers/s390/char/sclp_early.c Auto-merging drivers/irqchip/irq-gic-v3.c Auto-merging arch/x86/kvm/lapic.c Auto-merging arch/x86/kvm/emulate.c Auto-merging arch/x86/kvm/Kconfig Auto-merging arch/x86/include/uapi/asm/msr-index.h Auto-merging arch/s390/include/asm/sclp.h Auto-merging arch/arm64/kvm/sys_regs.c CONFLICT (content): Merge conflict in arch/arm64/kvm/sys_regs.c Auto-merging arch/arm64/kvm/hyp.S Auto-merging arch/arm64/kvm/Kconfig CONFLICT (content): Merge conflict in arch/arm64/kvm/Kconfig Auto-merging arch/arm64/kernel/asm-offsets.c Auto-merging arch/arm64/include/asm/kvm_mmu.h Auto-merging arch/arm64/include/asm/kvm_host.h Auto-merging arch/arm64/include/asm/kvm_emulate.h Auto-merging arch/arm/kvm/trace.h Auto-merging arch/arm/kvm/mmu.c CONFLICT (content): Merge conflict in arch/arm/kvm/mmu.c Auto-merging arch/arm/kvm/arm.c Auto-merging arch/arm/kvm/Kconfig CONFLICT (content): Merge conflict in arch/arm/kvm/Kconfig Auto-merging arch/arm/include/asm/kvm_mmu.h Auto-merging arch/arm/include/asm/kvm_host.h Auto-merging arch/arm/include/asm/kvm_emulate.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/arm64/kvm/Kconfig'. [master e8c74925da4a] Merge remote-tracking branch 'kvm/linux-next' $ git diff -M --stat --summary HEAD^.. Documentation/virtual/kvm/api.txt | 35 +- Documentation/virtual/kvm/devices/arm-vgic.txt | 37 +- Documentation/virtual/kvm/devices/vm.txt | 14 + arch/arm/include/asm/kvm_asm.h | 1 + arch/arm/include/asm/kvm_emulate.h | 5 +- arch/arm/include/asm/kvm_host.h | 5 + arch/arm/include/asm/kvm_mmio.h | 1 + arch/arm/include/asm/kvm_mmu.h | 21 + arch/arm/include/asm/pgtable-3level.h | 1 + arch/arm/include/uapi/asm/kvm.h | 2 + arch/arm/kvm/Kconfig | 2 + arch/arm/kvm/Makefile | 1 + arch/arm/kvm/arm.c | 58 +- arch/arm/kvm/handle_exit.c | 8 +- arch/arm/kvm/interrupts.S | 11 + arch/arm/kvm/mmu.c | 257 +++++- arch/arm/kvm/psci.c | 17 +- arch/arm/kvm/trace.h | 11 +- arch/arm64/include/asm/esr.h | 1 + arch/arm64/include/asm/kvm_asm.h | 1 + arch/arm64/include/asm/kvm_emulate.h | 10 +- arch/arm64/include/asm/kvm_host.h | 6 + arch/arm64/include/asm/kvm_mmio.h | 1 + arch/arm64/include/asm/kvm_mmu.h | 21 + arch/arm64/include/asm/pgtable-hwdef.h | 1 + arch/arm64/include/uapi/asm/kvm.h | 9 + arch/arm64/kernel/asm-offsets.c | 1 + arch/arm64/kvm/Kconfig | 2 + arch/arm64/kvm/Makefile | 2 + arch/arm64/kvm/handle_exit.c | 13 +- arch/arm64/kvm/hyp.S | 22 + arch/arm64/kvm/sys_regs.c | 40 +- arch/arm64/kvm/trace.h | 55 ++ arch/arm64/kvm/vgic-v3-switch.S | 14 +- arch/mips/kvm/mips.c | 3 +- arch/powerpc/kvm/powerpc.c | 3 +- arch/s390/include/asm/kvm_host.h | 28 +- arch/s390/include/asm/sclp.h | 4 +- arch/s390/include/uapi/asm/kvm.h | 16 + arch/s390/kvm/intercept.c | 41 +- arch/s390/kvm/interrupt.c | 189 ++-- arch/s390/kvm/kvm-s390.c | 324 ++++++- arch/s390/kvm/kvm-s390.h | 6 +- arch/s390/kvm/sigp.c | 160 ++-- arch/s390/kvm/trace-s390.h | 14 +- arch/x86/include/asm/kvm_host.h | 20 +- arch/x86/include/uapi/asm/msr-index.h | 3 + arch/x86/include/uapi/asm/vmx.h | 5 + arch/x86/kvm/Kconfig | 1 + arch/x86/kvm/emulate.c | 144 +-- arch/x86/kvm/lapic.c | 73 +- arch/x86/kvm/lapic.h | 3 + arch/x86/kvm/mmu.c | 116 ++- arch/x86/kvm/mmu.h | 17 +- arch/x86/kvm/svm.c | 4 +- arch/x86/kvm/trace.h | 20 + arch/x86/kvm/vmx.c | 240 ++++- arch/x86/kvm/x86.c | 124 ++- arch/x86/kvm/x86.h | 3 + drivers/irqchip/irq-gic-v3.c | 14 +- drivers/s390/char/sclp_early.c | 8 + include/kvm/arm_vgic.h | 43 +- include/linux/irqchip/arm-gic-v3.h | 44 + include/linux/kvm_host.h | 13 +- include/uapi/linux/kvm.h | 9 + virt/kvm/Kconfig | 6 + virt/kvm/arm/vgic-v2-emul.c | 847 ++++++++++++++++++ virt/kvm/arm/vgic-v2.c | 4 + virt/kvm/arm/vgic-v3-emul.c | 1036 ++++++++++++++++++++++ virt/kvm/arm/vgic-v3.c | 82 +- virt/kvm/arm/vgic.c | 1127 ++++++------------------ virt/kvm/arm/vgic.h | 123 +++ virt/kvm/kvm_main.c | 83 ++ 73 files changed, 4322 insertions(+), 1364 deletions(-) create mode 100644 arch/arm64/kvm/trace.h create mode 100644 virt/kvm/arm/vgic-v2-emul.c create mode 100644 virt/kvm/arm/vgic-v3-emul.c create mode 100644 virt/kvm/arm/vgic.h Merging kvm-arm/next (4b990589952f KVM: Remove unused config symbol) $ git merge kvm-arm/next Already up-to-date. Merging kvm-ppc/kvm-ppc-next (2c4aa55a6af0 Merge tag 'signed-kvm-ppc-next' of git://github.com/agraf/linux-2.6 into HEAD) $ git merge kvm-ppc/kvm-ppc-next Already up-to-date. Merging kvms390/next (c1e40d9ae52a s390/kernel: Update /proc/sysinfo file with Extended Name and UUID) $ git merge kvms390/next Auto-merging arch/s390/kernel/sysinfo.c Auto-merging arch/s390/include/asm/sysinfo.h Merge made by the 'recursive' strategy. arch/s390/include/asm/sysinfo.h | 10 +++++++--- arch/s390/kernel/sysinfo.c | 29 +++++++++++++++++++++++++++++ arch/s390/kvm/interrupt.c | 2 ++ arch/s390/kvm/kvm-s390.c | 2 +- 4 files changed, 39 insertions(+), 4 deletions(-) Merging xen-tip/linux-next (dab069c61aa3 xen/gntdev: provide find_special_page VMA operation) $ git merge xen-tip/linux-next Auto-merging mm/memory.c Auto-merging include/linux/mm.h Auto-merging drivers/net/xen-netback/netback.c Merge made by the 'recursive' strategy. arch/arm/include/asm/xen/page.h | 2 +- arch/arm/xen/enlighten.c | 4 +- arch/arm/xen/mm.c | 2 +- arch/arm/xen/p2m.c | 2 +- arch/x86/include/asm/xen/page.h | 20 +-- arch/x86/xen/mmu.c | 17 ++- arch/x86/xen/p2m.c | 267 ++---------------------------------- arch/x86/xen/setup.c | 37 ++--- arch/x86/xen/smp.c | 2 +- arch/x86/xen/time.c | 4 + arch/x86/xen/xen-ops.h | 6 + drivers/block/xen-blkback/blkback.c | 177 ++++++++++++++++-------- drivers/block/xen-blkback/common.h | 3 + drivers/net/xen-netback/interface.c | 7 +- drivers/net/xen-netback/netback.c | 106 ++------------ drivers/xen/balloon.c | 86 +----------- drivers/xen/gntdev.c | 143 ++++++++++++++----- drivers/xen/grant-table.c | 120 +++++++++++++++- drivers/xen/tmem.c | 2 +- drivers/xen/xen-scsiback.c | 6 +- include/linux/mm.h | 8 ++ include/linux/page-flags.h | 5 + include/xen/grant_table.h | 43 +++++- include/xen/interface/features.h | 6 + include/xen/interface/grant_table.h | 7 + mm/memory.c | 2 + 26 files changed, 495 insertions(+), 589 deletions(-) Merging percpu/for-next (4c907baf36d8 percpu_ref: implement percpu_ref_is_dying()) $ git merge percpu/for-next Merge made by the 'recursive' strategy. include/linux/percpu-refcount.h | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) Merging workqueues/for-next (b5b3ab523e31 Merge branch 'for-3.19-fixes' into for-next) $ git merge workqueues/for-next Merge made by the 'recursive' strategy. include/linux/workqueue.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) Merging drivers-x86/for-next (ed52ccbce7ff asus-laptop: use DEVICE_ATTR_xx macros) $ git merge drivers-x86/for-next Merge made by the 'recursive' strategy. drivers/platform/x86/asus-laptop.c | 97 ++++---- drivers/platform/x86/fujitsu-laptop.c | 7 +- drivers/platform/x86/intel_scu_ipc.c | 77 +++--- drivers/platform/x86/samsung-laptop.c | 20 +- drivers/platform/x86/toshiba_acpi.c | 455 ++++++++++++++++++++++++++++++++++ 5 files changed, 555 insertions(+), 101 deletions(-) Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_laptop - Add a limit for deferred retries) $ git merge chrome-platform/for-next Already up-to-date. Merging regmap/for-next (d367ebab510a Merge remote-tracking branches 'regmap/topic/ac97' and 'regmap/topic/doc' into regmap-next) $ git merge regmap/for-next Merge made by the 'recursive' strategy. drivers/base/regmap/internal.h | 6 ++++-- drivers/base/regmap/regmap-ac97.c | 4 ++-- include/linux/regmap.h | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) Merging hsi/for-next (67e9a2ce6e07 hsi: nokia-modem: fix uninitialized device pointer) $ git merge hsi/for-next Merge made by the 'recursive' strategy. drivers/hsi/clients/nokia-modem.c | 1 + 1 file changed, 1 insertion(+) Merging leds/for-next (4552d2ee3ccb DT: leds: Add led-sources property) $ git merge leds/for-next Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/leds/common.txt | 30 ++ drivers/leds/Kconfig | 10 + drivers/leds/Makefile | 1 + drivers/leds/led-class-flash.c | 486 ++++++++++++++++++++++ drivers/leds/led-class.c | 9 +- drivers/leds/leds-mc13783.c | 4 +- drivers/leds/leds.h | 3 +- include/linux/led-class-flash.h | 207 +++++++++ include/linux/leds.h | 3 + 9 files changed, 746 insertions(+), 7 deletions(-) create mode 100644 drivers/leds/led-class-flash.c create mode 100644 include/linux/led-class-flash.h Merging ipmi/for-next (b942c653ae26 Merge tag 'trace-sh-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) $ git merge ipmi/for-next Already up-to-date. Merging driver-core/driver-core-next (26bc420b59a3 Linux 3.19-rc6) $ git merge driver-core/driver-core-next Already up-to-date. Merging tty/tty-next (eb1527a8738b tty/serial: serial8250_set_divisor() can be static) $ git merge tty/tty-next Removing drivers/tty/serial/mrst_max3110.h Removing drivers/tty/serial/mrst_max3110.c Auto-merging drivers/tty/serial/Kconfig Removing arch/x86/platform/intel-mid/device_libs/platform_max3111.c Auto-merging arch/arm/boot/dts/exynos4412-trats2.dts Auto-merging arch/arm/boot/dts/exynos4412-odroid-common.dtsi Auto-merging arch/arm/boot/dts/exynos4210-universal_c210.dts Auto-merging arch/arm/boot/dts/exynos4210-trats.dts Auto-merging Documentation/kernel-parameters.txt Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/arm/sprd.txt | 11 + .../devicetree/bindings/serial/digicolor-usart.txt | 27 + .../devicetree/bindings/serial/sirf-uart.txt | 4 +- .../devicetree/bindings/serial/sprd-uart.txt | 7 + .../devicetree/bindings/vendor-prefixes.txt | 2 + Documentation/kernel-parameters.txt | 12 + arch/arm/boot/dts/exynos4210-origen.dts | 1 + arch/arm/boot/dts/exynos4210-smdkv310.dts | 1 + arch/arm/boot/dts/exynos4210-trats.dts | 1 + arch/arm/boot/dts/exynos4210-universal_c210.dts | 1 + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 4 + arch/arm/boot/dts/exynos4412-origen.dts | 1 + arch/arm/boot/dts/exynos4412-smdk4412.dts | 1 + arch/arm/boot/dts/exynos4412-tiny4412.dts | 4 + arch/arm/boot/dts/exynos4412-trats2.dts | 1 + arch/x86/include/asm/intel-mid.h | 3 - arch/x86/kernel/early_printk.c | 187 ++++- arch/x86/platform/intel-mid/device_libs/Makefile | 2 - .../intel-mid/device_libs/platform_max3111.c | 35 - .../platform/intel-mid/early_printk_intel_mid.c | 220 +---- drivers/bluetooth/hci_ath.c | 15 +- drivers/pnp/driver.c | 2 +- drivers/tty/amiserial.c | 2 +- drivers/tty/isicom.c | 2 +- drivers/tty/n_tty.c | 254 +++--- drivers/tty/pty.c | 31 +- drivers/tty/rocket.c | 4 +- drivers/tty/serial/8250/8250_core.c | 228 ++++-- drivers/tty/serial/8250/8250_dma.c | 6 +- drivers/tty/serial/8250/8250_dw.c | 11 + drivers/tty/serial/8250/8250_early.c | 13 +- drivers/tty/serial/8250/8250_omap.c | 88 +- drivers/tty/serial/8250/8250_pci.c | 4 +- drivers/tty/serial/8250/8250_pnp.c | 8 +- drivers/tty/serial/8250/Kconfig | 19 + drivers/tty/serial/Kconfig | 44 +- drivers/tty/serial/Makefile | 3 +- drivers/tty/serial/altera_jtaguart.c | 1 + drivers/tty/serial/altera_uart.c | 1 + drivers/tty/serial/atmel_serial.c | 153 ++-- drivers/tty/serial/digicolor-usart.c | 560 +++++++++++++ drivers/tty/serial/fsl_lpuart.c | 135 +-- drivers/tty/serial/imx.c | 190 ++++- drivers/tty/serial/mcf.c | 7 +- drivers/tty/serial/men_z135_uart.c | 155 ++-- drivers/tty/serial/mrst_max3110.c | 909 --------------------- drivers/tty/serial/mrst_max3110.h | 61 -- drivers/tty/serial/msm_serial.c | 27 +- drivers/tty/serial/mxs-auart.c | 55 +- drivers/tty/serial/of_serial.c | 8 + drivers/tty/serial/omap-serial.c | 37 +- drivers/tty/serial/samsung.c | 678 ++++++++++++++- drivers/tty/serial/samsung.h | 42 + drivers/tty/serial/serial_core.c | 111 ++- drivers/tty/serial/sh-sci.c | 25 +- drivers/tty/serial/sirfsoc_uart.c | 40 +- drivers/tty/serial/sirfsoc_uart.h | 4 +- drivers/tty/serial/sprd_serial.c | 793 ++++++++++++++++++ drivers/tty/serial/xilinx_uartps.c | 10 +- drivers/tty/tty_buffer.c | 6 + drivers/tty/tty_ioctl.c | 3 +- drivers/tty/tty_mutex.c | 18 +- drivers/tty/vt/vt.c | 18 +- include/linux/pnp.h | 12 +- include/linux/serial_8250.h | 4 + include/linux/serial_core.h | 22 +- include/linux/serial_s3c.h | 28 + include/linux/tty.h | 25 +- include/linux/vt_buffer.h | 4 - include/uapi/linux/serial_core.h | 9 +- include/uapi/linux/serial_reg.h | 3 +- 71 files changed, 3505 insertions(+), 1908 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/sprd.txt create mode 100644 Documentation/devicetree/bindings/serial/digicolor-usart.txt create mode 100644 Documentation/devicetree/bindings/serial/sprd-uart.txt delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_max3111.c create mode 100644 drivers/tty/serial/digicolor-usart.c delete mode 100644 drivers/tty/serial/mrst_max3110.c delete mode 100644 drivers/tty/serial/mrst_max3110.h create mode 100644 drivers/tty/serial/sprd_serial.c Merging usb/usb-next (b3a54bf9ed76 Merge 3.19-rc7 into usb-next) $ git merge usb/usb-next Auto-merging Documentation/usb/usbmon.txt Merge made by the 'recursive' strategy. .../devicetree/bindings/phy/phy-miphy28lp.txt | 43 +++--- .../devicetree/bindings/phy/rockchip-usb-phy.txt | 37 +++++ .../devicetree/bindings/phy/samsung-phy.txt | 2 +- Documentation/devicetree/bindings/usb/usb-ehci.txt | 1 + Documentation/usb/usbmon.txt | 2 +- arch/mips/cavium-octeon/octeon-platform.c | 152 ++++++++------------ drivers/phy/Kconfig | 7 + drivers/phy/Makefile | 1 + drivers/phy/phy-armada375-usb2.c | 4 +- drivers/phy/phy-exynos-mipi-video.c | 89 +++++++----- drivers/phy/phy-miphy28lp.c | 61 ++++---- drivers/phy/phy-rockchip-usb.c | 158 +++++++++++++++++++++ drivers/phy/phy-ti-pipe3.c | 143 +++++++++++++++---- drivers/usb/class/cdc-acm.c | 54 ++++--- drivers/usb/core/buffer.c | 26 ++-- drivers/usb/core/devio.c | 63 ++++---- drivers/usb/core/driver.c | 29 ++-- drivers/usb/core/hcd.c | 16 +-- drivers/usb/core/hub.c | 33 ++--- drivers/usb/core/message.c | 23 +-- drivers/usb/core/usb.c | 1 + drivers/usb/dwc2/hcd.c | 4 +- drivers/usb/gadget/udc/bdc/bdc_core.c | 1 - drivers/usb/gadget/udc/dummy_hcd.c | 8 +- drivers/usb/host/ehci-atmel.c | 102 +++++++++---- drivers/usb/host/ehci-fsl.c | 1 - drivers/usb/host/ehci-grlib.c | 1 - drivers/usb/host/ehci-hcd.c | 6 +- drivers/usb/host/ehci-hub.c | 8 +- drivers/usb/host/ehci-pci.c | 23 ++- drivers/usb/host/ehci-platform.c | 92 ++++++++---- drivers/usb/host/ehci-pmcmsp.c | 1 - drivers/usb/host/ehci-ppc-of.c | 1 - drivers/usb/host/ehci-sead3.c | 1 - drivers/usb/host/ehci-sh.c | 1 - drivers/usb/host/ehci-tilegx.c | 1 - drivers/usb/host/ehci-xilinx-of.c | 1 - drivers/usb/host/ehci.h | 2 +- drivers/usb/host/fhci-hub.c | 9 +- drivers/usb/host/fotg210-hcd.c | 4 +- drivers/usb/host/fusbh200-hcd.c | 4 +- drivers/usb/host/imx21-hcd.c | 5 +- drivers/usb/host/isp116x-hcd.c | 5 +- drivers/usb/host/isp1362-hcd.c | 8 +- drivers/usb/host/isp1760-hcd.c | 13 +- drivers/usb/host/max3421-hcd.c | 6 +- drivers/usb/host/ohci-at91.c | 132 ++++++++++------- drivers/usb/host/ohci-da8xx.c | 1 - drivers/usb/host/ohci-hub.c | 10 +- drivers/usb/host/ohci-jz4740.c | 1 - drivers/usb/host/ohci-platform.c | 83 ++++++++--- drivers/usb/host/ohci-ppc-of.c | 1 - drivers/usb/host/ohci-s3c2410.c | 6 +- drivers/usb/host/ohci-sm501.c | 1 - drivers/usb/host/ohci-tilegx.c | 1 - drivers/usb/host/ohci-tmio.c | 1 - drivers/usb/host/oxu210hp-hcd.c | 10 +- drivers/usb/host/pci-quirks.c | 46 +++--- drivers/usb/host/r8a66597-hcd.c | 13 +- drivers/usb/host/sl811-hcd.c | 10 +- drivers/usb/host/u132-hcd.c | 10 +- drivers/usb/host/uhci-grlib.c | 1 - drivers/usb/host/uhci-platform.c | 1 - drivers/usb/host/xhci-dbg.c | 2 +- drivers/usb/host/xhci-mem.c | 31 ++-- drivers/usb/host/xhci-ring.c | 12 +- drivers/usb/host/xhci.c | 78 +++++----- drivers/usb/host/xhci.h | 12 +- drivers/usb/image/microtek.c | 4 +- drivers/usb/misc/uss720.c | 12 +- drivers/usb/musb/musb_virthub.c | 7 +- drivers/usb/renesas_usbhs/mod_host.c | 3 +- drivers/usb/serial/mos7840.c | 60 -------- drivers/usb/serial/option.c | 60 ++------ drivers/usb/usbip/vhci_hcd.c | 3 +- drivers/usb/wusbcore/rh.c | 4 +- drivers/uwb/lc-dev.c | 7 - include/linux/mfd/syscon/exynos4-pmu.h | 21 +++ include/linux/mod_devicetable.h | 6 +- include/linux/usb.h | 7 +- include/linux/usb/ehci_pdriver.h | 4 + include/linux/usb/hcd.h | 3 + include/uapi/linux/usbdevice_fs.h | 3 +- 83 files changed, 1140 insertions(+), 780 deletions(-) create mode 100644 Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt create mode 100644 drivers/phy/phy-rockchip-usb.c create mode 100644 include/linux/mfd/syscon/exynos4-pmu.h Merging usb-gadget/next (8333d3cd06f8 usb: gadget: Kconfig: use bool instead of boolean) $ git merge usb-gadget/next Resolved 'drivers/usb/musb/musb_virthub.c' using previous resolution. Auto-merging drivers/usb/musb/musb_virthub.c CONFLICT (content): Merge conflict in drivers/usb/musb/musb_virthub.c Auto-merging drivers/usb/isp1760/isp1760-hcd.c Removing drivers/usb/host/isp1760-if.c Removing drivers/usb/host/isp1760-hcd.h Auto-merging drivers/usb/gadget/udc/dummy_hcd.c Auto-merging drivers/usb/gadget/udc/atmel_usba_udc.c Auto-merging drivers/usb/gadget/udc/at91_udc.h Auto-merging drivers/usb/gadget/udc/at91_udc.c Auto-merging drivers/usb/gadget/Kconfig Auto-merging drivers/usb/dwc2/hcd.c Auto-merging MAINTAINERS Auto-merging Documentation/devicetree/bindings/usb/atmel-usb.txt Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 46352ff84338] Merge remote-tracking branch 'usb-gadget/next' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/configfs-usb-gadget-uvc | 265 +++ .../devicetree/bindings/usb/atmel-usb.txt | 5 +- Documentation/devicetree/bindings/usb/dwc2.txt | 4 + .../devicetree/bindings/usb/renesas_usbhs.txt | 2 + .../devicetree/bindings/usb/usb-nop-xceiv.txt | 10 +- Documentation/usb/gadget-testing.txt | 728 ++++++ Documentation/usb/gadget_serial.txt | 8 +- MAINTAINERS | 2 +- drivers/staging/emxx_udc/emxx_udc.c | 9 +- drivers/staging/emxx_udc/emxx_udc.h | 1 - drivers/usb/Kconfig | 2 + drivers/usb/Makefile | 2 +- drivers/usb/chipidea/udc.c | 18 +- drivers/usb/dwc2/Kconfig | 4 +- drivers/usb/dwc2/core.c | 2 +- drivers/usb/dwc2/core.h | 60 +- drivers/usb/dwc2/gadget.c | 1191 +++++++--- drivers/usb/dwc2/hcd.c | 96 +- drivers/usb/dwc2/hw.h | 2 + drivers/usb/dwc2/platform.c | 36 +- drivers/usb/dwc3/Kconfig | 6 - drivers/usb/dwc3/Makefile | 1 - drivers/usb/dwc3/core.c | 2 +- drivers/usb/dwc3/core.h | 5 - drivers/usb/dwc3/dwc3-pci.c | 178 +- drivers/usb/dwc3/ep0.c | 2 +- drivers/usb/dwc3/gadget.c | 82 +- drivers/usb/dwc3/trace.h | 10 + drivers/usb/gadget/Kconfig | 11 + drivers/usb/gadget/composite.c | 2 +- drivers/usb/gadget/function/Makefile | 2 +- drivers/usb/gadget/function/f_fs.c | 119 +- drivers/usb/gadget/function/f_hid.c | 2 +- drivers/usb/gadget/function/f_sourcesink.c | 20 +- drivers/usb/gadget/function/f_uac1.c | 16 +- drivers/usb/gadget/function/f_uvc.c | 136 +- drivers/usb/gadget/function/u_ether.c | 4 +- drivers/usb/gadget/function/u_fs.h | 25 + drivers/usb/gadget/function/u_uac1.c | 3 +- drivers/usb/gadget/function/u_uac1.h | 1 - drivers/usb/gadget/function/u_uvc.h | 52 +- drivers/usb/gadget/function/uvc_configfs.c | 2468 ++++++++++++++++++++ drivers/usb/gadget/function/uvc_configfs.h | 22 + drivers/usb/gadget/udc/at91_udc.c | 8 +- drivers/usb/gadget/udc/at91_udc.h | 1 - drivers/usb/gadget/udc/atmel_usba_udc.c | 147 +- drivers/usb/gadget/udc/atmel_usba_udc.h | 9 + drivers/usb/gadget/udc/bdc/bdc_ep.c | 10 +- drivers/usb/gadget/udc/bdc/bdc_udc.c | 1 + drivers/usb/gadget/udc/dummy_hcd.c | 1 + drivers/usb/gadget/udc/fsl_qe_udc.c | 2 +- drivers/usb/gadget/udc/fsl_udc_core.c | 5 +- drivers/usb/gadget/udc/lpc32xx_udc.c | 12 +- drivers/usb/gadget/udc/mv_udc_core.c | 3 - drivers/usb/gadget/udc/net2272.c | 7 +- drivers/usb/gadget/udc/net2272.h | 1 - drivers/usb/gadget/udc/net2280.c | 533 ++--- drivers/usb/gadget/udc/net2280.h | 24 +- drivers/usb/gadget/udc/omap_udc.c | 1 + drivers/usb/gadget/udc/pch_udc.c | 1 + drivers/usb/gadget/udc/pxa25x_udc.c | 2 - drivers/usb/gadget/udc/pxa27x_udc.c | 2 - drivers/usb/gadget/udc/r8a66597-udc.c | 1 + drivers/usb/gadget/udc/s3c2410_udc.c | 21 +- drivers/usb/gadget/udc/udc-core.c | 2 + drivers/usb/host/Kconfig | 14 - drivers/usb/host/Makefile | 3 - drivers/usb/host/isp1760-hcd.h | 208 -- drivers/usb/host/isp1760-if.c | 477 ---- drivers/usb/isp1760/Kconfig | 59 + drivers/usb/isp1760/Makefile | 5 + drivers/usb/isp1760/isp1760-core.c | 177 ++ drivers/usb/isp1760/isp1760-core.h | 68 + drivers/usb/{host => isp1760}/isp1760-hcd.c | 278 +-- drivers/usb/isp1760/isp1760-hcd.h | 102 + drivers/usb/isp1760/isp1760-if.c | 309 +++ drivers/usb/isp1760/isp1760-regs.h | 230 ++ drivers/usb/isp1760/isp1760-udc.c | 1498 ++++++++++++ drivers/usb/isp1760/isp1760-udc.h | 106 + drivers/usb/musb/Kconfig | 7 +- drivers/usb/musb/blackfin.c | 2 +- drivers/usb/musb/musb_cppi41.c | 24 +- drivers/usb/musb/musb_debugfs.c | 2 +- drivers/usb/musb/musb_gadget.c | 4 +- drivers/usb/musb/musb_gadget_ep0.c | 2 +- drivers/usb/musb/musb_virthub.c | 3 +- drivers/usb/phy/phy-fsl-usb.c | 35 - drivers/usb/phy/phy-generic.c | 150 +- drivers/usb/phy/phy-generic.h | 10 +- drivers/usb/phy/phy-mxs-usb.c | 86 +- drivers/usb/renesas_usbhs/common.c | 25 +- drivers/usb/renesas_usbhs/common.h | 3 + drivers/usb/renesas_usbhs/fifo.c | 25 +- drivers/usb/renesas_usbhs/mod_gadget.c | 2 + include/linux/usb/gadget.h | 2 + include/linux/usb/phy.h | 4 +- include/linux/usb/usb_phy_generic.h | 2 + include/uapi/linux/usb/functionfs.h | 1 + .../usb/ffs-aio-example/multibuff/host_app/test.c | 14 +- .../ffs-aio-example/simple/device_app/aio_simple.c | 2 + tools/usb/ffs-aio-example/simple/host_app/test.c | 17 +- 101 files changed, 8127 insertions(+), 2239 deletions(-) create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-uvc create mode 100644 Documentation/usb/gadget-testing.txt create mode 100644 drivers/usb/gadget/function/uvc_configfs.c create mode 100644 drivers/usb/gadget/function/uvc_configfs.h delete mode 100644 drivers/usb/host/isp1760-hcd.h delete mode 100644 drivers/usb/host/isp1760-if.c create mode 100644 drivers/usb/isp1760/Kconfig create mode 100644 drivers/usb/isp1760/Makefile create mode 100644 drivers/usb/isp1760/isp1760-core.c create mode 100644 drivers/usb/isp1760/isp1760-core.h rename drivers/usb/{host => isp1760}/isp1760-hcd.c (91%) create mode 100644 drivers/usb/isp1760/isp1760-hcd.h create mode 100644 drivers/usb/isp1760/isp1760-if.c create mode 100644 drivers/usb/isp1760/isp1760-regs.h create mode 100644 drivers/usb/isp1760/isp1760-udc.c create mode 100644 drivers/usb/isp1760/isp1760-udc.h Merging usb-serial/usb-next (3e264ffc831e USB: mos7840: remove unused code) $ git merge usb-serial/usb-next Already up-to-date. Merging staging/staging-next (178cf7de6f1d Merge 3.19-rc7 into staging-next) $ git merge staging/staging-next Removing drivers/staging/unisys/visorchipset/testing.h Removing drivers/staging/unisys/channels/chanstub.h Removing drivers/staging/unisys/channels/chanstub.c Removing drivers/staging/unisys/channels/channel.c Removing drivers/staging/unisys/channels/Makefile Removing drivers/staging/unisys/channels/Kconfig Auto-merging drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c Auto-merging drivers/staging/lustre/lustre/llite/file.c Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c Removing drivers/staging/android/uapi/android_alarm.h Removing drivers/staging/android/logger.h Removing drivers/staging/android/logger.c Removing drivers/staging/android/android_alarm.h Removing drivers/staging/android/alarm-dev.c Auto-merging drivers/staging/Makefile Auto-merging drivers/staging/Kconfig Removing drivers/iio/magnetometer/ak09911.c Auto-merging drivers/iio/Kconfig Auto-merging MAINTAINERS Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt Auto-merging Documentation/devicetree/bindings/i2c/trivial-devices.txt Merge made by the 'recursive' strategy. Documentation/ABI/testing/sysfs-bus-iio | 200 +- .../devicetree/bindings/i2c/trivial-devices.txt | 1 + .../devicetree/bindings/iio/adc/cc10001_adc.txt | 22 + .../devicetree/bindings/iio/adc/qcom,spmi-vadc.txt | 129 ++ .../devicetree/bindings/iio/sensorhub.txt | 25 + .../bindings/staging/iio/adc/mxs-lradc.txt | 4 +- .../devicetree/bindings/vendor-prefixes.txt | 1 + Documentation/driver-model/devres.txt | 2 + MAINTAINERS | 20 + drivers/iio/Kconfig | 1 - drivers/iio/accel/Kconfig | 31 + drivers/iio/accel/Makefile | 6 + drivers/iio/accel/hid-sensor-accel-3d.c | 8 +- drivers/iio/accel/kxcjk-1013.c | 52 +- drivers/iio/accel/mma8452.c | 2 +- drivers/iio/accel/mma9551.c | 637 ++++++ drivers/iio/accel/mma9551_core.c | 798 +++++++ drivers/iio/accel/mma9551_core.h | 81 + drivers/iio/accel/mma9553.c | 1334 +++++++++++ drivers/iio/accel/ssp_accel_sensor.c | 169 ++ drivers/iio/adc/Kconfig | 25 + drivers/iio/adc/Makefile | 2 + drivers/iio/adc/cc10001_adc.c | 423 ++++ drivers/iio/adc/qcom-spmi-vadc.c | 1016 +++++++++ drivers/iio/adc/ti_am335x_adc.c | 11 +- drivers/iio/amplifiers/ad8366.c | 4 +- drivers/iio/common/Kconfig | 1 + drivers/iio/common/Makefile | 1 + .../iio/common/hid-sensors/hid-sensor-trigger.c | 75 +- .../iio/common/hid-sensors/hid-sensor-trigger.h | 5 + drivers/iio/common/ssp_sensors/Kconfig | 26 + drivers/iio/common/ssp_sensors/Makefile | 8 + drivers/iio/common/ssp_sensors/ssp.h | 257 +++ drivers/iio/common/ssp_sensors/ssp_dev.c | 712 ++++++ drivers/iio/common/ssp_sensors/ssp_iio.c | 107 + drivers/iio/common/ssp_sensors/ssp_iio_sensor.h | 71 + drivers/iio/common/ssp_sensors/ssp_spi.c | 608 +++++ drivers/iio/common/st_sensors/st_sensors_spi.c | 2 +- drivers/iio/frequency/ad9523.c | 2 +- drivers/iio/frequency/adf4350.c | 7 +- drivers/iio/gyro/Makefile | 2 + drivers/iio/gyro/hid-sensor-gyro-3d.c | 8 +- drivers/iio/gyro/ssp_gyro_sensor.c | 168 ++ drivers/iio/iio_core.h | 9 + drivers/iio/imu/Kconfig | 11 + drivers/iio/imu/Makefile | 2 + drivers/iio/imu/inv_mpu6050/Kconfig | 1 + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 124 +- drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 6 + drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 39 +- drivers/iio/imu/kmx61.c | 1595 +++++++++++++ drivers/iio/industrialio-buffer.c | 410 ++-- drivers/iio/industrialio-core.c | 57 +- drivers/iio/industrialio-event.c | 15 +- drivers/iio/industrialio-triggered-buffer.c | 13 +- drivers/iio/inkern.c | 30 +- drivers/iio/kfifo_buf.c | 87 +- drivers/iio/light/Kconfig | 24 + drivers/iio/light/Makefile | 2 + drivers/iio/light/cm32181.c | 2 +- drivers/iio/light/cm3232.c | 403 ++++ drivers/iio/light/hid-sensor-als.c | 9 +- drivers/iio/light/hid-sensor-prox.c | 10 +- drivers/iio/light/jsa1212.c | 471 ++++ drivers/iio/light/lm3533-als.c | 2 +- drivers/iio/light/tcs3414.c | 4 +- drivers/iio/magnetometer/Kconfig | 15 +- drivers/iio/magnetometer/Makefile | 1 - drivers/iio/magnetometer/ak09911.c | 326 --- drivers/iio/magnetometer/ak8975.c | 505 +++-- drivers/iio/magnetometer/hid-sensor-magn-3d.c | 9 +- drivers/iio/orientation/hid-sensor-incl-3d.c | 9 +- drivers/iio/pressure/bmp280.c | 150 +- drivers/iio/pressure/hid-sensor-press.c | 9 +- drivers/iio/proximity/Kconfig | 17 + drivers/iio/proximity/Makefile | 1 + drivers/iio/proximity/as3935.c | 18 +- drivers/iio/proximity/sx9500.c | 752 +++++++ drivers/iio/trigger/iio-trig-sysfs.c | 2 + drivers/staging/Kconfig | 4 + drivers/staging/Makefile | 2 + drivers/staging/android/Kconfig | 26 - drivers/staging/android/Makefile | 2 - drivers/staging/android/alarm-dev.c | 446 ---- drivers/staging/android/android_alarm.h | 41 - drivers/staging/android/ashmem.c | 12 +- drivers/staging/android/ion/ion.c | 3 + drivers/staging/android/ion/ion_cma_heap.c | 20 +- drivers/staging/android/ion/ion_heap.c | 2 - drivers/staging/android/logger.c | 808 ------- drivers/staging/android/logger.h | 89 - drivers/staging/android/sync_debug.c | 3 +- drivers/staging/android/uapi/android_alarm.h | 62 - drivers/staging/board/board.c | 3 +- .../clocking-wizard/clk-xlnx-clock-wizard.c | 5 +- drivers/staging/comedi/Kconfig | 21 +- drivers/staging/comedi/comedi_compat32.c | 99 +- drivers/staging/comedi/comedi_compat32.h | 38 +- drivers/staging/comedi/comedi_fops.c | 30 +- drivers/staging/comedi/comedi_usb.c | 3 +- drivers/staging/comedi/comedi_usb.h | 50 + drivers/staging/comedi/comedidev.h | 70 +- drivers/staging/comedi/drivers.c | 2 +- drivers/staging/comedi/drivers/8253.h | 92 +- drivers/staging/comedi/drivers/8255.c | 174 +- drivers/staging/comedi/drivers/8255.h | 32 +- drivers/staging/comedi/drivers/8255_pci.c | 65 +- drivers/staging/comedi/drivers/Makefile | 1 + .../comedi/drivers/addi-data/hwdrv_apci1500.c | 2365 -------------------- drivers/staging/comedi/drivers/addi_apci_1032.c | 78 +- drivers/staging/comedi/drivers/addi_apci_1500.c | 844 ++++++- drivers/staging/comedi/drivers/adl_pci6208.c | 3 +- drivers/staging/comedi/drivers/adl_pci7x3x.c | 62 +- drivers/staging/comedi/drivers/adl_pci8164.c | 2 +- drivers/staging/comedi/drivers/adl_pci9111.c | 2 +- drivers/staging/comedi/drivers/adl_pci9118.c | 4 +- drivers/staging/comedi/drivers/adv_pci1710.c | 665 +++--- drivers/staging/comedi/drivers/adv_pci1723.c | 2 +- drivers/staging/comedi/drivers/adv_pci1724.c | 2 +- drivers/staging/comedi/drivers/aio_iiro_16.c | 240 +- drivers/staging/comedi/drivers/c6xdigio.c | 2 +- drivers/staging/comedi/drivers/cb_pcidas.c | 2 +- drivers/staging/comedi/drivers/cb_pcidas64.c | 124 +- drivers/staging/comedi/drivers/cb_pcidda.c | 10 +- drivers/staging/comedi/drivers/comedi_bond.c | 1 + drivers/staging/comedi/drivers/comedi_isadma.c | 262 +++ drivers/staging/comedi/drivers/comedi_isadma.h | 116 + drivers/staging/comedi/drivers/comedi_parport.c | 2 +- drivers/staging/comedi/drivers/dac02.c | 2 +- drivers/staging/comedi/drivers/das08.c | 17 +- drivers/staging/comedi/drivers/das08_isa.c | 18 +- drivers/staging/comedi/drivers/das08_pci.c | 2 +- drivers/staging/comedi/drivers/das16.c | 469 ++-- drivers/staging/comedi/drivers/das16m1.c | 2 +- drivers/staging/comedi/drivers/das1800.c | 340 ++- drivers/staging/comedi/drivers/das6402.c | 4 +- drivers/staging/comedi/drivers/das800.c | 2 +- drivers/staging/comedi/drivers/dmm32at.c | 4 +- drivers/staging/comedi/drivers/dt282x.c | 222 +- drivers/staging/comedi/drivers/dt3000.c | 2 +- drivers/staging/comedi/drivers/dt9812.c | 3 +- drivers/staging/comedi/drivers/dyna_pci10xx.c | 35 +- drivers/staging/comedi/drivers/gsc_hpdi.c | 4 +- drivers/staging/comedi/drivers/ii_pci20kc.c | 2 +- drivers/staging/comedi/drivers/jr3_pci.h | 5 +- drivers/staging/comedi/drivers/ke_counter.c | 2 +- drivers/staging/comedi/drivers/me4000.c | 4 +- drivers/staging/comedi/drivers/me_daq.c | 5 +- drivers/staging/comedi/drivers/mf6x4.c | 2 +- drivers/staging/comedi/drivers/ni_6527.c | 3 +- drivers/staging/comedi/drivers/ni_65xx.c | 30 +- drivers/staging/comedi/drivers/ni_at_a2150.c | 192 +- drivers/staging/comedi/drivers/ni_at_ao.c | 3 +- drivers/staging/comedi/drivers/ni_labpc.c | 16 +- drivers/staging/comedi/drivers/ni_labpc.h | 8 +- drivers/staging/comedi/drivers/ni_labpc_common.c | 55 +- drivers/staging/comedi/drivers/ni_labpc_cs.c | 15 +- drivers/staging/comedi/drivers/ni_labpc_isadma.c | 149 +- drivers/staging/comedi/drivers/ni_labpc_isadma.h | 23 +- drivers/staging/comedi/drivers/ni_labpc_pci.c | 7 +- drivers/staging/comedi/drivers/ni_mio_common.c | 7 +- drivers/staging/comedi/drivers/ni_pcidio.c | 4 +- drivers/staging/comedi/drivers/ni_tio.c | 43 +- drivers/staging/comedi/drivers/ni_tiocmd.c | 43 +- drivers/staging/comedi/drivers/ni_usb6501.c | 3 +- drivers/staging/comedi/drivers/pcl711.c | 6 +- drivers/staging/comedi/drivers/pcl724.c | 12 +- drivers/staging/comedi/drivers/pcl726.c | 7 +- drivers/staging/comedi/drivers/pcl730.c | 19 +- drivers/staging/comedi/drivers/pcl812.c | 258 +-- drivers/staging/comedi/drivers/pcl816.c | 240 +- drivers/staging/comedi/drivers/pcl818.c | 218 +- drivers/staging/comedi/drivers/pcmad.c | 3 +- drivers/staging/comedi/drivers/pcmda12.c | 2 +- drivers/staging/comedi/drivers/pcmmio.c | 2 +- drivers/staging/comedi/drivers/pcmuio.c | 3 +- drivers/staging/comedi/drivers/quatech_daqp_cs.c | 5 +- drivers/staging/comedi/drivers/rtd520.c | 12 +- drivers/staging/comedi/drivers/rti800.c | 3 +- drivers/staging/comedi/drivers/rti802.c | 2 +- drivers/staging/comedi/drivers/s626.c | 2 +- drivers/staging/comedi/drivers/usbdux.c | 6 +- drivers/staging/comedi/drivers/usbduxfast.c | 5 +- drivers/staging/comedi/drivers/usbduxsigma.c | 5 +- drivers/staging/comedi/drivers/vmk80xx.c | 80 +- drivers/staging/comedi/drivers/z8536.h | 202 ++ .../staging/comedi/kcomedilib/kcomedilib_main.c | 2 +- drivers/staging/cptm1217/clearpad_tm1217.c | 6 + drivers/staging/dgap/dgap.c | 38 +- drivers/staging/dgnc/dgnc_driver.c | 40 +- drivers/staging/dgnc/dgnc_utils.c | 2 +- drivers/staging/dgnc/digi.h | 60 +- drivers/staging/dgnc/dpacompat.h | 12 +- drivers/staging/fbtft/Kconfig | 169 ++ drivers/staging/fbtft/Makefile | 34 + drivers/staging/fbtft/README | 32 + drivers/staging/fbtft/fb_agm1264k-fl.c | 462 ++++ drivers/staging/fbtft/fb_bd663474.c | 193 ++ drivers/staging/fbtft/fb_hx8340bn.c | 229 ++ drivers/staging/fbtft/fb_hx8347d.c | 181 ++ drivers/staging/fbtft/fb_hx8353d.c | 166 ++ drivers/staging/fbtft/fb_ili9320.c | 234 ++ drivers/staging/fbtft/fb_ili9325.c | 291 +++ drivers/staging/fbtft/fb_ili9340.c | 163 ++ drivers/staging/fbtft/fb_ili9341.c | 179 ++ drivers/staging/fbtft/fb_ili9481.c | 117 + drivers/staging/fbtft/fb_ili9486.c | 121 + drivers/staging/fbtft/fb_pcd8544.c | 177 ++ drivers/staging/fbtft/fb_ra8875.c | 331 +++ drivers/staging/fbtft/fb_s6d02a1.c | 168 ++ drivers/staging/fbtft/fb_s6d1121.c | 208 ++ drivers/staging/fbtft/fb_ssd1289.c | 206 ++ drivers/staging/fbtft/fb_ssd1306.c | 229 ++ drivers/staging/fbtft/fb_ssd1331.c | 205 ++ drivers/staging/fbtft/fb_ssd1351.c | 258 +++ drivers/staging/fbtft/fb_st7735r.c | 195 ++ drivers/staging/fbtft/fb_tinylcd.c | 124 + drivers/staging/fbtft/fb_tls8204.c | 176 ++ drivers/staging/fbtft/fb_uc1701.c | 210 ++ drivers/staging/fbtft/fb_upd161704.c | 206 ++ drivers/staging/fbtft/fb_watterott.c | 324 +++ drivers/staging/fbtft/fbtft-bus.c | 256 +++ drivers/staging/fbtft/fbtft-core.c | 1521 +++++++++++++ drivers/staging/fbtft/fbtft-io.c | 239 ++ drivers/staging/fbtft/fbtft-sysfs.c | 222 ++ drivers/staging/fbtft/fbtft.h | 447 ++++ drivers/staging/fbtft/fbtft_device.c | 1444 ++++++++++++ drivers/staging/fbtft/flexfb.c | 592 +++++ drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 38 +- drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 8 +- drivers/staging/gdm724x/gdm_lte.c | 3 +- drivers/staging/gdm724x/gdm_mux.c | 2 +- drivers/staging/gs_fpgaboot/io.c | 9 - .../staging/iio/Documentation/iio_event_monitor.c | 23 +- drivers/staging/iio/Documentation/ring.txt | 8 +- drivers/staging/iio/accel/lis3l02dq_core.c | 13 +- drivers/staging/iio/accel/lis3l02dq_ring.c | 2 +- drivers/staging/iio/accel/sca3000_core.c | 45 +- drivers/staging/iio/accel/sca3000_ring.c | 29 +- drivers/staging/iio/adc/ad7192.c | 2 +- drivers/staging/iio/adc/mxs-lradc.c | 45 +- drivers/staging/iio/iio_dummy_evgen.c | 17 + drivers/staging/iio/iio_dummy_evgen.h | 6 + drivers/staging/iio/iio_simple_dummy.c | 210 +- drivers/staging/iio/iio_simple_dummy.h | 13 +- drivers/staging/iio/iio_simple_dummy_buffer.c | 12 +- drivers/staging/iio/iio_simple_dummy_events.c | 66 +- drivers/staging/iio/impedance-analyzer/ad5933.c | 53 +- drivers/staging/iio/light/tsl2583.c | 2 +- drivers/staging/iio/light/tsl2x7x_core.c | 2 +- drivers/staging/iio/meter/ade7758.h | 1 - drivers/staging/iio/meter/ade7758_core.c | 15 +- drivers/staging/iio/meter/ade7758_ring.c | 7 +- drivers/staging/iio/meter/ade7759.c | 2 +- .../staging/lustre/include/linux/libcfs/libcfs.h | 3 + .../lustre/include/linux/libcfs/libcfs_hash.h | 28 +- .../lustre/include/linux/libcfs/libcfs_private.h | 8 - .../staging/lustre/include/linux/lnet/lib-lnet.h | 26 +- .../staging/lustre/include/linux/lnet/lib-types.h | 6 +- .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 14 +- .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 2 +- .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 13 +- .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 2 +- .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 14 +- .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 28 +- .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.c | 36 +- .../lustre/lnet/klnds/socklnd/socklnd_proto.c | 4 +- drivers/staging/lustre/lnet/lnet/lib-move.c | 36 +- drivers/staging/lustre/lnet/lnet/lo.c | 2 +- drivers/staging/lustre/lnet/lnet/module.c | 2 +- drivers/staging/lustre/lnet/lnet/router.c | 23 +- drivers/staging/lustre/lnet/lnet/router_proc.c | 2 +- drivers/staging/lustre/lnet/selftest/conctl.c | 2 +- drivers/staging/lustre/lnet/selftest/conrpc.c | 2 +- drivers/staging/lustre/lnet/selftest/conrpc.h | 2 +- drivers/staging/lustre/lnet/selftest/console.c | 2 +- drivers/staging/lustre/lnet/selftest/framework.c | 4 +- drivers/staging/lustre/lnet/selftest/module.c | 50 +- drivers/staging/lustre/lnet/selftest/rpc.c | 8 +- drivers/staging/lustre/lnet/selftest/selftest.h | 12 + drivers/staging/lustre/lnet/selftest/timer.c | 2 +- drivers/staging/lustre/lustre/fid/fid_internal.h | 2 +- drivers/staging/lustre/lustre/fid/fid_request.c | 4 +- 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 | 2 +- drivers/staging/lustre/lustre/fld/lproc_fld.c | 16 +- drivers/staging/lustre/lustre/include/lclient.h | 2 + .../staging/lustre/lustre/include/lprocfs_status.h | 44 +- .../lustre/lustre/include/lustre/lustre_idl.h | 5 + drivers/staging/lustre/lustre/include/lustre_fid.h | 4 +- drivers/staging/lustre/lustre/include/lustre_fld.h | 4 +- drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 5 +- drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 4 +- drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 7 +- drivers/staging/lustre/lustre/libcfs/debug.c | 8 +- drivers/staging/lustre/lustre/libcfs/hash.c | 18 +- .../staging/lustre/lustre/libcfs/libcfs_string.c | 16 +- .../lustre/lustre/libcfs/linux/linux-curproc.c | 7 +- .../lustre/lustre/libcfs/linux/linux-proc.c | 24 +- .../lustre/lustre/libcfs/linux/linux-tcpip.c | 2 +- .../lustre/lustre/libcfs/linux/linux-tracefile.c | 4 +- drivers/staging/lustre/lustre/libcfs/module.c | 8 +- drivers/staging/lustre/lustre/libcfs/nidstrings.c | 233 +- drivers/staging/lustre/lustre/libcfs/tracefile.c | 2 +- drivers/staging/lustre/lustre/llite/dir.c | 4 +- drivers/staging/lustre/lustre/llite/file.c | 3 +- drivers/staging/lustre/lustre/lmv/lmv_obd.c | 87 +- drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 4 +- drivers/staging/lustre/lustre/lov/lproc_lov.c | 20 +- drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 9 +- drivers/staging/lustre/lustre/mdc/mdc_lib.c | 7 +- drivers/staging/lustre/lustre/mdc/mdc_request.c | 62 +- drivers/staging/lustre/lustre/obdclass/cl_object.c | 5 +- .../lustre/lustre/obdclass/linux/linux-module.c | 31 +- .../lustre/lustre/obdclass/lprocfs_status.c | 26 +- drivers/staging/lustre/lustre/obdclass/obd_mount.c | 5 + drivers/staging/lustre/lustre/osc/lproc_osc.c | 57 +- drivers/staging/lustre/lustre/osc/osc_internal.h | 5 - .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 41 +- drivers/staging/lustre/lustre/ptlrpc/sec_gc.c | 2 + drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 4 +- drivers/staging/mt29f_spinand/Kconfig | 2 +- drivers/staging/mt29f_spinand/mt29f_spinand.c | 17 +- drivers/staging/netlogic/xlr_net.c | 2 +- drivers/staging/nvec/nvec.c | 2 +- drivers/staging/octeon-usb/octeon-hcd.c | 2 +- drivers/staging/octeon/ethernet-rx.c | 2 + drivers/staging/octeon/ethernet.c | 2 +- drivers/staging/olpc_dcon/olpc_dcon.c | 2 +- drivers/staging/olpc_dcon/olpc_dcon_xo_1.c | 2 +- drivers/staging/panel/panel.c | 104 +- drivers/staging/rtl8188eu/core/rtw_ap.c | 2 +- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 58 +- drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 7 +- drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 36 +- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 14 - drivers/staging/rtl8188eu/include/rtl8188e_cmd.h | 1 - drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 1 - drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 4 +- drivers/staging/rtl8188eu/include/usb_ops_linux.h | 1 - drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 27 - drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 29 - drivers/staging/rtl8192e/rtl8192e/rtl_cam.h | 2 - drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 4 +- drivers/staging/rtl8192e/rtl8192e/rtl_pm.c | 14 - drivers/staging/rtl8192e/rtl8192e/rtl_pm.h | 2 - drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 +- drivers/staging/rtl8192e/rtllib_rx.c | 127 +- .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 28 +- .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 2 +- drivers/staging/rtl8192u/r8190_rtl8256.c | 2 +- drivers/staging/rtl8192u/r8192U_dm.c | 2309 ++++++++----------- drivers/staging/rtl8712/recv_linux.c | 14 - drivers/staging/rtl8712/recv_osdep.h | 1 - drivers/staging/rtl8712/rtl8712_cmd.h | 12 +- drivers/staging/rtl8712/rtl8712_event.h | 2 +- drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 4 +- drivers/staging/rtl8712/rtl871x_mlme.c | 4 +- drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 525 ----- drivers/staging/rtl8712/rtl871x_mp_ioctl.h | 46 - drivers/staging/rtl8712/rtl871x_pwrctrl.h | 22 +- drivers/staging/rtl8712/rtl871x_sta_mgt.c | 5 +- drivers/staging/rtl8712/rtl871x_xmit.c | 2 +- drivers/staging/rtl8712/sta_info.h | 2 +- drivers/staging/rtl8712/usb_intf.c | 1 - drivers/staging/rtl8723au/core/rtw_ap.c | 10 +- drivers/staging/rtl8723au/core/rtw_cmd.c | 61 - drivers/staging/rtl8723au/core/rtw_efuse.c | 32 +- drivers/staging/rtl8723au/core/rtw_xmit.c | 9 - drivers/staging/rtl8723au/hal/HalPwrSeqCmd.c | 8 +- drivers/staging/rtl8723au/hal/odm.c | 87 +- drivers/staging/rtl8723au/hal/odm_HWConfig.c | 8 +- .../staging/rtl8723au/hal/rtl8723a_bt-coexist.c | 2 +- drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c | 35 +- drivers/staging/rtl8723au/hal/rtl8723au_xmit.c | 4 +- drivers/staging/rtl8723au/hal/usb_halinit.c | 14 +- drivers/staging/rtl8723au/include/Hal8723APhyCfg.h | 55 - drivers/staging/rtl8723au/include/Hal8723PwrSeq.h | 46 +- drivers/staging/rtl8723au/include/osdep_intf.h | 3 - .../rtl8723au/include/rtl8723a_bt-coexist.h | 177 +- drivers/staging/rtl8723au/include/rtl8723a_recv.h | 4 +- drivers/staging/rtl8723au/include/rtw_cmd.h | 10 +- drivers/staging/rtl8723au/include/rtw_mlme_ext.h | 2 +- drivers/staging/rtl8723au/include/wifi.h | 14 +- drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 3 +- drivers/staging/rtl8723au/os_dep/os_intfs.c | 2 +- drivers/staging/rtl8723au/os_dep/usb_intf.c | 170 +- drivers/staging/rts5208/ms.c | 12 +- drivers/staging/rts5208/rtsx_transport.c | 12 +- drivers/staging/skein/skein_block.c | 17 +- drivers/staging/skein/skein_generic.c | 1 - drivers/staging/sm7xxfb/Kconfig | 13 + drivers/staging/sm7xxfb/Makefile | 1 + drivers/staging/sm7xxfb/TODO | 12 + drivers/staging/sm7xxfb/sm7xx.h | 779 +++++++ drivers/staging/sm7xxfb/sm7xxfb.c | 1024 +++++++++ drivers/staging/speakup/kobjects.c | 2 +- drivers/staging/speakup/selection.c | 2 +- drivers/staging/speakup/synth.c | 6 +- drivers/staging/unisys/Kconfig | 1 - drivers/staging/unisys/Makefile | 1 - drivers/staging/unisys/channels/Kconfig | 10 - drivers/staging/unisys/channels/Makefile | 11 - drivers/staging/unisys/channels/channel.c | 219 -- drivers/staging/unisys/channels/chanstub.c | 75 - drivers/staging/unisys/channels/chanstub.h | 23 - .../staging/unisys/common-spar/include/version.h | 1 - drivers/staging/unisys/include/timskmod.h | 4 +- drivers/staging/unisys/uislib/Kconfig | 2 +- drivers/staging/unisys/uislib/uislib.c | 755 +++---- drivers/staging/unisys/uislib/uisqueue.c | 215 +- drivers/staging/unisys/uislib/uisthread.c | 1 - drivers/staging/unisys/uislib/uisutils.c | 99 +- drivers/staging/unisys/virthba/Kconfig | 2 +- drivers/staging/unisys/virthba/virthba.c | 351 +-- drivers/staging/unisys/virtpci/virtpci.c | 61 +- drivers/staging/unisys/visorchannel/visorchannel.h | 69 +- .../unisys/visorchannel/visorchannel_funcs.c | 206 +- drivers/staging/unisys/visorchipset/file.c | 122 +- drivers/staging/unisys/visorchipset/file.h | 3 +- drivers/staging/unisys/visorchipset/globals.h | 2 - drivers/staging/unisys/visorchipset/testing.h | 43 - drivers/staging/unisys/visorchipset/visorchipset.h | 55 - .../unisys/visorchipset/visorchipset_main.c | 3 +- .../unisys/visorchipset/visorchipset_umode.h | 2 - drivers/staging/unisys/visorutil/charqueue.c | 2 +- drivers/staging/vt6655/baseband.c | 343 +-- drivers/staging/vt6655/baseband.h | 17 - drivers/staging/vt6655/card.c | 9 +- drivers/staging/vt6655/channel.c | 18 +- drivers/staging/vt6655/channel.h | 2 +- drivers/staging/vt6655/device.h | 25 +- drivers/staging/vt6655/device_main.c | 70 +- drivers/staging/vt6655/dpc.c | 6 - drivers/staging/vt6655/mac.c | 25 +- drivers/staging/vt6655/mac.h | 684 +++--- drivers/staging/vt6655/power.c | 26 +- drivers/staging/vt6655/rf.c | 27 +- drivers/staging/vt6655/rf.h | 8 +- drivers/staging/vt6655/rxtx.c | 2 +- drivers/staging/vt6655/upc.h | 8 +- drivers/staging/vt6656/card.c | 2 +- drivers/staging/vt6656/device.h | 6 +- drivers/staging/vt6656/dpc.h | 2 +- drivers/staging/vt6656/main_usb.c | 3 +- drivers/staging/vt6656/rxtx.c | 15 +- drivers/staging/wlan-ng/hfa384x.h | 6 +- drivers/staging/wlan-ng/hfa384x_usb.c | 17 +- drivers/staging/wlan-ng/p80211conv.c | 2 +- drivers/staging/wlan-ng/p80211req.c | 2 +- drivers/staging/wlan-ng/prism2mgmt.h | 2 +- drivers/staging/wlan-ng/prism2sta.c | 4 +- drivers/staging/xgifb/XGI_main_26.c | 2 +- include/dt-bindings/iio/qcom,spmi-vadc.h | 119 + include/linux/iio/buffer.h | 76 +- include/linux/iio/common/ssp_sensors.h | 82 + include/linux/iio/consumer.h | 12 +- include/linux/iio/iio.h | 11 +- include/linux/iio/kfifo_buf.h | 5 +- include/linux/iio/types.h | 14 +- 461 files changed, 30997 insertions(+), 13353 deletions(-) create mode 100644 Documentation/devicetree/bindings/iio/adc/cc10001_adc.txt create mode 100644 Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.txt create mode 100644 Documentation/devicetree/bindings/iio/sensorhub.txt create mode 100644 drivers/iio/accel/mma9551.c create mode 100644 drivers/iio/accel/mma9551_core.c create mode 100644 drivers/iio/accel/mma9551_core.h create mode 100644 drivers/iio/accel/mma9553.c create mode 100644 drivers/iio/accel/ssp_accel_sensor.c create mode 100644 drivers/iio/adc/cc10001_adc.c create mode 100644 drivers/iio/adc/qcom-spmi-vadc.c create mode 100644 drivers/iio/common/ssp_sensors/Kconfig create mode 100644 drivers/iio/common/ssp_sensors/Makefile create mode 100644 drivers/iio/common/ssp_sensors/ssp.h create mode 100644 drivers/iio/common/ssp_sensors/ssp_dev.c create mode 100644 drivers/iio/common/ssp_sensors/ssp_iio.c create mode 100644 drivers/iio/common/ssp_sensors/ssp_iio_sensor.h create mode 100644 drivers/iio/common/ssp_sensors/ssp_spi.c create mode 100644 drivers/iio/gyro/ssp_gyro_sensor.c create mode 100644 drivers/iio/imu/kmx61.c create mode 100644 drivers/iio/light/cm3232.c create mode 100644 drivers/iio/light/jsa1212.c delete mode 100644 drivers/iio/magnetometer/ak09911.c create mode 100644 drivers/iio/proximity/sx9500.c delete mode 100644 drivers/staging/android/alarm-dev.c delete mode 100644 drivers/staging/android/android_alarm.h delete mode 100644 drivers/staging/android/logger.c delete mode 100644 drivers/staging/android/logger.h delete mode 100644 drivers/staging/android/uapi/android_alarm.h create mode 100644 drivers/staging/comedi/comedi_usb.h delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c create mode 100644 drivers/staging/comedi/drivers/comedi_isadma.c create mode 100644 drivers/staging/comedi/drivers/comedi_isadma.h create mode 100644 drivers/staging/comedi/drivers/z8536.h create mode 100644 drivers/staging/fbtft/Kconfig create mode 100644 drivers/staging/fbtft/Makefile create mode 100644 drivers/staging/fbtft/README create mode 100644 drivers/staging/fbtft/fb_agm1264k-fl.c create mode 100644 drivers/staging/fbtft/fb_bd663474.c create mode 100644 drivers/staging/fbtft/fb_hx8340bn.c create mode 100644 drivers/staging/fbtft/fb_hx8347d.c create mode 100644 drivers/staging/fbtft/fb_hx8353d.c create mode 100644 drivers/staging/fbtft/fb_ili9320.c create mode 100644 drivers/staging/fbtft/fb_ili9325.c create mode 100644 drivers/staging/fbtft/fb_ili9340.c create mode 100644 drivers/staging/fbtft/fb_ili9341.c create mode 100644 drivers/staging/fbtft/fb_ili9481.c create mode 100644 drivers/staging/fbtft/fb_ili9486.c create mode 100644 drivers/staging/fbtft/fb_pcd8544.c create mode 100644 drivers/staging/fbtft/fb_ra8875.c create mode 100644 drivers/staging/fbtft/fb_s6d02a1.c create mode 100644 drivers/staging/fbtft/fb_s6d1121.c create mode 100644 drivers/staging/fbtft/fb_ssd1289.c create mode 100644 drivers/staging/fbtft/fb_ssd1306.c create mode 100644 drivers/staging/fbtft/fb_ssd1331.c create mode 100644 drivers/staging/fbtft/fb_ssd1351.c create mode 100644 drivers/staging/fbtft/fb_st7735r.c create mode 100644 drivers/staging/fbtft/fb_tinylcd.c create mode 100644 drivers/staging/fbtft/fb_tls8204.c create mode 100644 drivers/staging/fbtft/fb_uc1701.c create mode 100644 drivers/staging/fbtft/fb_upd161704.c create mode 100644 drivers/staging/fbtft/fb_watterott.c create mode 100644 drivers/staging/fbtft/fbtft-bus.c create mode 100644 drivers/staging/fbtft/fbtft-core.c create mode 100644 drivers/staging/fbtft/fbtft-io.c create mode 100644 drivers/staging/fbtft/fbtft-sysfs.c create mode 100644 drivers/staging/fbtft/fbtft.h create mode 100644 drivers/staging/fbtft/fbtft_device.c create mode 100644 drivers/staging/fbtft/flexfb.c create mode 100644 drivers/staging/sm7xxfb/Kconfig create mode 100644 drivers/staging/sm7xxfb/Makefile create mode 100644 drivers/staging/sm7xxfb/TODO create mode 100644 drivers/staging/sm7xxfb/sm7xx.h create mode 100644 drivers/staging/sm7xxfb/sm7xxfb.c delete mode 100644 drivers/staging/unisys/channels/Kconfig delete mode 100644 drivers/staging/unisys/channels/Makefile delete mode 100644 drivers/staging/unisys/channels/channel.c delete mode 100644 drivers/staging/unisys/channels/chanstub.c delete mode 100644 drivers/staging/unisys/channels/chanstub.h delete mode 100644 drivers/staging/unisys/visorchipset/testing.h create mode 100644 include/dt-bindings/iio/qcom,spmi-vadc.h create mode 100644 include/linux/iio/common/ssp_sensors.h Merging char-misc/char-misc-next (786f949631c7 Merge tag 'extcon-next-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next) $ git merge char-misc/char-misc-next Resolved 'drivers/char/mem.c' using previous resolution. Auto-merging security/selinux/hooks.c Auto-merging security/security.c Auto-merging drivers/pcmcia/Kconfig Auto-merging drivers/hv/vmbus_drv.c Auto-merging drivers/char/mem.c CONFLICT (content): Merge conflict in drivers/char/mem.c Auto-merging MAINTAINERS Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master bc9ab2a554cc] Merge remote-tracking branch 'char-misc/char-misc-next' $ git diff -M --stat --summary HEAD^.. .../devicetree/bindings/powerpc/fsl/lbc.txt | 18 +- Documentation/stable_kernel_rules.txt | 44 +- MAINTAINERS | 1 + arch/powerpc/include/asm/fsl_lbc.h | 3 + arch/x86/include/uapi/asm/hyperv.h | 11 + drivers/android/binder.c | 26 ++ drivers/char/Kconfig | 9 + drivers/char/i8k.c | 316 +++++++++---- drivers/char/mem.c | 22 +- drivers/coresight/coresight-etb10.c | 12 +- drivers/coresight/coresight-etm3x.c | 16 +- drivers/coresight/coresight-funnel.c | 12 +- drivers/coresight/coresight-tmc.c | 12 +- drivers/coresight/coresight-tpiu.c | 12 +- drivers/coresight/of_coresight.c | 6 +- drivers/extcon/extcon-adc-jack.c | 1 + drivers/extcon/extcon-class.c | 1 - drivers/extcon/extcon-max77693.c | 2 +- drivers/hv/channel.c | 54 ++- drivers/hv/channel_mgmt.c | 54 ++- drivers/hv/connection.c | 6 +- drivers/hv/hv.c | 78 ++++ drivers/hv/hv_balloon.c | 88 +++- drivers/hv/hv_fcopy.c | 27 ++ drivers/hv/hyperv_vmbus.h | 21 + drivers/hv/vmbus_drv.c | 37 +- drivers/misc/ad525x_dpot-spi.c | 4 + drivers/misc/ad525x_dpot.c | 7 +- drivers/misc/genwqe/card_base.h | 1 - drivers/misc/genwqe/card_sysfs.c | 1 - drivers/misc/ioc4.c | 31 +- drivers/misc/mei/amthif.c | 14 +- drivers/misc/mei/bus.c | 69 +-- drivers/misc/mei/client.c | 156 +++++-- drivers/misc/mei/client.h | 17 +- drivers/misc/mei/debugfs.c | 32 +- drivers/misc/mei/hbm.c | 34 +- drivers/misc/mei/main.c | 22 +- drivers/misc/mei/mei_dev.h | 8 +- drivers/misc/mei/nfc.c | 2 + drivers/misc/mei/wd.c | 1 + drivers/misc/ti-st/st_core.c | 24 +- drivers/misc/ti-st/st_kim.c | 138 ++++-- drivers/misc/ti-st/st_ll.c | 17 +- drivers/misc/vmw_vmci/vmci_driver.c | 2 +- drivers/misc/vmw_vmci/vmci_host.c | 13 +- drivers/pcmcia/Kconfig | 12 +- drivers/pcmcia/Makefile | 1 + drivers/pcmcia/cistpl.c | 31 +- drivers/pcmcia/cs_internal.h | 6 +- drivers/pcmcia/ds.c | 3 + drivers/pcmcia/rsrc_mgr.c | 5 +- drivers/pcmcia/rsrc_pci.c | 173 +++++++ drivers/pnp/pnpbios/core.c | 3 +- drivers/uio/Kconfig | 20 + drivers/uio/Makefile | 1 + drivers/uio/uio_fsl_elbc_gpcm.c | 499 +++++++++++++++++++++ drivers/uio/uio_pci_generic.c | 3 +- drivers/vme/vme.c | 2 +- include/linux/coresight.h | 19 +- include/linux/hyperv.h | 38 +- include/linux/mei_cl_bus.h | 4 +- include/linux/security.h | 58 +++ include/linux/ti_wilink_st.h | 1 + security/capability.c | 27 ++ security/security.c | 23 + security/selinux/hooks.c | 73 +++ security/selinux/include/classmap.h | 2 + tools/hv/Makefile | 4 +- tools/hv/hv_fcopy_daemon.c | 10 +- tools/hv/hv_kvp_daemon.c | 41 +- 71 files changed, 2073 insertions(+), 468 deletions(-) create mode 100644 drivers/pcmcia/rsrc_pci.c create mode 100644 drivers/uio/uio_fsl_elbc_gpcm.c Merging cgroup/for-next (8abba61bcfd4 Merge branch 'for-3.19-fixes' into for-next) $ git merge cgroup/for-next Merge made by the 'recursive' strategy. include/linux/cgroup.h | 4 ++++ include/linux/cgroup_subsys.h | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) Merging scsi/for-next (ec0c9b17ab9f Merge branch 'misc' into for-next) $ git merge scsi/for-next Auto-merging drivers/xen/xen-scsiback.c Auto-merging drivers/scsi/scsi_scan.c Auto-merging drivers/scsi/scsi.c Auto-merging drivers/phy/Makefile Auto-merging drivers/phy/Kconfig Auto-merging drivers/ata/libata-eh.c Merge made by the 'recursive' strategy. drivers/ata/libata-eh.c | 20 +- drivers/misc/enclosure.c | 108 +- drivers/phy/Kconfig | 7 + drivers/phy/Makefile | 3 + drivers/phy/phy-qcom-ufs-i.h | 159 +++ drivers/phy/phy-qcom-ufs-qmp-14nm.c | 201 +++ drivers/phy/phy-qcom-ufs-qmp-14nm.h | 177 +++ drivers/phy/phy-qcom-ufs-qmp-20nm.c | 257 ++++ drivers/phy/phy-qcom-ufs-qmp-20nm.h | 235 ++++ drivers/phy/phy-qcom-ufs.c | 745 +++++++++++ drivers/scsi/3w-9xxx.c | 3 +- drivers/scsi/BusLogic.c | 10 +- drivers/scsi/Kconfig | 4 +- drivers/scsi/Makefile | 6 +- drivers/scsi/NCR5380.c | 20 +- drivers/scsi/advansys.c | 142 +- drivers/scsi/aha152x.c | 295 +++-- drivers/scsi/aic7xxx/aic79xx_proc.c | 38 +- drivers/scsi/aic7xxx/aic7xxx_proc.c | 24 +- drivers/scsi/am53c974.c | 6 - drivers/scsi/arm/fas216.c | 6 +- drivers/scsi/atari_NCR5380.c | 4 +- drivers/scsi/atp870u.c | 5 +- drivers/scsi/ch.c | 6 - drivers/scsi/constants.c | 275 +--- drivers/scsi/dc395x.c | 79 +- drivers/scsi/device_handler/scsi_dh.c | 3 +- drivers/scsi/dpt_i2o.c | 2 +- drivers/scsi/eata_pio.c | 2 +- drivers/scsi/esas2r/esas2r_main.c | 2 +- drivers/scsi/esp_scsi.c | 2 - drivers/scsi/gdth_proc.c | 24 +- drivers/scsi/hpsa.c | 1858 ++++++++++++++------------- drivers/scsi/hpsa.h | 61 +- drivers/scsi/hpsa_cmd.h | 334 +++-- drivers/scsi/in2000.c | 18 +- drivers/scsi/ips.c | 7 +- drivers/scsi/lpfc/lpfc_els.c | 9 + drivers/scsi/megaraid.c | 2 +- drivers/scsi/megaraid/megaraid_sas.h | 66 +- drivers/scsi/megaraid/megaraid_sas_base.c | 188 ++- drivers/scsi/megaraid/megaraid_sas_fp.c | 17 +- drivers/scsi/megaraid/megaraid_sas_fusion.c | 109 +- drivers/scsi/megaraid/megaraid_sas_fusion.h | 9 +- drivers/scsi/mpt2sas/mpi/mpi2.h | 7 +- drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h | 51 +- drivers/scsi/mpt2sas/mpi/mpi2_ioc.h | 4 +- drivers/scsi/mpt2sas/mpi/mpi2_tool.h | 6 +- drivers/scsi/mpt2sas/mpt2sas_base.c | 52 +- drivers/scsi/mpt2sas/mpt2sas_base.h | 16 +- drivers/scsi/mpt2sas/mpt2sas_config.c | 39 +- drivers/scsi/mpt2sas/mpt2sas_ctl.c | 3 +- drivers/scsi/mpt2sas/mpt2sas_ctl.h | 3 +- drivers/scsi/mpt2sas/mpt2sas_debug.h | 3 +- drivers/scsi/mpt2sas/mpt2sas_scsih.c | 47 +- drivers/scsi/mpt2sas/mpt2sas_transport.c | 3 +- drivers/scsi/mpt3sas/mpt3sas_base.c | 53 +- drivers/scsi/mpt3sas/mpt3sas_base.h | 12 +- drivers/scsi/mpt3sas/mpt3sas_config.c | 39 +- drivers/scsi/mpt3sas/mpt3sas_ctl.c | 3 +- drivers/scsi/mpt3sas/mpt3sas_ctl.h | 3 +- drivers/scsi/mpt3sas/mpt3sas_debug.h | 3 +- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 42 +- drivers/scsi/mpt3sas/mpt3sas_transport.c | 3 +- drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c | 3 +- drivers/scsi/mpt3sas/mpt3sas_trigger_diag.h | 3 +- drivers/scsi/nsp32.c | 41 +- drivers/scsi/pcmcia/nsp_cs.c | 50 +- drivers/scsi/qla2xxx/qla_dfs.c | 8 +- drivers/scsi/scsi.c | 11 +- drivers/scsi/scsi_debug.c | 128 +- drivers/scsi/scsi_error.c | 50 +- drivers/scsi/scsi_logging.c | 489 +++++++ drivers/scsi/scsi_proc.c | 22 +- drivers/scsi/scsi_scan.c | 54 +- drivers/scsi/scsi_trace.c | 6 +- drivers/scsi/sd.c | 13 +- drivers/scsi/ses.c | 148 ++- drivers/scsi/sg.c | 17 +- drivers/scsi/sr_ioctl.c | 11 - drivers/scsi/storvsc_drv.c | 190 +-- drivers/scsi/ufs/Kconfig | 13 + drivers/scsi/ufs/Makefile | 1 + drivers/scsi/ufs/ufs-qcom.c | 1004 +++++++++++++++ drivers/scsi/ufs/ufs-qcom.h | 170 +++ drivers/scsi/ufs/ufshcd.c | 6 +- drivers/scsi/wd33c93.c | 18 +- drivers/scsi/wd7000.c | 41 +- drivers/xen/xen-scsiback.c | 1 + include/linux/enclosure.h | 13 +- include/linux/phy/phy-qcom-ufs.h | 59 + include/scsi/scsi.h | 3 + include/scsi/scsi_dbg.h | 74 +- include/scsi/scsi_device.h | 22 +- 94 files changed, 6335 insertions(+), 2274 deletions(-) create mode 100644 drivers/phy/phy-qcom-ufs-i.h create mode 100644 drivers/phy/phy-qcom-ufs-qmp-14nm.c create mode 100644 drivers/phy/phy-qcom-ufs-qmp-14nm.h create mode 100644 drivers/phy/phy-qcom-ufs-qmp-20nm.c create mode 100644 drivers/phy/phy-qcom-ufs-qmp-20nm.h create mode 100644 drivers/phy/phy-qcom-ufs.c create mode 100644 drivers/scsi/scsi_logging.c create mode 100644 drivers/scsi/ufs/ufs-qcom.c create mode 100644 drivers/scsi/ufs/ufs-qcom.h create mode 100644 include/linux/phy/phy-qcom-ufs.h Merging target-updates/for-next (2936f1d4f3e8 vhost/scsi: Global tcm_vhost -> vhost_scsi rename) $ git merge target-updates/for-next Recorded preimage for 'drivers/vhost/scsi.c' Auto-merging include/target/iscsi/iscsi_target_core.h Auto-merging include/linux/uio.h Auto-merging drivers/vhost/scsi.c CONFLICT (content): Merge conflict in drivers/vhost/scsi.c Auto-merging drivers/target/iscsi/iscsi_target.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/vhost/scsi.c'. [master f4cdda845a82] Merge remote-tracking branch 'target-updates/for-next' $ git diff -M --stat --summary HEAD^.. drivers/infiniband/ulp/isert/ib_isert.c | 21 +- drivers/infiniband/ulp/srpt/ib_srpt.c | 4 +- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 4 +- drivers/target/iscsi/iscsi_target.c | 18 +- drivers/target/iscsi/iscsi_target_auth.c | 2 +- drivers/target/iscsi/iscsi_target_configfs.c | 17 +- drivers/target/iscsi/iscsi_target_datain_values.c | 2 +- drivers/target/iscsi/iscsi_target_device.c | 2 +- drivers/target/iscsi/iscsi_target_erl0.c | 2 +- drivers/target/iscsi/iscsi_target_erl1.c | 2 +- drivers/target/iscsi/iscsi_target_erl2.c | 2 +- drivers/target/iscsi/iscsi_target_login.c | 4 +- drivers/target/iscsi/iscsi_target_nego.c | 2 +- drivers/target/iscsi/iscsi_target_nodeattrib.c | 2 +- drivers/target/iscsi/iscsi_target_parameters.c | 2 +- drivers/target/iscsi/iscsi_target_seq_pdu_list.c | 2 +- drivers/target/iscsi/iscsi_target_stat.c | 4 +- drivers/target/iscsi/iscsi_target_tmr.c | 2 +- drivers/target/iscsi/iscsi_target_tpg.c | 2 +- drivers/target/iscsi/iscsi_target_tq.c | 2 +- drivers/target/iscsi/iscsi_target_util.c | 11 +- drivers/vhost/scsi.c | 1125 +++++++++++--------- include/linux/uio.h | 2 + .../target/iscsi/iscsi_target_core.h | 13 + .../target/iscsi/iscsi_target_stat.h | 0 include/target/iscsi/iscsi_transport.h | 2 +- lib/iovec.c | 35 + 27 files changed, 706 insertions(+), 580 deletions(-) rename {drivers => include}/target/iscsi/iscsi_target_core.h (98%) rename {drivers => include}/target/iscsi/iscsi_target_stat.h (100%) Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) $ git merge target-merge/for-next-merge Already up-to-date. Merging pinctrl/for-next (8f61904b0b20 Merge branch 'devel' into for-next) $ git merge pinctrl/for-next Removing drivers/pinctrl/sh-pfc/pfc-sh7372.c Merge made by the 'recursive' strategy. .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 1 + .../bindings/pinctrl/qcom,msm8916-pinctrl.txt | 186 ++ .../bindings/pinctrl/renesas,pfc-pinctrl.txt | 9 +- .../bindings/pinctrl/samsung-pinctrl.txt | 12 + .../bindings/pinctrl/xlnx,zynq-pinctrl.txt | 104 + drivers/pinctrl/Kconfig | 18 +- drivers/pinctrl/Makefile | 4 +- drivers/pinctrl/intel/pinctrl-cherryview.c | 105 +- drivers/pinctrl/meson/Makefile | 2 + drivers/pinctrl/meson/pinctrl-meson.c | 761 ++++++ drivers/pinctrl/meson/pinctrl-meson.h | 209 ++ drivers/pinctrl/meson/pinctrl-meson8.c | 1089 ++++++++ drivers/pinctrl/mvebu/pinctrl-armada-38x.c | 6 +- drivers/pinctrl/mvebu/pinctrl-dove.c | 4 +- drivers/pinctrl/nomadik/pinctrl-abx500.c | 2 +- drivers/pinctrl/pinconf-generic.c | 206 +- drivers/pinctrl/pinconf.c | 4 +- drivers/pinctrl/pinconf.h | 22 +- drivers/pinctrl/pinctrl-bcm281xx.c | 4 +- drivers/pinctrl/pinctrl-falcon.c | 3 +- drivers/pinctrl/pinctrl-rockchip.c | 50 +- drivers/pinctrl/pinctrl-tz1090-pdc.c | 2 +- drivers/pinctrl/pinctrl-tz1090.c | 2 +- drivers/pinctrl/pinctrl-zynq.c | 1180 +++++++++ drivers/pinctrl/qcom/Kconfig | 8 + drivers/pinctrl/qcom/Makefile | 1 + drivers/pinctrl/qcom/pinctrl-msm.c | 17 - drivers/pinctrl/qcom/pinctrl-msm.h | 10 +- drivers/pinctrl/qcom/pinctrl-msm8916.c | 1005 ++++++++ drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 129 +- drivers/pinctrl/samsung/pinctrl-exynos.c | 29 + drivers/pinctrl/sh-pfc/Kconfig | 10 +- drivers/pinctrl/sh-pfc/Makefile | 2 +- drivers/pinctrl/sh-pfc/core.c | 18 +- drivers/pinctrl/sh-pfc/core.h | 2 +- drivers/pinctrl/sh-pfc/pfc-emev2.c | 1711 +++++++++++++ drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 13 + drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 21 +- drivers/pinctrl/sh-pfc/pfc-sh7372.c | 2645 -------------------- drivers/pinctrl/sh-pfc/pinctrl.c | 2 +- drivers/pinctrl/sh-pfc/sh_pfc.h | 2 + drivers/pinctrl/sirf/pinctrl-sirf.c | 51 +- drivers/pinctrl/sirf/pinctrl-sirf.h | 1 - drivers/pinctrl/sunxi/Kconfig | 4 + drivers/pinctrl/sunxi/Makefile | 1 + drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c | 5 + drivers/pinctrl/sunxi/pinctrl-sun6i-a31s.c | 815 ++++++ include/dt-bindings/gpio/meson8-gpio.h | 157 ++ include/linux/pinctrl/consumer.h | 6 +- include/linux/pinctrl/pinconf-generic.h | 29 + include/linux/pinctrl/pinctrl.h | 12 + 51 files changed, 7690 insertions(+), 3001 deletions(-) create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8916-pinctrl.txt create mode 100644 Documentation/devicetree/bindings/pinctrl/xlnx,zynq-pinctrl.txt create mode 100644 drivers/pinctrl/meson/Makefile create mode 100644 drivers/pinctrl/meson/pinctrl-meson.c create mode 100644 drivers/pinctrl/meson/pinctrl-meson.h create mode 100644 drivers/pinctrl/meson/pinctrl-meson8.c create mode 100644 drivers/pinctrl/pinctrl-zynq.c create mode 100644 drivers/pinctrl/qcom/pinctrl-msm8916.c create mode 100644 drivers/pinctrl/sh-pfc/pfc-emev2.c delete mode 100644 drivers/pinctrl/sh-pfc/pfc-sh7372.c create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun6i-a31s.c create mode 100644 include/dt-bindings/gpio/meson8-gpio.h Merging vhost/linux-next (eaa27f34e91a linux 3.19-rc4) $ git merge vhost/linux-next Already up-to-date. Merging remoteproc/for-next (9a3c4145af32 Linux 3.16-rc6) $ git merge remoteproc/for-next Already up-to-date. Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small) $ git merge rpmsg/for-next Already up-to-date. Merging gpio/for-next (8c8ec414bdf5 Merge branch 'devel' into for-next) $ git merge gpio/for-next Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt Merge made by the 'recursive' strategy. .../bindings/gpio/fujitsu,mb86s70-gpio.txt | 20 ++ .../devicetree/bindings/gpio/gpio-max732x.txt | 59 +++++ .../devicetree/bindings/gpio/gpio-sx150x.txt | 40 +++ .../devicetree/bindings/gpio/gpio-xgene-sb.txt | 32 +++ Documentation/devicetree/bindings/gpio/gpio.txt | 5 +- .../devicetree/bindings/vendor-prefixes.txt | 1 + drivers/gpio/Kconfig | 35 ++- drivers/gpio/Makefile | 2 + drivers/gpio/gpio-amd8111.c | 6 + drivers/gpio/gpio-dln2.c | 1 + drivers/gpio/gpio-dwapb.c | 53 +--- drivers/gpio/gpio-ge.c | 98 +++---- drivers/gpio/gpio-generic.c | 76 ++++++ drivers/gpio/gpio-grgpio.c | 2 +- drivers/gpio/gpio-max732x.c | 202 +++++++++++---- drivers/gpio/gpio-mb86s7x.c | 232 +++++++++++++++++ drivers/gpio/gpio-mcp23s08.c | 17 +- drivers/gpio/gpio-mm-lantiq.c | 42 +-- drivers/gpio/gpio-moxart.c | 101 +++----- drivers/gpio/gpio-mpc5200.c | 23 +- drivers/gpio/gpio-mpc8xxx.c | 70 +++-- drivers/gpio/gpio-mvebu.c | 100 +++++--- drivers/gpio/gpio-omap.c | 39 ++- drivers/gpio/gpio-rcar.c | 75 ++---- drivers/gpio/gpio-sch.c | 89 +++---- drivers/gpio/gpio-stmpe.c | 23 +- drivers/gpio/gpio-sx150x.c | 251 ++++++++++-------- drivers/gpio/gpio-tc3589x.c | 15 +- drivers/gpio/gpio-tz1090-pdc.c | 2 +- drivers/gpio/gpio-tz1090.c | 2 +- drivers/gpio/gpio-vf610.c | 1 - drivers/gpio/gpio-vx855.c | 44 +--- drivers/gpio/gpio-xgene-sb.c | 160 ++++++++++++ drivers/gpio/gpio-xilinx.c | 284 ++++++++++++--------- drivers/gpio/gpio-zevio.c | 12 + drivers/gpio/gpiolib-of.c | 17 ++ drivers/gpio/gpiolib-sysfs.c | 3 +- drivers/gpio/gpiolib.c | 8 +- include/linux/gpio/consumer.h | 17 +- include/linux/mfd/stmpe.h | 16 -- include/linux/mfd/tc3589x.h | 12 - include/linux/of_gpio.h | 1 + 42 files changed, 1519 insertions(+), 769 deletions(-) create mode 100644 Documentation/devicetree/bindings/gpio/fujitsu,mb86s70-gpio.txt create mode 100644 Documentation/devicetree/bindings/gpio/gpio-max732x.txt create mode 100644 Documentation/devicetree/bindings/gpio/gpio-sx150x.txt create mode 100644 Documentation/devicetree/bindings/gpio/gpio-xgene-sb.txt create mode 100644 drivers/gpio/gpio-mb86s7x.c create mode 100644 drivers/gpio/gpio-xgene-sb.c Merging dma-mapping/dma-mapping-next (dda02fd6278d mm, cma: make parameters order consistent in func declaration and definition) $ git merge dma-mapping/dma-mapping-next Already up-to-date. Merging pwm/for-next (9c959bfe0039 pwm: Add device tree binding document for IMG PWM DAC) $ git merge pwm/for-next Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/pwm/img-pwm.txt | 24 ++ .../devicetree/bindings/pwm/pwm-sun4i.txt | 20 ++ drivers/pwm/Kconfig | 24 ++ drivers/pwm/Makefile | 2 + drivers/pwm/pwm-atmel-hlcdc.c | 6 + drivers/pwm/pwm-img.c | 249 ++++++++++++++ drivers/pwm/pwm-sti.c | 30 +- drivers/pwm/pwm-sun4i.c | 366 +++++++++++++++++++++ 8 files changed, 702 insertions(+), 19 deletions(-) create mode 100644 Documentation/devicetree/bindings/pwm/img-pwm.txt create mode 100644 Documentation/devicetree/bindings/pwm/pwm-sun4i.txt create mode 100644 drivers/pwm/pwm-img.c create mode 100644 drivers/pwm/pwm-sun4i.c Merging dma-buf/for-next (4eb2440ed60f reservation: Remove shadowing local variable 'ret') $ git merge dma-buf/for-next Merge made by the 'recursive' strategy. drivers/dma-buf/fence.c | 3 +++ drivers/dma-buf/reservation.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) Merging userns/for-next (db86da7cb76f userns: Unbreak the unprivileged remount tests) $ git merge userns/for-next Already up-to-date. Merging ktest/for-next (17150fef4ab1 ktest: Add back "tail -1" to kernelrelease make) $ git merge ktest/for-next Already up-to-date. Merging clk/clk-next (146ec580c386 clkdev: Export clk_register_clkdev) $ git merge clk/clk-next Recorded preimage for 'arch/arm/mach-omap2/io.c' Removing include/linux/clk-private.h Auto-merging include/dt-bindings/clock/rk3288-cru.h Auto-merging drivers/clk/sunxi/clk-sunxi.c Auto-merging drivers/clk/shmobile/Makefile Auto-merging drivers/clk/rockchip/clk-rk3288.c Auto-merging drivers/clk/clk-qoriq.c Auto-merging drivers/clk/Kconfig Auto-merging arch/arm/mach-omap2/prm_common.c Auto-merging arch/arm/mach-omap2/io.c CONFLICT (content): Merge conflict in arch/arm/mach-omap2/io.c Auto-merging arch/arm/mach-omap2/dpll44xx.c Auto-merging arch/arm/mach-omap2/clock.h Auto-merging arch/arm/mach-omap2/clock.c CONFLICT (modify/delete): arch/arm/mach-omap2/cclock3xxx_data.c deleted in clk/clk-next and modified in HEAD. Version HEAD of arch/arm/mach-omap2/cclock3xxx_data.c left in tree. Auto-merging arch/arm/mach-omap2/Makefile Auto-merging MAINTAINERS Automatic merge failed; fix conflicts and then commit the result. $ git rm -f arch/arm/mach-omap2/cclock3xxx_data.c arch/arm/mach-omap2/cclock3xxx_data.c: needs merge rm 'arch/arm/mach-omap2/cclock3xxx_data.c' $ git commit -v -a Recorded resolution for 'arch/arm/mach-omap2/io.c'. [master a07ec7d818b9] Merge remote-tracking branch 'clk/clk-next' $ git diff -M --stat --summary HEAD^.. Documentation/clk.txt | 2 + .../devicetree/bindings/clock/exynos7-clock.txt | 15 + .../devicetree/bindings/clock/qcom,lcc.txt | 21 + .../devicetree/bindings/clock/qoriq-clock.txt | 5 +- .../bindings/clock/renesas,cpg-mstp-clocks.txt | 1 + .../bindings/clock/renesas,r8a73a4-cpg-clocks.txt | 33 + .../clock/renesas,rcar-gen2-cpg-clocks.txt | 12 +- .../devicetree/bindings/clock/ti,cdce706.txt | 42 + .../devicetree/bindings/clock/ti/fapll.txt | 33 + MAINTAINERS | 5 + arch/arm/mach-omap2/Makefile | 2 +- arch/arm/mach-omap2/cclock3xxx_data.c | 3688 ---------------- arch/arm/mach-omap2/clock.c | 16 - arch/arm/mach-omap2/clock.h | 14 +- arch/arm/mach-omap2/clock_common_data.c | 11 - arch/arm/mach-omap2/dpll3xxx.c | 2 + arch/arm/mach-omap2/dpll44xx.c | 2 + arch/arm/mach-omap2/io.c | 26 +- arch/arm/mach-omap2/prm.h | 1 + arch/arm/mach-omap2/prm_common.c | 11 + arch/mips/alchemy/common/clock.c | 8 + arch/powerpc/kernel/time.c | 5 + arch/powerpc/platforms/512x/clock-commonclk.c | 11 +- drivers/clk/Kconfig | 18 +- drivers/clk/Makefile | 4 +- drivers/clk/at91/clk-programmable.c | 2 + drivers/clk/bcm/clk-kona.c | 2 + drivers/clk/clk-asm9260.c | 348 ++ drivers/clk/clk-cdce706.c | 700 +++ drivers/clk/clk-composite.c | 9 +- drivers/clk/clk-divider.c | 228 +- drivers/clk/clk-gate.c | 18 +- drivers/clk/clk-mux.c | 16 + drivers/clk/{clk-ppc-corenet.c => clk-qoriq.c} | 109 +- drivers/clk/clk.c | 990 +++-- drivers/clk/clk.h | 5 + drivers/clk/clkdev.c | 85 +- drivers/clk/hisilicon/clk-hi3620.c | 2 + drivers/clk/mmp/clk-mix.c | 2 + drivers/clk/pxa/Makefile | 1 + drivers/clk/pxa/clk-pxa3xx.c | 364 ++ drivers/clk/qcom/Kconfig | 18 + drivers/clk/qcom/Makefile | 4 + drivers/clk/qcom/clk-pll.c | 1 + drivers/clk/qcom/clk-rcg.c | 10 +- drivers/clk/qcom/clk-rcg2.c | 6 + drivers/clk/qcom/clk-regmap-divider.c | 70 + drivers/clk/qcom/clk-regmap-divider.h | 29 + drivers/clk/qcom/clk-regmap-mux.c | 59 + drivers/clk/qcom/clk-regmap-mux.h | 29 + drivers/clk/qcom/gcc-ipq806x.c | 12 + drivers/clk/qcom/lcc-ipq806x.c | 473 ++ drivers/clk/qcom/lcc-msm8960.c | 585 +++ drivers/clk/rockchip/clk-rk3288.c | 48 +- drivers/clk/samsung/clk-exynos-audss.c | 32 +- drivers/clk/samsung/clk-exynos7.c | 408 +- drivers/clk/shmobile/Makefile | 2 + drivers/clk/shmobile/clk-div6.c | 15 +- drivers/clk/shmobile/clk-r8a73a4.c | 241 + drivers/clk/shmobile/clk-rcar-gen2.c | 88 + drivers/clk/st/clk-flexgen.c | 19 +- drivers/clk/sunxi/clk-factors.c | 2 + drivers/clk/sunxi/clk-sun6i-ar100.c | 2 + drivers/clk/sunxi/clk-sun9i-core.c | 57 +- drivers/clk/sunxi/clk-sunxi.c | 3 + drivers/clk/ti/Makefile | 4 +- drivers/clk/ti/clk-3xxx-legacy.c | 4653 ++++++++++++++++++++ drivers/clk/ti/clk-3xxx.c | 8 +- drivers/clk/ti/clk-44xx.c | 2 +- drivers/clk/ti/clk-54xx.c | 2 +- drivers/clk/ti/clk-7xx.c | 2 +- drivers/clk/ti/clk-816x.c | 53 + drivers/clk/ti/clk.c | 125 + drivers/clk/ti/clock.h | 172 + drivers/clk/ti/composite.c | 46 +- drivers/clk/ti/divider.c | 132 +- drivers/clk/ti/dpll.c | 119 +- drivers/clk/ti/fapll.c | 410 ++ drivers/clk/ti/gate.c | 161 +- drivers/clk/ti/interface.c | 96 +- drivers/clk/ti/mux.c | 70 +- drivers/clk/ux500/clk-prcc.c | 1 - drivers/clk/ux500/clk-prcmu.c | 1 - drivers/clk/zynq/clkc.c | 1 + drivers/cpufreq/Kconfig.powerpc | 2 +- include/dt-bindings/clock/alphascale,asm9260.h | 97 + include/dt-bindings/clock/exynos7-clk.h | 88 +- include/dt-bindings/clock/qcom,gcc-ipq806x.h | 1 - include/dt-bindings/clock/qcom,lcc-ipq806x.h | 30 + include/dt-bindings/clock/qcom,lcc-msm8960.h | 50 + include/dt-bindings/clock/rk3288-cru.h | 4 + include/linux/clk-private.h | 220 - include/linux/clk-provider.h | 52 +- include/linux/clk.h | 45 + include/linux/clk/ti.h | 17 + 95 files changed, 11141 insertions(+), 4605 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/qcom,lcc.txt create mode 100644 Documentation/devicetree/bindings/clock/renesas,r8a73a4-cpg-clocks.txt create mode 100644 Documentation/devicetree/bindings/clock/ti,cdce706.txt create mode 100644 Documentation/devicetree/bindings/clock/ti/fapll.txt delete mode 100644 arch/arm/mach-omap2/cclock3xxx_data.c create mode 100644 drivers/clk/clk-asm9260.c create mode 100644 drivers/clk/clk-cdce706.c rename drivers/clk/{clk-ppc-corenet.c => clk-qoriq.c} (71%) create mode 100644 drivers/clk/pxa/clk-pxa3xx.c create mode 100644 drivers/clk/qcom/clk-regmap-divider.c create mode 100644 drivers/clk/qcom/clk-regmap-divider.h create mode 100644 drivers/clk/qcom/clk-regmap-mux.c create mode 100644 drivers/clk/qcom/clk-regmap-mux.h create mode 100644 drivers/clk/qcom/lcc-ipq806x.c create mode 100644 drivers/clk/qcom/lcc-msm8960.c create mode 100644 drivers/clk/shmobile/clk-r8a73a4.c create mode 100644 drivers/clk/ti/clk-3xxx-legacy.c create mode 100644 drivers/clk/ti/clk-816x.c create mode 100644 drivers/clk/ti/clock.h create mode 100644 drivers/clk/ti/fapll.c create mode 100644 include/dt-bindings/clock/alphascale,asm9260.h create mode 100644 include/dt-bindings/clock/qcom,lcc-ipq806x.h create mode 100644 include/dt-bindings/clock/qcom,lcc-msm8960.h delete mode 100644 include/linux/clk-private.h Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data) $ git merge random/dev Already up-to-date. Merging aio/master (f84249f4cfef fs/aio: fix sleeping while TASK_INTERRUPTIBLE) $ git merge aio/master Auto-merging fs/aio.c Merge made by the 'recursive' strategy. fs/aio.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 93 insertions(+), 24 deletions(-) Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu) $ git merge llvmlinux/for-next Merge made by the 'recursive' strategy. Merging kselftest/next (ef6c93c78457 kbuild: add a new kselftest_install make target to install selftests) $ git merge kselftest/next Auto-merging tools/testing/selftests/vm/Makefile Auto-merging Makefile Merge made by the 'recursive' strategy. Makefile | 14 +++++- tools/testing/selftests/Makefile | 54 +++++++++++++++++++++- tools/testing/selftests/breakpoints/Makefile | 19 +++++++- tools/testing/selftests/cpu-hotplug/Makefile | 14 +++++- .../{on-off-test.sh => cpu-on-off-test.sh} | 0 tools/testing/selftests/efivarfs/Makefile | 16 ++++++- tools/testing/selftests/firmware/Makefile | 43 ++++++++++------- tools/testing/selftests/ftrace/Makefile | 13 +++++- tools/testing/selftests/ipc/Makefile | 19 +++++++- tools/testing/selftests/kcmp/Makefile | 13 +++++- tools/testing/selftests/memfd/Makefile | 17 +++++-- tools/testing/selftests/memory-hotplug/Makefile | 14 +++++- .../{on-off-test.sh => mem-on-off-test.sh} | 0 tools/testing/selftests/mount/Makefile | 12 ++++- tools/testing/selftests/mqueue/Makefile | 18 ++++++-- tools/testing/selftests/net/Makefile | 20 ++++++-- tools/testing/selftests/ptrace/Makefile | 16 +++++-- tools/testing/selftests/size/Makefile | 12 ++++- tools/testing/selftests/sysctl/Makefile | 17 ++++++- tools/testing/selftests/timers/Makefile | 12 ++++- tools/testing/selftests/user/Makefile | 12 ++++- tools/testing/selftests/vm/Makefile | 11 ++++- 22 files changed, 317 insertions(+), 49 deletions(-) rename tools/testing/selftests/cpu-hotplug/{on-off-test.sh => cpu-on-off-test.sh} (100%) rename tools/testing/selftests/memory-hotplug/{on-off-test.sh => mem-on-off-test.sh} (100%) Merging y2038/y2038 (ed8c2241c1ae coredump: Use 64bit time for unix time of coredump) $ git merge y2038/y2038 Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_hw.c Auto-merging drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c Merge made by the 'recursive' strategy. drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 4 +- drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 4 +- drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 4 +- drivers/staging/ft1000/ft1000.h | 4 +- drivers/staging/gdm72xx/gdm_sdio.c | 13 +++--- drivers/staging/gdm72xx/gdm_sdio.h | 4 +- drivers/staging/media/lirc/lirc_parallel.c | 35 +++++++---------- drivers/staging/media/lirc/lirc_sasem.c | 20 +++++----- drivers/staging/media/lirc/lirc_serial.c | 50 ++++++++---------------- fs/coredump.c | 8 ++-- kernel/cpuset.c | 12 ++++-- 11 files changed, 68 insertions(+), 90 deletions(-) Merging luto-misc/next (188c901941ef Merge branch 'leds-fixes-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds) $ git merge luto-misc/next Already up-to-date. Merging access_once/linux-next (c5b19946eb76 kernel: Fix sparse warning for ACCESS_ONCE) $ git merge access_once/linux-next Auto-merging mm/gup.c Auto-merging include/linux/compiler.h Auto-merging arch/x86/xen/p2m.c Merge made by the 'recursive' strategy. arch/powerpc/kvm/book3s_hv_rm_xics.c | 8 ++++---- arch/powerpc/kvm/book3s_xics.c | 16 ++++++++-------- arch/powerpc/mm/hugetlbpage.c | 4 ++-- arch/sh/mm/gup.c | 2 +- arch/x86/include/asm/spinlock.h | 4 ++-- arch/x86/xen/p2m.c | 2 +- include/linux/compiler.h | 21 ++++++++++++++++----- mm/gup.c | 2 +- 8 files changed, 35 insertions(+), 24 deletions(-) Merging livepatching/for-next (dbed7ddab967 livepatch: fix uninitialized return value) $ git merge livepatching/for-next Auto-merging kernel/Makefile Auto-merging include/linux/kernel.h Auto-merging arch/x86/Kconfig Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. Documentation/ABI/testing/sysfs-kernel-livepatch | 44 + Documentation/oops-tracing.txt | 2 + Documentation/sysctl/kernel.txt | 1 + MAINTAINERS | 15 + arch/x86/Kconfig | 3 + arch/x86/include/asm/livepatch.h | 46 + arch/x86/kernel/Makefile | 1 + arch/x86/kernel/livepatch.c | 90 ++ include/linux/kernel.h | 1 + include/linux/livepatch.h | 133 +++ kernel/Makefile | 1 + kernel/livepatch/Kconfig | 18 + kernel/livepatch/Makefile | 3 + kernel/livepatch/core.c | 1015 ++++++++++++++++++++++ kernel/panic.c | 2 + samples/Kconfig | 7 + samples/Makefile | 2 +- samples/livepatch/Makefile | 1 + samples/livepatch/livepatch-sample.c | 91 ++ 19 files changed, 1475 insertions(+), 1 deletion(-) create mode 100644 Documentation/ABI/testing/sysfs-kernel-livepatch create mode 100644 arch/x86/include/asm/livepatch.h create mode 100644 arch/x86/kernel/livepatch.c create mode 100644 include/linux/livepatch.h create mode 100644 kernel/livepatch/Kconfig create mode 100644 kernel/livepatch/Makefile create mode 100644 kernel/livepatch/core.c create mode 100644 samples/livepatch/Makefile create mode 100644 samples/livepatch/livepatch-sample.c Merging akpm-current/current (78ccbbfb50bf mm: remove remaining references to NUMA hinting bits and helpers -fix) $ git merge --no-ff akpm-current/current Resolved 'arch/powerpc/include/asm/pgtable-ppc32.h' using previous resolution. Resolved 'include/linux/mm.h' using previous resolution. Resolved 'mm/swap.c' using previous resolution. Auto-merging virt/kvm/kvm_main.c Auto-merging mm/vmscan.c Auto-merging mm/swap.c CONFLICT (content): Merge conflict in mm/swap.c Auto-merging mm/shmem.c Auto-merging mm/page-writeback.c Auto-merging mm/nommu.c Auto-merging mm/memory.c Auto-merging mm/madvise.c Auto-merging mm/gup.c Removing mm/fremap.c Auto-merging mm/filemap_xip.c Auto-merging mm/filemap.c Auto-merging mm/Kconfig Auto-merging lib/string.c Auto-merging lib/Makefile Auto-merging lib/Kconfig.debug Auto-merging lib/Kconfig Auto-merging kernel/trace/trace.c Auto-merging kernel/time/hrtimer.c Auto-merging kernel/sched/core.c Auto-merging kernel/rcu/tree_plugin.h Auto-merging kernel/kexec.c Auto-merging kernel/futex.c Auto-merging kernel/debug/debug_core.c Auto-merging kernel/cpuset.c Auto-merging init/main.c Auto-merging init/Kconfig Auto-merging include/linux/types.h Auto-merging include/linux/rtc.h Auto-merging include/linux/mm.h CONFLICT (content): Merge conflict in include/linux/mm.h Auto-merging include/linux/kvm_host.h Auto-merging include/linux/fs.h Auto-merging fs/xfs/xfs_super.c Auto-merging fs/xfs/xfs_qm.c Auto-merging fs/xfs/xfs_file.c Auto-merging fs/ubifs/file.c Auto-merging fs/super.c Auto-merging fs/proc/generic.c Auto-merging fs/ocfs2/super.c Auto-merging fs/ocfs2/quota_local.c Auto-merging fs/ocfs2/file.c Auto-merging fs/inode.c Auto-merging fs/gfs2/quota.c Auto-merging fs/gfs2/file.c Auto-merging fs/fuse/file.c Auto-merging fs/f2fs/file.c Auto-merging fs/dcache.c Auto-merging fs/cifs/file.c Auto-merging fs/btrfs/file.c Auto-merging drivers/scsi/scsi_debug.c Auto-merging drivers/rtc/interface.c Auto-merging drivers/rtc/Kconfig Auto-merging drivers/leds/Kconfig Auto-merging drivers/input/input.c Auto-merging drivers/clk/clk.c Auto-merging arch/x86/kernel/signal.c Auto-merging arch/x86/include/asm/thread_info.h Auto-merging arch/sh/mm/gup.c Auto-merging arch/s390/include/asm/pgtable.h Auto-merging arch/powerpc/mm/hugetlbpage.c Auto-merging arch/powerpc/include/asm/thread_info.h Auto-merging arch/powerpc/include/asm/pte-common.h Auto-merging arch/powerpc/include/asm/pte-8xx.h Auto-merging arch/powerpc/include/asm/pgtable.h Auto-merging arch/powerpc/include/asm/pgtable-ppc32.h CONFLICT (content): Merge conflict in arch/powerpc/include/asm/pgtable-ppc32.h Auto-merging arch/microblaze/kernel/signal.c Auto-merging arch/arm64/kernel/signal32.c Auto-merging arch/arm64/include/asm/pgtable.h Auto-merging arch/arm/include/asm/pgtable-3level.h Auto-merging arch/arm/boot/dts/armada-xp-netgear-rn2120.dts Auto-merging arch/arm/boot/dts/armada-370-netgear-rn104.dts Auto-merging arch/arm/boot/dts/armada-370-netgear-rn102.dts Auto-merging Documentation/sysctl/vm.txt Auto-merging Documentation/filesystems/proc.txt Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt Auto-merging Documentation/devicetree/bindings/i2c/trivial-devices.txt Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 68a9462de925] Merge branch 'akpm-current/current' $ git diff -M --stat --summary HEAD^.. .gitignore | 5 + .mailmap | 1 + Documentation/cachetlb.txt | 8 +- Documentation/cgroups/unified-hierarchy.txt | 79 ++ .../devicetree/bindings/i2c/trivial-devices.txt | 1 + .../devicetree/bindings/rtc/isil,isl12057.txt | 78 ++ .../devicetree/bindings/rtc/nxp,rtc-2123.txt | 16 + .../devicetree/bindings/vendor-prefixes.txt | 1 + Documentation/filesystems/fiemap.txt | 3 +- Documentation/filesystems/ocfs2.txt | 4 + Documentation/filesystems/proc.txt | 60 ++ Documentation/filesystems/vfat.txt | 10 + Documentation/leds/leds-class.txt | 3 - Documentation/printk-formats.txt | 6 + Documentation/sysctl/vm.txt | 12 +- Documentation/vm/pagemap.txt | 8 + Documentation/vm/remap_file_pages.txt | 7 +- arch/alpha/include/asm/pgtable.h | 9 +- arch/alpha/include/asm/thread_info.h | 5 - arch/alpha/include/uapi/asm/mman.h | 1 + arch/alpha/kernel/signal.c | 2 +- arch/arc/include/asm/pgtable.h | 15 +- arch/arc/include/asm/thread_info.h | 4 - arch/arc/kernel/signal.c | 2 +- arch/arm/boot/dts/armada-370-netgear-rn102.dts | 1 + arch/arm/boot/dts/armada-370-netgear-rn104.dts | 1 + arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 1 + arch/arm/include/asm/pgtable-2level.h | 3 +- arch/arm/include/asm/pgtable-3level.h | 2 +- arch/arm/include/asm/pgtable-nommu.h | 4 +- arch/arm/include/asm/pgtable.h | 20 +- arch/arm/include/asm/thread_info.h | 4 - arch/arm/kernel/signal.c | 4 +- arch/arm/mm/hugetlbpage.c | 6 - arch/arm/mm/pgd.c | 4 + arch/arm/mm/proc-macros.S | 2 +- arch/arm64/include/asm/pgtable.h | 26 +- arch/arm64/include/asm/thread_info.h | 4 - arch/arm64/kernel/signal.c | 2 +- arch/arm64/kernel/signal32.c | 4 +- arch/arm64/mm/hugetlbpage.c | 6 - arch/avr32/include/asm/pgtable.h | 27 +- arch/avr32/include/asm/thread_info.h | 4 - arch/avr32/kernel/asm-offsets.c | 1 - arch/avr32/kernel/signal.c | 2 +- arch/blackfin/include/asm/pgtable.h | 5 - arch/blackfin/include/asm/thread_info.h | 4 - arch/blackfin/kernel/signal.c | 2 +- arch/c6x/include/asm/pgtable.h | 5 - arch/c6x/include/asm/thread_info.h | 4 - arch/c6x/kernel/signal.c | 2 +- arch/cris/arch-v10/kernel/signal.c | 2 +- arch/cris/arch-v32/kernel/signal.c | 2 +- arch/cris/include/arch-v10/arch/mmu.h | 3 - arch/cris/include/arch-v32/arch/mmu.h | 3 - arch/cris/include/asm/pgtable.h | 6 +- arch/cris/include/asm/thread_info.h | 4 - arch/frv/include/asm/pgtable.h | 29 +- arch/frv/include/asm/string.h | 1 - arch/frv/include/asm/thread_info.h | 4 - arch/frv/kernel/asm-offsets.c | 1 - arch/frv/kernel/signal.c | 2 +- arch/frv/mm/extable.c | 23 - arch/hexagon/include/asm/pgtable.h | 62 +- arch/hexagon/include/asm/thread_info.h | 4 - arch/hexagon/kernel/signal.c | 2 +- arch/ia64/include/asm/pgtable.h | 27 +- arch/ia64/include/asm/thread_info.h | 4 - arch/ia64/kernel/signal.c | 2 +- arch/ia64/kernel/topology.c | 6 +- arch/ia64/mm/hugetlbpage.c | 6 - arch/m32r/include/asm/pgtable-2level.h | 4 - arch/m32r/include/asm/pgtable.h | 13 +- arch/m32r/include/asm/thread_info.h | 5 - arch/m32r/kernel/signal.c | 2 +- arch/m68k/include/asm/mcf_pgtable.h | 23 +- arch/m68k/include/asm/motorola_pgtable.h | 15 - arch/m68k/include/asm/pgtable_mm.h | 2 +- arch/m68k/include/asm/pgtable_no.h | 2 - arch/m68k/include/asm/sun3_pgtable.h | 15 - arch/m68k/include/asm/thread_info.h | 4 - arch/m68k/kernel/signal.c | 4 +- arch/metag/include/asm/pgtable.h | 6 - arch/metag/include/asm/thread_info.h | 6 +- arch/metag/kernel/signal.c | 2 +- arch/metag/mm/hugetlbpage.c | 6 - arch/microblaze/include/asm/pgtable.h | 15 +- arch/microblaze/include/asm/thread_info.h | 4 - arch/microblaze/kernel/signal.c | 2 +- arch/mips/include/asm/pgtable-32.h | 38 +- arch/mips/include/asm/pgtable-64.h | 9 - arch/mips/include/asm/pgtable-bits.h | 9 - arch/mips/include/asm/pgtable.h | 2 - arch/mips/include/asm/thread_info.h | 4 - arch/mips/include/uapi/asm/mman.h | 1 + arch/mips/kernel/asm-offsets.c | 1 - arch/mips/kernel/signal.c | 2 +- arch/mips/kernel/signal32.c | 2 +- arch/mips/mm/gup.c | 8 +- arch/mips/mm/hugetlbpage.c | 18 - arch/mips/netlogic/common/smp.c | 13 +- arch/mn10300/include/asm/cacheflush.h | 7 - arch/mn10300/include/asm/pgtable.h | 19 +- arch/mn10300/include/asm/thread_info.h | 4 - arch/mn10300/kernel/asm-offsets.c | 1 - arch/mn10300/kernel/signal.c | 2 +- arch/nios2/include/asm/pgtable-bits.h | 1 - arch/nios2/include/asm/pgtable.h | 12 +- arch/openrisc/include/asm/pgtable.h | 10 +- arch/openrisc/include/asm/thread_info.h | 4 - arch/openrisc/kernel/head.S | 5 - arch/openrisc/kernel/signal.c | 2 +- arch/parisc/include/asm/pgtable.h | 12 +- arch/parisc/include/asm/thread_info.h | 4 - arch/parisc/include/uapi/asm/mman.h | 1 + arch/parisc/kernel/signal.c | 2 +- arch/powerpc/include/asm/cacheflush.h | 7 - arch/powerpc/include/asm/pgtable-ppc32.h | 11 +- arch/powerpc/include/asm/pgtable-ppc64.h | 9 +- arch/powerpc/include/asm/pgtable.h | 55 +- arch/powerpc/include/asm/pte-40x.h | 1 - arch/powerpc/include/asm/pte-44x.h | 5 - arch/powerpc/include/asm/pte-8xx.h | 1 - arch/powerpc/include/asm/pte-book3e.h | 1 - arch/powerpc/include/asm/pte-common.h | 5 - arch/powerpc/include/asm/pte-fsl-booke.h | 3 - arch/powerpc/include/asm/pte-hash32.h | 1 - arch/powerpc/include/asm/pte-hash64.h | 7 - arch/powerpc/include/asm/thread_info.h | 4 - arch/powerpc/kernel/cacheinfo.c | 15 +- arch/powerpc/kernel/machine_kexec_64.c | 2 - arch/powerpc/kernel/signal_32.c | 4 +- arch/powerpc/kernel/signal_64.c | 2 +- arch/powerpc/kvm/book3s_hv_rm_mmu.c | 2 +- arch/powerpc/mm/copro_fault.c | 8 +- arch/powerpc/mm/fault.c | 25 +- arch/powerpc/mm/hugetlbpage.c | 8 + arch/powerpc/mm/pgtable.c | 11 +- arch/powerpc/mm/pgtable_64.c | 5 +- arch/powerpc/mm/subpage-prot.c | 6 +- arch/powerpc/sysdev/xics/ics-opal.c | 6 +- arch/powerpc/sysdev/xics/ics-rtas.c | 7 +- arch/s390/include/asm/cacheflush.h | 4 - arch/s390/include/asm/pgtable.h | 31 +- arch/s390/include/asm/string.h | 1 - arch/s390/include/asm/thread_info.h | 4 - arch/s390/kernel/compat_signal.c | 2 +- arch/s390/kernel/signal.c | 2 +- arch/s390/mm/gup.c | 6 +- arch/s390/mm/hugetlbpage.c | 20 - arch/score/include/asm/pgtable-bits.h | 1 - arch/score/include/asm/pgtable.h | 20 +- arch/score/include/asm/thread_info.h | 4 - arch/score/kernel/asm-offsets.c | 1 - arch/score/kernel/signal.c | 2 +- arch/sh/Kconfig | 2 +- arch/sh/boards/mach-se/7343/irq.c | 3 - arch/sh/boards/mach-se/7722/irq.c | 3 - arch/sh/include/asm/pgtable.h | 2 +- arch/sh/include/asm/pgtable_32.h | 30 +- arch/sh/include/asm/pgtable_64.h | 9 +- arch/sh/include/asm/thread_info.h | 4 - arch/sh/kernel/asm-offsets.c | 1 - arch/sh/kernel/signal_32.c | 4 +- arch/sh/kernel/signal_64.c | 4 +- arch/sh/mm/gup.c | 6 +- arch/sh/mm/hugetlbpage.c | 12 - arch/sparc/include/asm/cacheflush_64.h | 5 - arch/sparc/include/asm/pgtable_32.h | 29 +- arch/sparc/include/asm/pgtable_64.h | 51 +- arch/sparc/include/asm/pgtsrmmu.h | 14 +- arch/sparc/include/asm/thread_info_32.h | 6 - arch/sparc/include/asm/thread_info_64.h | 12 +- arch/sparc/kernel/signal32.c | 4 +- arch/sparc/kernel/signal_32.c | 2 +- arch/sparc/kernel/signal_64.c | 2 +- arch/sparc/kernel/traps_64.c | 2 - arch/sparc/mm/gup.c | 6 +- arch/sparc/mm/hugetlbpage.c | 12 - arch/tile/include/asm/pgtable.h | 13 +- arch/tile/include/asm/thread_info.h | 4 - arch/tile/kernel/hardwall.c | 5 +- arch/tile/kernel/proc.c | 5 +- arch/tile/kernel/setup.c | 13 +- arch/tile/kernel/signal.c | 2 +- arch/tile/mm/homecache.c | 16 +- arch/tile/mm/hugetlbpage.c | 28 - arch/tile/mm/init.c | 18 +- arch/um/include/asm/pgtable-2level.h | 11 +- arch/um/include/asm/pgtable-3level.h | 22 +- arch/um/include/asm/pgtable.h | 9 - arch/um/include/asm/thread_info.h | 4 - arch/unicore32/include/asm/pgtable-hwdef.h | 1 - arch/unicore32/include/asm/pgtable.h | 14 - arch/unicore32/include/asm/thread_info.h | 4 - arch/unicore32/kernel/signal.c | 2 +- arch/unicore32/mm/pgd.c | 3 + arch/x86/ia32/ia32_signal.c | 2 +- arch/x86/include/asm/pgtable-2level.h | 38 +- arch/x86/include/asm/pgtable-3level.h | 12 - arch/x86/include/asm/pgtable.h | 71 +- arch/x86/include/asm/pgtable_64.h | 11 +- arch/x86/include/asm/pgtable_types.h | 46 +- arch/x86/include/asm/thread_info.h | 4 - arch/x86/kernel/cpu/intel_cacheinfo.c | 26 +- arch/x86/kernel/machine_kexec_64.c | 1 + arch/x86/kernel/signal.c | 2 +- arch/x86/mm/gup.c | 13 +- arch/x86/mm/hugetlbpage.c | 20 +- arch/x86/mm/numa.c | 6 +- arch/x86/mm/pgtable.c | 14 +- arch/x86/platform/uv/uv_nmi.c | 25 +- arch/x86/um/signal.c | 2 +- arch/xtensa/include/asm/pgtable.h | 12 +- arch/xtensa/include/asm/thread_info.h | 5 - arch/xtensa/include/uapi/asm/mman.h | 1 + arch/xtensa/kernel/setup.c | 7 +- arch/xtensa/kernel/signal.c | 2 +- block/genhd.c | 2 +- drivers/base/cpu.c | 2 +- drivers/base/node.c | 3 +- drivers/block/zram/zram_drv.c | 55 +- drivers/bus/arm-cci.c | 4 +- drivers/clk/clk.c | 12 +- drivers/gpu/drm/drm_vma_manager.c | 3 +- drivers/input/Kconfig | 9 + drivers/input/Makefile | 3 + drivers/input/input.c | 9 + drivers/input/keyboard/atkbd.c | 4 +- drivers/input/keyboard/gpio_keys.c | 2 +- drivers/input/leds.c | 272 +++++ drivers/leds/Kconfig | 3 - drivers/media/pci/ivtv/ivtv-udma.c | 6 +- drivers/net/ethernet/tile/tilegx.c | 5 +- drivers/net/ethernet/tile/tilepro.c | 5 +- drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 23 +- drivers/net/wireless/ath/carl9170/debug.c | 24 +- drivers/rtc/Kconfig | 11 + drivers/rtc/Makefile | 1 + drivers/rtc/class.c | 24 + drivers/rtc/interface.c | 13 +- drivers/rtc/rtc-ab-b5ze-s3.c | 1035 +++++++++++++++++++ drivers/rtc/rtc-at91sam9.c | 2 +- drivers/rtc/rtc-imxdi.c | 50 +- drivers/rtc/rtc-isl12057.c | 348 ++++++- drivers/rtc/rtc-pcf2123.c | 10 + drivers/rtc/rtc-rk808.c | 10 +- drivers/scsi/scsi_debug.c | 6 +- drivers/scsi/st.c | 7 +- drivers/staging/android/lowmemorykiller.c | 7 +- drivers/tty/Kconfig | 4 + drivers/tty/sysrq.c | 23 +- drivers/tty/vt/keyboard.c | 110 ++- drivers/usb/host/whci/debug.c | 7 +- drivers/usb/wusbcore/reservation.c | 5 +- drivers/usb/wusbcore/wa-rpipe.c | 5 +- drivers/usb/wusbcore/wusbhc.c | 7 +- drivers/uwb/drp.c | 2 - drivers/uwb/uwb-debug.c | 16 +- drivers/video/fbdev/pvr2fb.c | 6 +- fs/9p/vfs_file.c | 2 - fs/affs/amigaffs.c | 6 +- fs/affs/dir.c | 8 +- fs/affs/file.c | 49 +- fs/affs/inode.c | 5 +- fs/affs/namei.c | 18 +- fs/affs/super.c | 1 + fs/befs/linuxvfs.c | 6 +- fs/btrfs/extent_io.c | 2 +- fs/btrfs/file.c | 1 - fs/ceph/addr.c | 1 - fs/cifs/file.c | 1 - fs/coda/dir.c | 138 ++- fs/dcache.c | 35 +- fs/drop_caches.c | 14 - fs/eventfd.c | 12 +- fs/ext4/file.c | 1 - fs/ext4/fsync.c | 5 +- fs/f2fs/file.c | 1 - fs/fat/cache.c | 79 +- fs/fat/dir.c | 2 +- fs/fat/fat.h | 6 +- fs/fat/file.c | 61 ++ fs/fat/inode.c | 77 +- fs/fuse/file.c | 1 - fs/gfs2/file.c | 1 - fs/gfs2/quota.c | 11 +- fs/inode.c | 16 +- fs/internal.h | 7 +- fs/ioctl.c | 5 + fs/jffs2/scan.c | 5 + fs/kernfs/dir.c | 24 +- fs/kernfs/file.c | 4 - fs/mpage.c | 23 +- fs/namespace.c | 6 +- fs/nfs/file.c | 1 - fs/nilfs2/file.c | 1 - fs/notify/fanotify/fanotify.c | 2 +- fs/notify/fanotify/fanotify_user.c | 35 +- fs/ocfs2/acl.c | 14 +- fs/ocfs2/alloc.c | 18 +- fs/ocfs2/aops.c | 21 +- fs/ocfs2/cluster/heartbeat.c | 49 +- fs/ocfs2/cluster/tcp.c | 3 +- fs/ocfs2/cluster/tcp_internal.h | 12 +- fs/ocfs2/dir.c | 10 +- fs/ocfs2/dlm/dlmast.c | 6 +- fs/ocfs2/dlm/dlmdebug.c | 4 +- fs/ocfs2/dlm/dlmdomain.c | 14 - fs/ocfs2/dlm/dlmdomain.h | 1 - fs/ocfs2/dlm/dlmmaster.c | 10 - fs/ocfs2/dlm/dlmrecovery.c | 7 + fs/ocfs2/dlm/dlmthread.c | 10 + fs/ocfs2/dlmglue.c | 3 + fs/ocfs2/file.c | 2 +- fs/ocfs2/journal.c | 1 - fs/ocfs2/mmap.c | 1 - fs/ocfs2/ocfs2.h | 2 + fs/ocfs2/quota_local.c | 6 - fs/ocfs2/refcounttree.c | 2 - fs/ocfs2/super.c | 17 + fs/ocfs2/xattr.c | 10 - fs/proc/array.c | 44 +- fs/proc/generic.c | 2 +- fs/proc/inode.c | 2 +- fs/proc/page.c | 16 +- fs/proc/task_mmu.c | 254 ++--- fs/proc/vmcore.c | 8 +- fs/reiserfs/inode.c | 2 +- fs/select.c | 2 +- fs/seq_file.c | 32 - fs/super.c | 47 +- fs/sysfs/file.c | 2 +- fs/ubifs/file.c | 1 - fs/ufs/super.c | 4 +- fs/xfs/xfs_buf.c | 13 +- fs/xfs/xfs_file.c | 1 - fs/xfs/xfs_qm.c | 12 +- fs/xfs/xfs_super.c | 7 +- include/asm-generic/4level-fixup.h | 1 + include/asm-generic/pgtable.h | 168 +--- include/linux/bitmap.h | 59 +- include/linux/compaction.h | 86 +- include/linux/cpumask.h | 71 +- include/linux/crc64_ecma.h | 56 ++ include/linux/cryptohash.h | 2 + include/linux/fs.h | 12 +- include/linux/gfp.h | 4 + include/linux/huge_mm.h | 16 + include/linux/hugetlb.h | 10 +- include/linux/init_task.h | 3 + include/linux/input.h | 28 + include/linux/kernfs.h | 7 +- include/linux/kexec.h | 24 +- include/linux/kvm_host.h | 11 - include/linux/list_lru.h | 82 +- include/linux/memcontrol.h | 92 +- include/linux/migrate.h | 4 - include/linux/mm.h | 133 ++- include/linux/mm_types.h | 23 +- include/linux/mmzone.h | 15 +- include/linux/nodemask.h | 67 +- include/linux/oom.h | 18 +- include/linux/page_counter.h | 3 +- include/linux/page_ext.h | 2 +- include/linux/printk.h | 6 +- include/linux/rbtree.h | 2 +- include/linux/rmap.h | 11 +- include/linux/rtc.h | 4 + include/linux/sched.h | 2 + include/linux/seq_buf.h | 3 - include/linux/seq_file.h | 25 - include/linux/shrinker.h | 6 +- include/linux/slab.h | 34 +- include/linux/slab_def.h | 2 +- include/linux/slub_def.h | 2 +- include/linux/string.h | 7 +- include/linux/string_helpers.h | 4 +- include/linux/swap.h | 15 - include/linux/swapops.h | 8 +- include/linux/types.h | 5 +- include/linux/vm_event_item.h | 1 + include/linux/zpool.h | 5 +- include/linux/zsmalloc.h | 2 +- include/trace/events/compaction.h | 209 +++- include/trace/events/kmem.h | 7 +- include/uapi/asm-generic/mman-common.h | 1 + include/uapi/linux/kernel-page-flags.h | 1 + include/uapi/linux/kexec.h | 6 - include/uapi/linux/mempolicy.h | 2 +- init/Kconfig | 16 - init/main.c | 5 - ipc/sem.c | 2 +- kernel/cgroup.c | 12 +- kernel/compat.c | 5 +- kernel/cpuset.c | 42 +- kernel/debug/debug_core.c | 17 + kernel/exit.c | 3 +- kernel/fork.c | 19 +- kernel/futex.c | 2 +- kernel/irq/proc.c | 11 +- kernel/kexec.c | 23 +- kernel/padata.c | 11 +- kernel/power/process.c | 75 +- kernel/printk/printk.c | 12 +- kernel/profile.c | 3 +- kernel/ptrace.c | 1 - kernel/rcu/tree_plugin.h | 5 +- kernel/sched/core.c | 10 +- kernel/sched/stats.c | 11 +- kernel/signal.c | 6 +- kernel/sysctl.c | 3 - kernel/time/alarmtimer.c | 2 +- kernel/time/hrtimer.c | 2 +- kernel/time/posix-cpu-timers.c | 3 +- kernel/time/tick-sched.c | 11 +- kernel/trace/trace.c | 6 +- kernel/trace/trace_seq.c | 2 +- kernel/workqueue.c | 5 +- lib/Kconfig | 7 + lib/Kconfig.debug | 3 + lib/Makefile | 5 +- lib/bitmap.c | 240 ++--- lib/crc64_ecma.c | 341 +++++++ lib/dynamic_queue_limits.c | 4 +- lib/gen_crc32table.c | 6 +- lib/genalloc.c | 5 +- lib/halfmd4.c | 2 +- lib/hexdump.c | 105 +- lib/idr.c | 1 - lib/interval_tree.c | 4 +- lib/kobject_uevent.c | 1 - lib/lcm.c | 2 +- lib/list_sort.c | 7 +- lib/llist.c | 1 - lib/md5.c | 2 +- lib/nlattr.c | 1 - lib/percpu_ida.c | 3 - lib/plist.c | 1 - lib/radix-tree.c | 2 +- lib/seq_buf.c | 36 - lib/show_mem.c | 1 - lib/sort.c | 6 +- lib/stmp_device.c | 3 +- lib/string.c | 20 +- lib/string_helpers.c | 26 +- lib/strncpy_from_user.c | 3 +- lib/test-hexdump.c | 180 ++++ lib/vsprintf.c | 126 ++- mm/Kconfig | 10 + mm/Makefile | 2 +- mm/cma.c | 2 +- mm/compaction.c | 156 ++- mm/debug.c | 4 +- mm/filemap.c | 1 - mm/filemap_xip.c | 1 - mm/fremap.c | 283 ------ mm/gup.c | 240 ++++- mm/huge_memory.c | 191 ++-- mm/hugetlb.c | 206 ++-- mm/hugetlb_cgroup.c | 2 +- mm/internal.h | 22 + mm/interval_tree.c | 34 +- mm/ksm.c | 2 +- mm/list_lru.c | 467 ++++++++- mm/madvise.c | 163 ++- mm/memcontrol.c | 1045 +++++++++++--------- mm/memory-failure.c | 11 +- mm/memory.c | 296 ++---- mm/memory_hotplug.c | 11 +- mm/mempolicy.c | 312 +++--- mm/migrate.c | 45 +- mm/mincore.c | 176 ++-- mm/mmap.c | 100 +- mm/mmzone.c | 4 +- mm/mprotect.c | 50 +- mm/mremap.c | 2 - mm/msync.c | 5 +- mm/nommu.c | 42 +- mm/oom_kill.c | 169 +++- mm/page-writeback.c | 17 +- mm/page_alloc.c | 440 ++++----- mm/page_counter.c | 7 +- mm/page_isolation.c | 7 +- mm/page_owner.c | 26 +- mm/pagewalk.c | 235 +++-- mm/percpu.c | 6 +- mm/pgtable-generic.c | 2 - mm/process_vm_access.c | 7 +- mm/rmap.c | 283 +----- mm/shmem.c | 3 +- mm/slab.c | 17 +- mm/slab.h | 67 +- mm/slab_common.c | 316 ++++-- mm/slob.c | 2 +- mm/slub.c | 175 ++-- mm/swap.c | 4 +- mm/util.c | 78 +- mm/vmscan.c | 233 +++-- mm/vmstat.c | 131 +-- mm/workingset.c | 9 +- mm/zbud.c | 3 +- mm/zpool.c | 6 +- mm/zsmalloc.c | 239 ++++- mm/zswap.c | 5 +- net/ceph/pagevec.c | 6 +- net/core/net-sysfs.c | 28 +- net/core/sysctl_net_core.c | 2 +- net/ipv4/tcp_memcontrol.c | 2 +- scripts/checkpatch.pl | 104 +- tools/vm/page-types.c | 1 + virt/kvm/async_pf.c | 2 +- virt/kvm/kvm_main.c | 50 +- 513 files changed, 8858 insertions(+), 6079 deletions(-) create mode 100644 Documentation/devicetree/bindings/rtc/isil,isl12057.txt create mode 100644 Documentation/devicetree/bindings/rtc/nxp,rtc-2123.txt create mode 100644 drivers/input/leds.c create mode 100644 drivers/rtc/rtc-ab-b5ze-s3.c create mode 100644 include/linux/crc64_ecma.h create mode 100644 lib/crc64_ecma.c create mode 100644 lib/test-hexdump.c delete mode 100644 mm/fremap.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: rtc: isl12022: deprecate use of isl in compatible string for isil Applying: rtc: isl12057: deprecate use of isl in compatible string for isil Applying: staging: iio: isl29028: deprecate use of isl in compatible string for isil Applying: arm: dts: zynq: update isl9305 compatible string to use isil vendor prefix Applying: mm: fix XIP fault vs truncate race Applying: mm-fix-xip-fault-vs-truncate-race-fix Applying: mm-fix-xip-fault-vs-truncate-race-fix-fix Applying: mm: allow page fault handlers to perform the COW Applying: mm-allow-page-fault-handlers-to-perform-the-cow-fix Applying: mm-allow-page-fault-handlers-to-perform-the-cow-fix-fix-3 Applying: mm-allow-page-fault-handlers-to-perform-the-cow-fix-fix Applying: vfs,ext2: introduce IS_DAX(inode) Applying: dax,ext2: replace XIP read and write with DAX I/O Applying: dax,ext2: replace ext2_clear_xip_target with dax_clear_blocks Applying: dax,ext2: replace the XIP page fault handler with the DAX page fault handler Applying: daxext2-replace-the-xip-page-fault-handler-with-the-dax-page-fault-handler-fix Applying: daxext2-replace-the-xip-page-fault-handler-with-the-dax-page-fault-handler-fix-2 Applying: daxext2-replace-the-xip-page-fault-handler-with-the-dax-page-fault-handler-fix-3 Applying: dax,ext2: replace xip_truncate_page with dax_truncate_page Applying: dax: replace XIP documentation with DAX documentation Applying: vfs: remove get_xip_mem Applying: ext2: remove ext2_xip_verify_sb() Applying: ext2: remove ext2_use_xip Applying: ext2: remove xip.c and xip.h Applying: vfs,ext2: remove CONFIG_EXT2_FS_XIP and rename CONFIG_FS_XIP to CONFIG_FS_DAX Applying: ext2: remove ext2_aops_xip Applying: ext2: get rid of most mentions of XIP in ext2 Applying: dax: add dax_zero_page_range Applying: dax-add-dax_zero_page_range-fix Applying: ext4: add DAX functionality Applying: ext4-add-dax-functionality-fix Applying: brd: rename XIP to DAX Applying: MAINTAINERS: fix spelling mistake & remove trailing WS Applying: ocfs2: prepare some interfaces used in append direct io Applying: ocfs2: add functions to add and remove inode in orphan dir Applying: ocfs2-add-functions-to-add-and-remove-inode-in-orphan-dir-fix Applying: ocfs2: add orphan recovery types in ocfs2_recover_orphans Applying: ocfs2: implement ocfs2_direct_IO_write Applying: ocfs2-implement-ocfs2_direct_io_write-fix Applying: ocfs2: allocate blocks in ocfs2_direct_IO_get_blocks Applying: ocfs2: do not fallback to buffer I/O write if appending Applying: ocfs2: complete the rest request through buffer io Applying: ocfs2: wait for orphan recovery first once append O_DIRECT write crash Applying: ocfs2: set append dio as a ro compat feature Applying: drivers/w1/w1_int.c: call put_device if device_register fails Applying: mm: add strictlimit knob $ cd ../next $ git fetch -f ../rebase-tmp akpm:akpm/master From ../rebase-tmp + 9721c95386b1...97054281cad8 akpm -> akpm/master (forced update) $ rm -rf ../rebase-tmp Merging akpm/master (97054281cad8 mm: add strictlimit knob) $ git merge --no-ff akpm/master Removing mm/filemap_xip.c Removing fs/ext2/xip.h Removing fs/ext2/xip.c Removing Documentation/filesystems/xip.txt Merge made by the 'recursive' strategy. Documentation/ABI/testing/sysfs-class-bdi | 8 + Documentation/filesystems/00-INDEX | 5 +- Documentation/filesystems/Locking | 3 - Documentation/filesystems/dax.txt | 91 +++++ Documentation/filesystems/ext2.txt | 5 +- Documentation/filesystems/ext4.txt | 4 + Documentation/filesystems/vfs.txt | 7 - Documentation/filesystems/xip.txt | 71 ---- MAINTAINERS | 8 +- arch/arm/boot/dts/zynq-parallella.dts | 2 +- drivers/block/Kconfig | 13 +- drivers/block/brd.c | 14 +- drivers/gpio/gpio-zevio.c | 4 + drivers/rtc/rtc-isl12022.c | 3 +- drivers/rtc/rtc-isl12057.c | 3 +- drivers/staging/iio/light/isl29028.c | 4 +- drivers/w1/w1_int.c | 3 +- fs/Kconfig | 21 +- fs/Makefile | 1 + fs/dax.c | 534 ++++++++++++++++++++++++++++++ fs/exofs/inode.c | 1 - fs/ext2/Kconfig | 11 - fs/ext2/Makefile | 1 - fs/ext2/ext2.h | 10 +- fs/ext2/file.c | 44 ++- fs/ext2/inode.c | 38 ++- fs/ext2/namei.c | 13 +- fs/ext2/super.c | 53 ++- fs/ext2/xip.c | 86 ----- fs/ext2/xip.h | 26 -- fs/ext4/ext4.h | 6 + fs/ext4/file.c | 49 ++- fs/ext4/indirect.c | 18 +- fs/ext4/inode.c | 89 +++-- fs/ext4/namei.c | 10 +- fs/ext4/super.c | 39 ++- fs/ocfs2/aops.c | 242 +++++++++++++- fs/ocfs2/file.c | 76 ++++- fs/ocfs2/file.h | 9 + fs/ocfs2/inode.c | 2 +- fs/ocfs2/inode.h | 2 + fs/ocfs2/journal.c | 110 ++++-- fs/ocfs2/journal.h | 5 + fs/ocfs2/namei.c | 284 ++++++++++++++-- fs/ocfs2/namei.h | 8 +- fs/ocfs2/ocfs2.h | 23 ++ fs/ocfs2/ocfs2_fs.h | 14 +- fs/ocfs2/super.c | 2 + fs/open.c | 5 +- include/linux/fs.h | 34 +- include/linux/mm.h | 1 + include/linux/rmap.h | 2 +- mm/Makefile | 1 - mm/backing-dev.c | 35 ++ mm/fadvise.c | 6 +- mm/filemap.c | 25 +- mm/filemap_xip.c | 478 -------------------------- mm/madvise.c | 2 +- mm/memory.c | 42 ++- scripts/diffconfig | 1 - 60 files changed, 1786 insertions(+), 921 deletions(-) create mode 100644 Documentation/filesystems/dax.txt delete mode 100644 Documentation/filesystems/xip.txt create mode 100644 fs/dax.c delete mode 100644 fs/ext2/xip.c delete mode 100644 fs/ext2/xip.h delete mode 100644 mm/filemap_xip.c