--- /dev/null
+$ date -R
+Fri, 28 Aug 2015 07:27:34 +1000
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at f9ed72dde34e Merge branch 'for-linus' of git://git.kernel.dk/linux-block
+Merging origin/master (95803812cfb3 Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux)
+$ git merge origin/master
+Updating f9ed72dde34e..95803812cfb3
+Fast-forward
+ arch/arm64/kvm/inject_fault.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+Merging fixes/master (c7e9ad7da219 Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
+$ git merge fixes/master
+Already up-to-date.
+Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
+$ git merge kbuild-current/rc-fixes
+Already up-to-date.
+Merging arc-current/for-curr (e4140819dadc ARC: signal handling robustify)
+$ git merge arc-current/for-curr
+Already up-to-date.
+Merging arm-current/fixes (3939f3345050 ARM: 8418/1: add boot image dependencies to not generate invalid images)
+$ git merge arm-current/fixes
+Already up-to-date.
+Merging m68k-current/for-linus (1214c525484c m68k: Use for_each_sg())
+$ git merge m68k-current/for-linus
+Already up-to-date.
+Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
+$ 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-fixes/fixes (4d9aac397a5d powerpc/PCI: Disable MSI/MSI-X interrupts at PCI probe time in OF case)
+$ git merge powerpc-fixes/fixes
+Merge made by the 'recursive' strategy.
+ arch/powerpc/kernel/pci_of_scan.c | 3 +++
+ drivers/pci/probe.c | 2 +-
+ include/linux/pci.h | 1 +
+ 3 files changed, 5 insertions(+), 1 deletion(-)
+Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
+$ git merge powerpc-merge-mpe/fixes
+Already up-to-date.
+Merging sparc/master (73958c651fbf sparc64: use ENTRY/ENDPROC in VISsave)
+$ git merge sparc/master
+Merge made by the 'recursive' strategy.
+ arch/sparc/include/uapi/asm/asi.h | 2 +-
+ arch/sparc/lib/VISsave.S | 10 +++++-----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+Merging net/master (ce7b4ccc4f62 sctp: asconf's process should verify address parameter is in the beginning)
+$ git merge net/master
+Merge made by the 'recursive' strategy.
+ drivers/net/can/usb/peak_usb/pcan_usb.c | 24 +++---
+ drivers/net/can/usb/peak_usb/pcan_usb_core.c | 4 +-
+ drivers/net/can/usb/peak_usb/pcan_usb_core.h | 4 +-
+ drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 96 +++++++++++++-----------
+ drivers/net/can/usb/peak_usb/pcan_usb_pro.c | 24 +++---
+ drivers/net/ethernet/Makefile | 2 +-
+ drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 3 +
+ drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 5 +-
+ drivers/net/ethernet/broadcom/genet/bcmgenet.c | 20 ++++-
+ drivers/net/ethernet/freescale/fec_main.c | 4 +-
+ drivers/net/ethernet/sfc/ef10.c | 27 ++++++-
+ drivers/net/phy/fixed_phy.c | 9 +++
+ drivers/net/phy/phy.c | 16 +++-
+ drivers/net/phy/phy_device.c | 2 +-
+ drivers/net/usb/usbnet.c | 7 +-
+ drivers/net/vxlan.c | 2 +
+ net/ipv6/ip6_gre.c | 1 +
+ net/key/af_key.c | 46 ++++++------
+ net/netlink/af_netlink.c | 2 +-
+ net/sched/cls_u32.c | 13 ++++
+ net/sctp/sm_make_chunk.c | 7 ++
+ 21 files changed, 206 insertions(+), 112 deletions(-)
+Merging ipsec/master (158cd4af8ded packet: missing dev_put() in packet_do_bind())
+$ git merge ipsec/master
+Already up-to-date.
+Merging sound-current/for-linus (c7cd0ef66aad ALSA: hda - Fix path power activation)
+$ git merge sound-current/for-linus
+Merge made by the 'recursive' strategy.
+ sound/pci/hda/hda_codec.c | 2 +-
+ sound/pci/hda/hda_generic.c | 11 ++++-------
+ sound/pci/hda/patch_conexant.c | 23 ++++++++++++++++++++++-
+ sound/usb/quirks.c | 1 +
+ 4 files changed, 28 insertions(+), 9 deletions(-)
+Merging pci-current/for-linus (45ea2a5fed6d PCI: Don't use 64-bit bus addresses on PA-RISC)
+$ git merge pci-current/for-linus
+Already up-to-date.
+Merging wireless-drivers/master (741e3b9902d1 rtlwifi: rtl8723be: Add module parameter for MSI interrupts)
+$ git merge wireless-drivers/master
+Already up-to-date.
+Merging driver-core.current/driver-core-linus (cbfe8fa6cd67 Linux 4.2-rc4)
+$ git merge driver-core.current/driver-core-linus
+Already up-to-date.
+Merging tty.current/tty-linus (cbfe8fa6cd67 Linux 4.2-rc4)
+$ git merge tty.current/tty-linus
+Already up-to-date.
+Merging usb.current/usb-linus (f7644cbfcdf0 Linux 4.2-rc6)
+$ git merge usb.current/usb-linus
+Already up-to-date.
+Merging usb-gadget-fixes/fixes (c93e64e91248 usb: udc: core: add device_del() call to error pathway)
+$ git merge usb-gadget-fixes/fixes
+Already up-to-date.
+Merging usb-serial-fixes/usb-linus (d071a3cdd2e1 USB: qcserial: add HP lt4111 LTE/EV-DO/HSPA+ Gobi 4G Module)
+$ git merge usb-serial-fixes/usb-linus
+Merge made by the 'recursive' strategy.
+ drivers/usb/serial/ftdi_sio.c | 4 ++++
+ drivers/usb/serial/ftdi_sio_ids.h | 8 ++++++++
+ drivers/usb/serial/qcserial.c | 1 +
+ 3 files changed, 13 insertions(+)
+Merging staging.current/staging-linus (f7644cbfcdf0 Linux 4.2-rc6)
+$ git merge staging.current/staging-linus
+Already up-to-date.
+Merging char-misc.current/char-misc-linus (f7644cbfcdf0 Linux 4.2-rc6)
+$ git merge char-misc.current/char-misc-linus
+Already up-to-date.
+Merging input-current/for-linus (e51e38494a8e Input: synaptics - fix handling of disabling gesture mode)
+$ git merge input-current/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/input/mouse/synaptics.c | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+Merging crypto-current/master (b310c178e6d8 crypto: caam - fix memory corruption in ahash_final_ctx)
+$ git merge crypto-current/master
+Already up-to-date.
+Merging ide/master (d681f1166919 ide: remove deprecated use of pci api)
+$ git merge ide/master
+Already up-to-date.
+Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
+$ git merge devicetree-current/devicetree/merge
+Already up-to-date.
+Merging rr-fixes/fixes (275d7d44d802 module: Fix locking in symbol_put_addr())
+$ git merge rr-fixes/fixes
+Merge made by the 'recursive' strategy.
+ kernel/module.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+Merging vfio-fixes/for-linus (4bc94d5dc95d vfio: Fix lockdep issue)
+$ git merge vfio-fixes/for-linus
+Already up-to-date.
+Merging kselftest-fixes/fixes (fee50f3c8427 selftests/futex: Fix futex_cmp_requeue_pi() error handling)
+$ git merge kselftest-fixes/fixes
+Already up-to-date.
+Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
+$ git merge backlight-fixes/for-backlight-fixes
+Already up-to-date.
+Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
+$ git merge ftrace-fixes/for-next-urgent
+Already up-to-date.
+Merging mfd-fixes/for-mfd-fixes (fb9caeedafe6 mfd: Remove MFD_CROS_EC_SPI depends on OF)
+$ git merge mfd-fixes/for-mfd-fixes
+Already up-to-date.
+Merging drm-intel-fixes/for-linux-next-fixes (c13dcf9f2d6f Linux 4.2-rc8)
+$ 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
+Already up-to-date.
+Merging arc/for-next (3d5926599a6b ARCv2: entry: Fix reserved handler)
+$ git merge arc/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arc/archs-pct.txt | 17 ++
+ MAINTAINERS | 3 +-
+ arch/arc/Kconfig | 2 +
+ arch/arc/boot/dts/axc003.dtsi | 13 +-
+ arch/arc/include/asm/arcregs.h | 1 +
+ arch/arc/include/asm/cache.h | 8 +
+ arch/arc/include/asm/cmpxchg.h | 22 +-
+ arch/arc/include/asm/futex.h | 72 +++---
+ arch/arc/include/asm/perf_event.h | 23 +-
+ arch/arc/kernel/entry-arcv2.S | 9 +-
+ arch/arc/kernel/entry.S | 6 +-
+ arch/arc/kernel/perf_event.c | 275 ++++++++++++++++++---
+ arch/arc/kernel/process.c | 2 +-
+ arch/arc/kernel/unaligned.c | 6 +-
+ arch/arc/mm/cache.c | 184 +++++++++++---
+ arch/arc/mm/dma.c | 18 ++
+ arch/arc/plat-axs10x/axs10x.c | 2 +-
+ 17 files changed, 524 insertions(+), 139 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arc/archs-pct.txt
+Merging arm/for-next (0986c811d54f Merge branch 'drm-dwhdmi-devel' into for-next)
+$ git merge arm/for-next
+Resolved 'arch/arm/include/asm/Kbuild' using previous resolution.
+Auto-merging include/linux/perf/arm_pmu.h
+Auto-merging drivers/perf/arm_pmu.c
+Removing arch/arm64/include/asm/psci.h
+Removing arch/arm/mach-omap2/include/mach/barriers.h
+Auto-merging arch/arm/mach-omap2/Kconfig
+Removing arch/arm/kernel/psci.c
+Auto-merging arch/arm/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/arm/include/asm/Kbuild
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 5c9dec2a785d] Merge remote-tracking branch 'arm/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/arm/l2cc.txt | 6 +
+ Documentation/devicetree/bindings/arm/pmu.txt | 12 +-
+ MAINTAINERS | 15 +-
+ arch/arm/Kconfig | 25 +-
+ arch/arm/common/mcpm_platsmp.c | 12 +-
+ arch/arm/include/asm/Kbuild | 1 -
+ arch/arm/include/asm/assembler.h | 69 +++-
+ arch/arm/include/asm/barrier.h | 13 +-
+ arch/arm/include/asm/bitops.h | 24 +-
+ arch/arm/include/asm/cacheflush.h | 21 +-
+ arch/arm/include/asm/dma-mapping.h | 2 +-
+ arch/arm/include/asm/domain.h | 53 ++-
+ arch/arm/include/asm/fixmap.h | 15 +-
+ arch/arm/include/asm/futex.h | 19 +-
+ arch/arm/include/asm/glue-cache.h | 2 -
+ arch/arm/include/asm/irq.h | 5 +
+ arch/arm/include/asm/outercache.h | 17 -
+ arch/arm/include/asm/pgtable-2level-hwdef.h | 1 +
+ arch/arm/include/asm/psci.h | 23 --
+ arch/arm/include/asm/smp.h | 2 +-
+ arch/arm/include/asm/smp_plat.h | 9 +
+ arch/arm/include/asm/switch_to.h | 5 +-
+ arch/arm/include/asm/thread_info.h | 23 +-
+ arch/arm/include/asm/uaccess.h | 132 ++++---
+ arch/arm/kernel/Makefile | 5 +-
+ arch/arm/kernel/armksyms.c | 6 +-
+ arch/arm/kernel/entry-armv.S | 32 +-
+ arch/arm/kernel/entry-common.S | 63 +++-
+ arch/arm/kernel/entry-header.S | 112 +++---
+ arch/arm/kernel/head.S | 5 +-
+ arch/arm/kernel/irq.c | 1 +
+ arch/arm/kernel/perf_event_v6.c | 2 +-
+ arch/arm/kernel/perf_event_v7.c | 2 +-
+ arch/arm/kernel/perf_event_xscale.c | 2 +-
+ arch/arm/kernel/process.c | 56 ++-
+ arch/arm/kernel/psci.c | 299 ----------------
+ arch/arm/kernel/psci_smp.c | 31 +-
+ arch/arm/kernel/setup.c | 9 +-
+ arch/arm/kernel/signal.c | 6 +
+ arch/arm/kernel/smp.c | 35 +-
+ arch/arm/kernel/swp_emulate.c | 3 +
+ arch/arm/kernel/traps.c | 1 -
+ arch/arm/lib/clear_user.S | 6 +-
+ arch/arm/lib/copy_from_user.S | 6 +-
+ arch/arm/lib/copy_to_user.S | 6 +-
+ arch/arm/lib/csumpartialcopyuser.S | 14 +
+ arch/arm/lib/uaccess_with_memcpy.c | 4 +-
+ arch/arm/mach-highbank/highbank.c | 2 +-
+ arch/arm/mach-highbank/pm.c | 16 +-
+ arch/arm/mach-mmp/pm-pxa910.c | 1 +
+ arch/arm/mach-omap2/Kconfig | 7 +
+ arch/arm/mach-omap2/common.c | 1 +
+ arch/arm/mach-omap2/common.h | 9 +
+ arch/arm/mach-omap2/include/mach/barriers.h | 33 --
+ arch/arm/mach-omap2/io.c | 2 +
+ arch/arm/mach-omap2/omap4-common.c | 121 +++++++
+ arch/arm/mach-omap2/sleep44xx.S | 8 +-
+ arch/arm/mach-prima2/pm.c | 1 +
+ arch/arm/mach-shmobile/common.h | 2 +-
+ arch/arm/mach-shmobile/platsmp.c | 4 +-
+ arch/arm/mach-shmobile/smp-r8a7790.c | 2 +-
+ arch/arm/mach-shmobile/smp-r8a7791.c | 2 +-
+ arch/arm/mach-shmobile/smp-sh73a0.c | 2 +-
+ arch/arm/mach-ux500/cache-l2x0.c | 1 +
+ arch/arm/mach-ux500/cpu-db8500.c | 2 +-
+ arch/arm/mm/Kconfig | 4 +
+ arch/arm/mm/abort-ev4.S | 1 +
+ arch/arm/mm/abort-ev5t.S | 4 +-
+ arch/arm/mm/abort-ev5tj.S | 4 +-
+ arch/arm/mm/abort-ev6.S | 8 +-
+ arch/arm/mm/abort-ev7.S | 1 +
+ arch/arm/mm/abort-lv4t.S | 2 +
+ arch/arm/mm/abort-macro.S | 14 +-
+ arch/arm/mm/cache-feroceon-l2.c | 6 +-
+ arch/arm/mm/cache-l2x0.c | 5 +
+ arch/arm/mm/dma-mapping.c | 22 +-
+ arch/arm/mm/dma.h | 32 ++
+ arch/arm/mm/flush.c | 15 +
+ arch/arm/mm/highmem.c | 6 +-
+ arch/arm/mm/mmu.c | 92 ++++-
+ arch/arm/mm/pgd.c | 10 +
+ arch/arm64/Kconfig | 1 +
+ arch/arm64/include/asm/acpi.h | 4 +-
+ arch/arm64/include/asm/psci.h | 28 --
+ arch/arm64/kernel/psci.c | 361 +------------------
+ arch/arm64/kernel/setup.c | 2 +-
+ arch/x86/kernel/apic/hw_nmi.c | 133 +------
+ drivers/Kconfig | 2 +
+ drivers/Makefile | 1 +
+ drivers/cpuidle/cpuidle-calxeda.c | 15 +-
+ drivers/firmware/Kconfig | 3 +
+ drivers/firmware/Makefile | 1 +
+ drivers/firmware/psci.c | 382 ++++++++++++++++++++
+ drivers/firmware/qcom_scm-32.c | 4 +-
+ drivers/gpu/drm/bridge/dw_hdmi.c | 387 ++++++++++++---------
+ drivers/gpu/drm/bridge/dw_hdmi.h | 8 +-
+ drivers/gpu/drm/imx/dw_hdmi-imx.c | 5 +
+ drivers/pcmcia/pxa2xx_base.c | 17 +-
+ drivers/pcmcia/sa1100_generic.c | 2 -
+ drivers/pcmcia/sa1111_generic.c | 14 +-
+ drivers/pcmcia/sa11xx_base.c | 17 +-
+ drivers/pcmcia/soc_common.h | 1 -
+ drivers/perf/Kconfig | 15 +
+ drivers/perf/Makefile | 1 +
+ .../kernel/perf_event.c => drivers/perf/arm_pmu.c | 69 ++--
+ include/drm/bridge/dw_hdmi.h | 7 +
+ include/linux/nmi.h | 6 +
+ .../asm/pmu.h => include/linux/perf/arm_pmu.h | 4 +-
+ include/linux/psci.h | 52 +++
+ lib/Makefile | 2 +-
+ lib/nmi_backtrace.c | 162 +++++++++
+ 111 files changed, 1904 insertions(+), 1456 deletions(-)
+ delete mode 100644 arch/arm/kernel/psci.c
+ delete mode 100644 arch/arm/mach-omap2/include/mach/barriers.h
+ create mode 100644 arch/arm/mm/dma.h
+ delete mode 100644 arch/arm64/include/asm/psci.h
+ create mode 100644 drivers/firmware/psci.c
+ create mode 100644 drivers/perf/Kconfig
+ create mode 100644 drivers/perf/Makefile
+ rename arch/arm/kernel/perf_event.c => drivers/perf/arm_pmu.c (94%)
+ rename arch/arm/include/asm/pmu.h => include/linux/perf/arm_pmu.h (98%)
+ create mode 100644 include/linux/psci.h
+ create mode 100644 lib/nmi_backtrace.c
+Merging arm-perf/for-next/perf (fa8ad7889d83 arm: perf: factor arm_pmu core out to drivers)
+$ git merge arm-perf/for-next/perf
+Already up-to-date.
+Merging arm-soc/for-next (38af586237cf arm-soc: document merges)
+$ git merge arm-soc/for-next
+Removing drivers/cpufreq/exynos5250-cpufreq.c
+Removing drivers/cpufreq/exynos4x12-cpufreq.c
+Removing drivers/cpufreq/exynos-cpufreq.h
+CONFLICT (modify/delete): drivers/cpufreq/exynos-cpufreq.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of drivers/cpufreq/exynos-cpufreq.c left in tree.
+Auto-merging arch/arm64/Kconfig
+Removing arch/arm/plat-samsung/include/plat/keypad-core.h
+Removing arch/arm/mach-ux500/headsmp.S
+Auto-merging arch/arm/mach-ux500/cpu-db8500.c
+Auto-merging arch/arm/mach-shmobile/smp-sh73a0.c
+Auto-merging arch/arm/mach-shmobile/smp-r8a7790.c
+Removing arch/arm/mach-shmobile/r8a7740.h
+Removing arch/arm/mach-shmobile/pm-sh73a0.c
+Removing arch/arm/mach-shmobile/pm-r8a7740.c
+Removing arch/arm/mach-shmobile/intc-sh73a0.c
+Removing arch/arm/mach-shmobile/include/mach/zboot_macros.h
+Removing arch/arm/mach-shmobile/include/mach/zboot.h
+Removing arch/arm/mach-shmobile/include/mach/head-kzm9g.txt
+Removing arch/arm/mach-shmobile/dma-register.h
+Removing arch/arm/mach-shmobile/clock-sh73a0.c
+Removing arch/arm/mach-shmobile/clock-r8a7779.c
+Removing arch/arm/mach-shmobile/clock-r8a7740.c
+Removing arch/arm/mach-shmobile/board-marzen.c
+Removing arch/arm/mach-shmobile/board-marzen-reference.c
+Removing arch/arm/mach-shmobile/board-kzm9g.c
+Removing arch/arm/mach-shmobile/board-armadillo800eva.c
+Auto-merging arch/arm/mach-s3c64xx/watchdog-reset.h
+Auto-merging arch/arm/mach-s3c64xx/regs-usb-hsotg-phy.h
+Auto-merging arch/arm/mach-s3c64xx/onenand-core.h
+Auto-merging arch/arm/mach-s3c64xx/irq-uart.h
+Auto-merging arch/arm/mach-s3c64xx/dev-backlight.c
+Auto-merging arch/arm/mach-s3c64xx/backlight.h
+Auto-merging arch/arm/mach-s3c64xx/ata-core.h
+Auto-merging arch/arm/mach-s3c24xx/nand-core.h
+Auto-merging arch/arm/mach-s3c24xx/fb-core.h
+Removing arch/arm/mach-orion5x/lsmini-setup.c
+Auto-merging arch/arm/mach-omap2/io.c
+Auto-merging arch/arm/mach-omap2/common.h
+Removing arch/arm/mach-omap2/board-omap3pandora.c
+Removing arch/arm/mach-omap2/board-omap3logic.c
+Auto-merging arch/arm/mach-omap2/Kconfig
+Auto-merging arch/arm/mach-exynos/regs-srom.h
+Removing arch/arm/mach-bcm/bcm63xx_headsmp.S
+CONFLICT (modify/delete): arch/arm/kernel/psci.c deleted in HEAD and modified in arm-soc/for-next. Version arm-soc/for-next of arch/arm/kernel/psci.c left in tree.
+Auto-merging arch/arm/kernel/irq.c
+Removing arch/arm/configs/marzen_defconfig
+Removing arch/arm/configs/kzm9g_defconfig
+Removing arch/arm/configs/armadillo800eva_defconfig
+Removing arch/arm/boot/compressed/head-shmobile.S
+Auto-merging arch/arm/Kconfig
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f arch/arm/kernel/psci.c drivers/cpufreq/exynos-cpufreq.c
+arch/arm/kernel/psci.c: needs merge
+drivers/cpufreq/exynos-cpufreq.c: needs merge
+rm 'arch/arm/kernel/psci.c'
+rm 'drivers/cpufreq/exynos-cpufreq.c'
+$ git commit -v -a
+[master 269179d601ce] Merge remote-tracking branch 'arm-soc/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/arm/Atmel/README | 5 +
+ .../devicetree/bindings/arm/atmel-at91.txt | 15 +-
+ Documentation/devicetree/bindings/arm/bcm/ns2.txt | 9 +
+ .../arm/bcm/raspberrypi,bcm2835-firmware.txt | 14 +
+ .../devicetree/bindings/arm/marvell,kirkwood.txt | 2 +
+ Documentation/devicetree/bindings/arm/mediatek.txt | 13 +-
+ .../bindings/arm/mediatek/mediatek,sysirq.txt | 4 +-
+ .../devicetree/bindings/arm/omap/omap.txt | 3 +
+ Documentation/devicetree/bindings/arm/rockchip.txt | 35 +
+ .../devicetree/bindings/clock/imx6ul-clock.txt | 13 +
+ .../bindings/clock/nvidia,tegra124-dfll.txt | 79 +
+ .../bindings/clock/renesas,r8a7778-cpg-clocks.txt | 29 +-
+ .../bindings/clock/renesas,r8a7779-cpg-clocks.txt | 30 +-
+ .../clock/renesas,rcar-gen2-cpg-clocks.txt | 26 +-
+ .../bindings/clock/renesas,rz-cpg-clocks.txt | 29 +-
+ .../bindings/clock/rockchip,rk3368-cru.txt | 61 +
+ .../devicetree/bindings/clock/st/st,clkgen-pll.txt | 4 +-
+ .../bindings/cpufreq/tegra124-cpufreq.txt | 44 +
+ .../devicetree/bindings/crypto/fsl-sec4.txt | 91 +-
+ .../devicetree/bindings/input/snvs-pwrkey.txt | 1 +
+ .../bindings/memory-controllers/arm,pl172.txt | 125 ++
+ .../bindings/memory-controllers/synopsys.txt | 4 +
+ .../bindings/pinctrl/fsl,imx6ul-pinctrl.txt | 36 +
+ .../devicetree/bindings/reset/ath79-reset.txt | 20 +
+ .../devicetree/bindings/reset/nxp,lpc1850-rgu.txt | 84 +
+ .../devicetree/bindings/reset/socfpga-reset.txt | 2 +
+ .../bindings/reset/st,sti-picophyreset.txt | 2 +-
+ .../devicetree/bindings/reset/st,sti-powerdown.txt | 4 +-
+ .../devicetree/bindings/reset/st,sti-softreset.txt | 4 +-
+ .../devicetree/bindings/reset/zynq-reset.txt | 68 +
+ .../bindings/rtc/atmel,at91rm9200-rtc.txt | 2 +
+ Documentation/devicetree/bindings/rtc/rtc-mxc.txt | 26 +
+ Documentation/devicetree/bindings/rtc/rtc-omap.txt | 1 +
+ .../devicetree/bindings/serial/mtk-uart.txt | 6 +-
+ .../devicetree/bindings/soc/mediatek/scpsys.txt | 41 +
+ .../devicetree/bindings/soc/qcom,smd-rpm.txt | 117 ++
+ .../devicetree/bindings/soc/qcom/qcom,smd.txt | 79 +
+ .../bindings/sound/nvidia,tegra30-hda.txt | 8 +-
+ .../bindings/timer/mediatek,mtk-timer.txt | 6 +-
+ .../devicetree/bindings/vendor-prefixes.txt | 3 +
+ .../devicetree/bindings/watchdog/atmel-wdt.txt | 2 +
+ MAINTAINERS | 10 +-
+ arch/arm/Kconfig | 12 +-
+ arch/arm/Kconfig.debug | 15 +
+ arch/arm/arm-soc-for-next-contents.txt | 303 ++++
+ arch/arm/boot/compressed/Makefile | 4 -
+ arch/arm/boot/compressed/head-shmobile.S | 71 -
+ arch/arm/boot/dts/Makefile | 46 +-
+ arch/arm/boot/dts/am335x-boneblack.dts | 20 +-
+ arch/arm/boot/dts/am335x-evm.dts | 69 +-
+ arch/arm/boot/dts/am335x-evmsk.dts | 62 +-
+ arch/arm/boot/dts/am335x-phycore-som.dtsi | 368 ++++
+ arch/arm/boot/dts/am335x-wega-rdk.dts | 22 +
+ arch/arm/boot/dts/am335x-wega.dtsi | 151 ++
+ arch/arm/boot/dts/am33xx.dtsi | 25 +-
+ arch/arm/boot/dts/am4372.dtsi | 68 +-
+ arch/arm/boot/dts/am437x-gp-evm.dts | 185 ++-
+ arch/arm/boot/dts/am437x-sk-evm.dts | 45 +-
+ arch/arm/boot/dts/am43x-epos-evm.dts | 130 +-
+ arch/arm/boot/dts/am43xx-clocks.dtsi | 9 +
+ arch/arm/boot/dts/am57xx-beagle-x15.dts | 1 -
+ arch/arm/boot/dts/armada-375.dtsi | 4 +
+ arch/arm/boot/dts/armada-388-gp.dts | 12 +-
+ arch/arm/boot/dts/armada-38x.dtsi | 8 +-
+ arch/arm/boot/dts/armada-39x.dtsi | 8 +-
+ arch/arm/boot/dts/at91-sama5d2_xplained.dts | 134 ++
+ arch/arm/boot/dts/at91-sama5d4_xplained.dts | 9 +
+ arch/arm/boot/dts/at91-sama5d4ek.dts | 9 +
+ arch/arm/boot/dts/at91rm9200.dtsi | 10 +-
+ arch/arm/boot/dts/at91sam9260.dtsi | 11 +-
+ arch/arm/boot/dts/at91sam9261.dtsi | 7 +-
+ arch/arm/boot/dts/at91sam9263.dtsi | 7 +-
+ arch/arm/boot/dts/at91sam9g15.dtsi | 1 +
+ arch/arm/boot/dts/at91sam9g15ek.dts | 25 +
+ arch/arm/boot/dts/at91sam9g35.dtsi | 1 +
+ arch/arm/boot/dts/at91sam9g35ek.dts | 21 +
+ arch/arm/boot/dts/at91sam9g45.dtsi | 60 +-
+ arch/arm/boot/dts/at91sam9m10g45ek.dts | 47 +
+ arch/arm/boot/dts/at91sam9n12.dtsi | 83 +-
+ arch/arm/boot/dts/at91sam9n12ek.dts | 61 +
+ arch/arm/boot/dts/at91sam9rl.dtsi | 8 +-
+ arch/arm/boot/dts/at91sam9x35.dtsi | 1 +
+ arch/arm/boot/dts/at91sam9x35ek.dts | 20 +
+ arch/arm/boot/dts/at91sam9x5.dtsi | 12 +-
+ arch/arm/boot/dts/at91sam9x5_lcd.dtsi | 139 ++
+ arch/arm/boot/dts/at91sam9x5dm.dtsi | 101 ++
+ arch/arm/boot/dts/atlas7-evb.dts | 18 +
+ arch/arm/boot/dts/atlas7.dtsi | 97 +-
+ arch/arm/boot/dts/axp152.dtsi | 49 +
+ arch/arm/boot/dts/bcm-cygnus-clock.dtsi | 89 +-
+ arch/arm/boot/dts/bcm2835-rpi.dtsi | 7 +
+ arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 4 +
+ arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 4 +
+ arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 14 +-
+ arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 4 +
+ arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 4 +
+ arch/arm/boot/dts/bcm5301x.dtsi | 10 +
+ arch/arm/boot/dts/bcm7445.dtsi | 50 +
+ arch/arm/boot/dts/cros-ec-sbs.dtsi | 52 +
+ arch/arm/boot/dts/cx92755.dtsi | 7 +
+ arch/arm/boot/dts/cx92755_equinox.dts | 3 +-
+ arch/arm/boot/dts/dm8148-evm.dts | 28 +
+ arch/arm/boot/dts/dm8148-t410.dts | 28 +
+ arch/arm/boot/dts/dm814x-clocks.dtsi | 109 ++
+ arch/arm/boot/dts/dm814x.dtsi | 333 ++++
+ arch/arm/boot/dts/dm816x.dtsi | 2 +-
+ arch/arm/boot/dts/dove.dtsi | 604 +++----
+ arch/arm/boot/dts/dra7-evm.dts | 18 +-
+ arch/arm/boot/dts/dra7.dtsi | 95 +-
+ arch/arm/boot/dts/dra72-evm.dts | 26 +-
+ arch/arm/boot/dts/dra74x.dtsi | 7 +-
+ arch/arm/boot/dts/emev2-kzm9d.dts | 8 +
+ arch/arm/boot/dts/emev2.dtsi | 48 +
+ arch/arm/boot/dts/exynos3250-monk.dts | 19 +
+ arch/arm/boot/dts/exynos3250-rinato.dts | 21 +-
+ arch/arm/boot/dts/exynos3250.dtsi | 16 +
+ arch/arm/boot/dts/exynos4.dtsi | 1 +
+ arch/arm/boot/dts/exynos4210-universal_c210.dts | 620 +++----
+ arch/arm/boot/dts/exynos4212.dtsi | 81 +
+ arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 4 +
+ arch/arm/boot/dts/exynos4412-odroidu3.dts | 8 +
+ arch/arm/boot/dts/exynos4412-origen.dts | 4 +
+ arch/arm/boot/dts/exynos4412-trats2.dts | 7 +
+ arch/arm/boot/dts/exynos4412.dtsi | 83 +
+ arch/arm/boot/dts/exynos5250-arndale.dts | 4 +
+ arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 1600 +++++++++---------
+ arch/arm/boot/dts/exynos5250-smdk5250.dts | 4 +
+ arch/arm/boot/dts/exynos5250-snow.dts | 5 +
+ arch/arm/boot/dts/exynos5250-spring.dts | 4 +
+ arch/arm/boot/dts/exynos5250.dtsi | 25 +-
+ arch/arm/boot/dts/exynos5410-smdk5410.dts | 6 +-
+ arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 1411 ++++++++--------
+ arch/arm/boot/dts/exynos5420.dtsi | 3 +-
+ arch/arm/boot/dts/exynos5422-cpu-thermal.dtsi | 59 +
+ arch/arm/boot/dts/exynos5422-cpus.dtsi | 81 +
+ arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 47 +
+ arch/arm/boot/dts/imx27.dtsi | 9 +
+ arch/arm/boot/dts/imx53-qsb-common.dtsi | 5 +-
+ arch/arm/boot/dts/imx53-qsrb.dts | 14 +-
+ arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 1 -
+ arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 35 +-
+ arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 35 +-
+ arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 34 +-
+ arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 1 -
+ arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 1 -
+ arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 39 +
+ arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 137 ++
+ arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 39 +
+ arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 7 +
+ arch/arm/boot/dts/imx6qdl.dtsi | 52 +-
+ arch/arm/boot/dts/imx6sl-warp.dts | 32 +-
+ arch/arm/boot/dts/imx6sl.dtsi | 21 +-
+ arch/arm/boot/dts/imx6sx.dtsi | 28 +-
+ arch/arm/boot/dts/imx6ul-14x14-evk.dts | 343 ++++
+ arch/arm/boot/dts/imx6ul-pinfunc.h | 938 +++++++++++
+ arch/arm/boot/dts/imx6ul.dtsi | 707 ++++++++
+ arch/arm/boot/dts/imx7d.dtsi | 260 ++-
+ arch/arm/boot/dts/kirkwood-lswvl.dts | 301 ++++
+ arch/arm/boot/dts/kirkwood-lswxl.dts | 301 ++++
+ arch/arm/boot/dts/lpc18xx.dtsi | 267 ++-
+ arch/arm/boot/dts/lpc4337-ciaa.dts | 187 +++
+ arch/arm/boot/dts/lpc4350-hitex-eval.dts | 244 ++-
+ arch/arm/boot/dts/lpc4357-ea4357-devkit.dts | 467 ++++++
+ arch/arm/boot/dts/ls1021a-qds.dts | 89 +
+ arch/arm/boot/dts/ls1021a-twr.dts | 81 +
+ arch/arm/boot/dts/ls1021a.dtsi | 106 +-
+ arch/arm/boot/dts/mt6580-evbp1.dts | 38 +
+ arch/arm/boot/dts/mt6580.dtsi | 116 ++
+ arch/arm/boot/dts/mt8135-evbp1.dts | 193 +++
+ arch/arm/boot/dts/mt8135.dtsi | 58 +-
+ arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 369 ++++
+ arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi | 73 +
+ arch/arm/boot/dts/omap3-devkit8000-lcd43.dts | 37 +
+ arch/arm/boot/dts/omap3-devkit8000-lcd70.dts | 37 +
+ arch/arm/boot/dts/omap3-devkit8000.dts | 191 +--
+ arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 12 +-
+ arch/arm/boot/dts/omap3-overo-base.dtsi | 55 +
+ arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi | 3 +-
+ arch/arm/boot/dts/omap3-overo-palo35-common.dtsi | 53 +
+ arch/arm/boot/dts/omap3-overo-palo35.dts | 37 +
+ arch/arm/boot/dts/omap3-overo-storm-palo35.dts | 37 +
+ arch/arm/boot/dts/omap3-overo-storm-tobiduo.dts | 21 +
+ arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi | 65 +
+ arch/arm/boot/dts/omap3-overo-tobiduo.dts | 21 +
+ arch/arm/boot/dts/omap3-overo.dtsi | 4 -
+ arch/arm/boot/dts/omap3-pandora-1ghz.dts | 2 +-
+ arch/arm/boot/dts/omap3-pandora-600mhz.dts | 2 +-
+ arch/arm/boot/dts/omap3-pandora-common.dtsi | 54 +-
+ arch/arm/boot/dts/omap5-uevm.dts | 7 +
+ arch/arm/boot/dts/omap5.dtsi | 7 +-
+ arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts | 273 +++
+ arch/arm/boot/dts/orion5x-lswsgl.dts | 276 +++
+ arch/arm/boot/dts/pxa27x.dtsi | 36 +
+ arch/arm/boot/dts/pxa2xx.dtsi | 4 +
+ arch/arm/boot/dts/pxa3xx.dtsi | 52 +
+ arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts | 20 +
+ arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 40 +
+ arch/arm/boot/dts/qcom-apq8064.dtsi | 91 +-
+ arch/arm/boot/dts/qcom-msm8660.dtsi | 11 +-
+ arch/arm/boot/dts/qcom-msm8960-cdp.dts | 302 ++++
+ arch/arm/boot/dts/qcom-msm8960.dtsi | 49 +-
+ arch/arm/boot/dts/qcom-msm8974.dtsi | 32 +
+ arch/arm/boot/dts/r7s72100.dtsi | 19 +
+ arch/arm/boot/dts/r8a73a4.dtsi | 9 +-
+ arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 13 +
+ arch/arm/boot/dts/r8a7740.dtsi | 1 +
+ arch/arm/boot/dts/r8a7778.dtsi | 22 +
+ arch/arm/boot/dts/r8a7779.dtsi | 28 +-
+ arch/arm/boot/dts/r8a7790-lager.dts | 4 +-
+ arch/arm/boot/dts/r8a7790.dtsi | 138 +-
+ arch/arm/boot/dts/r8a7791-koelsch.dts | 2 +-
+ arch/arm/boot/dts/r8a7791.dtsi | 120 +-
+ arch/arm/boot/dts/r8a7793-gose.dts | 63 +
+ arch/arm/boot/dts/r8a7793.dtsi | 374 +++++
+ arch/arm/boot/dts/r8a7794-silk.dts | 102 ++
+ arch/arm/boot/dts/r8a7794.dtsi | 48 +-
+ arch/arm/boot/dts/rk3066a-bqcurie2.dts | 1 +
+ arch/arm/boot/dts/rk3066a-marsboard.dts | 13 +
+ arch/arm/boot/dts/rk3066a-rayeager.dts | 5 +
+ arch/arm/boot/dts/rk3066a.dtsi | 22 +
+ arch/arm/boot/dts/rk3188-radxarock.dts | 5 +
+ arch/arm/boot/dts/rk3188.dtsi | 22 +
+ arch/arm/boot/dts/rk3288-evb.dtsi | 1 +
+ arch/arm/boot/dts/rk3288-firefly.dtsi | 3 +
+ arch/arm/boot/dts/rk3288-popmetal.dts | 1 +
+ arch/arm/boot/dts/rk3288-r89.dts | 413 +++++
+ arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 232 +++
+ arch/arm/boot/dts/rk3288-veyron-jerry.dts | 197 +++
+ arch/arm/boot/dts/rk3288-veyron-minnie.dts | 230 +++
+ arch/arm/boot/dts/rk3288-veyron-pinky.dts | 128 ++
+ arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi | 122 ++
+ arch/arm/boot/dts/rk3288-veyron-speedy.dts | 155 ++
+ arch/arm/boot/dts/rk3288-veyron.dtsi | 563 +++++++
+ arch/arm/boot/dts/rk3288.dtsi | 31 +-
+ arch/arm/boot/dts/rk3xxx.dtsi | 10 +
+ arch/arm/boot/dts/sama5d2.dtsi | 926 +++++++++++
+ arch/arm/boot/dts/sama5d3.dtsi | 10 +-
+ arch/arm/boot/dts/sama5d3_tcb1.dtsi | 4 +-
+ arch/arm/boot/dts/sama5d4.dtsi | 25 +-
+ arch/arm/boot/dts/sh73a0.dtsi | 3 +
+ arch/arm/boot/dts/socfpga.dtsi | 46 +-
+ arch/arm/boot/dts/socfpga_arria10.dtsi | 11 +
+ arch/arm/boot/dts/socfpga_arria10_socdk.dtsi | 3 +-
+ arch/arm/boot/dts/socfpga_arria5_socdk.dts | 3 +-
+ arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts | 111 ++
+ arch/arm/boot/dts/socfpga_cyclone5_socdk.dts | 3 +-
+ arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 3 +-
+ arch/arm/boot/dts/ste-nomadik-nhk15.dts | 39 +-
+ arch/arm/boot/dts/ste-nomadik-s8815.dts | 44 +-
+ arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 22 +-
+ arch/arm/boot/dts/stih407-clock.dtsi | 4 +-
+ arch/arm/boot/dts/stih407-family.dtsi | 47 +-
+ arch/arm/boot/dts/stih407-pinctrl.dtsi | 200 +++
+ arch/arm/boot/dts/stih407.dtsi | 28 -
+ arch/arm/boot/dts/stih410-clock.dtsi | 4 +-
+ arch/arm/boot/dts/stih410.dtsi | 12 +
+ arch/arm/boot/dts/stih415.dtsi | 2 +-
+ arch/arm/boot/dts/stih416.dtsi | 2 +-
+ arch/arm/boot/dts/stih418-clock.dtsi | 4 +-
+ arch/arm/boot/dts/stih418.dtsi | 4 +
+ arch/arm/boot/dts/stm32429i-eval.dts | 75 +
+ arch/arm/boot/dts/stm32f429-disco.dts | 8 +-
+ arch/arm/boot/dts/stm32f429.dtsi | 79 +-
+ arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 15 +
+ arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 34 +
+ arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 19 +
+ .../boot/dts/sun4i-a10-itead-iteaduino-plus.dts | 202 +++
+ arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 15 +
+ arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 32 +
+ arch/arm/boot/dts/sun4i-a10.dtsi | 16 +-
+ arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 37 +-
+ arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 58 +
+ arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 37 +
+ arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 29 +-
+ arch/arm/boot/dts/sun5i.dtsi | 16 +-
+ arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 5 +
+ arch/arm/boot/dts/sun6i-a31.dtsi | 16 +-
+ arch/arm/boot/dts/sun6i-a31s-cs908.dts | 5 +
+ arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 56 +-
+ arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 2 +-
+ arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 32 +
+ arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 32 +
+ arch/arm/boot/dts/sun7i-a20.dtsi | 16 +-
+ arch/arm/boot/dts/sun8i-a23-a33.dtsi | 25 +-
+ arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | 9 +
+ arch/arm/boot/dts/sun8i-a23.dtsi | 33 +
+ arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts | 17 +
+ arch/arm/boot/dts/sun8i-a33-ippo-q8h-v1.2.dts | 133 ++
+ arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 13 +
+ arch/arm/boot/dts/sun8i-a33.dtsi | 33 +
+ arch/arm/boot/dts/sunxi-common-regulators.dtsi | 2 +
+ arch/arm/boot/dts/tegra114.dtsi | 5 +-
+ arch/arm/boot/dts/tegra124-jetson-tk1.dts | 25 +-
+ arch/arm/boot/dts/tegra124-venice2.dts | 10 +-
+ arch/arm/boot/dts/tegra124.dtsi | 50 +
+ arch/arm/boot/dts/tegra20.dtsi | 5 +-
+ arch/arm/boot/dts/tegra30.dtsi | 5 +-
+ arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts | 38 +-
+ arch/arm/boot/dts/uniphier-ph1-ld4.dtsi | 143 ++
+ arch/arm/boot/dts/uniphier-ph1-ld6b-ref.dts | 105 ++
+ arch/arm/boot/dts/uniphier-ph1-ld6b.dtsi | 67 +
+ arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts | 40 +-
+ arch/arm/boot/dts/uniphier-ph1-pro4.dtsi | 158 ++
+ arch/arm/boot/dts/uniphier-ph1-pro5.dtsi | 252 +++
+ arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts | 46 +-
+ arch/arm/boot/dts/uniphier-ph1-sld3.dtsi | 122 ++
+ arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts | 42 +-
+ arch/arm/boot/dts/uniphier-ph1-sld8.dtsi | 143 ++
+ arch/arm/boot/dts/uniphier-pinctrl.dtsi | 105 ++
+ arch/arm/boot/dts/uniphier-proxstream2.dtsi | 273 +++
+ arch/arm/boot/dts/uniphier-ref-daughter.dtsi | 50 +
+ arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 2 +
+ arch/arm/boot/dts/vexpress-v2m.dtsi | 2 +
+ arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 2 +-
+ arch/arm/boot/dts/vfxxx.dtsi | 85 +-
+ arch/arm/boot/dts/zynq-7000.dtsi | 10 +-
+ arch/arm/boot/dts/zynq-zc702.dts | 28 +
+ arch/arm/common/it8152.c | 2 +-
+ arch/arm/common/locomo.c | 11 +-
+ arch/arm/common/sa1111.c | 9 +-
+ arch/arm/configs/armadillo800eva_defconfig | 162 --
+ arch/arm/configs/at91_dt_defconfig | 13 +-
+ arch/arm/configs/ep93xx_defconfig | 29 +-
+ arch/arm/configs/exynos_defconfig | 5 +
+ arch/arm/configs/imx_v6_v7_defconfig | 31 +-
+ arch/arm/configs/kzm9g_defconfig | 154 --
+ arch/arm/configs/marzen_defconfig | 124 --
+ arch/arm/configs/multi_v7_defconfig | 28 +-
+ arch/arm/configs/mvebu_v7_defconfig | 4 +
+ arch/arm/configs/omap2plus_defconfig | 10 +
+ arch/arm/configs/orion5x_defconfig | 3 +
+ arch/arm/configs/prima2_defconfig | 12 +-
+ arch/arm/configs/qcom_defconfig | 3 +
+ arch/arm/configs/shmobile_defconfig | 3 +
+ arch/arm/configs/sunxi_defconfig | 10 +-
+ arch/arm/configs/tegra_defconfig | 9 +-
+ arch/arm/include/debug/at91.S | 5 +-
+ arch/arm/include/debug/imx-uart.h | 13 +
+ arch/arm/include/debug/zynq.S | 2 +-
+ arch/arm/kernel/irq.c | 4 +-
+ arch/arm/kernel/smp_twd.c | 48 +-
+ arch/arm/mach-at91/Kconfig | 12 +
+ arch/arm/mach-at91/at91rm9200.c | 2 +-
+ arch/arm/mach-at91/at91sam9.c | 6 +-
+ arch/arm/mach-at91/pm.c | 2 +-
+ arch/arm/mach-at91/sama5.c | 7 +-
+ arch/arm/mach-at91/soc.h | 3 +
+ arch/arm/mach-bcm/Kconfig | 2 +
+ arch/arm/mach-bcm/Makefile | 4 +-
+ arch/arm/mach-bcm/bcm63xx_headsmp.S | 23 -
+ arch/arm/mach-bcm/bcm63xx_smp.c | 4 +-
+ arch/arm/mach-bcm/bcm63xx_smp.h | 1 -
+ arch/arm/mach-bcm/bcm_5301x.c | 2 +-
+ arch/arm/mach-bcm/bcm_kona_smc.c | 2 +-
+ arch/arm/mach-clps711x/board-autcpu12.c | 2 +-
+ arch/arm/mach-cns3xxx/core.c | 59 +-
+ arch/arm/mach-davinci/cp_intc.c | 14 +-
+ arch/arm/mach-davinci/da850.c | 4 +-
+ arch/arm/mach-davinci/da8xx-dt.c | 4 +-
+ arch/arm/mach-davinci/time.c | 54 +-
+ arch/arm/mach-digicolor/digicolor.c | 2 +-
+ arch/arm/mach-dove/irq.c | 5 +-
+ arch/arm/mach-ebsa110/core.c | 2 +-
+ arch/arm/mach-ep93xx/Kconfig | 54 -
+ arch/arm/mach-ep93xx/Makefile | 2 +-
+ arch/arm/mach-ep93xx/Makefile.boot | 15 +-
+ arch/arm/mach-ep93xx/core.c | 116 +-
+ arch/arm/mach-ep93xx/edb93xx.c | 2 -
+ arch/arm/mach-ep93xx/simone.c | 3 +-
+ arch/arm/mach-ep93xx/snappercl15.c | 2 -
+ arch/arm/mach-ep93xx/timer-ep93xx.c | 143 ++
+ arch/arm/mach-ep93xx/vision_ep9307.c | 63 +-
+ arch/arm/mach-exynos/Kconfig | 7 +
+ arch/arm/mach-exynos/Makefile | 2 +
+ arch/arm/mach-exynos/common.h | 6 +
+ arch/arm/mach-exynos/exynos.c | 4 +
+ arch/arm/mach-exynos/firmware.c | 2 -
+ arch/arm/mach-exynos/platsmp.c | 2 +-
+ arch/arm/mach-exynos/pmu.c | 3 +-
+ .../include/plat => mach-exynos}/regs-srom.h | 3 +-
+ .../{plat-samsung => mach-exynos}/s5p-dev-mfc.c | 0
+ arch/arm/mach-exynos/suspend.c | 8 +-
+ arch/arm/mach-footbridge/common.c | 2 +-
+ arch/arm/mach-footbridge/dc21285-timer.c | 48 +-
+ arch/arm/mach-footbridge/isa-irq.c | 8 +-
+ arch/arm/mach-gemini/gpio.c | 2 +-
+ arch/arm/mach-gemini/include/mach/hardware.h | 3 -
+ arch/arm/mach-gemini/irq.c | 2 +-
+ arch/arm/mach-gemini/time.c | 219 ++-
+ arch/arm/mach-imx/3ds_debugboard.c | 2 +-
+ arch/arm/mach-imx/Kconfig | 8 +
+ arch/arm/mach-imx/Makefile | 1 +
+ arch/arm/mach-imx/cpu.c | 3 +
+ arch/arm/mach-imx/epit.c | 67 +-
+ arch/arm/mach-imx/mach-imx6ul.c | 88 +
+ arch/arm/mach-imx/mach-imx7d.c | 2 +-
+ arch/arm/mach-imx/mach-mx31ads.c | 2 +-
+ arch/arm/mach-imx/mxc.h | 6 +
+ arch/arm/mach-iop13xx/irq.c | 2 +-
+ arch/arm/mach-iop32x/irq.c | 2 +-
+ arch/arm/mach-iop33x/irq.c | 2 +-
+ arch/arm/mach-ixp4xx/common.c | 70 +-
+ arch/arm/mach-ks8695/irq.c | 2 +-
+ arch/arm/mach-ks8695/time.c | 43 +-
+ arch/arm/mach-lpc32xx/irq.c | 10 +-
+ arch/arm/mach-lpc32xx/phy3250.c | 4 +-
+ arch/arm/mach-lpc32xx/timer.c | 40 +-
+ arch/arm/mach-mediatek/Kconfig | 1 +
+ arch/arm/mach-mmp/mmp-dt.c | 4 +-
+ arch/arm/mach-mmp/mmp2-dt.c | 2 +-
+ arch/arm/mach-mmp/time.c | 29 +-
+ arch/arm/mach-mvebu/Kconfig | 1 +
+ arch/arm/mach-mvebu/coherency.c | 29 +-
+ arch/arm/mach-mvebu/common.h | 4 +-
+ arch/arm/mach-mvebu/dove.c | 2 +
+ arch/arm/mach-mvebu/pm-board.c | 30 +-
+ arch/arm/mach-mvebu/pm.c | 79 +-
+ arch/arm/mach-mvebu/pmsu.c | 4 +-
+ arch/arm/mach-mxs/mach-mxs.c | 4 +-
+ arch/arm/mach-netx/generic.c | 2 +-
+ arch/arm/mach-netx/time.c | 61 +-
+ arch/arm/mach-nomadik/cpu-8815.c | 41 +-
+ arch/arm/mach-omap1/fpga.c | 2 +-
+ arch/arm/mach-omap1/irq.c | 2 +-
+ arch/arm/mach-omap1/time.c | 35 +-
+ arch/arm/mach-omap1/timer32k.c | 33 +-
+ arch/arm/mach-omap2/Kconfig | 20 -
+ arch/arm/mach-omap2/Makefile | 6 +-
+ arch/arm/mach-omap2/board-generic.c | 6 +-
+ arch/arm/mach-omap2/board-omap3logic.c | 249 ---
+ arch/arm/mach-omap2/board-omap3pandora.c | 633 -------
+ arch/arm/mach-omap2/clockdomain.h | 3 +-
+ arch/arm/mach-omap2/clockdomains7xx_data.c | 2 +-
+ arch/arm/mach-omap2/clockdomains81xx_data.c | 23 +-
+ arch/arm/mach-omap2/common.h | 1 +
+ arch/arm/mach-omap2/control.c | 1 +
+ arch/arm/mach-omap2/io.c | 70 +-
+ arch/arm/mach-omap2/iomap.h | 63 +
+ arch/arm/mach-omap2/omap-iommu.c | 13 +-
+ arch/arm/mach-omap2/omap-mpuss-lowpower.c | 2 +-
+ arch/arm/mach-omap2/omap3-restart.c | 1 +
+ arch/arm/mach-omap2/omap4-restart.c | 1 +
+ arch/arm/mach-omap2/omap54xx.h | 8 +
+ arch/arm/mach-omap2/omap_hwmod.c | 16 +-
+ arch/arm/mach-omap2/omap_hwmod.h | 7 +-
+ arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 2 +-
+ arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 2 +-
+ arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 571 ++++---
+ arch/arm/mach-omap2/pdata-quirks.c | 163 +-
+ arch/arm/mach-omap2/powerdomains3xxx_data.c | 126 +-
+ arch/arm/mach-omap2/prcm-common.h | 8 +
+ arch/arm/mach-omap2/prcm43xx.h | 7 +
+ arch/arm/mach-omap2/prm44xx.c | 61 +-
+ arch/arm/mach-omap2/prm_common.c | 3 +-
+ arch/arm/mach-omap2/timer.c | 66 +-
+ arch/arm/mach-omap2/vc.c | 2 +-
+ arch/arm/mach-omap2/voltagedomains3xxx_data.c | 2 +-
+ arch/arm/mach-omap2/voltagedomains44xx_data.c | 2 +-
+ arch/arm/mach-omap2/voltagedomains54xx_data.c | 2 +-
+ arch/arm/mach-orion5x/Kconfig | 6 +-
+ arch/arm/mach-orion5x/Makefile | 1 -
+ arch/arm/mach-orion5x/dns323-setup.c | 4 +-
+ arch/arm/mach-orion5x/include/mach/irqs.h | 64 +-
+ arch/arm/mach-orion5x/irq.c | 4 +-
+ arch/arm/mach-orion5x/lsmini-setup.c | 280 ----
+ arch/arm/mach-orion5x/tsx09-common.c | 4 +-
+ arch/arm/mach-pxa/balloon3.c | 16 +-
+ arch/arm/mach-pxa/cm-x2xx-pci.c | 3 +-
+ arch/arm/mach-pxa/devices.c | 37 +
+ arch/arm/mach-pxa/irq.c | 1 -
+ arch/arm/mach-pxa/lpd270.c | 5 +-
+ arch/arm/mach-pxa/pcm990-baseboard.c | 5 +-
+ arch/arm/mach-pxa/pxa-dt.c | 4 +-
+ arch/arm/mach-pxa/pxa25x.c | 1 +
+ arch/arm/mach-pxa/pxa27x.c | 1 +
+ arch/arm/mach-pxa/pxa3xx.c | 3 +-
+ arch/arm/mach-pxa/sharpsl_pm.c | 6 +-
+ arch/arm/mach-pxa/tosa-bt.c | 15 +-
+ arch/arm/mach-pxa/viper.c | 5 +-
+ arch/arm/mach-pxa/zeus.c | 5 +-
+ arch/arm/mach-realview/realview-dt.c | 2 +-
+ arch/arm/mach-rockchip/platsmp.c | 56 +-
+ arch/arm/mach-rockchip/pm.c | 78 +-
+ arch/arm/mach-rockchip/pm.h | 12 +-
+ arch/arm/mach-rpc/ecard.c | 2 +-
+ arch/arm/mach-rpc/irq.c | 16 +-
+ arch/arm/mach-s3c24xx/Kconfig | 5 +
+ arch/arm/mach-s3c24xx/Makefile | 1 +
+ arch/arm/mach-s3c24xx/bast-irq.c | 2 +-
+ .../include/plat => mach-s3c24xx}/fb-core.h | 2 -
+ arch/arm/mach-s3c24xx/mach-s3c2416-dt.c | 2 +-
+ .../include/plat => mach-s3c24xx}/nand-core.h | 3 +-
+ arch/arm/mach-s3c24xx/s3c2412.c | 2 +-
+ arch/arm/mach-s3c24xx/s3c2416.c | 6 +-
+ arch/arm/mach-s3c24xx/s3c2443.c | 7 +-
+ arch/arm/mach-s3c24xx/s3c244x.c | 2 +-
+ .../{plat-samsung => mach-s3c24xx}/setup-camif.c | 0
+ .../include/plat => mach-s3c24xx}/spi-core.h | 0
+ arch/arm/mach-s3c64xx/Kconfig | 6 +
+ arch/arm/mach-s3c64xx/Makefile | 2 +
+ .../include/plat => mach-s3c64xx}/ata-core.h | 3 +-
+ .../include/plat => mach-s3c64xx}/backlight.h | 3 +-
+ arch/arm/mach-s3c64xx/common.c | 6 +-
+ .../{plat-samsung => mach-s3c64xx}/dev-backlight.c | 6 +-
+ .../include/plat => mach-s3c64xx}/irq-uart.h | 3 +-
+ arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c | 5 +-
+ arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +-
+ .../include/plat => mach-s3c64xx}/onenand-core.h | 2 -
+ .../plat => mach-s3c64xx}/regs-usb-hsotg-phy.h | 3 +-
+ arch/arm/mach-s3c64xx/s3c6400.c | 2 +-
+ arch/arm/mach-s3c64xx/s3c6410.c | 4 +-
+ arch/arm/mach-s3c64xx/setup-usb-phy.c | 2 +-
+ .../include/plat => mach-s3c64xx}/watchdog-reset.h | 3 +-
+ arch/arm/mach-sa1100/neponset.c | 4 +-
+ arch/arm/mach-shmobile/Kconfig | 54 +-
+ arch/arm/mach-shmobile/Makefile | 16 +-
+ arch/arm/mach-shmobile/Makefile.boot | 3 -
+ arch/arm/mach-shmobile/board-armadillo800eva.c | 1365 ---------------
+ arch/arm/mach-shmobile/board-bockw-reference.c | 2 +-
+ arch/arm/mach-shmobile/board-bockw.c | 2 +-
+ arch/arm/mach-shmobile/board-kzm9g.c | 916 ----------
+ arch/arm/mach-shmobile/board-marzen-reference.c | 56 -
+ arch/arm/mach-shmobile/board-marzen.c | 347 ----
+ arch/arm/mach-shmobile/clock-r8a7740.c | 675 --------
+ arch/arm/mach-shmobile/clock-r8a7779.c | 271 ---
+ arch/arm/mach-shmobile/clock-sh73a0.c | 752 ---------
+ arch/arm/mach-shmobile/dma-register.h | 84 -
+ arch/arm/mach-shmobile/include/mach/head-kzm9g.txt | 410 -----
+ arch/arm/mach-shmobile/include/mach/zboot.h | 19 -
+ arch/arm/mach-shmobile/include/mach/zboot_macros.h | 108 --
+ arch/arm/mach-shmobile/intc-sh73a0.c | 337 ----
+ arch/arm/mach-shmobile/platsmp-apmu.c | 4 +-
+ arch/arm/mach-shmobile/pm-r8a7740.c | 129 --
+ arch/arm/mach-shmobile/pm-r8a7779.c | 4 +-
+ arch/arm/mach-shmobile/pm-rcar.c | 105 +-
+ arch/arm/mach-shmobile/pm-rcar.h | 12 +-
+ arch/arm/mach-shmobile/pm-rmobile.c | 49 +-
+ arch/arm/mach-shmobile/pm-rmobile.h | 30 -
+ arch/arm/mach-shmobile/pm-sh73a0.c | 32 -
+ arch/arm/mach-shmobile/r8a7740.h | 58 -
+ arch/arm/mach-shmobile/r8a7779.h | 19 -
+ arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 3 +-
+ arch/arm/mach-shmobile/setup-r7s72100.c | 2 +-
+ arch/arm/mach-shmobile/setup-r8a73a4.c | 2 +-
+ arch/arm/mach-shmobile/setup-r8a7740.c | 680 +-------
+ arch/arm/mach-shmobile/setup-r8a7778.c | 2 +-
+ arch/arm/mach-shmobile/setup-r8a7779.c | 683 +-------
+ arch/arm/mach-shmobile/setup-r8a7791.c | 2 +-
+ arch/arm/mach-shmobile/setup-r8a7793.c | 33 +
+ arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 -
+ arch/arm/mach-shmobile/setup-sh73a0.c | 741 +--------
+ arch/arm/mach-shmobile/sh73a0.h | 83 -
+ arch/arm/mach-shmobile/smp-r8a7779.c | 21 +-
+ arch/arm/mach-shmobile/smp-r8a7790.c | 4 +-
+ arch/arm/mach-shmobile/smp-sh73a0.c | 8 -
+ arch/arm/mach-shmobile/timer.c | 12 -
+ arch/arm/mach-socfpga/core.h | 1 +
+ arch/arm/mach-socfpga/platsmp.c | 13 +
+ arch/arm/mach-socfpga/socfpga.c | 26 +
+ arch/arm/mach-spear/time.c | 91 +-
+ arch/arm/mach-sti/board-dt.c | 2 +-
+ arch/arm/mach-sti/headsmp.S | 1 +
+ arch/arm/mach-sti/platsmp.c | 57 +-
+ arch/arm/mach-sti/smp.h | 2 +
+ arch/arm/mach-tegra/Kconfig | 1 +
+ arch/arm/mach-tegra/cpuidle-tegra114.c | 19 +-
+ arch/arm/mach-tegra/iomap.h | 3 -
+ arch/arm/mach-uniphier/platsmp.c | 8 +-
+ arch/arm/mach-ux500/Makefile | 2 +-
+ arch/arm/mach-ux500/cpu-db8500.c | 1 -
+ arch/arm/mach-ux500/headsmp.S | 37 -
+ arch/arm/mach-ux500/platsmp.c | 132 +-
+ arch/arm/mach-ux500/setup.h | 1 -
+ arch/arm/mach-w90x900/irq.c | 2 +-
+ arch/arm/mach-w90x900/time.c | 51 +-
+ arch/arm/mach-zx/Kconfig | 1 +
+ arch/arm/mach-zx/Makefile | 2 +-
+ arch/arm/mach-zx/zx296702-pm-domain.c | 202 +++
+ arch/arm/mach-zx/zx296702.c | 2 +-
+ arch/arm/mach-zynq/common.c | 4 +-
+ arch/arm/mach-zynq/headsmp.S | 2 +-
+ arch/arm/plat-iop/time.c | 70 +-
+ arch/arm/plat-orion/gpio.c | 9 +-
+ arch/arm/plat-orion/time.c | 93 +-
+ arch/arm/plat-pxa/dma.c | 22 +-
+ arch/arm/plat-pxa/include/plat/dma.h | 15 +
+ arch/arm/plat-samsung/Kconfig | 17 -
+ arch/arm/plat-samsung/Makefile | 5 -
+ arch/arm/plat-samsung/include/plat/keypad-core.h | 31 -
+ arch/arm64/Kconfig | 105 +-
+ arch/arm64/Kconfig.platforms | 125 ++
+ arch/arm64/boot/dts/Makefile | 3 +
+ arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 2 +
+ arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 2 +
+ arch/arm64/boot/dts/broadcom/Makefile | 5 +
+ arch/arm64/boot/dts/broadcom/ns2-svk.dts | 59 +
+ arch/arm64/boot/dts/broadcom/ns2.dtsi | 118 ++
+ arch/arm64/boot/dts/marvell/Makefile | 5 +
+ arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts | 66 +
+ arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 164 ++
+ arch/arm64/boot/dts/mediatek/Makefile | 1 +
+ arch/arm64/boot/dts/mediatek/mt6795-evb.dts | 41 +
+ arch/arm64/boot/dts/mediatek/mt6795.dtsi | 175 ++
+ arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 353 ++++
+ arch/arm64/boot/dts/mediatek/mt8173.dtsi | 327 +++-
+ .../arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi | 34 +-
+ arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi | 14 +-
+ arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 51 +
+ arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 430 +++++
+ arch/arm64/boot/dts/qcom/msm8916.dtsi | 227 ++-
+ arch/arm64/boot/dts/rockchip/Makefile | 5 +
+ arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 354 ++++
+ arch/arm64/boot/dts/rockchip/rk3368.dtsi | 900 ++++++++++
+ arch/arm64/boot/dts/sprd/sc9836.dtsi | 99 +-
+ arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts | 89 +
+ arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 233 ++-
+ arch/arm64/configs/defconfig | 4 +
+ arch/mips/Kconfig | 1 +
+ arch/mips/boot/dts/qca/ar9132.dtsi | 8 +
+ drivers/clk/imx/Makefile | 1 +
+ drivers/clk/imx/clk-imx6q.c | 4 +
+ drivers/clk/imx/clk-imx6ul.c | 432 +++++
+ drivers/clk/rockchip/Makefile | 2 +
+ drivers/clk/rockchip/clk-inverter.c | 116 ++
+ drivers/clk/rockchip/clk-mmc-phase.c | 6 +-
+ drivers/clk/rockchip/clk-rk3188.c | 9 +-
+ drivers/clk/rockchip/clk-rk3288.c | 13 +-
+ drivers/clk/rockchip/clk-rk3368.c | 881 ++++++++++
+ drivers/clk/rockchip/clk.c | 7 +
+ drivers/clk/rockchip/clk.h | 72 +-
+ drivers/clk/samsung/clk-exynos3250.c | 32 +-
+ drivers/clk/samsung/clk-exynos4.c | 50 +
+ drivers/clk/samsung/clk-exynos5250.c | 31 +
+ drivers/clk/shmobile/clk-mstp.c | 87 +
+ drivers/clk/shmobile/clk-r8a7778.c | 2 +
+ drivers/clk/shmobile/clk-r8a7779.c | 2 +
+ drivers/clk/shmobile/clk-rcar-gen2.c | 2 +
+ drivers/clk/shmobile/clk-rz.c | 3 +
+ drivers/clk/tegra/Makefile | 3 +
+ drivers/clk/tegra/clk-dfll.c | 1755 ++++++++++++++++++++
+ drivers/clk/tegra/clk-dfll.h | 54 +
+ drivers/clk/tegra/clk-tegra-super-gen4.c | 4 +-
+ drivers/clk/tegra/clk-tegra124-dfll-fcpu.c | 166 ++
+ drivers/clk/tegra/clk-tegra124.c | 82 +
+ drivers/clk/tegra/clk.c | 39 +-
+ drivers/clk/tegra/clk.h | 3 +
+ drivers/clk/tegra/cvb.c | 140 ++
+ drivers/clk/tegra/cvb.h | 67 +
+ drivers/clk/ti/Makefile | 2 +-
+ drivers/clk/ti/clk-43xx.c | 1 +
+ drivers/clk/ti/clk-814x.c | 33 +
+ drivers/clk/ti/clk-816x.c | 2 +-
+ drivers/clk/zynq/Makefile | 2 +-
+ drivers/cpufreq/Kconfig.arm | 62 +-
+ drivers/cpufreq/Makefile | 7 +-
+ drivers/cpufreq/exynos-cpufreq.c | 239 ---
+ drivers/cpufreq/exynos-cpufreq.h | 89 -
+ drivers/cpufreq/exynos4x12-cpufreq.c | 236 ---
+ drivers/cpufreq/exynos5250-cpufreq.c | 210 ---
+ drivers/cpufreq/tegra124-cpufreq.c | 214 +++
+ .../cpufreq/{tegra-cpufreq.c => tegra20-cpufreq.c} | 0
+ drivers/input/keyboard/Kconfig | 11 +
+ drivers/input/keyboard/Makefile | 1 +
+ drivers/input/keyboard/snvs_pwrkey.c | 227 +++
+ drivers/iommu/Kconfig | 2 +-
+ drivers/irqchip/irq-sa11x0.c | 1 -
+ drivers/memory/Kconfig | 8 +
+ drivers/memory/Makefile | 1 +
+ drivers/memory/omap-gpmc.c | 5 +-
+ drivers/memory/pl172.c | 301 ++++
+ drivers/memory/tegra/Makefile | 1 +
+ drivers/memory/tegra/mc.c | 8 +-
+ drivers/memory/tegra/mc.h | 4 +
+ drivers/memory/tegra/tegra114.c | 1 +
+ drivers/memory/tegra/tegra124-emc.c | 42 +-
+ drivers/memory/tegra/tegra124.c | 2 +
+ drivers/memory/tegra/tegra210.c | 1080 ++++++++++++
+ drivers/memory/tegra/tegra30.c | 1 +
+ drivers/pci/host/Kconfig | 4 +-
+ drivers/pci/host/pcie-iproc.c | 27 +-
+ drivers/pci/host/pcie-iproc.h | 4 +-
+ drivers/pinctrl/pinctrl-tegra.c | 19 +-
+ drivers/reset/Makefile | 3 +
+ drivers/reset/reset-ath79.c | 128 ++
+ drivers/reset/reset-lpc18xx.c | 258 +++
+ drivers/reset/reset-socfpga.c | 19 +-
+ drivers/reset/reset-zynq.c | 155 ++
+ drivers/reset/sti/reset-stih407.c | 4 +-
+ drivers/reset/sti/reset-stih415.c | 4 +-
+ drivers/reset/sti/reset-stih416.c | 4 +-
+ drivers/rtc/Kconfig | 1 +
+ drivers/rtc/rtc-mxc.c | 60 +-
+ drivers/rtc/rtc-snvs.c | 132 +-
+ drivers/soc/Makefile | 1 +
+ drivers/soc/dove/Makefile | 1 +
+ drivers/soc/dove/pmu.c | 412 +++++
+ drivers/soc/mediatek/Kconfig | 19 +
+ drivers/soc/mediatek/Makefile | 2 +
+ drivers/soc/mediatek/mtk-infracfg.c | 91 +
+ drivers/soc/mediatek/mtk-pmic-wrap.c | 1 -
+ drivers/soc/mediatek/mtk-scpsys.c | 488 ++++++
+ drivers/soc/qcom/Kconfig | 31 +
+ drivers/soc/qcom/Makefile | 3 +
+ drivers/soc/qcom/smd-rpm.c | 244 +++
+ drivers/soc/qcom/smd.c | 1319 +++++++++++++++
+ drivers/soc/qcom/smem.c | 775 +++++++++
+ drivers/soc/tegra/Makefile | 6 +-
+ drivers/soc/tegra/common.c | 2 +
+ drivers/soc/tegra/fuse/Makefile | 2 +
+ drivers/soc/tegra/fuse/fuse-tegra.c | 257 ++-
+ drivers/soc/tegra/fuse/fuse-tegra20.c | 175 +-
+ drivers/soc/tegra/fuse/fuse-tegra30.c | 232 +--
+ drivers/soc/tegra/fuse/fuse.h | 95 +-
+ drivers/soc/tegra/fuse/speedo-tegra114.c | 22 +-
+ drivers/soc/tegra/fuse/speedo-tegra124.c | 26 +-
+ drivers/soc/tegra/fuse/speedo-tegra20.c | 28 +-
+ drivers/soc/tegra/fuse/speedo-tegra210.c | 184 ++
+ drivers/soc/tegra/fuse/speedo-tegra30.c | 48 +-
+ drivers/soc/tegra/fuse/tegra-apbmisc.c | 76 +-
+ drivers/soc/tegra/pmc.c | 125 +-
+ drivers/video/fbdev/ep93xx-fb.c | 30 +-
+ include/dt-bindings/clock/exynos3250.h | 1 +
+ include/dt-bindings/clock/exynos5250.h | 1 +
+ include/dt-bindings/clock/imx6ul-clock.h | 240 +++
+ include/dt-bindings/clock/r8a7790-clock.h | 3 +
+ include/dt-bindings/clock/r8a7791-clock.h | 2 +
+ include/dt-bindings/clock/r8a7793-clock.h | 164 ++
+ include/dt-bindings/clock/rk3066a-cru.h | 5 +
+ include/dt-bindings/clock/rk3188-cru-common.h | 5 +
+ include/dt-bindings/clock/rk3188-cru.h | 5 +
+ include/dt-bindings/clock/rk3288-cru.h | 5 +
+ include/dt-bindings/clock/rk3368-cru.h | 384 +++++
+ include/dt-bindings/memory/tegra210-mc.h | 36 +
+ include/dt-bindings/pinctrl/am43xx.h | 1 +
+ include/dt-bindings/pinctrl/dra.h | 20 +
+ include/dt-bindings/power/mt8173-power.h | 15 +
+ include/dt-bindings/reset/altr,rst-mgr-a10.h | 110 ++
+ .../{reset-controller => reset}/stih407-resets.h | 0
+ .../{reset-controller => reset}/stih415-resets.h | 0
+ .../{reset-controller => reset}/stih416-resets.h | 0
+ include/dt-bindings/reset/tegra124-car.h | 12 +
+ include/linux/clk/shmobile.h | 12 +
+ include/linux/clk/ti.h | 3 +-
+ include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 8 +
+ include/linux/platform_data/video-ep93xx.h | 8 -
+ include/linux/soc/dove/pmu.h | 6 +
+ include/linux/soc/mediatek/infracfg.h | 26 +
+ include/linux/soc/qcom/smd-rpm.h | 35 +
+ include/linux/soc/qcom/smd.h | 46 +
+ include/linux/soc/qcom/smem.h | 11 +
+ include/soc/tegra/fuse.h | 6 +-
+ include/soc/tegra/mc.h | 2 +
+ include/soc/tegra/pmc.h | 5 +
+ 753 files changed, 40249 insertions(+), 16004 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/bcm/ns2.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/imx6ul-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra124-dfll.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3368-cru.txt
+ create mode 100644 Documentation/devicetree/bindings/cpufreq/tegra124-cpufreq.txt
+ create mode 100644 Documentation/devicetree/bindings/input/snvs-pwrkey.txt
+ create mode 100644 Documentation/devicetree/bindings/memory-controllers/arm,pl172.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx6ul-pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/reset/ath79-reset.txt
+ create mode 100644 Documentation/devicetree/bindings/reset/nxp,lpc1850-rgu.txt
+ create mode 100644 Documentation/devicetree/bindings/reset/zynq-reset.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/rtc-mxc.txt
+ create mode 100644 Documentation/devicetree/bindings/soc/mediatek/scpsys.txt
+ create mode 100644 Documentation/devicetree/bindings/soc/qcom,smd-rpm.txt
+ create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smd.txt
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ delete mode 100644 arch/arm/boot/compressed/head-shmobile.S
+ create mode 100644 arch/arm/boot/dts/am335x-phycore-som.dtsi
+ create mode 100644 arch/arm/boot/dts/am335x-wega-rdk.dts
+ create mode 100644 arch/arm/boot/dts/am335x-wega.dtsi
+ create mode 100644 arch/arm/boot/dts/at91-sama5d2_xplained.dts
+ create mode 100644 arch/arm/boot/dts/at91sam9x5dm.dtsi
+ create mode 100644 arch/arm/boot/dts/axp152.dtsi
+ create mode 100644 arch/arm/boot/dts/cros-ec-sbs.dtsi
+ create mode 100644 arch/arm/boot/dts/dm8148-evm.dts
+ create mode 100644 arch/arm/boot/dts/dm8148-t410.dts
+ create mode 100644 arch/arm/boot/dts/dm814x-clocks.dtsi
+ create mode 100644 arch/arm/boot/dts/dm814x.dtsi
+ create mode 100644 arch/arm/boot/dts/exynos5422-cpu-thermal.dtsi
+ create mode 100644 arch/arm/boot/dts/exynos5422-cpus.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ul-14x14-evk.dts
+ create mode 100644 arch/arm/boot/dts/imx6ul-pinfunc.h
+ create mode 100644 arch/arm/boot/dts/imx6ul.dtsi
+ create mode 100644 arch/arm/boot/dts/kirkwood-lswvl.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-lswxl.dts
+ create mode 100644 arch/arm/boot/dts/lpc4337-ciaa.dts
+ create mode 100644 arch/arm/boot/dts/mt6580-evbp1.dts
+ create mode 100644 arch/arm/boot/dts/mt6580.dtsi
+ create mode 100644 arch/arm/boot/dts/omap3-devkit8000-common.dtsi
+ create mode 100644 arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi
+ create mode 100644 arch/arm/boot/dts/omap3-devkit8000-lcd43.dts
+ create mode 100644 arch/arm/boot/dts/omap3-devkit8000-lcd70.dts
+ create mode 100644 arch/arm/boot/dts/omap3-overo-palo35-common.dtsi
+ create mode 100644 arch/arm/boot/dts/omap3-overo-palo35.dts
+ create mode 100644 arch/arm/boot/dts/omap3-overo-storm-palo35.dts
+ create mode 100644 arch/arm/boot/dts/omap3-overo-storm-tobiduo.dts
+ create mode 100644 arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi
+ create mode 100644 arch/arm/boot/dts/omap3-overo-tobiduo.dts
+ create mode 100644 arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts
+ create mode 100644 arch/arm/boot/dts/orion5x-lswsgl.dts
+ create mode 100644 arch/arm/boot/dts/r8a7793-gose.dts
+ create mode 100644 arch/arm/boot/dts/r8a7793.dtsi
+ create mode 100644 arch/arm/boot/dts/r8a7794-silk.dts
+ create mode 100644 arch/arm/boot/dts/rk3288-r89.dts
+ create mode 100644 arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
+ create mode 100644 arch/arm/boot/dts/rk3288-veyron-jerry.dts
+ create mode 100644 arch/arm/boot/dts/rk3288-veyron-minnie.dts
+ create mode 100644 arch/arm/boot/dts/rk3288-veyron-pinky.dts
+ create mode 100644 arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi
+ create mode 100644 arch/arm/boot/dts/rk3288-veyron-speedy.dts
+ create mode 100644 arch/arm/boot/dts/rk3288-veyron.dtsi
+ create mode 100644 arch/arm/boot/dts/sama5d2.dtsi
+ create mode 100644 arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts
+ create mode 100644 arch/arm/boot/dts/stm32429i-eval.dts
+ create mode 100644 arch/arm/boot/dts/sun4i-a10-itead-iteaduino-plus.dts
+ create mode 100644 arch/arm/boot/dts/sun8i-a33-ippo-q8h-v1.2.dts
+ create mode 100644 arch/arm/boot/dts/uniphier-ph1-ld6b-ref.dts
+ create mode 100644 arch/arm/boot/dts/uniphier-ph1-ld6b.dtsi
+ create mode 100644 arch/arm/boot/dts/uniphier-ph1-pro5.dtsi
+ create mode 100644 arch/arm/boot/dts/uniphier-pinctrl.dtsi
+ create mode 100644 arch/arm/boot/dts/uniphier-proxstream2.dtsi
+ create mode 100644 arch/arm/boot/dts/uniphier-ref-daughter.dtsi
+ delete mode 100644 arch/arm/configs/armadillo800eva_defconfig
+ delete mode 100644 arch/arm/configs/kzm9g_defconfig
+ delete mode 100644 arch/arm/configs/marzen_defconfig
+ delete mode 100644 arch/arm/mach-bcm/bcm63xx_headsmp.S
+ create mode 100644 arch/arm/mach-ep93xx/timer-ep93xx.c
+ rename arch/arm/{plat-samsung/include/plat => mach-exynos}/regs-srom.h (96%)
+ rename arch/arm/{plat-samsung => mach-exynos}/s5p-dev-mfc.c (100%)
+ create mode 100644 arch/arm/mach-imx/mach-imx6ul.c
+ delete mode 100644 arch/arm/mach-omap2/board-omap3logic.c
+ delete mode 100644 arch/arm/mach-omap2/board-omap3pandora.c
+ delete mode 100644 arch/arm/mach-orion5x/lsmini-setup.c
+ rename arch/arm/{plat-samsung/include/plat => mach-s3c24xx}/fb-core.h (93%)
+ rename arch/arm/{plat-samsung/include/plat => mach-s3c24xx}/nand-core.h (93%)
+ rename arch/arm/{plat-samsung => mach-s3c24xx}/setup-camif.c (100%)
+ rename arch/arm/{plat-samsung/include/plat => mach-s3c24xx}/spi-core.h (100%)
+ rename arch/arm/{plat-samsung/include/plat => mach-s3c64xx}/ata-core.h (92%)
+ rename arch/arm/{plat-samsung/include/plat => mach-s3c64xx}/backlight.h (92%)
+ rename arch/arm/{plat-samsung => mach-s3c64xx}/dev-backlight.c (98%)
+ rename arch/arm/{plat-samsung/include/plat => mach-s3c64xx}/irq-uart.h (90%)
+ rename arch/arm/{plat-samsung/include/plat => mach-s3c64xx}/onenand-core.h (95%)
+ rename arch/arm/{plat-samsung/include/plat => mach-s3c64xx}/regs-usb-hsotg-phy.h (96%)
+ rename arch/arm/{plat-samsung/include/plat => mach-s3c64xx}/watchdog-reset.h (91%)
+ delete mode 100644 arch/arm/mach-shmobile/board-armadillo800eva.c
+ delete mode 100644 arch/arm/mach-shmobile/board-kzm9g.c
+ delete mode 100644 arch/arm/mach-shmobile/board-marzen-reference.c
+ delete mode 100644 arch/arm/mach-shmobile/board-marzen.c
+ delete mode 100644 arch/arm/mach-shmobile/clock-r8a7740.c
+ delete mode 100644 arch/arm/mach-shmobile/clock-r8a7779.c
+ delete mode 100644 arch/arm/mach-shmobile/clock-sh73a0.c
+ delete mode 100644 arch/arm/mach-shmobile/dma-register.h
+ delete mode 100644 arch/arm/mach-shmobile/include/mach/head-kzm9g.txt
+ delete mode 100644 arch/arm/mach-shmobile/include/mach/zboot.h
+ delete mode 100644 arch/arm/mach-shmobile/include/mach/zboot_macros.h
+ delete mode 100644 arch/arm/mach-shmobile/intc-sh73a0.c
+ delete mode 100644 arch/arm/mach-shmobile/pm-r8a7740.c
+ delete mode 100644 arch/arm/mach-shmobile/pm-sh73a0.c
+ delete mode 100644 arch/arm/mach-shmobile/r8a7740.h
+ create mode 100644 arch/arm/mach-shmobile/setup-r8a7793.c
+ delete mode 100644 arch/arm/mach-ux500/headsmp.S
+ create mode 100644 arch/arm/mach-zx/zx296702-pm-domain.c
+ delete mode 100644 arch/arm/plat-samsung/include/plat/keypad-core.h
+ create mode 100644 arch/arm64/Kconfig.platforms
+ create mode 100644 arch/arm64/boot/dts/broadcom/Makefile
+ create mode 100644 arch/arm64/boot/dts/broadcom/ns2-svk.dts
+ create mode 100644 arch/arm64/boot/dts/broadcom/ns2.dtsi
+ create mode 100644 arch/arm64/boot/dts/marvell/Makefile
+ create mode 100644 arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts
+ create mode 100644 arch/arm64/boot/dts/marvell/berlin4ct.dtsi
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt6795-evb.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt6795.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
+ create mode 100644 arch/arm64/boot/dts/rockchip/Makefile
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-r88.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3368.dtsi
+ create mode 100644 drivers/clk/imx/clk-imx6ul.c
+ create mode 100644 drivers/clk/rockchip/clk-inverter.c
+ create mode 100644 drivers/clk/rockchip/clk-rk3368.c
+ create mode 100644 drivers/clk/tegra/clk-dfll.c
+ create mode 100644 drivers/clk/tegra/clk-dfll.h
+ create mode 100644 drivers/clk/tegra/clk-tegra124-dfll-fcpu.c
+ create mode 100644 drivers/clk/tegra/cvb.c
+ create mode 100644 drivers/clk/tegra/cvb.h
+ create mode 100644 drivers/clk/ti/clk-814x.c
+ delete mode 100644 drivers/cpufreq/exynos-cpufreq.c
+ delete mode 100644 drivers/cpufreq/exynos-cpufreq.h
+ delete mode 100644 drivers/cpufreq/exynos4x12-cpufreq.c
+ delete mode 100644 drivers/cpufreq/exynos5250-cpufreq.c
+ create mode 100644 drivers/cpufreq/tegra124-cpufreq.c
+ rename drivers/cpufreq/{tegra-cpufreq.c => tegra20-cpufreq.c} (100%)
+ create mode 100644 drivers/input/keyboard/snvs_pwrkey.c
+ create mode 100644 drivers/memory/pl172.c
+ create mode 100644 drivers/memory/tegra/tegra210.c
+ create mode 100644 drivers/reset/reset-ath79.c
+ create mode 100644 drivers/reset/reset-lpc18xx.c
+ create mode 100644 drivers/reset/reset-zynq.c
+ create mode 100644 drivers/soc/dove/Makefile
+ create mode 100644 drivers/soc/dove/pmu.c
+ create mode 100644 drivers/soc/mediatek/mtk-infracfg.c
+ create mode 100644 drivers/soc/mediatek/mtk-scpsys.c
+ create mode 100644 drivers/soc/qcom/smd-rpm.c
+ create mode 100644 drivers/soc/qcom/smd.c
+ create mode 100644 drivers/soc/qcom/smem.c
+ create mode 100644 drivers/soc/tegra/fuse/speedo-tegra210.c
+ create mode 100644 include/dt-bindings/clock/imx6ul-clock.h
+ create mode 100644 include/dt-bindings/clock/r8a7793-clock.h
+ create mode 100644 include/dt-bindings/clock/rk3368-cru.h
+ create mode 100644 include/dt-bindings/memory/tegra210-mc.h
+ create mode 100644 include/dt-bindings/power/mt8173-power.h
+ create mode 100644 include/dt-bindings/reset/altr,rst-mgr-a10.h
+ rename include/dt-bindings/{reset-controller => reset}/stih407-resets.h (100%)
+ rename include/dt-bindings/{reset-controller => reset}/stih415-resets.h (100%)
+ rename include/dt-bindings/{reset-controller => reset}/stih416-resets.h (100%)
+ create mode 100644 include/dt-bindings/reset/tegra124-car.h
+ create mode 100644 include/linux/soc/dove/pmu.h
+ create mode 100644 include/linux/soc/mediatek/infracfg.h
+ create mode 100644 include/linux/soc/qcom/smd-rpm.h
+ create mode 100644 include/linux/soc/qcom/smd.h
+ create mode 100644 include/linux/soc/qcom/smem.h
+$ git am -3 ../patches/0001-ARM-fix-for-PSCI-code-movement.patch
+Applying: ARM: fix for PSCI code movement
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/firmware/psci.c
+$ git add -A .
+$ git commit -v -a --amend
+[master d04d8d689fd9] Merge remote-tracking branch 'arm-soc/for-next'
+ Date: Fri Aug 28 07:47:46 2015 +1000
+Merging at91/at91-next (253ebd4df402 Merge branch 'at91-4.3-defconfig' into at91-next)
+$ git merge at91/at91-next
+Resolved 'arch/arm/configs/at91_dt_defconfig' using previous resolution.
+Resolved 'arch/arm/mach-at91/sama5.c' using previous resolution.
+Auto-merging arch/arm/mach-at91/sama5.c
+CONFLICT (content): Merge conflict in arch/arm/mach-at91/sama5.c
+Auto-merging arch/arm/configs/at91_dt_defconfig
+CONFLICT (content): Merge conflict in arch/arm/configs/at91_dt_defconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 6e148b045601] Merge remote-tracking branch 'at91/at91-next'
+$ git diff -M --stat --summary HEAD^..
+Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
+$ git merge bcm2835/for-next
+Already up-to-date.
+Merging berlin/berlin/for-next (d770e558e219 Linux 4.2-rc1)
+$ git merge berlin/berlin/for-next
+Already up-to-date.
+Merging cortex-m/for-next (e799b6f37e6c ARM: zImage: add support for ARMv7-M)
+$ git merge cortex-m/for-next
+Merge made by the 'recursive' strategy.
+Merging imx-mxs/for-next (c746ef1b64e9 Merge branch 'imx/defconfig' into for-next)
+$ git merge imx-mxs/for-next
+Merge made by the 'recursive' strategy.
+ drivers/clk/imx/clk-imx31.c | 3 ++-
+ drivers/clk/imx/clk-imx35.c | 6 +++++-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+Merging keystone/next (a6ba4234e474 ARM: dts: k2l: fix the netcp range size)
+$ git merge keystone/next
+Resolved 'arch/arm/boot/dts/k2e.dtsi' using previous resolution.
+Resolved 'arch/arm/boot/dts/k2hk.dtsi' using previous resolution.
+Resolved 'arch/arm/boot/dts/k2l.dtsi' using previous resolution.
+Auto-merging arch/arm/boot/dts/k2l.dtsi
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/k2l.dtsi
+Auto-merging arch/arm/boot/dts/k2hk.dtsi
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/k2hk.dtsi
+Auto-merging arch/arm/boot/dts/k2e.dtsi
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/k2e.dtsi
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 299122ccd73a] Merge remote-tracking branch 'keystone/next'
+$ git diff -M --stat --summary HEAD^..
+Merging mvebu/for-next (adfc8c76d84a Merge branch 'mvebu/config' into mvebu/for-next)
+$ git merge mvebu/for-next
+Merge made by the 'recursive' strategy.
+Merging omap/for-next (b2a882022a1e Merge branch 'omap-for-v4.3/dt-v2' into for-next)
+$ git merge omap/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data)
+$ git merge omap-pending/for-next
+Resolved 'arch/arm/mach-omap2/omap_hwmod_43xx_data.c' using previous resolution.
+Resolved 'arch/arm/mach-omap2/omap_hwmod_7xx_data.c' using previous resolution.
+Auto-merging arch/arm/mach-omap2/omap_hwmod_7xx_data.c
+CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_7xx_data.c
+Auto-merging arch/arm/mach-omap2/omap_hwmod_43xx_data.c
+CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 63ddcffa0f7f] Merge remote-tracking branch 'omap-pending/for-next'
+$ git diff -M --stat --summary HEAD^..
+Merging qcom/qcom/for-next (4ae93a64be4f soc: qcom: smem: Fix errant private access)
+$ git merge qcom/qcom/for-next
+Auto-merging drivers/firmware/Makefile
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/firmware/qcom,scm.txt | 25 ++++
+ arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts | 36 ++++++
+ arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 122 ++++++++++++++++++
+ arch/arm/boot/dts/qcom-apq8064.dtsi | 87 +++++++++++++
+ arch/arm/boot/dts/qcom-msm8974.dtsi | 10 ++
+ drivers/firmware/Makefile | 4 +
+ drivers/firmware/qcom_scm-64.c | 69 +++++++++++
+ drivers/firmware/qcom_scm.c | 138 ++++++++++++++++++++-
+ drivers/soc/qcom/smem.c | 5 +-
+ 9 files changed, 490 insertions(+), 6 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt
+ create mode 100644 drivers/firmware/qcom_scm-64.c
+Merging renesas/next (078e7cdb7497 Merge branch 'heads/fixes-for-v4.3' into next)
+$ git merge renesas/next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/r8a7790.dtsi | 1 +
+ arch/arm/boot/dts/r8a7791.dtsi | 1 +
+ drivers/sh/pm_runtime.c | 19 +++++--------------
+ 3 files changed, 7 insertions(+), 14 deletions(-)
+Merging rockchip/for-next (ed0450118b2f Merge branch 'v4.3-armsoc/soc' into for-next)
+$ git merge rockchip/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
+$ git merge rpi/for-rpi-next
+Already up-to-date.
+Merging samsung/for-next (112129267f1a Merge branch 'v4.3-next/dt64-samsung' into for-next)
+$ git merge samsung/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/samsung/pmu.txt | 1 +
+ .../devicetree/bindings/hwmon/pwm-fan.txt | 29 +-
+ Documentation/devicetree/bindings/mfd/s2mps11.txt | 4 +
+ arch/arm/boot/dts/exynos4412-odroidu3.dts | 43 +
+ arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 1 +
+ arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 698 +++++++++++++++
+ .../dts/exynos/exynos5433-tmu-sensor-conf.dtsi | 22 +
+ arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi | 231 +++++
+ arch/arm64/boot/dts/exynos/exynos5433.dtsi | 931 +++++++++++++++++++++
+ 9 files changed, 1958 insertions(+), 2 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi
+ create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tmu-sensor-conf.dtsi
+ create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi
+ create mode 100644 arch/arm64/boot/dts/exynos/exynos5433.dtsi
+Merging samsung-krzk/for-next (002528669469 Merge branch 'defconfig-for-next' into for-next)
+$ git merge samsung-krzk/for-next
+Auto-merging arch/arm/configs/multi_v7_defconfig
+Auto-merging arch/arm/configs/exynos_defconfig
+Auto-merging arch/arm/boot/dts/exynos5250-smdk5250.dts
+Auto-merging arch/arm/boot/dts/exynos4.dtsi
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/exynos4.dtsi | 8 ++++++++
+ arch/arm/boot/dts/exynos5250-smdk5250.dts | 1 +
+ arch/arm/configs/exynos_defconfig | 2 ++
+ arch/arm/configs/multi_v7_defconfig | 2 ++
+ 4 files changed, 13 insertions(+)
+Merging sunxi/sunxi/for-next (9d73c13a139c Merge branches 'sunxi/dt-for-4.3' and 'sunxi/defconfig-for-4.3' into sunxi/for-next)
+$ git merge sunxi/sunxi/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging tegra/for-next (bea5a17a8beb Merge branch for-4.3/defconfig into for-next)
+$ git merge tegra/for-next
+Merge made by the 'recursive' strategy.
+ drivers/iommu/tegra-smmu.c | 306 ++++++++++++++++++++++++++--------------
+ drivers/memory/tegra/tegra114.c | 18 +--
+ drivers/memory/tegra/tegra124.c | 31 +---
+ drivers/memory/tegra/tegra30.c | 18 +--
+ include/soc/tegra/mc.h | 8 +-
+ 5 files changed, 202 insertions(+), 179 deletions(-)
+Merging arm64/for-next/core (674c242c9323 arm64: flush FP/SIMD state correctly after execve())
+$ git merge arm64/for-next/core
+Auto-merging arch/sparc/lib/ksyms.c
+Auto-merging arch/s390/kvm/kvm-s390.c
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arc/include/asm/atomic.h
+Merge made by the 'recursive' strategy.
+ Documentation/arm64/booting.txt | 11 +-
+ arch/alpha/include/asm/atomic.h | 42 ++--
+ arch/arc/include/asm/atomic.h | 8 +-
+ arch/arm/include/asm/atomic.h | 14 ++
+ arch/arm64/Kconfig | 86 +++++--
+ arch/arm64/Makefile | 18 +-
+ arch/arm64/boot/Makefile | 12 +
+ arch/arm64/include/asm/alternative.h | 78 ++++++-
+ arch/arm64/include/asm/assembler.h | 14 --
+ arch/arm64/include/asm/atomic.h | 265 +++++-----------------
+ arch/arm64/include/asm/atomic_ll_sc.h | 247 ++++++++++++++++++++
+ arch/arm64/include/asm/atomic_lse.h | 391 ++++++++++++++++++++++++++++++++
+ arch/arm64/include/asm/barrier.h | 24 --
+ arch/arm64/include/asm/bug.h | 64 ++++++
+ arch/arm64/include/asm/cmpxchg.h | 192 ++++++----------
+ arch/arm64/include/asm/cpufeature.h | 18 +-
+ arch/arm64/include/asm/cputype.h | 3 -
+ arch/arm64/include/asm/debug-monitors.h | 44 ++--
+ arch/arm64/include/asm/esr.h | 9 +
+ arch/arm64/include/asm/exception.h | 6 +
+ arch/arm64/include/asm/fixmap.h | 2 +-
+ arch/arm64/include/asm/futex.h | 10 +
+ arch/arm64/include/asm/hardirq.h | 4 -
+ arch/arm64/include/asm/hugetlb.h | 4 -
+ arch/arm64/include/asm/irq_work.h | 11 -
+ arch/arm64/include/asm/lse.h | 53 +++++
+ arch/arm64/include/asm/memory.h | 8 +
+ arch/arm64/include/asm/mmu.h | 1 -
+ arch/arm64/include/asm/percpu.h | 8 -
+ arch/arm64/include/asm/perf_event.h | 2 +-
+ arch/arm64/include/asm/pgtable-hwdef.h | 3 +
+ arch/arm64/include/asm/pgtable.h | 167 +++++++++++++-
+ arch/arm64/include/asm/processor.h | 2 +
+ arch/arm64/include/asm/ptrace.h | 4 -
+ arch/arm64/include/asm/smp.h | 4 -
+ arch/arm64/include/asm/smp_plat.h | 2 -
+ arch/arm64/include/asm/spinlock.h | 147 +++++++++---
+ arch/arm64/include/asm/spinlock_types.h | 2 +
+ arch/arm64/include/asm/sysreg.h | 40 +++-
+ arch/arm64/include/asm/tlb.h | 7 +-
+ arch/arm64/include/asm/tlbflush.h | 76 +++----
+ arch/arm64/include/asm/topology.h | 9 -
+ arch/arm64/include/asm/traps.h | 23 +-
+ arch/arm64/include/asm/uaccess.h | 11 +
+ arch/arm64/include/uapi/asm/hwcap.h | 1 +
+ arch/arm64/include/uapi/asm/ptrace.h | 1 +
+ arch/arm64/kernel/Makefile | 6 +-
+ arch/arm64/kernel/alternative.c | 30 ++-
+ arch/arm64/kernel/armv8_deprecated.c | 19 +-
+ arch/arm64/kernel/cpu_ops.c | 2 -
+ arch/arm64/kernel/cpufeature.c | 53 ++++-
+ arch/arm64/kernel/debug-monitors.c | 4 +-
+ arch/arm64/kernel/efi-stub.c | 41 +++-
+ arch/arm64/kernel/entry.S | 46 ++--
+ arch/arm64/kernel/fpsimd.c | 1 +
+ arch/arm64/kernel/head.S | 15 +-
+ arch/arm64/kernel/hw_breakpoint.c | 6 +-
+ arch/arm64/kernel/insn.c | 5 +-
+ arch/arm64/kernel/irq.c | 2 -
+ arch/arm64/kernel/kgdb.c | 12 +-
+ arch/arm64/kernel/pci.c | 13 ++
+ arch/arm64/kernel/perf_callchain.c | 196 ++++++++++++++++
+ arch/arm64/kernel/perf_event.c | 310 ++-----------------------
+ arch/arm64/kernel/psci.c | 5 -
+ arch/arm64/kernel/ptrace.c | 92 +++++++-
+ arch/arm64/kernel/setup.c | 85 +++----
+ arch/arm64/kernel/sleep.S | 14 +-
+ arch/arm64/kernel/smp.c | 15 +-
+ arch/arm64/kernel/time.c | 2 -
+ arch/arm64/kernel/topology.c | 2 +-
+ arch/arm64/kernel/traps.c | 94 ++++++--
+ arch/arm64/kvm/hyp.S | 12 +-
+ arch/arm64/lib/Makefile | 13 ++
+ arch/arm64/lib/atomic_ll_sc.c | 3 +
+ arch/arm64/lib/bitops.S | 45 ++--
+ arch/arm64/lib/clear_user.S | 8 +
+ arch/arm64/lib/copy_from_user.S | 25 +-
+ arch/arm64/lib/copy_in_user.S | 25 +-
+ arch/arm64/lib/copy_to_user.S | 25 +-
+ arch/arm64/mm/cache.S | 7 +-
+ arch/arm64/mm/context.c | 16 --
+ arch/arm64/mm/dma-mapping.c | 33 +--
+ arch/arm64/mm/fault.c | 28 ++-
+ arch/arm64/mm/flush.c | 4 -
+ arch/arm64/mm/hugetlbpage.c | 4 -
+ arch/arm64/mm/init.c | 4 +-
+ arch/arm64/mm/mmu.c | 13 +-
+ arch/arm64/mm/proc.S | 21 +-
+ arch/avr32/include/asm/atomic.h | 12 +
+ arch/blackfin/include/asm/atomic.h | 16 +-
+ arch/blackfin/kernel/bfin_ksyms.c | 7 +-
+ arch/blackfin/mach-bf561/atomic.S | 30 +--
+ arch/blackfin/mach-common/smp.c | 2 +-
+ arch/frv/include/asm/atomic.h | 107 ++++-----
+ arch/frv/include/asm/atomic_defs.h | 172 ++++++++++++++
+ arch/frv/include/asm/bitops.h | 99 +-------
+ arch/frv/kernel/dma.c | 6 +-
+ arch/frv/kernel/frv_ksyms.c | 5 -
+ arch/frv/lib/Makefile | 2 +-
+ arch/frv/lib/atomic-lib.c | 7 +
+ arch/frv/lib/atomic-ops.S | 110 ---------
+ arch/frv/lib/atomic64-ops.S | 94 --------
+ arch/h8300/include/asm/atomic.h | 137 +++--------
+ arch/hexagon/include/asm/atomic.h | 4 +
+ arch/ia64/include/asm/atomic.h | 24 +-
+ arch/m32r/include/asm/atomic.h | 45 +---
+ arch/m32r/kernel/smp.c | 4 +-
+ arch/m68k/include/asm/atomic.h | 14 +-
+ arch/metag/include/asm/atomic_lnkget.h | 38 +---
+ arch/metag/include/asm/atomic_lock1.h | 23 +-
+ arch/mips/include/asm/atomic.h | 7 +
+ arch/mn10300/include/asm/atomic.h | 71 +-----
+ arch/mn10300/mm/tlb-smp.c | 2 +-
+ arch/parisc/include/asm/atomic.h | 7 +
+ arch/powerpc/include/asm/atomic.h | 7 +
+ arch/powerpc/kernel/misc_32.S | 19 --
+ arch/s390/include/asm/atomic.h | 41 ++--
+ arch/s390/kernel/time.c | 4 +-
+ arch/s390/kvm/interrupt.c | 30 +--
+ arch/s390/kvm/kvm-s390.c | 32 +--
+ arch/sh/include/asm/atomic-grb.h | 43 +---
+ arch/sh/include/asm/atomic-irq.h | 21 +-
+ arch/sh/include/asm/atomic-llsc.h | 31 +--
+ arch/sparc/include/asm/atomic_32.h | 4 +-
+ arch/sparc/include/asm/atomic_64.h | 4 +
+ arch/sparc/lib/atomic32.c | 22 +-
+ arch/sparc/lib/atomic_64.S | 6 +
+ arch/sparc/lib/ksyms.c | 3 +
+ arch/tile/include/asm/atomic_32.h | 28 +++
+ arch/tile/include/asm/atomic_64.h | 40 ++++
+ arch/tile/lib/atomic_32.c | 23 ++
+ arch/tile/lib/atomic_asm_32.S | 4 +
+ arch/x86/include/asm/atomic.h | 25 +-
+ arch/x86/include/asm/atomic64_32.h | 14 ++
+ arch/x86/include/asm/atomic64_64.h | 15 ++
+ arch/xtensa/include/asm/atomic.h | 73 +-----
+ drivers/gpu/drm/i915/i915_drv.c | 2 +-
+ drivers/gpu/drm/i915/i915_gem.c | 2 +-
+ drivers/gpu/drm/i915/i915_irq.c | 4 +-
+ drivers/of/fdt.c | 12 +-
+ drivers/s390/scsi/zfcp_aux.c | 2 +-
+ drivers/s390/scsi/zfcp_erp.c | 62 ++---
+ drivers/s390/scsi/zfcp_fc.c | 8 +-
+ drivers/s390/scsi/zfcp_fsf.c | 26 +--
+ drivers/s390/scsi/zfcp_qdio.c | 14 +-
+ include/asm-generic/atomic.h | 11 +-
+ include/asm-generic/atomic64.h | 4 +
+ include/linux/atomic.h | 38 ++--
+ lib/atomic64.c | 3 +
+ lib/atomic64_test.c | 68 ++++--
+ 150 files changed, 3148 insertions(+), 2146 deletions(-)
+ create mode 100644 arch/arm64/include/asm/atomic_ll_sc.h
+ create mode 100644 arch/arm64/include/asm/atomic_lse.h
+ create mode 100644 arch/arm64/include/asm/bug.h
+ create mode 100644 arch/arm64/include/asm/lse.h
+ create mode 100644 arch/arm64/kernel/perf_callchain.c
+ create mode 100644 arch/arm64/lib/atomic_ll_sc.c
+ create mode 100644 arch/frv/include/asm/atomic_defs.h
+ create mode 100644 arch/frv/lib/atomic-lib.c
+Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
+$ git merge blackfin/for-linus
+Already up-to-date.
+Merging c6x/for-linux-next (960a2741d5fd c67: irq: Use __handle_domain_irq())
+$ git merge c6x/for-linux-next
+Merge made by the 'recursive' strategy.
+ arch/c6x/Kconfig | 1 +
+ arch/c6x/kernel/irq.c | 13 ++-----------
+ 2 files changed, 3 insertions(+), 11 deletions(-)
+Merging cris/for-next (1e4d6e13d050 cris: don't use module_init for non-modular core eeprom.c code)
+$ git merge cris/for-next
+Resolved 'arch/cris/include/asm/Kbuild' using previous resolution.
+Removing arch/cris/include/uapi/asm/types.h
+Removing arch/cris/include/uapi/asm/statfs.h
+Removing arch/cris/include/uapi/asm/sockios.h
+Removing arch/cris/include/uapi/asm/socket.h
+Removing arch/cris/include/uapi/asm/siginfo.h
+Removing arch/cris/include/uapi/asm/shmbuf.h
+Removing arch/cris/include/uapi/asm/sembuf.h
+Removing arch/cris/include/uapi/asm/resource.h
+Removing arch/cris/include/uapi/asm/poll.h
+Removing arch/cris/include/uapi/asm/msgbuf.h
+Removing arch/cris/include/uapi/asm/mman.h
+Removing arch/cris/include/uapi/asm/kvm_para.h
+Removing arch/cris/include/uapi/asm/ipcbuf.h
+Removing arch/cris/include/uapi/asm/ioctl.h
+Removing arch/cris/include/uapi/asm/fcntl.h
+Removing arch/cris/include/uapi/asm/errno.h
+Auto-merging arch/cris/include/uapi/asm/elf_v32.h
+Auto-merging arch/cris/include/uapi/asm/elf_v10.h
+Auto-merging arch/cris/include/uapi/asm/elf.h
+Removing arch/cris/include/uapi/asm/bitsperlong.h
+Removing arch/cris/include/uapi/asm/auxvec.h
+Removing arch/cris/include/asm/types.h
+Auto-merging arch/cris/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/cris/include/asm/Kbuild
+Removing arch/cris/arch-v10/lib/old_checksum.c
+Removing arch/cris/arch-v10/lib/dmacopy.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 3cf704e11437] Merge remote-tracking branch 'cris/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/cris/Kconfig | 12 +++
+ arch/cris/arch-v10/kernel/entry.S | 8 ++
+ arch/cris/arch-v10/lib/dmacopy.c | 42 ----------
+ arch/cris/arch-v10/lib/old_checksum.c | 86 --------------------
+ arch/cris/arch-v32/drivers/Kconfig | 16 ++--
+ arch/cris/arch-v32/drivers/axisflashmap.c | 9 ++-
+ arch/cris/arch-v32/drivers/mach-a3/gpio.c | 4 +-
+ arch/cris/arch-v32/drivers/mach-fs/gpio.c | 3 +-
+ arch/cris/arch-v32/kernel/entry.S | 19 +++++
+ arch/cris/arch-v32/kernel/process.c | 4 +-
+ arch/cris/arch-v32/kernel/signal.c | 1 -
+ arch/cris/arch-v32/mach-fs/pinmux.c | 8 +-
+ arch/cris/configs/artpec_3_defconfig | 5 +-
+ arch/cris/configs/etraxfs_defconfig | 1 +
+ arch/cris/include/arch-v32/arch/bug.h | 11 ++-
+ arch/cris/include/arch-v32/arch/irqflags.h | 2 +-
+ arch/cris/include/asm/Kbuild | 17 ++++
+ arch/cris/include/asm/mmu_context.h | 9 ++-
+ arch/cris/include/asm/stacktrace.h | 8 ++
+ arch/cris/include/asm/types.h | 12 ---
+ arch/cris/include/asm/unistd.h | 2 +-
+ arch/cris/include/uapi/asm/Kbuild | 5 ++
+ arch/cris/include/uapi/asm/auxvec.h | 4 -
+ arch/cris/include/uapi/asm/bitsperlong.h | 1 -
+ arch/cris/include/{ => uapi}/asm/elf.h | 9 ++-
+ .../{arch-v10/arch/elf.h => uapi/asm/elf_v10.h} | 5 +-
+ .../{arch-v32/arch/elf.h => uapi/asm/elf_v32.h} | 5 +-
+ arch/cris/include/uapi/asm/errno.h | 6 --
+ arch/cris/include/uapi/asm/fcntl.h | 1 -
+ arch/cris/include/uapi/asm/ioctl.h | 1 -
+ arch/cris/include/uapi/asm/ipcbuf.h | 1 -
+ arch/cris/include/uapi/asm/kvm_para.h | 1 -
+ arch/cris/include/uapi/asm/mman.h | 1 -
+ arch/cris/include/uapi/asm/msgbuf.h | 33 --------
+ arch/cris/include/uapi/asm/poll.h | 1 -
+ arch/cris/include/uapi/asm/ptrace.h | 6 +-
+ .../arch/ptrace.h => uapi/asm/ptrace_v10.h} | 0
+ .../arch/ptrace.h => uapi/asm/ptrace_v32.h} | 0
+ arch/cris/include/uapi/asm/resource.h | 6 --
+ arch/cris/include/uapi/asm/sembuf.h | 25 ------
+ arch/cris/include/uapi/asm/shmbuf.h | 42 ----------
+ arch/cris/include/uapi/asm/siginfo.h | 6 --
+ arch/cris/include/uapi/asm/socket.h | 92 ----------------------
+ arch/cris/include/uapi/asm/sockios.h | 13 ---
+ arch/cris/include/uapi/asm/statfs.h | 6 --
+ arch/cris/include/uapi/asm/types.h | 1 -
+ arch/cris/include/uapi/asm/unistd.h | 8 ++
+ arch/cris/kernel/Makefile | 1 +
+ arch/cris/kernel/irq.c | 6 +-
+ arch/cris/kernel/stacktrace.c | 76 ++++++++++++++++++
+ 50 files changed, 220 insertions(+), 421 deletions(-)
+ delete mode 100644 arch/cris/arch-v10/lib/dmacopy.c
+ delete mode 100644 arch/cris/arch-v10/lib/old_checksum.c
+ create mode 100644 arch/cris/include/asm/stacktrace.h
+ delete mode 100644 arch/cris/include/asm/types.h
+ delete mode 100644 arch/cris/include/uapi/asm/auxvec.h
+ delete mode 100644 arch/cris/include/uapi/asm/bitsperlong.h
+ rename arch/cris/include/{ => uapi}/asm/elf.h (95%)
+ rename arch/cris/include/{arch-v10/arch/elf.h => uapi/asm/elf_v10.h} (98%)
+ rename arch/cris/include/{arch-v32/arch/elf.h => uapi/asm/elf_v32.h} (98%)
+ delete mode 100644 arch/cris/include/uapi/asm/errno.h
+ delete mode 100644 arch/cris/include/uapi/asm/fcntl.h
+ delete mode 100644 arch/cris/include/uapi/asm/ioctl.h
+ delete mode 100644 arch/cris/include/uapi/asm/ipcbuf.h
+ delete mode 100644 arch/cris/include/uapi/asm/kvm_para.h
+ delete mode 100644 arch/cris/include/uapi/asm/mman.h
+ delete mode 100644 arch/cris/include/uapi/asm/msgbuf.h
+ delete mode 100644 arch/cris/include/uapi/asm/poll.h
+ rename arch/cris/include/{arch-v10/arch/ptrace.h => uapi/asm/ptrace_v10.h} (100%)
+ rename arch/cris/include/{arch-v32/arch/ptrace.h => uapi/asm/ptrace_v32.h} (100%)
+ delete mode 100644 arch/cris/include/uapi/asm/resource.h
+ delete mode 100644 arch/cris/include/uapi/asm/sembuf.h
+ delete mode 100644 arch/cris/include/uapi/asm/shmbuf.h
+ delete mode 100644 arch/cris/include/uapi/asm/siginfo.h
+ delete mode 100644 arch/cris/include/uapi/asm/socket.h
+ delete mode 100644 arch/cris/include/uapi/asm/sockios.h
+ delete mode 100644 arch/cris/include/uapi/asm/statfs.h
+ delete mode 100644 arch/cris/include/uapi/asm/types.h
+ create mode 100644 arch/cris/kernel/stacktrace.c
+Merging h8300/h8300-next (99bcfda85f66 Revert "asm-generic: {get,put}_user ptr argument evaluate only 1 time")
+$ git merge h8300/h8300-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/clock/renesas,h8300-div-clock.txt | 2 +-
+ drivers/clk/h8300/clk-h8s2678.c | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+Merging hexagon/linux-next (15978bfde3bb hexagon/time: Migrate to new 'set-state' interface)
+$ git merge hexagon/linux-next
+Merge made by the 'recursive' strategy.
+ arch/hexagon/kernel/time.c | 17 +----------------
+ 1 file changed, 1 insertion(+), 16 deletions(-)
+Merging ia64/next (ae40b7e28752 Merge branch 'misc-4.2' into next)
+$ git merge ia64/next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging m68k/for-next (1ecb40643a9a m68k/bootinfo: Use kmemdup rather than duplicating its implementation)
+$ git merge m68k/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/configs/amiga_defconfig | 16 +++++++++++-----
+ arch/m68k/configs/apollo_defconfig | 16 +++++++++++-----
+ arch/m68k/configs/atari_defconfig | 16 +++++++++++-----
+ arch/m68k/configs/bvme6000_defconfig | 16 +++++++++++-----
+ arch/m68k/configs/hp300_defconfig | 16 +++++++++++-----
+ arch/m68k/configs/mac_defconfig | 16 +++++++++++-----
+ arch/m68k/configs/multi_defconfig | 16 +++++++++++-----
+ arch/m68k/configs/mvme147_defconfig | 16 +++++++++++-----
+ arch/m68k/configs/mvme16x_defconfig | 16 +++++++++++-----
+ arch/m68k/configs/q40_defconfig | 16 +++++++++++-----
+ arch/m68k/configs/sun3_defconfig | 16 +++++++++++-----
+ arch/m68k/configs/sun3x_defconfig | 16 +++++++++++-----
+ arch/m68k/kernel/bootinfo_proc.c | 4 +---
+ 13 files changed, 133 insertions(+), 63 deletions(-)
+Merging m68knommu/for-next (50e48bd06731 m68k/coldfire: use PFN_DOWN macro)
+$ git merge m68knommu/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/coldfire/m54xx.c | 9 ++++---
+ arch/m68k/coldfire/pit.c | 66 +++++++++++++++++++++-------------------------
+ 2 files changed, 35 insertions(+), 40 deletions(-)
+Merging metag/for-next (3fe6942f0486 Documentation/features/vm: Meta2 is capable of THP)
+$ git merge metag/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/features/vm/THP/arch-support.txt | 2 +-
+ arch/metag/kernel/irq.c | 10 ++++++----
+ 2 files changed, 7 insertions(+), 5 deletions(-)
+Merging microblaze/next (bb88ba0946dd elf-em.h: move EM_MICROBLAZE to the common header)
+$ git merge microblaze/next
+Merge made by the 'recursive' strategy.
+ arch/microblaze/include/uapi/asm/elf.h | 3 ++-
+ include/uapi/linux/elf-em.h | 1 +
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+Merging mips/mips-for-linux-next (8e5f2cf82761 MIPS: math-emu: Remove unused handle_dsemul function declaration)
+$ git merge mips/mips-for-linux-next
+Auto-merging drivers/gpio/gpio-ath79.c
+Removing arch/mips/include/asm/mach-pistachio/gpio.h
+Removing arch/mips/include/asm/mach-loongson64/gpio.h
+Removing arch/mips/include/asm/mach-lantiq/gpio.h
+Removing arch/mips/include/asm/mach-generic/gpio.h
+Removing arch/mips/include/asm/mach-cavium-octeon/gpio.h
+Removing arch/mips/include/asm/mach-bcm63xx/gpio.h
+Removing arch/mips/include/asm/mach-bcm47xx/gpio.h
+Removing arch/mips/include/asm/mach-au1x00/gpio.h
+Removing arch/mips/include/asm/mach-ath79/gpio.h
+Removing arch/mips/include/asm/mach-ath25/gpio.h
+Removing arch/mips/include/asm/mach-ar7/gpio.h
+Removing arch/mips/include/asm/gpio.h
+Removing arch/mips/include/asm/debug.h
+Auto-merging arch/mips/Kconfig
+Merge made by the 'recursive' strategy.
+ .../bindings/timer/img,pistachio-gptimer.txt | 28 ++
+ .../features/debug/uprobes/arch-support.txt | 2 +-
+ Documentation/sysrq.txt | 1 +
+ arch/mips/Kconfig | 25 +-
+ arch/mips/Kconfig.debug | 9 -
+ arch/mips/alchemy/Kconfig | 7 -
+ arch/mips/alchemy/board-gpr.c | 1 +
+ arch/mips/alchemy/board-mtx1.c | 1 +
+ arch/mips/alchemy/common/Makefile | 7 +-
+ arch/mips/alchemy/common/irq.c | 4 +-
+ arch/mips/alchemy/common/time.c | 6 -
+ arch/mips/alchemy/devboards/bcsr.c | 6 +-
+ arch/mips/alchemy/devboards/db1000.c | 1 +
+ arch/mips/alchemy/devboards/db1300.c | 1 +
+ arch/mips/alchemy/devboards/db1550.c | 1 +
+ arch/mips/alchemy/devboards/pm.c | 2 +-
+ arch/mips/ar7/gpio.c | 5 +-
+ arch/mips/ar7/platform.c | 1 -
+ arch/mips/ar7/setup.c | 1 -
+ arch/mips/ath79/Makefile | 2 +-
+ arch/mips/ath79/common.h | 3 -
+ arch/mips/ath79/irq.c | 19 +-
+ arch/mips/bcm47xx/buttons.c | 3 +-
+ arch/mips/bcm63xx/irq.c | 6 +-
+ arch/mips/boot/dts/netlogic/xlp_evp.dts | 12 +
+ arch/mips/boot/dts/netlogic/xlp_fvp.dts | 12 +
+ arch/mips/boot/dts/netlogic/xlp_gvp.dts | 11 +
+ arch/mips/boot/dts/netlogic/xlp_rvp.dts | 11 +
+ arch/mips/boot/dts/netlogic/xlp_svp.dts | 12 +
+ .../cavium-octeon/executive/cvmx-helper-board.c | 6 +
+ .../cavium-octeon/executive/cvmx-helper-util.c | 20 +-
+ .../cavium-octeon/executive/cvmx-helper-xaui.c | 14 +-
+ arch/mips/cavium-octeon/executive/cvmx-helper.c | 17 +
+ arch/mips/cavium-octeon/executive/cvmx-pko.c | 149 ++++++-
+ arch/mips/cavium-octeon/octeon-irq.c | 36 +-
+ arch/mips/include/asm/Kbuild | 1 -
+ arch/mips/include/asm/abi.h | 4 +
+ arch/mips/include/asm/asmmacro.h | 114 ++++++
+ arch/mips/include/asm/cdmm.h | 4 +-
+ arch/mips/include/asm/cevt-r4k.h | 1 -
+ arch/mips/include/asm/cpu-features.h | 4 +
+ arch/mips/include/asm/cpu-type.h | 4 +
+ arch/mips/include/asm/cpu.h | 3 +
+ arch/mips/include/asm/debug.h | 48 ---
+ arch/mips/include/asm/elf.h | 4 +-
+ arch/mips/include/asm/fpu.h | 21 +-
+ arch/mips/include/asm/gpio.h | 6 -
+ arch/mips/include/asm/irq.h | 2 +-
+ arch/mips/include/asm/kdebug.h | 4 +-
+ arch/mips/include/asm/linkage.h | 1 -
+ arch/mips/include/asm/maar.h | 2 +-
+ arch/mips/include/asm/mach-ar7/ar7.h | 4 +
+ arch/mips/include/asm/mach-ar7/gpio.h | 41 --
+ arch/mips/include/asm/mach-ath25/gpio.h | 16 -
+ arch/mips/include/asm/mach-ath79/gpio.h | 26 --
+ arch/mips/include/asm/mach-au1x00/gpio-au1000.h | 148 +------
+ arch/mips/include/asm/mach-au1x00/gpio.h | 86 ----
+ arch/mips/include/asm/mach-bcm47xx/gpio.h | 17 -
+ arch/mips/include/asm/mach-bcm63xx/gpio.h | 15 -
+ arch/mips/include/asm/mach-cavium-octeon/gpio.h | 21 -
+ arch/mips/include/asm/mach-generic/gpio.h | 21 -
+ arch/mips/include/asm/mach-jz4740/gpio.h | 2 -
+ arch/mips/include/asm/mach-lantiq/gpio.h | 13 -
+ arch/mips/include/asm/mach-loongson64/gpio.h | 36 --
+ arch/mips/include/asm/mach-pistachio/gpio.h | 21 -
+ arch/mips/include/asm/mach-rc32434/gpio.h | 12 -
+ arch/mips/include/asm/mips-cm.h | 89 ++++-
+ arch/mips/include/asm/mips-cpc.h | 10 -
+ arch/mips/include/asm/mipsregs.h | 60 +--
+ arch/mips/include/asm/msa.h | 80 ++++
+ arch/mips/include/asm/octeon/cvmx-bootinfo.h | 2 +
+ arch/mips/include/asm/octeon/cvmx-pip.h | 2 +-
+ arch/mips/include/asm/octeon/cvmx-pko.h | 3 +
+ arch/mips/include/asm/octeon/cvmx-pow-defs.h | 29 ++
+ arch/mips/include/asm/octeon/cvmx-pow.h | 9 +-
+ arch/mips/include/asm/octeon/cvmx-wqe.h | 308 ++++++++++++---
+ arch/mips/include/asm/pgtable-bits.h | 2 +-
+ arch/mips/include/asm/pgtable.h | 2 +
+ arch/mips/include/asm/processor.h | 2 +
+ arch/mips/include/asm/ptrace.h | 80 ++++
+ arch/mips/include/asm/signal.h | 3 +
+ arch/mips/include/asm/spinlock.h | 5 +
+ arch/mips/include/asm/switch_to.h | 67 ++--
+ arch/mips/include/asm/thread_info.h | 5 +-
+ arch/mips/include/asm/time.h | 4 +-
+ arch/mips/include/asm/tlbdebug.h | 1 +
+ arch/mips/include/asm/uprobes.h | 58 +++
+ arch/mips/include/asm/vpe.h | 2 +-
+ arch/mips/include/uapi/asm/break.h | 2 +
+ arch/mips/include/uapi/asm/hwcap.h | 8 +
+ arch/mips/include/uapi/asm/inst.h | 40 +-
+ arch/mips/include/uapi/asm/sigcontext.h | 12 +
+ arch/mips/include/uapi/asm/ucontext.h | 65 +++
+ arch/mips/jazz/irq.c | 7 -
+ arch/mips/jz4740/gpio.c | 24 +-
+ arch/mips/jz4740/time.c | 46 ++-
+ arch/mips/kernel/Makefile | 1 +
+ arch/mips/kernel/asm-offsets.c | 12 +-
+ arch/mips/kernel/cevt-bcm1480.c | 44 +--
+ arch/mips/kernel/cevt-ds1287.c | 37 +-
+ arch/mips/kernel/cevt-gt641xx.c | 57 ++-
+ arch/mips/kernel/cevt-r4k.c | 18 +-
+ arch/mips/kernel/cevt-sb1250.c | 45 +--
+ arch/mips/kernel/cevt-txx9.c | 81 ++--
+ arch/mips/kernel/cpu-probe.c | 56 ++-
+ arch/mips/kernel/idle.c | 1 +
+ arch/mips/kernel/mips-cm.c | 257 +++++++++++-
+ arch/mips/kernel/mips-cpc.c | 11 +-
+ arch/mips/kernel/perf_event_mipsxx.c | 13 +-
+ arch/mips/kernel/pm-cps.c | 2 +
+ arch/mips/kernel/ptrace.c | 88 +++++
+ arch/mips/kernel/r4k_fpu.S | 436 ++++++++++++---------
+ arch/mips/kernel/r4k_switch.S | 41 +-
+ arch/mips/kernel/signal-common.h | 9 +
+ arch/mips/kernel/signal.c | 433 +++++++++++++++-----
+ arch/mips/kernel/signal32.c | 207 +---------
+ arch/mips/kernel/signal_n32.c | 6 +-
+ arch/mips/kernel/spram.c | 1 +
+ arch/mips/kernel/sysrq.c | 14 +-
+ arch/mips/kernel/time.c | 9 +-
+ arch/mips/kernel/traps.c | 57 +--
+ arch/mips/kernel/unaligned.c | 74 +++-
+ arch/mips/kernel/uprobes.c | 341 ++++++++++++++++
+ arch/mips/kernel/vpe.c | 7 +-
+ arch/mips/lasat/sysctl.c | 2 +-
+ arch/mips/lib/dump_tlb.c | 45 ++-
+ arch/mips/lib/r3k_dump_tlb.c | 11 +
+ arch/mips/loongson32/common/time.c | 57 +--
+ arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c | 46 +--
+ arch/mips/loongson64/loongson-3/hpet.c | 117 +++---
+ arch/mips/math-emu/Makefile | 4 +-
+ arch/mips/math-emu/cp1emu.c | 400 ++++++++++++++++++-
+ arch/mips/math-emu/dp_2008class.c | 55 +++
+ arch/mips/math-emu/dp_fmax.c | 213 ++++++++++
+ arch/mips/math-emu/dp_fmin.c | 213 ++++++++++
+ arch/mips/math-emu/dp_maddf.c | 265 +++++++++++++
+ arch/mips/math-emu/dp_msubf.c | 269 +++++++++++++
+ arch/mips/math-emu/dsemul.c | 1 -
+ arch/mips/math-emu/ieee754.h | 19 +
+ arch/mips/math-emu/ieee754int.h | 8 +-
+ arch/mips/math-emu/me-debugfs.c | 2 +-
+ arch/mips/math-emu/sp_2008class.c | 55 +++
+ arch/mips/math-emu/sp_fmax.c | 213 ++++++++++
+ arch/mips/math-emu/sp_fmin.c | 213 ++++++++++
+ arch/mips/math-emu/sp_maddf.c | 255 ++++++++++++
+ arch/mips/math-emu/sp_msubf.c | 258 ++++++++++++
+ arch/mips/mm/c-r4k.c | 1 +
+ arch/mips/mm/dma-default.c | 35 ++
+ arch/mips/mm/fault.c | 8 +-
+ arch/mips/mm/init.c | 36 +-
+ arch/mips/mm/sc-mips.c | 42 ++
+ arch/mips/mm/tlb-r3k.c | 2 +-
+ arch/mips/mti-malta/malta-init.c | 7 +
+ arch/mips/mti-malta/malta-int.c | 112 +-----
+ arch/mips/mti-malta/malta-memory.c | 25 --
+ arch/mips/netlogic/common/irq.c | 12 +-
+ arch/mips/netlogic/common/smp.c | 6 +-
+ arch/mips/netlogic/xlp/ahci-init-xlp2.c | 2 +-
+ arch/mips/netlogic/xlp/nlm_hal.c | 2 +
+ arch/mips/oprofile/common.c | 1 +
+ arch/mips/oprofile/op_model_mipsxx.c | 12 +-
+ arch/mips/pci/msi-xlp.c | 20 +-
+ arch/mips/pci/ops-emma2rh.c | 6 +-
+ arch/mips/pci/pci-ar71xx.c | 4 +-
+ arch/mips/pci/pci-ar724x.c | 4 +-
+ arch/mips/pci/pci-lantiq.c | 1 -
+ arch/mips/pci/pci-rt3883.c | 7 +-
+ arch/mips/pistachio/Kconfig | 13 +
+ arch/mips/pmcs-msp71xx/msp_irq_cic.c | 3 +-
+ arch/mips/ralink/cevt-rt3352.c | 59 +--
+ arch/mips/rb532/devices.c | 1 +
+ arch/mips/rb532/gpio.c | 6 +
+ arch/mips/sgi-ip27/ip27-timer.c | 7 -
+ arch/mips/sibyte/common/bus_watcher.c | 2 +-
+ arch/mips/sni/time.c | 49 +--
+ arch/mips/txx9/generic/setup.c | 16 -
+ drivers/ata/pata_rb532_cf.c | 3 +-
+ drivers/bus/mips_cdmm.c | 14 +-
+ drivers/clocksource/Kconfig | 4 +
+ drivers/clocksource/Makefile | 1 +
+ drivers/clocksource/mips-gic-timer.c | 65 ++-
+ drivers/clocksource/time-pistachio.c | 217 ++++++++++
+ drivers/gpio/Makefile | 1 +
+ .../mips/ath79/gpio.c => drivers/gpio/gpio-ath79.c | 75 ----
+ drivers/input/misc/rb532_button.c | 1 +
+ drivers/irqchip/irq-mips-gic.c | 142 ++++---
+ drivers/net/ethernet/ti/cpmac.c | 2 +
+ drivers/staging/octeon/ethernet-rx.c | 133 +++++--
+ drivers/staging/octeon/ethernet-tx.c | 19 +-
+ drivers/staging/octeon/ethernet-util.h | 22 +-
+ drivers/staging/octeon/ethernet.c | 7 +-
+ drivers/tty/mips_ejtag_fdc.c | 9 +-
+ include/linux/irqchip/mips-gic.h | 14 +-
+ 193 files changed, 6359 insertions(+), 2121 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/timer/img,pistachio-gptimer.txt
+ delete mode 100644 arch/mips/include/asm/debug.h
+ delete mode 100644 arch/mips/include/asm/gpio.h
+ delete mode 100644 arch/mips/include/asm/mach-ar7/gpio.h
+ delete mode 100644 arch/mips/include/asm/mach-ath25/gpio.h
+ delete mode 100644 arch/mips/include/asm/mach-ath79/gpio.h
+ delete mode 100644 arch/mips/include/asm/mach-au1x00/gpio.h
+ delete mode 100644 arch/mips/include/asm/mach-bcm47xx/gpio.h
+ delete mode 100644 arch/mips/include/asm/mach-bcm63xx/gpio.h
+ delete mode 100644 arch/mips/include/asm/mach-cavium-octeon/gpio.h
+ delete mode 100644 arch/mips/include/asm/mach-generic/gpio.h
+ delete mode 100644 arch/mips/include/asm/mach-lantiq/gpio.h
+ delete mode 100644 arch/mips/include/asm/mach-loongson64/gpio.h
+ delete mode 100644 arch/mips/include/asm/mach-pistachio/gpio.h
+ create mode 100644 arch/mips/include/asm/uprobes.h
+ create mode 100644 arch/mips/include/uapi/asm/hwcap.h
+ create mode 100644 arch/mips/include/uapi/asm/ucontext.h
+ create mode 100644 arch/mips/kernel/uprobes.c
+ create mode 100644 arch/mips/math-emu/dp_2008class.c
+ create mode 100644 arch/mips/math-emu/dp_fmax.c
+ create mode 100644 arch/mips/math-emu/dp_fmin.c
+ create mode 100644 arch/mips/math-emu/dp_maddf.c
+ create mode 100644 arch/mips/math-emu/dp_msubf.c
+ create mode 100644 arch/mips/math-emu/sp_2008class.c
+ create mode 100644 arch/mips/math-emu/sp_fmax.c
+ create mode 100644 arch/mips/math-emu/sp_fmin.c
+ create mode 100644 arch/mips/math-emu/sp_maddf.c
+ create mode 100644 arch/mips/math-emu/sp_msubf.c
+ create mode 100644 arch/mips/pistachio/Kconfig
+ create mode 100644 drivers/clocksource/time-pistachio.c
+ rename arch/mips/ath79/gpio.c => drivers/gpio/gpio-ath79.c (78%)
+Merging nios2/for-next (81c9517e7ab4 nios2/time: Migrate to new 'set-state' interface)
+$ git merge nios2/for-next
+Merge made by the 'recursive' strategy.
+ arch/nios2/kernel/time.c | 49 ++++++++++++++++++++++++++++--------------------
+ 1 file changed, 29 insertions(+), 20 deletions(-)
+Merging parisc-hd/for-next (0c0f80b3f908 parisc: Define ioremap_uc and ioremap_wc)
+$ git merge parisc-hd/for-next
+Merge made by the 'recursive' strategy.
+ arch/parisc/include/asm/io.h | 2 ++
+ 1 file changed, 2 insertions(+)
+Merging powerpc/next (96983515657b Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next)
+$ git merge powerpc/next
+Auto-merging arch/powerpc/platforms/powernv/pci-ioda.c
+Auto-merging arch/powerpc/platforms/powernv/eeh-powernv.c
+Auto-merging arch/powerpc/kernel/signal_32.c
+Removing arch/powerpc/configs/mpc85xx_smp_defconfig
+Removing arch/powerpc/configs/mpc85xx_defconfig
+Auto-merging arch/powerpc/configs/fsl-emb-nonhw.config
+Removing arch/powerpc/configs/corenet32_smp_defconfig
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-class-cxl | 10 +
+ .../devicetree/bindings/leds/leds-powernv.txt | 26 +
+ .../bindings/memory-controllers/fsl/ifc.txt | 3 +
+ .../devicetree/bindings/powerpc/fsl/scfg.txt | 18 +
+ Documentation/trace/ftrace.txt | 5 +
+ arch/powerpc/Kconfig | 22 +-
+ arch/powerpc/Makefile | 20 +
+ arch/powerpc/boot/dts/fsl/p1022si-post.dtsi | 2 +-
+ arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi | 2 +
+ arch/powerpc/boot/dts/fsl/t1040si-post.dtsi | 5 +
+ arch/powerpc/boot/dts/t1023rdb.dts | 13 +-
+ arch/powerpc/boot/dts/t1024rdb.dts | 6 +
+ arch/powerpc/boot/dts/t1040d4rdb.dts | 46 ++
+ arch/powerpc/boot/dts/t1042d4rdb.dts | 53 ++
+ arch/powerpc/boot/dts/t104xd4rdb.dtsi | 205 ++++++++
+ arch/powerpc/configs/85xx-32bit.config | 5 +
+ arch/powerpc/configs/85xx-64bit.config | 4 +
+ arch/powerpc/configs/85xx-hw.config | 142 ++++++
+ arch/powerpc/configs/85xx-smp.config | 2 +
+ arch/powerpc/configs/altivec.config | 1 +
+ arch/powerpc/configs/corenet32_smp_defconfig | 185 -------
+ arch/powerpc/configs/corenet_basic_defconfig | 1 +
+ ...orenet64_smp_defconfig => fsl-emb-nonhw.config} | 264 ++++------
+ arch/powerpc/configs/mpc85xx_basic_defconfig | 23 +
+ arch/powerpc/configs/mpc85xx_defconfig | 252 ----------
+ arch/powerpc/configs/mpc85xx_smp_defconfig | 244 ---------
+ arch/powerpc/configs/ppc64_defconfig | 3 +
+ arch/powerpc/configs/pseries_defconfig | 6 +-
+ arch/powerpc/include/asm/Kbuild | 1 -
+ arch/powerpc/include/asm/archrandom.h | 28 +-
+ arch/powerpc/include/asm/cacheflush.h | 7 +-
+ arch/powerpc/include/asm/checksum.h | 37 +-
+ arch/powerpc/include/asm/compat.h | 7 +
+ arch/powerpc/include/asm/device.h | 15 +-
+ arch/powerpc/include/asm/dma-mapping.h | 14 +-
+ arch/powerpc/include/asm/iommu.h | 31 +-
+ arch/powerpc/include/asm/machdep.h | 2 +-
+ arch/powerpc/include/asm/opal-api.h | 124 ++++-
+ arch/powerpc/include/asm/opal.h | 8 +-
+ arch/powerpc/include/asm/pci-bridge.h | 1 +
+ arch/powerpc/include/asm/pgtable-ppc64.h | 8 +-
+ arch/powerpc/include/asm/pgtable.h | 11 +
+ arch/powerpc/include/asm/ppc-pci.h | 1 +
+ arch/powerpc/include/asm/processor.h | 1 -
+ arch/powerpc/include/asm/pte-common.h | 3 +-
+ arch/powerpc/include/asm/reg.h | 12 +-
+ arch/powerpc/include/asm/rtas.h | 1 +
+ arch/powerpc/include/asm/spu_csa.h | 6 -
+ arch/powerpc/include/asm/syscall.h | 54 +-
+ arch/powerpc/include/asm/trace_clock.h | 19 +
+ arch/powerpc/include/uapi/asm/Kbuild | 1 +
+ arch/powerpc/include/uapi/asm/errno.h | 2 -
+ arch/powerpc/include/uapi/asm/sigcontext.h | 4 +-
+ arch/powerpc/kernel/Makefile | 1 +
+ arch/powerpc/kernel/asm-offsets.c | 1 -
+ arch/powerpc/kernel/dma-iommu.c | 2 +-
+ arch/powerpc/kernel/dma-swiotlb.c | 4 +-
+ arch/powerpc/kernel/dma.c | 118 ++++-
+ arch/powerpc/kernel/eeh.c | 10 +-
+ arch/powerpc/kernel/eeh_pe.c | 22 +
+ arch/powerpc/kernel/entry_32.S | 7 +-
+ arch/powerpc/kernel/entry_64.S | 28 +-
+ arch/powerpc/kernel/exceptions-64e.S | 13 +-
+ arch/powerpc/kernel/fsl_booke_entry_mapping.S | 15 +-
+ arch/powerpc/kernel/kvm.c | 1 -
+ arch/powerpc/kernel/misc_64.S | 13 +-
+ arch/powerpc/kernel/nvram_64.c | 10 +-
+ arch/powerpc/kernel/pci-common.c | 72 +--
+ arch/powerpc/kernel/process.c | 14 +-
+ arch/powerpc/kernel/prom.c | 25 +-
+ arch/powerpc/kernel/prom_init.c | 25 +-
+ arch/powerpc/kernel/ptrace.c | 89 +++-
+ arch/powerpc/kernel/rtas.c | 25 +-
+ arch/powerpc/kernel/signal_32.c | 5 +
+ arch/powerpc/kernel/signal_64.c | 21 +-
+ arch/powerpc/kernel/trace_clock.c | 15 +
+ arch/powerpc/lib/checksum_32.S | 16 -
+ arch/powerpc/lib/checksum_64.S | 21 -
+ arch/powerpc/lib/copy_32.S | 109 +++-
+ arch/powerpc/mm/fsl_booke_mmu.c | 2 +-
+ arch/powerpc/mm/hash_low_64.S | 4 +-
+ arch/powerpc/mm/hash_utils_64.c | 12 +-
+ arch/powerpc/mm/hugetlbpage.c | 8 -
+ arch/powerpc/mm/mem.c | 14 +-
+ arch/powerpc/mm/numa.c | 16 +-
+ arch/powerpc/mm/pgtable_64.c | 10 -
+ arch/powerpc/mm/slb.c | 24 +-
+ arch/powerpc/mm/tlb_low_64e.S | 10 +-
+ arch/powerpc/oprofile/op_model_power4.c | 4 +-
+ arch/powerpc/perf/core-book3s.c | 4 +-
+ arch/powerpc/perf/hv-24x7.c | 24 +-
+ arch/powerpc/platforms/512x/Kconfig | 4 +-
+ arch/powerpc/platforms/85xx/c293pcie.c | 4 -
+ arch/powerpc/platforms/85xx/corenet_generic.c | 2 +
+ arch/powerpc/platforms/cell/Kconfig | 15 -
+ arch/powerpc/platforms/cell/spufs/file.c | 55 --
+ arch/powerpc/platforms/cell/spufs/lscsa_alloc.c | 124 +----
+ arch/powerpc/platforms/powernv/eeh-powernv.c | 12 +-
+ arch/powerpc/platforms/powernv/opal-hmi.c | 177 ++++++-
+ arch/powerpc/platforms/powernv/opal-power.c | 147 +++++-
+ arch/powerpc/platforms/powernv/opal-wrappers.S | 4 +
+ arch/powerpc/platforms/powernv/opal.c | 47 +-
+ arch/powerpc/platforms/powernv/pci-ioda.c | 147 +++---
+ arch/powerpc/platforms/powernv/pci.c | 11 -
+ arch/powerpc/platforms/powernv/pci.h | 7 +-
+ arch/powerpc/platforms/powernv/powernv.h | 6 -
+ arch/powerpc/platforms/powernv/rng.c | 2 +-
+ arch/powerpc/platforms/powernv/setup.c | 16 +-
+ arch/powerpc/platforms/powernv/subcore.c | 4 +-
+ arch/powerpc/platforms/pseries/hotplug-memory.c | 3 +-
+ arch/powerpc/platforms/pseries/iommu.c | 3 +-
+ arch/powerpc/platforms/pseries/ras.c | 3 +-
+ arch/powerpc/platforms/pseries/rng.c | 2 +-
+ arch/powerpc/sysdev/cpm_common.c | 2 +-
+ arch/powerpc/sysdev/dart_iommu.c | 16 +-
+ arch/powerpc/sysdev/ppc4xx_hsta_msi.c | 4 +-
+ arch/powerpc/xmon/xmon.c | 8 +-
+ drivers/leds/Kconfig | 11 +
+ drivers/leds/Makefile | 1 +
+ drivers/leds/leds-powernv.c | 345 +++++++++++++
+ drivers/macintosh/therm_windtunnel.c | 2 +
+ drivers/macintosh/windfarm.h | 4 -
+ drivers/macintosh/windfarm_core.c | 47 +-
+ drivers/memory/fsl_ifc.c | 43 +-
+ drivers/misc/cxl/Kconfig | 7 +-
+ drivers/misc/cxl/Makefile | 2 +
+ drivers/misc/cxl/api.c | 9 +-
+ drivers/misc/cxl/context.c | 20 +-
+ drivers/misc/cxl/cxl.h | 88 +++-
+ drivers/misc/cxl/debugfs.c | 2 +-
+ drivers/misc/cxl/file.c | 27 +-
+ drivers/misc/cxl/irq.c | 56 ++-
+ drivers/misc/cxl/main.c | 1 +
+ drivers/misc/cxl/native.c | 119 ++++-
+ drivers/misc/cxl/pci.c | 554 ++++++++++++++++-----
+ drivers/misc/cxl/sysfs.c | 26 +
+ drivers/misc/cxl/trace.h | 10 +-
+ drivers/misc/cxl/vphb.c | 34 ++
+ drivers/mtd/nand/fsl_ifc_nand.c | 258 +++++-----
+ drivers/tty/hvc/hvsi.c | 46 +-
+ include/linux/fsl_ifc.h | 50 ++
+ include/misc/cxl.h | 10 +
+ include/uapi/misc/cxl.h | 4 +-
+ tools/testing/selftests/powerpc/mm/Makefile | 3 +-
+ tools/testing/selftests/seccomp/seccomp_bpf.c | 15 +-
+ 145 files changed, 3422 insertions(+), 1977 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/leds/leds-powernv.txt
+ create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/scfg.txt
+ create mode 100644 arch/powerpc/boot/dts/t1040d4rdb.dts
+ create mode 100644 arch/powerpc/boot/dts/t1042d4rdb.dts
+ create mode 100644 arch/powerpc/boot/dts/t104xd4rdb.dtsi
+ create mode 100644 arch/powerpc/configs/85xx-32bit.config
+ create mode 100644 arch/powerpc/configs/85xx-64bit.config
+ create mode 100644 arch/powerpc/configs/85xx-hw.config
+ create mode 100644 arch/powerpc/configs/85xx-smp.config
+ create mode 100644 arch/powerpc/configs/altivec.config
+ delete mode 100644 arch/powerpc/configs/corenet32_smp_defconfig
+ create mode 100644 arch/powerpc/configs/corenet_basic_defconfig
+ rename arch/powerpc/configs/{corenet64_smp_defconfig => fsl-emb-nonhw.config} (50%)
+ create mode 100644 arch/powerpc/configs/mpc85xx_basic_defconfig
+ delete mode 100644 arch/powerpc/configs/mpc85xx_defconfig
+ delete mode 100644 arch/powerpc/configs/mpc85xx_smp_defconfig
+ create mode 100644 arch/powerpc/include/asm/trace_clock.h
+ create mode 100644 arch/powerpc/kernel/trace_clock.c
+ create mode 100644 drivers/leds/leds-powernv.c
+Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
+$ git merge powerpc-mpe/next
+Already up-to-date.
+Merging fsl/next (4524cd093fa8 powerpc/t1023rdb/dts: set ifc nand chip select from 2 to 1)
+$ git merge fsl/next
+Already up-to-date.
+Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate)
+$ git merge mpc5xxx/next
+Already up-to-date.
+Merging s390/features (e4ec73510812 s390/jump_label: Use %*ph to print small buffers)
+$ git merge s390/features
+Auto-merging drivers/s390/scsi/zfcp_fsf.c
+Auto-merging arch/s390/kvm/kvm-s390.c
+Removing arch/s390/kernel/sclp.S
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 6 -
+ arch/s390/Kbuild | 1 +
+ arch/s390/Kconfig | 75 ++++
+ arch/s390/Makefile | 2 +
+ arch/s390/configs/default_defconfig | 2 +
+ arch/s390/configs/gcov_defconfig | 2 +
+ arch/s390/configs/performance_defconfig | 3 +
+ arch/s390/crypto/aes_s390.c | 3 +-
+ arch/s390/crypto/des_s390.c | 3 +-
+ arch/s390/crypto/ghash_s390.c | 3 +-
+ arch/s390/crypto/prng.c | 4 +-
+ arch/s390/crypto/sha1_s390.c | 3 +-
+ arch/s390/crypto/sha256_s390.c | 3 +-
+ arch/s390/crypto/sha512_s390.c | 3 +-
+ arch/s390/include/asm/cpufeature.h | 29 ++
+ arch/s390/include/asm/ctl_reg.h | 2 +
+ arch/s390/include/asm/fpu-internal.h | 110 ++++++
+ arch/s390/include/asm/kvm_host.h | 6 +-
+ arch/s390/include/asm/linkage.h | 22 ++
+ arch/s390/include/asm/mmzone.h | 16 +
+ arch/s390/include/asm/numa.h | 35 ++
+ arch/s390/include/asm/pci.h | 22 +-
+ arch/s390/include/asm/pgtable.h | 13 +
+ arch/s390/include/asm/processor.h | 36 +-
+ arch/s390/include/asm/sclp.h | 2 +-
+ arch/s390/include/asm/switch_to.h | 135 +------
+ arch/s390/include/asm/topology.h | 39 ++
+ arch/s390/include/asm/unistd.h | 24 +-
+ arch/s390/include/asm/vx-insn.h | 480 +++++++++++++++++++++++++
+ arch/s390/include/uapi/asm/unistd.h | 10 +-
+ arch/s390/kernel/Makefile | 11 +
+ arch/s390/kernel/asm-offsets.c | 3 +
+ arch/s390/kernel/compat_signal.c | 48 +--
+ arch/s390/kernel/entry.S | 614 +++++++++++++++++++++++---------
+ arch/s390/kernel/head.S | 5 +-
+ arch/s390/kernel/jump_label.c | 9 +-
+ arch/s390/kernel/nmi.c | 11 +-
+ arch/s390/kernel/perf_cpum_sf.c | 9 +-
+ arch/s390/kernel/process.c | 52 ++-
+ arch/s390/kernel/processor.c | 9 +
+ arch/s390/kernel/ptrace.c | 174 ++++-----
+ arch/s390/kernel/s390_ksyms.c | 3 +
+ arch/s390/kernel/sclp.S | 355 ------------------
+ arch/s390/kernel/sclp.c | 160 +++++++++
+ arch/s390/kernel/setup.c | 19 +-
+ arch/s390/kernel/signal.c | 47 +--
+ arch/s390/kernel/smp.c | 4 +-
+ arch/s390/kernel/syscalls.S | 10 +-
+ arch/s390/kernel/topology.c | 31 +-
+ arch/s390/kernel/traps.c | 34 +-
+ arch/s390/kernel/vdso32/Makefile | 2 +-
+ arch/s390/kernel/vdso64/Makefile | 2 +-
+ arch/s390/kernel/vtime.c | 12 +-
+ arch/s390/kvm/kvm-s390.c | 130 +++++--
+ arch/s390/lib/delay.c | 1 +
+ arch/s390/lib/uaccess.c | 15 +-
+ arch/s390/mm/fault.c | 2 +-
+ arch/s390/mm/gup.c | 10 +
+ arch/s390/mm/init.c | 40 +--
+ arch/s390/mm/pgtable.c | 225 +++++-------
+ arch/s390/numa/Makefile | 3 +
+ arch/s390/numa/mode_emu.c | 530 +++++++++++++++++++++++++++
+ arch/s390/numa/numa.c | 184 ++++++++++
+ arch/s390/numa/numa_mode.h | 24 ++
+ arch/s390/numa/toptree.c | 342 ++++++++++++++++++
+ arch/s390/numa/toptree.h | 60 ++++
+ arch/s390/pci/pci.c | 34 +-
+ arch/s390/pci/pci_dma.c | 8 +-
+ arch/s390/pci/pci_event.c | 12 +-
+ arch/s390/pci/pci_insn.c | 33 +-
+ arch/s390/pci/pci_sysfs.c | 17 +-
+ drivers/s390/block/dasd_alias.c | 6 +-
+ drivers/s390/block/dasd_eckd.c | 333 ++++++++++++-----
+ drivers/s390/block/dasd_eckd.h | 11 +-
+ drivers/s390/block/dasd_int.h | 1 +
+ drivers/s390/block/dcssblk.c | 14 +-
+ drivers/s390/char/con3270.c | 4 +
+ drivers/s390/char/ctrlchar.c | 16 +-
+ drivers/s390/char/ctrlchar.h | 12 +
+ drivers/s390/char/diag_ftp.c | 4 +-
+ drivers/s390/char/monreader.c | 2 +-
+ drivers/s390/char/sclp.c | 6 +-
+ drivers/s390/char/sclp_cmd.c | 18 +-
+ drivers/s390/char/sclp_vt220.c | 52 ++-
+ drivers/s390/char/tty3270.c | 4 +
+ drivers/s390/cio/chsc.c | 165 ++++++---
+ drivers/s390/cio/device_ops.c | 2 +-
+ drivers/s390/cio/eadm_sch.c | 3 +-
+ drivers/s390/crypto/ap_bus.c | 2 +-
+ drivers/s390/crypto/zcrypt_pcixcc.c | 2 +-
+ drivers/s390/net/qeth_l2_main.c | 5 +-
+ drivers/s390/net/qeth_l3_main.c | 5 +-
+ drivers/s390/scsi/zfcp_fsf.c | 2 +-
+ include/linux/cpufeature.h | 7 +-
+ 94 files changed, 3696 insertions(+), 1368 deletions(-)
+ create mode 100644 arch/s390/include/asm/cpufeature.h
+ create mode 100644 arch/s390/include/asm/fpu-internal.h
+ create mode 100644 arch/s390/include/asm/mmzone.h
+ create mode 100644 arch/s390/include/asm/numa.h
+ create mode 100644 arch/s390/include/asm/vx-insn.h
+ delete mode 100644 arch/s390/kernel/sclp.S
+ create mode 100644 arch/s390/kernel/sclp.c
+ create mode 100644 arch/s390/numa/Makefile
+ create mode 100644 arch/s390/numa/mode_emu.c
+ create mode 100644 arch/s390/numa/numa.c
+ create mode 100644 arch/s390/numa/numa_mode.h
+ create mode 100644 arch/s390/numa/toptree.c
+ create mode 100644 arch/s390/numa/toptree.h
+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 (8d03bc56cc27 tile: correct some typos in opcode type names)
+$ git merge tile/master
+Resolved 'include/uapi/linux/elf-em.h' using previous resolution.
+Auto-merging include/uapi/linux/elf-em.h
+CONFLICT (content): Merge conflict in include/uapi/linux/elf-em.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master cde08e56a52f] Merge remote-tracking branch 'tile/master'
+$ git diff -M --stat --summary HEAD^..
+ .../seccomp/seccomp-filter/arch-support.txt | 2 +-
+ arch/tile/Kconfig | 17 +++++++++++++
+ arch/tile/include/asm/Kbuild | 1 +
+ arch/tile/include/asm/elf.h | 4 +---
+ arch/tile/include/asm/switch_to.h | 8 +++----
+ arch/tile/include/asm/syscall.h | 28 +++++++++++++++++++++-
+ arch/tile/include/uapi/arch/opcode_tilegx.h | 6 ++---
+ arch/tile/kernel/intvec_32.S | 1 +
+ arch/tile/kernel/intvec_64.S | 1 +
+ arch/tile/kernel/process.c | 5 ++++
+ arch/tile/kernel/ptrace.c | 3 +++
+ arch/tile/kernel/time.c | 8 ++++---
+ arch/tile/kernel/vdso/Makefile | 4 ++--
+ include/uapi/linux/audit.h | 3 +++
+ include/uapi/linux/elf-em.h | 2 ++
+ 15 files changed, 75 insertions(+), 18 deletions(-)
+Merging uml/linux-next (bdbac7d0e2b3 um: Fix kernel mode fault condition)
+$ git merge uml/linux-next
+Merge made by the 'recursive' strategy.
+ arch/um/Makefile | 4 ++--
+ arch/um/kernel/trap.c | 2 +-
+ arch/um/os-Linux/helper.c | 6 +++---
+ arch/x86/um/ldt.c | 5 ++++-
+ 4 files changed, 10 insertions(+), 7 deletions(-)
+Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
+$ git merge unicore32/unicore32
+Already up-to-date.
+Merging xtensa/for_next (895fb3159280 xtensa: improve vmlinux.lds.S sed post-processing)
+$ git merge xtensa/for_next
+Resolved 'arch/xtensa/include/asm/atomic.h' using previous resolution.
+Auto-merging arch/xtensa/include/asm/atomic.h
+CONFLICT (content): Merge conflict in arch/xtensa/include/asm/atomic.h
+Auto-merging arch/xtensa/include/asm/Kbuild
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 97cb70611176] Merge remote-tracking branch 'xtensa/for_next'
+$ git diff -M --stat --summary HEAD^..
+ arch/xtensa/Kconfig | 24 +-
+ arch/xtensa/include/asm/Kbuild | 1 -
+ arch/xtensa/include/asm/atomic.h | 6 +-
+ arch/xtensa/include/asm/cmpxchg.h | 4 +-
+ arch/xtensa/include/asm/device.h | 19 ++
+ arch/xtensa/include/asm/dma-mapping.h | 186 +++----------
+ arch/xtensa/include/asm/irqflags.h | 22 +-
+ arch/xtensa/include/asm/processor.h | 31 ++-
+ arch/xtensa/include/asm/stacktrace.h | 8 +
+ arch/xtensa/include/asm/traps.h | 29 +-
+ arch/xtensa/kernel/Makefile | 10 +-
+ arch/xtensa/kernel/entry.S | 184 +++++++++----
+ arch/xtensa/kernel/irq.c | 17 +-
+ arch/xtensa/kernel/pci-dma.c | 203 ++++++++++++--
+ arch/xtensa/kernel/perf_event.c | 454 +++++++++++++++++++++++++++++++
+ arch/xtensa/kernel/stacktrace.c | 167 +++++++++++-
+ arch/xtensa/kernel/traps.c | 31 ++-
+ arch/xtensa/kernel/vectors.S | 10 +-
+ arch/xtensa/mm/fault.c | 7 +
+ arch/xtensa/oprofile/backtrace.c | 158 +----------
+ arch/xtensa/platforms/iss/network.c | 8 +-
+ tools/perf/arch/xtensa/Build | 1 +
+ tools/perf/arch/xtensa/Makefile | 3 +
+ tools/perf/arch/xtensa/util/Build | 1 +
+ tools/perf/arch/xtensa/util/dwarf-regs.c | 25 ++
+ 25 files changed, 1182 insertions(+), 427 deletions(-)
+ create mode 100644 arch/xtensa/include/asm/device.h
+ create mode 100644 arch/xtensa/kernel/perf_event.c
+ create mode 100644 tools/perf/arch/xtensa/Build
+ create mode 100644 tools/perf/arch/xtensa/Makefile
+ create mode 100644 tools/perf/arch/xtensa/util/Build
+ create mode 100644 tools/perf/arch/xtensa/util/dwarf-regs.c
+Merging btrfs/next (3a9508b0221d btrfs: fix compile when block cgroups are not enabled)
+$ git merge btrfs/next
+Merge made by the 'recursive' strategy.
+ fs/btrfs/backref.c | 35 ++++-
+ fs/btrfs/ctree.c | 4 +-
+ fs/btrfs/ctree.h | 18 +--
+ fs/btrfs/disk-io.c | 16 +-
+ fs/btrfs/extent-tree.c | 298 ++++++++++++++++++++++++++++++++-----
+ fs/btrfs/extent_io.c | 25 +++-
+ fs/btrfs/free-space-cache.c | 57 +++++---
+ fs/btrfs/inode.c | 35 ++++-
+ fs/btrfs/ioctl.c | 52 +++----
+ fs/btrfs/locking.c | 1 +
+ fs/btrfs/raid56.c | 87 +++++++++--
+ fs/btrfs/raid56.h | 10 +-
+ fs/btrfs/reada.c | 4 +-
+ fs/btrfs/relocation.c | 33 ++---
+ fs/btrfs/scrub.c | 348 +++++++++++++++++++++++++++++++++-----------
+ fs/btrfs/super.c | 14 +-
+ fs/btrfs/transaction.c | 7 +-
+ fs/btrfs/transaction.h | 2 +
+ fs/btrfs/tree-log.c | 344 +++++++++++++++++++++++++++++++++++--------
+ fs/btrfs/volumes.c | 89 ++++++-----
+ fs/btrfs/volumes.h | 3 +
+ 21 files changed, 1144 insertions(+), 338 deletions(-)
+Merging ceph/master (64c1797a9371 libceph: Remove spurious kunmap() of the zero page)
+$ git merge ceph/master
+Merge made by the 'recursive' strategy.
+Merging cifs/for-next (5fb4e288a025 cifs: Fix use-after-free on mid_q_entry)
+$ git merge cifs/for-next
+Merge made by the 'recursive' strategy.
+ fs/cifs/cifs_ioctl.h | 42 ++++++++++++++++++++++++++++++++++++++++++
+ fs/cifs/cifsfs.h | 2 +-
+ fs/cifs/cifspdu.h | 14 ++++++++++++++
+ fs/cifs/cifssmb.c | 7 +++++++
+ fs/cifs/ioctl.c | 48 ++++++++++++++++++++++++++++++++++++++++++------
+ fs/cifs/smb2pdu.c | 7 +++++++
+ fs/cifs/transport.c | 2 ++
+ 7 files changed, 115 insertions(+), 7 deletions(-)
+ create mode 100644 fs/cifs/cifs_ioctl.h
+Merging ecryptfs/next (0dad87fcb732 eCryptfs: Delete a check before the function call "key_put")
+$ git merge ecryptfs/next
+Merge made by the 'recursive' strategy.
+ fs/ecryptfs/crypto.c | 3 +--
+ fs/ecryptfs/dentry.c | 16 ++++++++--------
+ 2 files changed, 9 insertions(+), 10 deletions(-)
+Merging ext3/for_next (9181f8bf5abf udf: Don't modify filesystem for read-only mounts)
+$ git merge ext3/for_next
+Removing include/trace/events/jbd.h
+Removing include/trace/events/ext3.h
+Removing include/linux/jbd_common.h
+Removing include/linux/jbd.h
+Removing fs/jbd/transaction.c
+Removing fs/jbd/revoke.c
+Removing fs/jbd/recovery.c
+Removing fs/jbd/journal.c
+Removing fs/jbd/commit.c
+Removing fs/jbd/checkpoint.c
+Removing fs/jbd/Makefile
+Removing fs/jbd/Kconfig
+Removing fs/ext3/xattr_user.c
+Removing fs/ext3/xattr_trusted.c
+Removing fs/ext3/xattr_security.c
+Removing fs/ext3/xattr.h
+Removing fs/ext3/xattr.c
+Removing fs/ext3/symlink.c
+Removing fs/ext3/super.c
+Removing fs/ext3/resize.c
+Removing fs/ext3/namei.h
+Removing fs/ext3/namei.c
+Removing fs/ext3/ioctl.c
+Removing fs/ext3/inode.c
+Removing fs/ext3/ialloc.c
+Removing fs/ext3/hash.c
+Removing fs/ext3/fsync.c
+Removing fs/ext3/file.c
+Removing fs/ext3/ext3_jbd.c
+Removing fs/ext3/ext3.h
+Removing fs/ext3/dir.c
+Removing fs/ext3/bitmap.c
+Removing fs/ext3/balloc.c
+Removing fs/ext3/acl.h
+Removing fs/ext3/acl.c
+Removing fs/ext3/Makefile
+Removing fs/ext3/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/filesystems.tmpl | 178 +-
+ Documentation/filesystems/ext2.txt | 4 +-
+ Documentation/filesystems/ext3.txt | 209 +-
+ Documentation/filesystems/vfs.txt | 2 +-
+ MAINTAINERS | 18 +-
+ block/bounce.c | 31 +-
+ fs/Kconfig | 5 +-
+ fs/Makefile | 2 -
+ fs/ext2/ialloc.c | 5 +-
+ fs/ext2/inode.c | 7 +-
+ fs/ext2/namei.c | 46 +-
+ fs/ext3/Kconfig | 89 -
+ fs/ext3/Makefile | 12 -
+ fs/ext3/acl.c | 281 ---
+ fs/ext3/acl.h | 72 -
+ fs/ext3/balloc.c | 2158 -------------------
+ fs/ext3/bitmap.c | 20 -
+ fs/ext3/dir.c | 537 -----
+ fs/ext3/ext3.h | 1332 ------------
+ fs/ext3/ext3_jbd.c | 59 -
+ fs/ext3/file.c | 79 -
+ fs/ext3/fsync.c | 109 -
+ fs/ext3/hash.c | 206 --
+ fs/ext3/ialloc.c | 706 -------
+ fs/ext3/inode.c | 3574 --------------------------------
+ fs/ext3/ioctl.c | 327 ---
+ fs/ext3/namei.c | 2586 -----------------------
+ fs/ext3/namei.h | 27 -
+ fs/ext3/resize.c | 1117 ----------
+ fs/ext3/super.c | 3165 ----------------------------
+ fs/ext3/symlink.c | 46 -
+ fs/ext3/xattr.c | 1330 ------------
+ fs/ext3/xattr.h | 136 --
+ fs/ext3/xattr_security.c | 78 -
+ fs/ext3/xattr_trusted.c | 54 -
+ fs/ext3/xattr_user.c | 58 -
+ fs/ext4/Kconfig | 54 +-
+ fs/ext4/ialloc.c | 6 +-
+ fs/ext4/inode.c | 7 +-
+ fs/ext4/namei.c | 63 +-
+ fs/ext4/super.c | 14 +-
+ fs/jbd/Kconfig | 30 -
+ fs/jbd/Makefile | 7 -
+ fs/jbd/checkpoint.c | 782 -------
+ fs/jbd/commit.c | 1021 ---------
+ fs/jbd/journal.c | 2145 -------------------
+ fs/jbd/recovery.c | 594 ------
+ fs/jbd/revoke.c | 733 -------
+ fs/jbd/transaction.c | 2237 --------------------
+ fs/jfs/file.c | 7 +-
+ fs/jfs/jfs_inode.c | 4 +-
+ fs/jfs/namei.c | 54 +-
+ fs/ocfs2/file.c | 22 +-
+ fs/ocfs2/namei.c | 59 +-
+ fs/ocfs2/quota_local.c | 4 +-
+ fs/ocfs2/refcounttree.c | 5 +-
+ fs/quota/dquot.c | 88 +-
+ fs/quota/quota.c | 4 +-
+ fs/reiserfs/inode.c | 7 +-
+ fs/reiserfs/namei.c | 63 +-
+ fs/udf/super.c | 7 +-
+ include/linux/blk_types.h | 5 +-
+ include/linux/jbd.h | 1047 ----------
+ include/linux/jbd2.h | 41 +-
+ include/linux/jbd_common.h | 46 -
+ include/linux/quotaops.h | 5 +-
+ include/trace/events/ext3.h | 866 --------
+ include/trace/events/jbd.h | 194 --
+ mm/Kconfig | 8 +-
+ 69 files changed, 505 insertions(+), 28389 deletions(-)
+ delete mode 100644 fs/ext3/Kconfig
+ delete mode 100644 fs/ext3/Makefile
+ delete mode 100644 fs/ext3/acl.c
+ delete mode 100644 fs/ext3/acl.h
+ delete mode 100644 fs/ext3/balloc.c
+ delete mode 100644 fs/ext3/bitmap.c
+ delete mode 100644 fs/ext3/dir.c
+ delete mode 100644 fs/ext3/ext3.h
+ delete mode 100644 fs/ext3/ext3_jbd.c
+ delete mode 100644 fs/ext3/file.c
+ delete mode 100644 fs/ext3/fsync.c
+ delete mode 100644 fs/ext3/hash.c
+ delete mode 100644 fs/ext3/ialloc.c
+ delete mode 100644 fs/ext3/inode.c
+ delete mode 100644 fs/ext3/ioctl.c
+ delete mode 100644 fs/ext3/namei.c
+ delete mode 100644 fs/ext3/namei.h
+ delete mode 100644 fs/ext3/resize.c
+ delete mode 100644 fs/ext3/super.c
+ delete mode 100644 fs/ext3/symlink.c
+ delete mode 100644 fs/ext3/xattr.c
+ delete mode 100644 fs/ext3/xattr.h
+ delete mode 100644 fs/ext3/xattr_security.c
+ delete mode 100644 fs/ext3/xattr_trusted.c
+ delete mode 100644 fs/ext3/xattr_user.c
+ delete mode 100644 fs/jbd/Kconfig
+ delete mode 100644 fs/jbd/Makefile
+ delete mode 100644 fs/jbd/checkpoint.c
+ delete mode 100644 fs/jbd/commit.c
+ delete mode 100644 fs/jbd/journal.c
+ delete mode 100644 fs/jbd/recovery.c
+ delete mode 100644 fs/jbd/revoke.c
+ delete mode 100644 fs/jbd/transaction.c
+ delete mode 100644 include/linux/jbd.h
+ delete mode 100644 include/linux/jbd_common.h
+ delete mode 100644 include/trace/events/ext3.h
+ delete mode 100644 include/trace/events/jbd.h
+Merging ext4/dev (bdfe0cbd746a Revert "ext4: remove block_device_ejected")
+$ git merge ext4/dev
+Auto-merging include/linux/jbd2.h
+Auto-merging fs/ext4/super.c
+Auto-merging fs/ext4/inode.c
+Merge made by the 'recursive' strategy.
+ fs/ext4/crypto_fname.c | 5 +++-
+ fs/ext4/crypto_key.c | 4 ++-
+ fs/ext4/crypto_policy.c | 17 ++++++++++--
+ fs/ext4/ext4.h | 2 +-
+ fs/ext4/inode.c | 8 ++++++
+ fs/ext4/mmp.c | 48 +++++++++++++++++---------------
+ fs/ext4/page-io.c | 8 ++++--
+ fs/ext4/super.c | 50 +++++++++++++++++++++++++--------
+ fs/jbd2/checkpoint.c | 39 ++++++++++++++++++++++----
+ fs/jbd2/commit.c | 2 +-
+ fs/jbd2/journal.c | 13 +++++++--
+ fs/jbd2/transaction.c | 74 +++++++++++++++++++++++++++++++++++++++----------
+ include/linux/jbd2.h | 3 +-
+ 13 files changed, 207 insertions(+), 66 deletions(-)
+Merging f2fs/dev (19b2c30d3cce f2fs: update extent tree in batches)
+$ git merge f2fs/dev
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/f2fs.txt | 4 +-
+ MAINTAINERS | 2 +
+ fs/f2fs/Kconfig | 2 +-
+ fs/f2fs/Makefile | 1 +
+ fs/f2fs/checkpoint.c | 93 ++--
+ fs/f2fs/crypto_key.c | 3 +-
+ fs/f2fs/data.c | 953 +++++++++----------------------------
+ fs/f2fs/debug.c | 30 +-
+ fs/f2fs/dir.c | 4 +-
+ fs/f2fs/extent_cache.c | 783 ++++++++++++++++++++++++++++++
+ fs/f2fs/f2fs.h | 134 ++++--
+ fs/f2fs/file.c | 185 +++++--
+ fs/f2fs/gc.c | 81 ++--
+ fs/f2fs/gc.h | 6 +
+ fs/f2fs/inline.c | 23 +-
+ fs/f2fs/inode.c | 97 ++--
+ fs/f2fs/namei.c | 21 +-
+ fs/f2fs/node.c | 86 +++-
+ fs/f2fs/recovery.c | 43 +-
+ fs/f2fs/segment.c | 78 +--
+ fs/f2fs/segment.h | 55 +--
+ fs/f2fs/shrinker.c | 139 ++++++
+ fs/f2fs/super.c | 63 ++-
+ fs/f2fs/xattr.c | 5 +-
+ include/linux/f2fs_fs.h | 16 +-
+ include/trace/events/f2fs.h | 12 +-
+ 26 files changed, 1894 insertions(+), 1025 deletions(-)
+ create mode 100644 fs/f2fs/extent_cache.c
+ create mode 100644 fs/f2fs/shrinker.c
+Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
+$ git merge fscache/fscache
+Merge made by the 'recursive' strategy.
+ fs/fscache/netfs.c | 38 ++++++++++++++++++--------------------
+ 1 file changed, 18 insertions(+), 20 deletions(-)
+Merging fuse/for-next (0a30f612d6cf fuse: update MAINTAINERS entry)
+$ git merge fuse/for-next
+Already up-to-date.
+Merging gfs2/for-next (ea79f0ec7a38 GFS2: Make ht_parms static)
+$ git merge gfs2/for-next
+Merge made by the 'recursive' strategy.
+ fs/gfs2/glock.c | 304 ++++++++++++++++++++-------------------------------
+ fs/gfs2/glops.c | 38 ++++---
+ fs/gfs2/incore.h | 13 ++-
+ fs/gfs2/lock_dlm.c | 10 +-
+ fs/gfs2/lops.c | 6 +-
+ fs/gfs2/meta_io.c | 6 +-
+ fs/gfs2/meta_io.h | 2 +-
+ fs/gfs2/quota.c | 22 ++--
+ fs/gfs2/rgrp.c | 2 +-
+ fs/gfs2/trace_gfs2.h | 18 +--
+ fs/gfs2/trans.c | 4 +-
+ 11 files changed, 181 insertions(+), 244 deletions(-)
+Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock)
+$ git merge jfs/jfs-next
+Already up-to-date.
+Merging nfs/linux-next (1090c3bf81ef nfs42: remove unused declaration)
+$ git merge nfs/linux-next
+Merge made by the 'recursive' strategy.
+ Documentation/kernel-parameters.txt | 9 +
+ drivers/infiniband/core/verbs.c | 67 ----
+ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 251 +--------------
+ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 32 +-
+ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 55 +---
+ .../lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c | 6 -
+ fs/nfs/blocklayout/blocklayout.h | 19 +-
+ fs/nfs/blocklayout/dev.c | 9 +-
+ fs/nfs/blocklayout/extent_tree.c | 19 +-
+ fs/nfs/callback.c | 4 -
+ fs/nfs/callback_proc.c | 9 +-
+ fs/nfs/client.c | 113 +------
+ fs/nfs/dir.c | 20 +-
+ fs/nfs/file.c | 11 +-
+ fs/nfs/flexfilelayout/flexfilelayout.c | 356 +++++++++++++++------
+ fs/nfs/flexfilelayout/flexfilelayout.h | 5 +-
+ fs/nfs/inode.c | 23 +-
+ fs/nfs/internal.h | 19 +-
+ fs/nfs/nfs3xdr.c | 1 +
+ fs/nfs/nfs42.h | 2 -
+ fs/nfs/nfs42xdr.c | 5 +-
+ fs/nfs/nfs4_fs.h | 4 +-
+ fs/nfs/nfs4client.c | 5 +-
+ fs/nfs/nfs4idmap.c | 14 +-
+ fs/nfs/nfs4proc.c | 48 +--
+ fs/nfs/nfs4state.c | 12 +-
+ fs/nfs/nfs4trace.h | 61 ++++
+ fs/nfs/nfs4xdr.c | 4 +-
+ fs/nfs/pagelist.c | 4 +-
+ fs/nfs/pnfs.c | 213 ++++++------
+ fs/nfs/pnfs.h | 48 ++-
+ fs/nfs/pnfs_nfs.c | 88 +++--
+ fs/nfs/super.c | 7 +-
+ fs/nfs/write.c | 36 ++-
+ fs/nfsd/blocklayoutxdr.c | 2 +-
+ fs/nfsd/blocklayoutxdr.h | 15 -
+ include/linux/nfs4.h | 18 ++
+ include/linux/nfs_fs.h | 2 +-
+ include/linux/nfs_xdr.h | 2 +-
+ include/linux/sunrpc/addr.h | 27 +-
+ include/linux/sunrpc/auth.h | 8 +-
+ include/linux/sunrpc/xprtrdma.h | 2 +-
+ include/rdma/ib_verbs.h | 46 ---
+ net/sunrpc/auth_unix.c | 2 +-
+ net/sunrpc/xprtrdma/fmr_ops.c | 19 ++
+ net/sunrpc/xprtrdma/frwr_ops.c | 5 +
+ net/sunrpc/xprtrdma/physical_ops.c | 25 +-
+ net/sunrpc/xprtrdma/rpc_rdma.c | 197 ++++++------
+ net/sunrpc/xprtrdma/transport.c | 77 ++---
+ net/sunrpc/xprtrdma/verbs.c | 234 +++++---------
+ net/sunrpc/xprtrdma/xprt_rdma.h | 27 +-
+ net/sunrpc/xprtsock.c | 15 +-
+ 52 files changed, 1031 insertions(+), 1271 deletions(-)
+Merging nfsd/nfsd-next (a8bd5e23a345 nfsd: Add Jeff Layton as co-maintainer)
+$ git merge nfsd/nfsd-next
+Auto-merging net/sunrpc/xprtrdma/xprt_rdma.h
+Auto-merging include/linux/fs.h
+Auto-merging fs/nfs/callback.c
+Auto-merging fs/namei.c
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/nfs/nfs-rdma.txt | 16 ++-
+ fs/lockd/svc.c | 8 +-
+ fs/namei.c | 74 +++++++++++++
+ fs/nfs/callback.c | 6 +-
+ fs/nfs_common/grace.c | 23 +++-
+ fs/nfsd/export.c | 73 +------------
+ fs/nfsd/export.h | 1 +
+ fs/nfsd/idmap.h | 4 +-
+ fs/nfsd/netns.h | 1 +
+ fs/nfsd/nfs2acl.c | 10 +-
+ fs/nfsd/nfs3acl.c | 4 +-
+ fs/nfsd/nfs3xdr.c | 2 +-
+ fs/nfsd/nfs4acl.c | 8 +-
+ fs/nfsd/nfs4callback.c | 122 +++++++++++++++------
+ fs/nfsd/nfs4idmap.c | 3 -
+ fs/nfsd/nfs4proc.c | 30 +++---
+ fs/nfsd/nfs4recover.c | 12 ++-
+ fs/nfsd/nfs4state.c | 160 +++++++++++++++------------
+ fs/nfsd/nfs4xdr.c | 166 ++++++++++++++++++-----------
+ fs/nfsd/nfssvc.c | 17 ++-
+ fs/nfsd/state.h | 2 +-
+ fs/nfsd/vfs.c | 29 ++---
+ fs/nfsd/vfs.h | 6 ++
+ include/linux/fs.h | 6 ++
+ include/linux/namei.h | 1 +
+ include/linux/sunrpc/cache.h | 9 +-
+ include/linux/sunrpc/svc.h | 68 ++++++++----
+ include/linux/sunrpc/svc_rdma.h | 91 +---------------
+ include/linux/sunrpc/svc_xprt.h | 1 +
+ include/uapi/linux/nfsacl.h | 1 +
+ net/sunrpc/cache.c | 103 +++++++++---------
+ net/sunrpc/svc.c | 113 ++++++++++----------
+ net/sunrpc/svc_xprt.c | 10 +-
+ net/sunrpc/xprtrdma/svc_rdma_sendto.c | 83 ++++++++++++++-
+ net/sunrpc/xprtrdma/svc_rdma_transport.c | 37 +------
+ net/sunrpc/xprtrdma/xprt_rdma.h | 1 -
+ 36 files changed, 729 insertions(+), 572 deletions(-)
+Merging orangefs/for-next (600896a3b8b0 Orangefs: Swap order of include files)
+$ git merge orangefs/for-next
+Auto-merging fs/Makefile
+Auto-merging fs/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/stable/sysfs-fs-orangefs | 87 ++
+ Documentation/filesystems/orangefs.txt | 137 +++
+ fs/Kconfig | 1 +
+ fs/Makefile | 1 +
+ fs/orangefs/Kconfig | 6 +
+ fs/orangefs/Makefile | 10 +
+ fs/orangefs/acl.c | 175 +++
+ fs/orangefs/dcache.c | 142 +++
+ fs/orangefs/devpvfs2-req.c | 1004 ++++++++++++++++
+ fs/orangefs/dir.c | 378 ++++++
+ fs/orangefs/downcall.h | 138 +++
+ fs/orangefs/file.c | 1016 ++++++++++++++++
+ fs/orangefs/inode.c | 469 ++++++++
+ fs/orangefs/namei.c | 473 ++++++++
+ fs/orangefs/protocol.h | 672 +++++++++++
+ fs/orangefs/pvfs2-bufmap.c | 974 +++++++++++++++
+ fs/orangefs/pvfs2-bufmap.h | 76 ++
+ fs/orangefs/pvfs2-cache.c | 260 ++++
+ fs/orangefs/pvfs2-debug.h | 290 +++++
+ fs/orangefs/pvfs2-debugfs.c | 458 +++++++
+ fs/orangefs/pvfs2-debugfs.h | 3 +
+ fs/orangefs/pvfs2-dev-proto.h | 102 ++
+ fs/orangefs/pvfs2-kernel.h | 864 ++++++++++++++
+ fs/orangefs/pvfs2-mod.c | 315 +++++
+ fs/orangefs/pvfs2-sysfs.c | 1787 ++++++++++++++++++++++++++++
+ fs/orangefs/pvfs2-sysfs.h | 2 +
+ fs/orangefs/pvfs2-utils.c | 1129 ++++++++++++++++++
+ fs/orangefs/super.c | 558 +++++++++
+ fs/orangefs/symlink.c | 31 +
+ fs/orangefs/upcall.h | 255 ++++
+ fs/orangefs/waitqueue.c | 529 ++++++++
+ fs/orangefs/xattr.c | 530 +++++++++
+ 32 files changed, 12872 insertions(+)
+ create mode 100644 Documentation/ABI/stable/sysfs-fs-orangefs
+ create mode 100644 Documentation/filesystems/orangefs.txt
+ create mode 100644 fs/orangefs/Kconfig
+ create mode 100644 fs/orangefs/Makefile
+ create mode 100644 fs/orangefs/acl.c
+ create mode 100644 fs/orangefs/dcache.c
+ create mode 100644 fs/orangefs/devpvfs2-req.c
+ create mode 100644 fs/orangefs/dir.c
+ create mode 100644 fs/orangefs/downcall.h
+ create mode 100644 fs/orangefs/file.c
+ create mode 100644 fs/orangefs/inode.c
+ create mode 100644 fs/orangefs/namei.c
+ create mode 100644 fs/orangefs/protocol.h
+ create mode 100644 fs/orangefs/pvfs2-bufmap.c
+ create mode 100644 fs/orangefs/pvfs2-bufmap.h
+ create mode 100644 fs/orangefs/pvfs2-cache.c
+ create mode 100644 fs/orangefs/pvfs2-debug.h
+ create mode 100644 fs/orangefs/pvfs2-debugfs.c
+ create mode 100644 fs/orangefs/pvfs2-debugfs.h
+ create mode 100644 fs/orangefs/pvfs2-dev-proto.h
+ create mode 100644 fs/orangefs/pvfs2-kernel.h
+ create mode 100644 fs/orangefs/pvfs2-mod.c
+ create mode 100644 fs/orangefs/pvfs2-sysfs.c
+ create mode 100644 fs/orangefs/pvfs2-sysfs.h
+ create mode 100644 fs/orangefs/pvfs2-utils.c
+ create mode 100644 fs/orangefs/super.c
+ create mode 100644 fs/orangefs/symlink.c
+ create mode 100644 fs/orangefs/upcall.h
+ create mode 100644 fs/orangefs/waitqueue.c
+ create mode 100644 fs/orangefs/xattr.c
+Merging overlayfs/overlayfs-next (cdb672795876 ovl: lookup whiteouts outside iterate_dir())
+$ git merge overlayfs/overlayfs-next
+Already up-to-date.
+Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
+$ git merge squashfs/master
+Already up-to-date.
+Merging v9fs/for-next (b5ac1fb2717e 9p: fix return code of read() when count is 0)
+$ git merge v9fs/for-next
+Merge made by the 'recursive' strategy.
+ fs/9p/v9fs.c | 2 +-
+ fs/9p/vfs_file.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Merging ubifs/linux-next (071a1f837f72 UGIFS: fix a typo in comment of ubifs_budget_req)
+$ git merge ubifs/linux-next
+Merge made by the 'recursive' strategy.
+ fs/ubifs/lpt.c | 6 ++----
+ fs/ubifs/tnc.c | 3 +--
+ fs/ubifs/ubifs.h | 4 ++--
+ 3 files changed, 5 insertions(+), 8 deletions(-)
+Merging xfs/for-next (70b33a7466ba Merge branch 'xfs-misc-fixes-for-4.3-3' into for-next)
+$ git merge xfs/for-next
+Merge made by the 'recursive' strategy.
+ fs/xfs/Makefile | 2 +-
+ fs/xfs/libxfs/xfs_alloc.c | 6 +-
+ fs/xfs/libxfs/xfs_alloc_btree.c | 4 +-
+ fs/xfs/libxfs/xfs_attr.c | 2 +
+ fs/xfs/libxfs/xfs_attr_leaf.c | 4 +-
+ fs/xfs/libxfs/xfs_attr_remote.c | 9 +-
+ fs/xfs/{ => libxfs}/xfs_bit.c | 0
+ fs/xfs/libxfs/xfs_bmap.c | 1 +
+ fs/xfs/libxfs/xfs_bmap_btree.c | 5 +-
+ fs/xfs/libxfs/xfs_btree.c | 10 +-
+ fs/xfs/libxfs/xfs_da_btree.c | 31 +++---
+ fs/xfs/libxfs/xfs_da_format.h | 11 +-
+ fs/xfs/libxfs/xfs_dir2.c | 36 +++----
+ fs/xfs/libxfs/xfs_dir2_block.c | 4 +-
+ fs/xfs/libxfs/xfs_dir2_data.c | 7 +-
+ fs/xfs/libxfs/xfs_dir2_leaf.c | 4 +-
+ fs/xfs/libxfs/xfs_dir2_node.c | 17 ++-
+ fs/xfs/libxfs/xfs_dquot_buf.c | 4 +-
+ fs/xfs/libxfs/xfs_format.h | 22 +++-
+ fs/xfs/libxfs/xfs_ialloc.c | 7 +-
+ fs/xfs/libxfs/xfs_ialloc_btree.c | 2 +-
+ fs/xfs/libxfs/xfs_inode_buf.c | 4 +-
+ fs/xfs/libxfs/xfs_sb.c | 27 +++--
+ fs/xfs/libxfs/xfs_symlink_remote.c | 4 +-
+ fs/xfs/xfs_bmap_util.c | 87 ++++++++-------
+ fs/xfs/xfs_buf.c | 9 +-
+ fs/xfs/xfs_buf_item.c | 26 ++---
+ fs/xfs/xfs_buf_item.h | 2 +-
+ fs/xfs/xfs_dir2_readdir.c | 11 +-
+ fs/xfs/xfs_dquot.c | 10 +-
+ fs/xfs/xfs_extfree_item.c | 105 ++++++++----------
+ fs/xfs/xfs_extfree_item.h | 26 ++++-
+ fs/xfs/xfs_file.c | 51 +++++----
+ fs/xfs/xfs_fsops.c | 6 +-
+ fs/xfs/xfs_inode.c | 141 ++++++++++++++++--------
+ fs/xfs/xfs_inode.h | 85 ++++++++++-----
+ fs/xfs/xfs_inode_item.c | 11 +-
+ fs/xfs/xfs_itable.c | 3 +-
+ fs/xfs/xfs_log.c | 87 +++++++++------
+ fs/xfs/xfs_log.h | 1 +
+ fs/xfs/xfs_log_cil.c | 8 +-
+ fs/xfs/xfs_log_priv.h | 2 +
+ fs/xfs/xfs_log_recover.c | 216 ++++++++++++++++++++++++++++---------
+ fs/xfs/xfs_mount.c | 28 ++---
+ fs/xfs/xfs_rtalloc.c | 57 +++++-----
+ fs/xfs/xfs_super.c | 16 ++-
+ fs/xfs/xfs_symlink.c | 9 +-
+ fs/xfs/xfs_trace.h | 34 ++++++
+ fs/xfs/xfs_trans.c | 15 ++-
+ fs/xfs/xfs_trans.h | 9 +-
+ fs/xfs/xfs_trans_extfree.c | 32 ++++--
+ fs/xfs/xfs_trans_priv.h | 15 +++
+ 52 files changed, 852 insertions(+), 473 deletions(-)
+ rename fs/xfs/{ => libxfs}/xfs_bit.c (100%)
+Merging file-locks/linux-next (ee296d7c5709 locks: inline posix_lock_file_wait and flock_lock_file_wait)
+$ git merge file-locks/linux-next
+Already up-to-date.
+Merging vfs/for-next (397d425dc26d vfs: Test for and handle paths that are unreachable from their mnt_root)
+$ git merge vfs/for-next
+Auto-merging include/linux/fs.h
+Removing fs/ufs/truncate.c
+Auto-merging fs/quota/dquot.c
+Auto-merging fs/namei.c
+Auto-merging fs/fs-writeback.c
+Auto-merging fs/btrfs/transaction.c
+Merge made by the 'recursive' strategy.
+ arch/Kconfig | 1 -
+ fs/block_dev.c | 12 +-
+ fs/btrfs/transaction.c | 8 +-
+ fs/dcache.c | 14 +-
+ fs/drop_caches.c | 10 +-
+ fs/fs-writeback.c | 72 +--
+ fs/inode.c | 50 ++-
+ fs/internal.h | 3 +-
+ fs/namei.c | 27 +-
+ fs/notify/inode_mark.c | 20 +-
+ fs/quota/dquot.c | 16 +-
+ fs/super.c | 175 ++++----
+ fs/ufs/Makefile | 2 +-
+ fs/ufs/balloc.c | 4 +
+ fs/ufs/inode.c | 948 ++++++++++++++++++++++++++-------------
+ fs/ufs/super.c | 36 +-
+ fs/ufs/truncate.c | 523 ---------------------
+ fs/ufs/ufs.h | 13 +-
+ fs/xfs/xfs_aops.c | 6 +-
+ include/linux/fs.h | 33 +-
+ include/linux/fsnotify_backend.h | 4 +-
+ include/linux/list.h | 5 +
+ include/linux/percpu-rwsem.h | 20 +
+ init/Kconfig | 1 -
+ kernel/locking/Makefile | 3 +-
+ kernel/locking/percpu-rwsem.c | 13 +
+ lib/Kconfig | 3 -
+ mm/backing-dev.c | 8 +-
+ mm/swapfile.c | 25 +-
+ 29 files changed, 936 insertions(+), 1119 deletions(-)
+ delete mode 100644 fs/ufs/truncate.c
+Merging pci/next (9af7b9b7eaaf Merge branches 'pci/enumeration' and 'pci/misc' into next)
+$ git merge pci/next
+Resolved 'drivers/pci/host/Kconfig' using previous resolution.
+Resolved 'drivers/pci/host/pcie-iproc.c' using previous resolution.
+Auto-merging include/linux/pci.h
+Auto-merging drivers/pci/probe.c
+Auto-merging drivers/pci/host/pcie-iproc.c
+CONFLICT (content): Merge conflict in drivers/pci/host/pcie-iproc.c
+Auto-merging drivers/pci/host/Kconfig
+CONFLICT (content): Merge conflict in drivers/pci/host/Kconfig
+Auto-merging drivers/iommu/intel-iommu.c
+Auto-merging arch/powerpc/kernel/pci_of_scan.c
+Auto-merging arch/powerpc/kernel/pci-common.c
+Auto-merging arch/arm64/boot/dts/apm/apm-storm.dtsi
+Auto-merging arch/arm/boot/dts/dra7.dtsi
+Auto-merging arch/arm/boot/dts/am57xx-beagle-x15.dts
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 8803e3e3b862] Merge remote-tracking branch 'pci/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/pci/ti-pci.txt | 3 +
+ arch/alpha/kernel/pci.c | 7 +-
+ arch/arm/boot/dts/am57xx-beagle-x15.dts | 4 +
+ arch/arm/boot/dts/dra7.dtsi | 2 +-
+ arch/arm/include/asm/mach/pci.h | 5 -
+ arch/arm/kernel/bios32.c | 45 +++-----
+ arch/arm64/boot/dts/apm/apm-storm.dtsi | 23 ++--
+ arch/frv/mb93090-mb00/pci-frv.c | 8 --
+ arch/frv/mb93090-mb00/pci-frv.h | 8 --
+ arch/frv/mb93090-mb00/pci-vdk.c | 2 -
+ arch/ia64/pci/pci.c | 5 +-
+ arch/microblaze/pci/pci-common.c | 9 +-
+ arch/mips/pci/pci.c | 6 --
+ arch/mn10300/unit-asb2305/pci-asb2305.c | 22 ++--
+ arch/mn10300/unit-asb2305/pci-asb2305.h | 7 --
+ arch/mn10300/unit-asb2305/pci.c | 1 -
+ arch/powerpc/kernel/pci-common.c | 8 +-
+ arch/powerpc/kernel/pci_of_scan.c | 6 +-
+ arch/sh/drivers/pci/pci-sh4.h | 8 --
+ arch/sparc/kernel/pci.c | 6 +-
+ arch/x86/include/asm/pci_x86.h | 2 -
+ arch/x86/pci/common.c | 21 ++--
+ arch/x86/pci/fixup.c | 13 ---
+ arch/x86/pci/intel_mid_pci.c | 9 +-
+ arch/x86/pci/irq.c | 23 +---
+ arch/xtensa/kernel/pci.c | 4 -
+ drivers/acpi/pci_irq.c | 17 +--
+ drivers/ata/ahci.c | 13 +--
+ drivers/ata/pata_jmicron.c | 12 ---
+ drivers/iommu/intel-iommu.c | 28 +++--
+ drivers/parisc/dino.c | 3 -
+ drivers/parisc/lba_pci.c | 1 -
+ drivers/pci/Makefile | 1 +
+ drivers/pci/access.c | 84 +++++++++++++--
+ drivers/pci/ats.c | 131 ++++++++---------------
+ drivers/pci/host/Kconfig | 4 +-
+ drivers/pci/host/pci-dra7xx.c | 122 ++++++++++++++++++++-
+ drivers/pci/host/pci-host-generic.c | 52 +++++----
+ drivers/pci/host/pci-imx6.c | 12 +--
+ drivers/pci/host/pci-keystone-dw.c | 2 -
+ drivers/pci/host/pci-mvebu.c | 1 +
+ drivers/pci/host/pci-tegra.c | 1 -
+ drivers/pci/host/pci-xgene-msi.c | 2 -
+ drivers/pci/host/pci-xgene.c | 13 ++-
+ drivers/pci/host/pcie-designware.c | 15 ++-
+ drivers/pci/host/pcie-iproc.c | 35 +++---
+ drivers/pci/host/pcie-rcar.c | 1 -
+ drivers/pci/host/pcie-spear13xx.c | 3 +-
+ drivers/pci/host/pcie-xilinx.c | 30 +++---
+ drivers/pci/hotplug/pci_hotplug_core.c | 122 ++++++++++-----------
+ drivers/pci/hotplug/pciehp.h | 14 +--
+ drivers/pci/hotplug/pciehp_hpc.c | 48 +++++----
+ drivers/pci/msi.c | 22 +---
+ drivers/pci/pci-acpi.c | 2 +-
+ drivers/pci/pci-driver.c | 26 +++--
+ drivers/pci/pci.c | 14 +--
+ drivers/pci/pci.h | 2 +
+ drivers/pci/pcie/portdrv_core.c | 2 +-
+ drivers/pci/probe.c | 92 +++++++++++-----
+ drivers/pci/quirks.c | 126 ++++++++++++++--------
+ drivers/pci/slot.c | 29 +++--
+ include/linux/pci-ats.h | 49 ---------
+ include/linux/pci.h | 60 +++++++++--
+ 63 files changed, 774 insertions(+), 674 deletions(-)
+Merging hid/for-next (8e433b666751 Merge branch 'for-4.3/upstream' into for-next)
+$ git merge hid/for-next
+Merge made by the 'recursive' strategy.
+ drivers/hid/Kconfig | 7 ++
+ drivers/hid/Makefile | 1 +
+ drivers/hid/hid-chicony.c | 26 +++++
+ drivers/hid/hid-core.c | 29 +++++-
+ drivers/hid/hid-cp2112.c | 107 +++++++++++++++------
+ drivers/hid/hid-gembird.c | 116 ++++++++++++++++++++++
+ drivers/hid/hid-ids.h | 20 +++-
+ drivers/hid/hid-input.c | 5 +-
+ drivers/hid/hid-lenovo.c | 59 +++++++++++-
+ drivers/hid/hid-lg.c | 2 +
+ drivers/hid/hid-microsoft.c | 6 +-
+ drivers/hid/hid-multitouch.c | 8 ++
+ drivers/hid/hid-picolcd_backlight.c | 3 +-
+ drivers/hid/hid-picolcd_cir.c | 3 +-
+ drivers/hid/hid-picolcd_lcd.c | 3 +-
+ drivers/hid/hid-rmi.c | 163 +++++++++++++++++++++++++++----
+ drivers/hid/hid-sensor-hub.c | 3 +
+ drivers/hid/hid-sony.c | 22 ++++-
+ drivers/hid/i2c-hid/i2c-hid.c | 28 ++++--
+ drivers/hid/usbhid/hid-core.c | 5 +-
+ drivers/hid/usbhid/hid-quirks.c | 6 +-
+ drivers/hid/wacom_sys.c | 90 +++++++-----------
+ drivers/hid/wacom_wac.c | 185 ++++++++++++++++++++++++------------
+ drivers/hid/wacom_wac.h | 7 +-
+ 24 files changed, 713 insertions(+), 191 deletions(-)
+ create mode 100644 drivers/hid/hid-gembird.c
+Merging i2c/i2c/for-next (31bb26d67b48 Merge branch 'i2c/for-4.3' into i2c/for-next)
+$ git merge i2c/i2c/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/{i2c => hwmon}/ina209.txt | 0
+ .../devicetree/bindings/{i2c => hwmon}/ina2xx.txt | 0
+ .../devicetree/bindings/{i2c => hwmon}/max6697.txt | 0
+ .../devicetree/bindings/i2c/i2c-cadence.txt | 6 +-
+ .../devicetree/bindings/i2c/i2c-emev2.txt | 22 +
+ .../devicetree/bindings/i2c/i2c-lpc2k.txt | 33 ++
+ .../devicetree/bindings/i2c/i2c-mux-reg.txt | 74 +++
+ Documentation/devicetree/bindings/i2c/i2c.txt | 45 ++
+ .../devicetree/bindings/i2c/trivial-devices.txt | 2 +
+ .../devicetree/bindings/{i2c => rtc}/ti,bq32k.txt | 0
+ Documentation/i2c/busses/i2c-parport | 1 +
+ Documentation/i2c/slave-interface | 9 +-
+ Documentation/i2c/ten-bit-addresses | 4 +
+ drivers/clk/shmobile/clk-emev2.c | 6 +
+ drivers/i2c/busses/Kconfig | 19 +-
+ drivers/i2c/busses/Makefile | 2 +
+ drivers/i2c/busses/i2c-cadence.c | 69 ++-
+ drivers/i2c/busses/i2c-designware-core.c | 3 +-
+ drivers/i2c/busses/i2c-designware-pcidrv.c | 4 +-
+ drivers/i2c/busses/i2c-emev2.c | 332 ++++++++++++
+ drivers/i2c/busses/i2c-i801.c | 120 ++++-
+ drivers/i2c/busses/i2c-imx.c | 76 ++-
+ drivers/i2c/busses/i2c-lpc2k.c | 513 ++++++++++++++++++
+ drivers/i2c/busses/i2c-mt65xx.c | 21 +-
+ drivers/i2c/busses/i2c-omap.c | 600 ++++++++++-----------
+ drivers/i2c/busses/i2c-parport.c | 25 +-
+ drivers/i2c/busses/i2c-parport.h | 8 +
+ drivers/i2c/busses/i2c-pxa.c | 112 ++--
+ drivers/i2c/busses/i2c-tegra.c | 52 +-
+ drivers/i2c/busses/i2c-viperboard.c | 10 +-
+ drivers/i2c/busses/i2c-xgene-slimpro.c | 8 +-
+ drivers/i2c/busses/i2c-xiic.c | 74 ++-
+ drivers/i2c/i2c-core.c | 229 ++++++--
+ drivers/i2c/i2c-slave-eeprom.c | 1 -
+ drivers/i2c/muxes/Kconfig | 11 +
+ drivers/i2c/muxes/Makefile | 1 +
+ drivers/i2c/muxes/i2c-arb-gpio-challenge.c | 2 +-
+ drivers/i2c/muxes/i2c-mux-pca9541.c | 1 -
+ drivers/i2c/muxes/i2c-mux-pca954x.c | 1 -
+ drivers/i2c/muxes/i2c-mux-reg.c | 294 ++++++++++
+ drivers/mfd/lpc_ich.c | 32 +-
+ drivers/misc/ad525x_dpot-i2c.c | 1 -
+ drivers/misc/apds990x.c | 1 -
+ drivers/misc/bh1770glc.c | 1 -
+ drivers/misc/bmp085-i2c.c | 1 -
+ drivers/misc/eeprom/at24.c | 38 +-
+ drivers/misc/eeprom/max6875.c | 1 +
+ drivers/misc/isl29003.c | 1 -
+ drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 1 -
+ drivers/misc/ti-st/st_kim.c | 1 -
+ drivers/misc/tsl2550.c | 1 -
+ drivers/of/irq.c | 1 +
+ drivers/platform/x86/intel_pmc_ipc.c | 9 +-
+ drivers/watchdog/Kconfig | 3 +-
+ drivers/watchdog/iTCO_wdt.c | 82 +--
+ include/dt-bindings/i2c/i2c.h | 18 +
+ include/linux/i2c.h | 19 +-
+ include/linux/mfd/lpc_ich.h | 6 -
+ include/linux/platform_data/i2c-mux-reg.h | 44 ++
+ include/linux/platform_data/itco_wdt.h | 19 +
+ 60 files changed, 2477 insertions(+), 593 deletions(-)
+ rename Documentation/devicetree/bindings/{i2c => hwmon}/ina209.txt (100%)
+ rename Documentation/devicetree/bindings/{i2c => hwmon}/ina2xx.txt (100%)
+ rename Documentation/devicetree/bindings/{i2c => hwmon}/max6697.txt (100%)
+ create mode 100644 Documentation/devicetree/bindings/i2c/i2c-emev2.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/i2c-lpc2k.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mux-reg.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/i2c.txt
+ rename Documentation/devicetree/bindings/{i2c => rtc}/ti,bq32k.txt (100%)
+ create mode 100644 drivers/i2c/busses/i2c-emev2.c
+ create mode 100644 drivers/i2c/busses/i2c-lpc2k.c
+ create mode 100644 drivers/i2c/muxes/i2c-mux-reg.c
+ create mode 100644 include/dt-bindings/i2c/i2c.h
+ create mode 100644 include/linux/platform_data/i2c-mux-reg.h
+ create mode 100644 include/linux/platform_data/itco_wdt.h
+Merging jdelvare-hwmon/master (902fd32b7711 hwmon: (k10temp) Remove duplicate pci-id define)
+$ git merge jdelvare-hwmon/master
+Merge made by the 'recursive' strategy.
+ drivers/hwmon/k10temp.c | 1 -
+ 1 file changed, 1 deletion(-)
+Merging dmi/master (1dc51b828800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
+$ git merge dmi/master
+Already up-to-date.
+Merging hwmon-staging/hwmon-next (1ed32160dba6 hwmon: (fam15h_power) Add ratio of Tsample to the PTSC period)
+$ git merge hwmon-staging/hwmon-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/hwmon/lm70.txt | 21 +
+ .../devicetree/bindings/hwmon/ltc2978.txt | 12 +-
+ Documentation/hwmon/adm1275 | 40 +-
+ Documentation/hwmon/fam15h_power | 10 +-
+ Documentation/hwmon/it87 | 35 +-
+ Documentation/hwmon/ltc2978 | 132 ++++--
+ Documentation/hwmon/max20751 | 77 ++++
+ Documentation/hwmon/nct7802 | 3 +-
+ Documentation/hwmon/pmbus | 8 +-
+ MAINTAINERS | 7 +
+ drivers/hwmon/Kconfig | 4 +-
+ drivers/hwmon/f71882fg.c | 176 ++++++--
+ drivers/hwmon/fam15h_power.c | 36 +-
+ drivers/hwmon/g762.c | 1 -
+ drivers/hwmon/it87.c | 43 +-
+ drivers/hwmon/lm70.c | 34 +-
+ drivers/hwmon/nct7802.c | 317 +++++++++++++-
+ drivers/hwmon/pmbus/Kconfig | 20 +-
+ drivers/hwmon/pmbus/Makefile | 1 +
+ drivers/hwmon/pmbus/adm1275.c | 358 ++++++++++-----
+ drivers/hwmon/pmbus/lm25066.c | 7 +-
+ drivers/hwmon/pmbus/ltc2978.c | 482 ++++++++++++++++-----
+ drivers/hwmon/pmbus/max20751.c | 64 +++
+ drivers/hwmon/pmbus/max34440.c | 9 +-
+ drivers/hwmon/pmbus/max8688.c | 19 +-
+ drivers/hwmon/pmbus/pmbus.c | 5 +
+ drivers/hwmon/pmbus/pmbus.h | 448 +++++++++----------
+ drivers/hwmon/pmbus/pmbus_core.c | 31 +-
+ drivers/hwmon/pmbus/zl6100.c | 11 +-
+ drivers/hwmon/sht15.c | 20 +-
+ 30 files changed, 1808 insertions(+), 623 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/hwmon/lm70.txt
+ create mode 100644 Documentation/hwmon/max20751
+ create mode 100644 drivers/hwmon/pmbus/max20751.c
+Merging v4l-dvb/master (cb72d295ed59 Merge branch 'patchwork' into to_next)
+$ git merge v4l-dvb/master
+Auto-merging mm/Kconfig
+Auto-merging include/linux/mm.h
+Auto-merging drivers/media/platform/omap3isp/omap3isp.h
+Auto-merging drivers/media/pci/smipcie/smipcie-main.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/device-drivers.tmpl | 34 +
+ Documentation/DocBook/media/Makefile | 3 +-
+ Documentation/DocBook/media/dvb/intro.xml | 5 +-
+ .../DocBook/media/v4l/media-ioc-device-info.xml | 2 +-
+ Documentation/DocBook/media/v4l/vidioc-expbuf.xml | 38 +-
+ .../DocBook/media/v4l/vidioc-queryctrl.xml | 2 +-
+ .../devicetree/bindings/media/i2c/adv7604.txt | 21 +-
+ .../devicetree/bindings/media/i2c/tc358743.txt | 48 +
+ .../devicetree/bindings/media/renesas,jpu.txt | 24 +
+ .../bindings/media/stih407-c8sectpfe.txt | 89 +
+ MAINTAINERS | 59 +
+ arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 2 +-
+ drivers/gpu/drm/exynos/Kconfig | 1 +
+ drivers/gpu/drm/exynos/exynos_drm_g2d.c | 89 +-
+ drivers/gpu/drm/exynos/exynos_drm_gem.c | 97 -
+ drivers/media/common/saa7146/saa7146_hlp.c | 9 +-
+ drivers/media/dvb-core/dvb_ca_en50221.c | 167 +-
+ drivers/media/dvb-core/dvb_ca_en50221.h | 34 +-
+ drivers/media/dvb-core/dvb_frontend.c | 1 -
+ drivers/media/dvb-core/dvb_frontend.h | 410 ++-
+ drivers/media/dvb-core/dvb_math.h | 25 +-
+ drivers/media/dvb-core/dvb_net.c | 2 +-
+ drivers/media/dvb-core/dvb_ringbuffer.h | 135 +-
+ drivers/media/dvb-core/dvbdev.h | 116 +-
+ drivers/media/dvb-frontends/Kconfig | 32 +-
+ drivers/media/dvb-frontends/Makefile | 4 +
+ drivers/media/dvb-frontends/a8293.c | 168 +-
+ drivers/media/dvb-frontends/a8293.h | 22 -
+ drivers/media/dvb-frontends/af9033.c | 1 -
+ drivers/media/dvb-frontends/ascot2e.c | 548 ++++
+ drivers/media/dvb-frontends/ascot2e.h | 58 +
+ drivers/media/dvb-frontends/au8522_decoder.c | 1 -
+ drivers/media/dvb-frontends/cx24123.c | 2 +-
+ drivers/media/dvb-frontends/cxd2841er.c | 2727 ++++++++++++++++++++
+ drivers/media/dvb-frontends/cxd2841er.h | 65 +
+ drivers/media/dvb-frontends/cxd2841er_priv.h | 43 +
+ drivers/media/dvb-frontends/dvb-pll.c | 50 +-
+ drivers/media/dvb-frontends/horus3a.c | 430 +++
+ drivers/media/dvb-frontends/horus3a.h | 58 +
+ drivers/media/dvb-frontends/lnbh25.c | 189 ++
+ drivers/media/dvb-frontends/lnbh25.h | 56 +
+ drivers/media/dvb-frontends/m88ds3103.c | 1 -
+ drivers/media/dvb-frontends/rtl2830.c | 1 -
+ drivers/media/dvb-frontends/rtl2832.c | 1 -
+ drivers/media/dvb-frontends/rtl2832_sdr.c | 1 -
+ drivers/media/dvb-frontends/s921.c | 2 +-
+ drivers/media/dvb-frontends/si2168.c | 1 -
+ drivers/media/dvb-frontends/sp2.c | 1 -
+ drivers/media/dvb-frontends/stv0367.c | 17 +-
+ drivers/media/dvb-frontends/tda10071.c | 825 +++---
+ drivers/media/dvb-frontends/tda10071.h | 63 +-
+ drivers/media/dvb-frontends/tda10071_priv.h | 20 +-
+ drivers/media/dvb-frontends/ts2020.c | 1 -
+ drivers/media/i2c/Kconfig | 14 +-
+ drivers/media/i2c/Makefile | 1 +
+ drivers/media/i2c/adv7170.c | 1 -
+ drivers/media/i2c/adv7175.c | 1 -
+ drivers/media/i2c/adv7180.c | 12 +-
+ drivers/media/i2c/adv7343.c | 8 -
+ drivers/media/i2c/adv7393.c | 7 -
+ drivers/media/i2c/adv7511.c | 3 +-
+ drivers/media/i2c/adv7604.c | 486 +++-
+ drivers/media/i2c/adv7842.c | 28 +-
+ drivers/media/i2c/ak881x.c | 8 +-
+ drivers/media/i2c/bt819.c | 12 -
+ drivers/media/i2c/bt856.c | 1 -
+ drivers/media/i2c/bt866.c | 1 -
+ drivers/media/i2c/cs5345.c | 8 -
+ drivers/media/i2c/cs53l32a.c | 1 -
+ drivers/media/i2c/cx25840/cx25840-core.c | 1 -
+ drivers/media/i2c/ir-kbd-i2c.c | 1 +
+ drivers/media/i2c/ks0127.c | 1 -
+ drivers/media/i2c/m52790.c | 1 -
+ drivers/media/i2c/msp3400-driver.c | 1 -
+ drivers/media/i2c/mt9v011.c | 1 -
+ drivers/media/i2c/mt9v032.c | 2 +-
+ drivers/media/i2c/ov2659.c | 4 -
+ drivers/media/i2c/ov7640.c | 1 -
+ drivers/media/i2c/ov7670.c | 1 -
+ drivers/media/i2c/ov9650.c | 2 +-
+ drivers/media/i2c/s5c73m3/s5c73m3-spi.c | 1 -
+ drivers/media/i2c/s5k6a3.c | 1 +
+ drivers/media/i2c/saa6588.c | 5 +-
+ drivers/media/i2c/saa6752hs.c | 1 -
+ drivers/media/i2c/saa7110.c | 12 -
+ drivers/media/i2c/saa7115.c | 1 -
+ drivers/media/i2c/saa7127.c | 1 -
+ drivers/media/i2c/saa717x.c | 8 -
+ drivers/media/i2c/saa7185.c | 1 -
+ drivers/media/i2c/soc_camera/mt9t112.c | 8 +-
+ drivers/media/i2c/soc_camera/tw9910.c | 35 +-
+ drivers/media/i2c/sony-btf-mpx.c | 1 -
+ drivers/media/i2c/sr030pc30.c | 15 +-
+ drivers/media/i2c/tc358743.c | 1978 ++++++++++++++
+ drivers/media/i2c/tc358743_regs.h | 681 +++++
+ drivers/media/i2c/tda7432.c | 8 -
+ drivers/media/i2c/tda9840.c | 1 -
+ drivers/media/i2c/tea6415c.c | 1 -
+ drivers/media/i2c/tea6420.c | 1 -
+ drivers/media/i2c/ths7303.c | 1 -
+ drivers/media/i2c/tlv320aic23b.c | 7 -
+ drivers/media/i2c/tvaudio.c | 1 -
+ drivers/media/i2c/tvp514x.c | 11 -
+ drivers/media/i2c/tvp5150.c | 1 -
+ drivers/media/i2c/tvp7002.c | 7 -
+ drivers/media/i2c/tw9903.c | 1 -
+ drivers/media/i2c/tw9906.c | 1 -
+ drivers/media/i2c/upd64031a.c | 1 -
+ drivers/media/i2c/upd64083.c | 1 -
+ drivers/media/i2c/vp27smpx.c | 1 -
+ drivers/media/i2c/vpx3220.c | 8 -
+ drivers/media/i2c/wm8739.c | 8 -
+ drivers/media/i2c/wm8775.c | 1 -
+ drivers/media/media-entity.c | 6 +-
+ drivers/media/pci/Kconfig | 7 +-
+ drivers/media/pci/Makefile | 3 +-
+ drivers/media/pci/bt8xx/btcx-risc.c | 5 +-
+ drivers/media/pci/bt8xx/bttv-input.c | 21 +-
+ drivers/media/pci/bt8xx/bttvp.h | 2 +-
+ drivers/media/pci/cobalt/Kconfig | 3 +-
+ drivers/media/pci/cobalt/cobalt-driver.c | 11 +-
+ drivers/media/pci/cobalt/cobalt-v4l2.c | 11 +-
+ drivers/media/pci/ivtv/ivtv-gpio.c | 7 -
+ drivers/media/pci/mantis/mantis_dma.c | 4 +-
+ drivers/media/pci/netup_unidvb/Kconfig | 12 +
+ drivers/media/pci/netup_unidvb/Makefile | 9 +
+ drivers/media/pci/netup_unidvb/netup_unidvb.h | 133 +
+ drivers/media/pci/netup_unidvb/netup_unidvb_ci.c | 248 ++
+ drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 1001 +++++++
+ drivers/media/pci/netup_unidvb/netup_unidvb_i2c.c | 381 +++
+ drivers/media/pci/netup_unidvb/netup_unidvb_spi.c | 252 ++
+ drivers/media/pci/smipcie/Kconfig | 1 +
+ drivers/media/pci/smipcie/Makefile | 3 +
+ drivers/media/pci/smipcie/smipcie-ir.c | 232 ++
+ .../pci/smipcie/{smipcie.c => smipcie-main.c} | 14 +-
+ drivers/media/pci/smipcie/smipcie.h | 19 +
+ drivers/media/pci/solo6x10/solo6x10-core.c | 18 +-
+ drivers/media/pci/solo6x10/solo6x10-g723.c | 13 +-
+ drivers/media/pci/solo6x10/solo6x10.h | 26 +-
+ drivers/media/pci/ttpci/budget-av.c | 2 +-
+ drivers/media/pci/ttpci/ttpci-eeprom.c | 9 +-
+ drivers/media/pci/tw68/tw68-core.c | 21 +-
+ drivers/media/pci/tw68/tw68.h | 16 -
+ drivers/media/pci/zoran/zoran.h | 7 +-
+ drivers/media/pci/zoran/zoran_card.c | 11 +-
+ drivers/media/pci/zoran/zoran_device.c | 18 +-
+ drivers/media/pci/zoran/zoran_driver.c | 344 +--
+ drivers/media/platform/Kconfig | 27 +-
+ drivers/media/platform/Makefile | 2 +
+ drivers/media/platform/am437x/am437x-vpfe.c | 16 +-
+ drivers/media/platform/coda/Makefile | 2 +-
+ drivers/media/platform/coda/coda-bit.c | 147 +-
+ drivers/media/platform/coda/coda-common.c | 336 +--
+ drivers/media/platform/coda/coda-gdi.c | 150 ++
+ drivers/media/platform/coda/coda.h | 15 +-
+ drivers/media/platform/coda/coda_regs.h | 10 +
+ drivers/media/platform/coda/trace.h | 89 +-
+ drivers/media/platform/fsl-viu.c | 160 +-
+ drivers/media/platform/omap/Kconfig | 1 +
+ drivers/media/platform/omap/omap_vout.c | 69 +-
+ drivers/media/platform/omap3isp/isp.c | 144 +-
+ drivers/media/platform/omap3isp/isp.h | 7 +-
+ drivers/media/platform/omap3isp/ispcsiphy.h | 2 +-
+ drivers/media/platform/omap3isp/ispvideo.c | 9 +-
+ .../media/platform/omap3isp}/omap3isp.h | 42 +-
+ drivers/media/platform/rcar_jpu.c | 1794 +++++++++++++
+ drivers/media/platform/s5p-jpeg/jpeg-core.c | 14 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c | 6 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 9 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr.c | 11 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr.h | 2 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 12 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 8 +-
+ drivers/media/platform/s5p-tv/hdmiphy_drv.c | 1 -
+ drivers/media/platform/s5p-tv/mixer_reg.c | 12 +-
+ drivers/media/platform/s5p-tv/sii9234_drv.c | 1 -
+ drivers/media/platform/sh_veu.c | 10 +-
+ drivers/media/platform/sh_vou.c | 817 +++---
+ drivers/media/platform/soc_camera/atmel-isi.c | 105 +-
+ drivers/media/platform/soc_camera/rcar_vin.c | 16 +-
+ .../platform/soc_camera/sh_mobile_ceu_camera.c | 3 +
+ drivers/media/platform/soc_camera/soc_camera.c | 48 +-
+ drivers/media/platform/sti/bdisp/bdisp-debug.c | 8 +
+ drivers/media/platform/sti/bdisp/bdisp-hw.c | 12 +-
+ drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 76 +-
+ drivers/media/platform/sti/c8sectpfe/Kconfig | 29 +
+ drivers/media/platform/sti/c8sectpfe/Makefile | 9 +
+ .../platform/sti/c8sectpfe/c8sectpfe-common.c | 265 ++
+ .../platform/sti/c8sectpfe/c8sectpfe-common.h | 64 +
+ .../media/platform/sti/c8sectpfe/c8sectpfe-core.c | 1236 +++++++++
+ .../media/platform/sti/c8sectpfe/c8sectpfe-core.h | 288 +++
+ .../platform/sti/c8sectpfe/c8sectpfe-debugfs.c | 271 ++
+ .../platform/sti/c8sectpfe/c8sectpfe-debugfs.h | 26 +
+ .../media/platform/sti/c8sectpfe/c8sectpfe-dvb.c | 244 ++
+ .../media/platform/sti/c8sectpfe/c8sectpfe-dvb.h | 20 +
+ drivers/media/platform/vivid/vivid-vid-cap.c | 2 +-
+ drivers/media/platform/vivid/vivid-vid-out.c | 15 +-
+ drivers/media/platform/vsp1/vsp1_drv.c | 13 +-
+ drivers/media/platform/vsp1/vsp1_entity.c | 18 +-
+ drivers/media/platform/vsp1/vsp1_entity.h | 4 +-
+ drivers/media/platform/vsp1/vsp1_regs.h | 6 +-
+ drivers/media/platform/vsp1/vsp1_rwpf.c | 11 +
+ drivers/media/platform/vsp1/vsp1_video.c | 85 +-
+ drivers/media/platform/vsp1/vsp1_video.h | 5 +-
+ drivers/media/platform/xilinx/xilinx-dma.c | 4 +-
+ drivers/media/radio/radio-tea5764.c | 1 -
+ drivers/media/radio/saa7706h.c | 17 +-
+ drivers/media/radio/tef6862.c | 1 -
+ drivers/media/radio/wl128x/fmdrv_common.c | 5 +-
+ drivers/media/rc/Kconfig | 26 +-
+ drivers/media/rc/ir-lirc-codec.c | 5 +-
+ drivers/media/rc/keymaps/rc-lirc.c | 2 +-
+ drivers/media/rc/keymaps/rc-lme2510.c | 132 +-
+ drivers/media/rc/rc-ir-raw.c | 2 +-
+ drivers/media/rc/rc-main.c | 74 +-
+ drivers/media/tuners/Kconfig | 2 +-
+ drivers/media/tuners/e4000.c | 1 -
+ drivers/media/tuners/fc2580.c | 1 -
+ drivers/media/tuners/it913x.c | 1 -
+ drivers/media/tuners/m88rs6000t.c | 1 -
+ drivers/media/tuners/si2157.c | 1 -
+ drivers/media/tuners/tda18212.c | 1 -
+ drivers/media/tuners/tua9001.c | 1 -
+ drivers/media/usb/airspy/airspy.c | 3 -
+ drivers/media/usb/dvb-usb-v2/lmedm04.c | 21 +-
+ drivers/media/usb/dvb-usb/pctv452e.c | 2 +-
+ drivers/media/usb/dvb-usb/technisat-usb2.c | 2 +-
+ drivers/media/usb/em28xx/em28xx-dvb.c | 4 -
+ drivers/media/usb/go7007/s2250-board.c | 1 -
+ drivers/media/usb/gspca/m5602/m5602_s5k83a.c | 2 +-
+ drivers/media/usb/gspca/sn9c2028.c | 2 +-
+ drivers/media/usb/stk1160/stk1160-core.c | 5 +-
+ drivers/media/usb/stk1160/stk1160-reg.h | 34 +
+ drivers/media/usb/stk1160/stk1160-v4l.c | 219 +-
+ drivers/media/usb/stk1160/stk1160-video.c | 4 +-
+ drivers/media/usb/stk1160/stk1160.h | 4 +-
+ drivers/media/usb/ttusb-dec/ttusb_dec.c | 9 +-
+ drivers/media/usb/usbvision/usbvision-core.c | 71 +-
+ drivers/media/usb/usbvision/usbvision-i2c.c | 2 +-
+ drivers/media/usb/usbvision/usbvision-video.c | 246 +-
+ drivers/media/usb/usbvision/usbvision.h | 10 +-
+ drivers/media/v4l2-core/Kconfig | 1 +
+ drivers/media/v4l2-core/Makefile | 3 +
+ drivers/media/v4l2-core/tuner-core.c | 1 -
+ drivers/media/v4l2-core/v4l2-ctrls.c | 15 -
+ drivers/media/v4l2-core/v4l2-dv-timings.c | 98 +-
+ drivers/media/v4l2-core/v4l2-event.c | 3 +
+ drivers/media/v4l2-core/v4l2-ioctl.c | 6 +-
+ drivers/media/v4l2-core/v4l2-mem2mem.c | 21 +-
+ drivers/media/v4l2-core/v4l2-subdev.c | 18 +
+ drivers/media/v4l2-core/v4l2-trace.c | 11 +
+ drivers/media/v4l2-core/videobuf2-core.c | 13 +-
+ drivers/media/v4l2-core/videobuf2-dma-contig.c | 207 +-
+ drivers/media/v4l2-core/videobuf2-dma-sg.c | 91 +-
+ drivers/media/v4l2-core/videobuf2-memops.c | 148 +-
+ drivers/media/v4l2-core/videobuf2-vmalloc.c | 90 +-
+ drivers/staging/iio/addac/adt7316-i2c.c | 1 -
+ drivers/staging/iio/light/isl29018.c | 1 -
+ drivers/staging/iio/light/isl29028.c | 1 -
+ drivers/staging/media/bcm2048/radio-bcm2048.c | 20 +-
+ drivers/staging/media/lirc/lirc_imon.c | 10 +-
+ drivers/staging/media/lirc/lirc_sasem.c | 2 +-
+ drivers/staging/media/lirc/lirc_zilog.c | 2 +-
+ drivers/staging/media/mn88472/mn88472.c | 1 -
+ drivers/staging/media/mn88473/mn88473.c | 1 -
+ drivers/staging/media/omap4iss/Kconfig | 2 +-
+ drivers/staging/media/omap4iss/TODO | 1 -
+ drivers/staging/media/omap4iss/iss_video.c | 73 -
+ drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 1 -
+ include/dt-bindings/media/c8sectpfe.h | 12 +
+ include/linux/mm.h | 44 +
+ include/linux/pci_ids.h | 9 +
+ include/media/media-devnode.h | 4 +
+ include/media/rc-core.h | 6 +-
+ include/media/rc-map.h | 38 +-
+ include/media/tc358743.h | 131 +
+ include/media/v4l2-async.h | 8 +-
+ include/media/v4l2-ctrls.h | 1018 ++++----
+ include/media/v4l2-dv-timings.h | 141 +-
+ include/media/v4l2-event.h | 47 +-
+ include/media/v4l2-flash-led-class.h | 12 +-
+ include/media/v4l2-mediabus.h | 4 +-
+ include/media/v4l2-mem2mem.h | 20 +
+ include/media/v4l2-subdev.h | 376 ++-
+ include/media/videobuf2-core.h | 10 +-
+ include/media/videobuf2-memops.h | 14 +-
+ include/trace/events/v4l2.h | 257 +-
+ include/uapi/linux/v4l2-controls.h | 4 +
+ include/uapi/linux/vsp1.h | 2 +-
+ mm/Kconfig | 3 +
+ mm/Makefile | 1 +
+ mm/frame_vector.c | 230 ++
+ 292 files changed, 19106 insertions(+), 4939 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/media/i2c/tc358743.txt
+ create mode 100644 Documentation/devicetree/bindings/media/renesas,jpu.txt
+ create mode 100644 Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt
+ create mode 100644 drivers/media/dvb-frontends/ascot2e.c
+ create mode 100644 drivers/media/dvb-frontends/ascot2e.h
+ create mode 100644 drivers/media/dvb-frontends/cxd2841er.c
+ create mode 100644 drivers/media/dvb-frontends/cxd2841er.h
+ create mode 100644 drivers/media/dvb-frontends/cxd2841er_priv.h
+ create mode 100644 drivers/media/dvb-frontends/horus3a.c
+ create mode 100644 drivers/media/dvb-frontends/horus3a.h
+ create mode 100644 drivers/media/dvb-frontends/lnbh25.c
+ create mode 100644 drivers/media/dvb-frontends/lnbh25.h
+ create mode 100644 drivers/media/i2c/tc358743.c
+ create mode 100644 drivers/media/i2c/tc358743_regs.h
+ create mode 100644 drivers/media/pci/netup_unidvb/Kconfig
+ create mode 100644 drivers/media/pci/netup_unidvb/Makefile
+ create mode 100644 drivers/media/pci/netup_unidvb/netup_unidvb.h
+ create mode 100644 drivers/media/pci/netup_unidvb/netup_unidvb_ci.c
+ create mode 100644 drivers/media/pci/netup_unidvb/netup_unidvb_core.c
+ create mode 100644 drivers/media/pci/netup_unidvb/netup_unidvb_i2c.c
+ create mode 100644 drivers/media/pci/netup_unidvb/netup_unidvb_spi.c
+ create mode 100644 drivers/media/pci/smipcie/smipcie-ir.c
+ rename drivers/media/pci/smipcie/{smipcie.c => smipcie-main.c} (99%)
+ create mode 100644 drivers/media/platform/coda/coda-gdi.c
+ rename {include/media => drivers/media/platform/omap3isp}/omap3isp.h (77%)
+ create mode 100644 drivers/media/platform/rcar_jpu.c
+ create mode 100644 drivers/media/platform/sti/c8sectpfe/Kconfig
+ create mode 100644 drivers/media/platform/sti/c8sectpfe/Makefile
+ create mode 100644 drivers/media/platform/sti/c8sectpfe/c8sectpfe-common.c
+ create mode 100644 drivers/media/platform/sti/c8sectpfe/c8sectpfe-common.h
+ create mode 100644 drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
+ create mode 100644 drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.h
+ create mode 100644 drivers/media/platform/sti/c8sectpfe/c8sectpfe-debugfs.c
+ create mode 100644 drivers/media/platform/sti/c8sectpfe/c8sectpfe-debugfs.h
+ create mode 100644 drivers/media/platform/sti/c8sectpfe/c8sectpfe-dvb.c
+ create mode 100644 drivers/media/platform/sti/c8sectpfe/c8sectpfe-dvb.h
+ create mode 100644 drivers/media/v4l2-core/v4l2-trace.c
+ create mode 100644 include/dt-bindings/media/c8sectpfe.h
+ create mode 100644 include/media/tc358743.h
+ create mode 100644 mm/frame_vector.c
+Merging kbuild/for-next (afa50c336d92 Merge branch 'kbuild/kbuild' into kbuild/for-next)
+$ git merge kbuild/for-next
+Auto-merging init/Kconfig
+Auto-merging arch/x86/Kconfig
+Auto-merging Makefile
+Merge made by the 'recursive' strategy.
+ .gitignore | 4 +
+ Documentation/lto-build | 173 ++++++
+ Makefile | 19 +-
+ arch/x86/Kconfig | 2 +-
+ include/asm-generic/vmlinux.lds.h | 4 +-
+ init/Kconfig | 73 +++
+ kernel/gcov/Kconfig | 2 +-
+ lib/Kconfig.debug | 2 +-
+ scripts/Makefile.lto | 84 +++
+ scripts/Makefile.modpost | 7 +-
+ scripts/basic/fixdep.c | 26 +-
+ scripts/coccinelle/api/platform_no_drv_owner.cocci | 73 +++
+ scripts/coccinelle/api/pm_runtime.cocci | 2 +-
+ scripts/coccinelle/api/simple_open.cocci | 4 +-
+ scripts/coccinelle/api/vma_pages.cocci | 60 ++
+ scripts/coccinelle/misc/ifaddr.cocci | 3 +-
+ scripts/coccinelle/misc/irqf_oneshot.cocci | 7 +-
+ scripts/coccinelle/misc/returnvar.cocci | 2 +-
+ scripts/coccinelle/misc/semicolon.cocci | 2 +-
+ scripts/coccinelle/misc/simple_return.cocci | 2 +-
+ scripts/genksyms/parse.tab.c_shipped | 671 ++++++++++-----------
+ scripts/genksyms/parse.tab.h_shipped | 26 +-
+ scripts/genksyms/parse.y | 9 +
+ scripts/kconfig/confdata.c | 7 +-
+ scripts/kconfig/merge_config.sh | 4 +
+ scripts/kconfig/symbol.c | 3 +-
+ scripts/kconfig/zconf.gperf | 1 +
+ scripts/kconfig/zconf.hash.c_shipped | 58 +-
+ scripts/kconfig/zconf.l | 20 +-
+ scripts/kconfig/zconf.lex.c_shipped | 325 +++++-----
+ scripts/link-vmlinux.sh | 2 +-
+ scripts/mod/modpost.h | 6 +
+ scripts/package/Makefile | 8 +-
+ scripts/package/builddeb | 52 +-
+ scripts/package/mkspec | 4 +-
+ scripts/tags.sh | 4 +
+ 36 files changed, 1127 insertions(+), 624 deletions(-)
+ create mode 100644 Documentation/lto-build
+ create mode 100644 scripts/Makefile.lto
+ create mode 100644 scripts/coccinelle/api/vma_pages.cocci
+Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
+$ git merge kconfig/for-next
+Already up-to-date.
+Merging libata/for-next (82908d67958c Merge branch 'for-4.2-fixes' into for-next)
+$ git merge libata/for-next
+Auto-merging drivers/ata/pata_arasan_cf.c
+Merge made by the 'recursive' strategy.
+ drivers/ata/libata-core.c | 3 +++
+ drivers/ata/pata_arasan_cf.c | 11 ++++-------
+ drivers/ata/sata_rcar.c | 4 ----
+ 3 files changed, 7 insertions(+), 11 deletions(-)
+Merging pm/linux-next (a5063b85e788 Merge branch 'acpi-pci' into linux-next)
+$ git merge pm/linux-next
+Auto-merging drivers/acpi/pci_irq.c
+Auto-merging arch/powerpc/include/asm/opal-api.h
+Auto-merging Documentation/devicetree/bindings/opp/opp.txt
+Merge made by the 'recursive' strategy.
+ Documentation/acpi/method-tracing.txt | 204 +++-
+ .../bindings/devfreq/event/exynos-ppmu.txt | 43 +-
+ .../devicetree/bindings/{power => opp}/opp.txt | 40 +-
+ .../devicetree/bindings/power/power_domain.txt | 2 +-
+ .../bindings/power/rockchip-io-domain.txt | 14 +
+ Documentation/power/devices.txt | 7 +
+ Documentation/power/runtime_pm.txt | 4 -
+ arch/powerpc/include/asm/opal-api.h | 12 +
+ arch/x86/include/asm/msr-index.h | 6 +
+ arch/x86/kernel/acpi/boot.c | 1 +
+ drivers/acpi/Kconfig | 19 +-
+ drivers/acpi/Makefile | 8 +-
+ drivers/acpi/ac.c | 4 -
+ drivers/acpi/acpi_ipmi.c | 4 -
+ drivers/acpi/acpi_memhotplug.c | 5 -
+ drivers/acpi/acpi_pad.c | 4 -
+ drivers/acpi/acpi_processor.c | 2 +-
+ drivers/acpi/acpi_video.c | 4 -
+ drivers/acpi/acpica/Makefile | 2 +
+ drivers/acpi/acpica/acdebug.h | 26 +-
+ drivers/acpi/acpica/acdispat.h | 8 +
+ drivers/acpi/acpica/acglobal.h | 20 +-
+ drivers/acpi/acpica/acinterp.h | 22 +
+ drivers/acpi/acpica/aclocal.h | 28 +-
+ drivers/acpi/acpica/acmacros.h | 9 +
+ drivers/acpi/acpica/acnamesp.h | 13 +-
+ drivers/acpi/acpica/acobject.h | 1 +
+ drivers/acpi/acpica/acparser.h | 4 +-
+ drivers/acpi/acpica/acstruct.h | 2 +-
+ drivers/acpi/acpica/actables.h | 14 +-
+ drivers/acpi/acpica/acutils.h | 25 +-
+ drivers/acpi/acpica/dsargs.c | 4 +-
+ drivers/acpi/acpica/dscontrol.c | 2 +-
+ drivers/acpi/acpica/dsdebug.c | 231 +++++
+ drivers/acpi/acpica/dsinit.c | 20 +-
+ drivers/acpi/acpica/dsmethod.c | 35 +-
+ drivers/acpi/acpica/dsopcode.c | 31 +-
+ drivers/acpi/acpica/dswload.c | 2 +-
+ drivers/acpi/acpica/dswload2.c | 2 +-
+ drivers/acpi/acpica/evregion.c | 22 +-
+ drivers/acpi/acpica/exconfig.c | 8 -
+ drivers/acpi/acpica/excreate.c | 1 +
+ drivers/acpi/acpica/exdebug.c | 324 ++++++
+ drivers/acpi/acpica/exdump.c | 5 +-
+ drivers/acpi/acpica/exresnte.c | 2 +-
+ drivers/acpi/acpica/exresolv.c | 16 +-
+ drivers/acpi/acpica/hwxfsleep.c | 15 +-
+ drivers/acpi/acpica/nseval.c | 4 +-
+ drivers/acpi/acpica/nsload.c | 16 +-
+ drivers/acpi/acpica/nsnames.c | 275 ++---
+ drivers/acpi/acpica/nsparse.c | 42 +-
+ drivers/acpi/acpica/nsutils.c | 19 +-
+ drivers/acpi/acpica/nsxfname.c | 8 +-
+ drivers/acpi/acpica/psargs.c | 26 +-
+ drivers/acpi/acpica/psloop.c | 32 +-
+ drivers/acpi/acpica/psobject.c | 17 +-
+ drivers/acpi/acpica/psparse.c | 14 +-
+ drivers/acpi/acpica/psutils.c | 8 +-
+ drivers/acpi/acpica/psxface.c | 123 +--
+ drivers/acpi/acpica/rscreate.c | 3 +-
+ drivers/acpi/acpica/tbfadt.c | 6 +-
+ drivers/acpi/acpica/tbfind.c | 15 +-
+ drivers/acpi/acpica/tbinstal.c | 40 +-
+ drivers/acpi/acpica/tbutils.c | 73 +-
+ drivers/acpi/acpica/tbxfload.c | 93 +-
+ drivers/acpi/acpica/utdebug.c | 31 +-
+ drivers/acpi/acpica/utdelete.c | 3 +
+ drivers/acpi/acpica/utfileio.c | 2 +-
+ drivers/acpi/acpica/utinit.c | 3 +-
+ drivers/acpi/acpica/utmisc.c | 4 +-
+ drivers/acpi/acpica/utnonansi.c | 380 +++++++
+ drivers/acpi/acpica/utstring.c | 342 ------
+ drivers/acpi/acpica/utxface.c | 12 +-
+ drivers/acpi/acpica/utxfinit.c | 11 -
+ drivers/acpi/apei/apei-base.c | 4 -
+ drivers/acpi/apei/einj.c | 4 -
+ drivers/acpi/apei/erst-dbg.c | 4 -
+ drivers/acpi/apei/erst.c | 4 -
+ drivers/acpi/apei/ghes.c | 4 -
+ drivers/acpi/apei/hest.c | 4 -
+ drivers/acpi/battery.c | 4 -
+ drivers/acpi/blacklist.c | 4 -
+ drivers/acpi/bus.c | 408 +++++++-
+ drivers/acpi/button.c | 4 -
+ drivers/acpi/cm_sbs.c | 4 -
+ drivers/acpi/container.c | 4 -
+ drivers/acpi/debugfs.c | 2 +
+ drivers/acpi/device_pm.c | 12 +-
+ drivers/acpi/device_sysfs.c | 521 ++++++++++
+ drivers/acpi/dock.c | 4 -
+ drivers/acpi/ec.c | 86 +-
+ drivers/acpi/fan.c | 4 -
+ drivers/acpi/hed.c | 4 -
+ drivers/acpi/internal.h | 16 +-
+ drivers/acpi/numa.c | 4 -
+ drivers/acpi/osl.c | 45 +-
+ drivers/acpi/pci_irq.c | 4 -
+ drivers/acpi/pci_link.c | 20 +-
+ drivers/acpi/pci_root.c | 4 -
+ drivers/acpi/pci_slot.c | 4 -
+ drivers/acpi/power.c | 19 +-
+ drivers/acpi/processor_driver.c | 92 +-
+ drivers/acpi/processor_idle.c | 4 -
+ drivers/acpi/processor_perflib.c | 8 +-
+ drivers/acpi/processor_thermal.c | 4 -
+ drivers/acpi/processor_throttling.c | 4 -
+ drivers/acpi/property.c | 5 +-
+ drivers/acpi/resource.c | 4 -
+ drivers/acpi/sbs.c | 4 -
+ drivers/acpi/scan.c | 860 ----------------
+ drivers/acpi/sysfs.c | 133 ++-
+ drivers/acpi/tables.c | 4 -
+ drivers/acpi/thermal.c | 4 -
+ drivers/acpi/utils.c | 4 -
+ drivers/base/core.c | 43 +
+ drivers/base/dd.c | 20 +
+ drivers/base/power/clock_ops.c | 4 +-
+ drivers/base/power/domain.c | 377 ++-----
+ drivers/base/power/main.c | 2 +-
+ drivers/base/power/opp.c | 1084 ++++++++++++++++----
+ drivers/base/power/power.h | 2 +
+ drivers/base/power/qos.c | 37 +
+ drivers/base/power/sysfs.c | 11 +
+ drivers/base/property.c | 8 +-
+ drivers/cpufreq/acpi-cpufreq.c | 93 +-
+ drivers/cpufreq/cpufreq-dt.c | 73 +-
+ drivers/cpufreq/cpufreq.c | 390 ++++---
+ drivers/cpufreq/cpufreq_conservative.c | 25 +-
+ drivers/cpufreq/cpufreq_governor.c | 196 +++-
+ drivers/cpufreq/cpufreq_governor.h | 40 +-
+ drivers/cpufreq/cpufreq_ondemand.c | 67 +-
+ drivers/cpufreq/cpufreq_opp.c | 4 +
+ drivers/cpufreq/e_powersaver.c | 2 +-
+ drivers/cpufreq/freq_table.c | 15 +
+ drivers/cpufreq/ia64-acpi-cpufreq.c | 20 +-
+ drivers/cpufreq/integrator-cpufreq.c | 18 +-
+ drivers/cpufreq/intel_pstate.c | 20 +-
+ drivers/cpufreq/powernow-k7.c | 4 +-
+ drivers/cpufreq/powernow-k8.c | 5 +-
+ drivers/cpufreq/powernv-cpufreq.c | 198 +++-
+ drivers/devfreq/event/exynos-ppmu.c | 170 ++-
+ drivers/devfreq/event/exynos-ppmu.h | 70 ++
+ drivers/dma/Kconfig | 8 +
+ drivers/dma/Makefile | 1 +
+ drivers/dma/idma64.c | 710 +++++++++++++
+ drivers/dma/idma64.h | 233 +++++
+ drivers/idle/intel_idle.c | 72 +-
+ drivers/mailbox/Kconfig | 1 +
+ drivers/mailbox/pcc.c | 8 +-
+ drivers/mfd/Kconfig | 23 +
+ drivers/mfd/Makefile | 3 +
+ drivers/mfd/intel-lpss-acpi.c | 84 ++
+ drivers/mfd/intel-lpss-pci.c | 113 ++
+ drivers/mfd/intel-lpss.c | 524 ++++++++++
+ drivers/mfd/intel-lpss.h | 62 ++
+ drivers/mfd/mfd-core.c | 2 +-
+ drivers/power/avs/Kconfig | 2 +-
+ drivers/power/avs/rockchip-io-domain.c | 59 ++
+ drivers/powercap/intel_rapl.c | 2 +
+ drivers/xen/xen-acpi-processor.c | 16 +-
+ include/acpi/acbuffer.h | 1 +
+ include/acpi/acconfig.h | 4 -
+ include/acpi/acexcep.h | 7 +-
+ include/acpi/acoutput.h | 21 +-
+ include/acpi/acpi_bus.h | 4 -
+ include/acpi/acpi_drivers.h | 4 -
+ include/acpi/acpiosxf.h | 6 +
+ include/acpi/acpixf.h | 16 +-
+ include/acpi/actbl2.h | 17 +-
+ include/acpi/actypes.h | 13 +-
+ include/acpi/platform/acenv.h | 19 +-
+ include/acpi/platform/acenvex.h | 3 +
+ include/acpi/platform/acmsvcex.h | 54 +
+ include/acpi/platform/acwinex.h | 49 +
+ include/acpi/processor.h | 59 +-
+ include/linux/acpi.h | 6 +-
+ include/linux/cpufreq.h | 13 +
+ include/linux/device.h | 2 +
+ include/linux/klist.h | 1 +
+ include/linux/of.h | 3 +-
+ include/linux/pm_domain.h | 7 -
+ include/linux/pm_opp.h | 36 +
+ include/linux/pm_qos.h | 5 +
+ include/linux/pm_runtime.h | 6 -
+ kernel/power/Kconfig | 10 +
+ kernel/power/suspend.c | 2 +
+ kernel/power/wakelock.c | 18 +-
+ lib/klist.c | 41 +
+ tools/power/acpi/Makefile | 168 +--
+ tools/power/acpi/Makefile.config | 92 ++
+ tools/power/acpi/Makefile.rules | 37 +
+ tools/power/acpi/tools/acpidump/Makefile | 53 +
+ tools/power/acpi/tools/ec/Makefile | 33 +-
+ tools/power/cpupower/utils/cpufreq-set.c | 4 +
+ tools/power/x86/turbostat/turbostat.8 | 5 -
+ tools/power/x86/turbostat/turbostat.c | 100 +-
+ 196 files changed, 7752 insertions(+), 3298 deletions(-)
+ rename Documentation/devicetree/bindings/{power => opp}/opp.txt (93%)
+ create mode 100644 drivers/acpi/acpica/dsdebug.c
+ create mode 100644 drivers/acpi/acpica/utnonansi.c
+ create mode 100644 drivers/acpi/device_sysfs.c
+ create mode 100644 drivers/dma/idma64.c
+ create mode 100644 drivers/dma/idma64.h
+ create mode 100644 drivers/mfd/intel-lpss-acpi.c
+ create mode 100644 drivers/mfd/intel-lpss-pci.c
+ create mode 100644 drivers/mfd/intel-lpss.c
+ create mode 100644 drivers/mfd/intel-lpss.h
+ create mode 100644 include/acpi/platform/acmsvcex.h
+ create mode 100644 include/acpi/platform/acwinex.h
+ create mode 100644 tools/power/acpi/Makefile.config
+ create mode 100644 tools/power/acpi/Makefile.rules
+ create mode 100644 tools/power/acpi/tools/acpidump/Makefile
+Merging idle/next (aba5686671dc Merge branch 'cpuidle' into release)
+$ git merge idle/next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
+$ git merge apm/for-next
+Already up-to-date.
+Merging thermal/next (6ce87b2a60f1 Merge branches 'for-rc' and 'release' of .git into next)
+$ git merge thermal/next
+Auto-merging drivers/thermal/power_allocator.c
+Auto-merging drivers/acpi/thermal.c
+Merge made by the 'recursive' strategy.
+ Documentation/thermal/sysfs-api.txt | 6 +
+ drivers/acpi/thermal.c | 12 +-
+ drivers/hwmon/lm75.c | 2 +-
+ drivers/hwmon/ntc_thermistor.c | 2 +-
+ drivers/hwmon/tmp102.c | 2 +-
+ drivers/input/touchscreen/sun4i-ts.c | 8 +-
+ drivers/platform/x86/acerhdf.c | 9 +-
+ drivers/platform/x86/intel_mid_thermal.c | 9 +-
+ drivers/power/charger-manager.c | 2 +-
+ drivers/power/power_supply_core.c | 2 +-
+ drivers/thermal/Kconfig | 8 +
+ drivers/thermal/Makefile | 1 +
+ drivers/thermal/armada_thermal.c | 2 +-
+ drivers/thermal/db8500_thermal.c | 7 +-
+ drivers/thermal/dove_thermal.c | 2 +-
+ drivers/thermal/fair_share.c | 2 +-
+ drivers/thermal/gov_bang_bang.c | 5 +-
+ drivers/thermal/hisi_thermal.c | 4 +-
+ drivers/thermal/imx_thermal.c | 27 +-
+ drivers/thermal/int340x_thermal/int3400_thermal.c | 2 +-
+ .../thermal/int340x_thermal/int340x_thermal_zone.c | 10 +-
+ .../thermal/int340x_thermal/int340x_thermal_zone.h | 8 +-
+ .../int340x_thermal/processor_thermal_device.c | 4 +-
+ drivers/thermal/intel_pch_thermal.c | 286 +++++++++++++++++++++
+ drivers/thermal/intel_powerclamp.c | 3 +
+ drivers/thermal/intel_quark_dts_thermal.c | 13 +-
+ drivers/thermal/intel_soc_dts_iosf.c | 8 +-
+ drivers/thermal/kirkwood_thermal.c | 2 +-
+ drivers/thermal/of-thermal.c | 14 +-
+ drivers/thermal/power_allocator.c | 16 +-
+ drivers/thermal/qcom-spmi-temp-alarm.c | 2 +-
+ drivers/thermal/rcar_thermal.c | 7 +-
+ drivers/thermal/rockchip_thermal.c | 10 +-
+ drivers/thermal/samsung/exynos_tmu.c | 23 +-
+ drivers/thermal/spear_thermal.c | 2 +-
+ drivers/thermal/st/st_thermal.c | 5 +-
+ drivers/thermal/step_wise.c | 4 +-
+ drivers/thermal/tegra_soctherm.c | 4 +-
+ drivers/thermal/thermal_core.c | 109 ++++----
+ drivers/thermal/thermal_hwmon.c | 10 +-
+ drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 10 +-
+ drivers/thermal/x86_pkg_temp_thermal.c | 10 +-
+ include/linux/thermal.h | 26 +-
+ include/trace/events/thermal_power_allocator.h | 6 +-
+ 44 files changed, 509 insertions(+), 197 deletions(-)
+ create mode 100644 drivers/thermal/intel_pch_thermal.c
+Merging thermal-soc/next (1afb9c539dae thermal/cpu_cooling: update policy limits if clipped_freq < policy->max)
+$ git merge thermal-soc/next
+Already up-to-date.
+Merging ieee1394/for-next (d71e6a11737f firewire: core: use correct vendor/model IDs)
+$ git merge ieee1394/for-next
+Already up-to-date.
+Merging dlm/next (b3a5bbfd780d dlm: print error from kernel_sendpage)
+$ git merge dlm/next
+Merge made by the 'recursive' strategy.
+ fs/dlm/lowcomms.c | 743 ++++++++++++++++------------------------
+ fs/dlm/user.c | 7 +-
+ include/uapi/linux/dlm_device.h | 2 +-
+ 3 files changed, 305 insertions(+), 447 deletions(-)
+Merging swiotlb/linux-next (023600f192be swiotlb: do not export map_single function)
+$ git merge swiotlb/linux-next
+Already up-to-date.
+Merging slave-dma/next (9dd4efc41d09 Merge branch 'for-linus' into next)
+$ git merge slave-dma/next
+Resolved 'drivers/dma/Kconfig' using previous resolution.
+Resolved 'drivers/dma/Makefile' using previous resolution.
+Removing include/dt-bindings/dma/jz4780-dma.h
+Removing drivers/dma/ioat/pci.c
+Removing drivers/dma/ioat/dma_v3.c
+Removing drivers/dma/ioat/dma_v2.h
+Removing drivers/dma/ioat/dma_v2.c
+Auto-merging drivers/dma/Makefile
+CONFLICT (content): Merge conflict in drivers/dma/Makefile
+Auto-merging drivers/dma/Kconfig
+CONFLICT (content): Merge conflict in drivers/dma/Kconfig
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 882a8e4a2cd9] Merge remote-tracking branch 'slave-dma/next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/dma/adi,axi-dmac.txt | 61 +
+ .../devicetree/bindings/dma/arm-pl08x.txt | 54 +
+ .../devicetree/bindings/dma/lpc1850-dmamux.txt | 54 +
+ Documentation/devicetree/bindings/dma/mv-xor.txt | 10 +-
+ .../devicetree/bindings/dma/sun4i-dma.txt | 46 +
+ Documentation/devicetree/bindings/dma/zxdma.txt | 38 +
+ Documentation/dmaengine/provider.txt | 23 +-
+ MAINTAINERS | 6 +
+ drivers/dma/Kconfig | 607 +++----
+ drivers/dma/Makefile | 88 +-
+ drivers/dma/amba-pl08x.c | 192 ++-
+ drivers/dma/at_hdmac.c | 127 +-
+ drivers/dma/at_hdmac_regs.h | 6 +
+ drivers/dma/at_xdmac.c | 183 ++-
+ drivers/dma/coh901318.c | 2 +-
+ drivers/dma/dma-axi-dmac.c | 691 ++++++++
+ drivers/dma/dma-jz4780.c | 124 +-
+ drivers/dma/dw/Kconfig | 6 +-
+ drivers/dma/edma.c | 2 +-
+ drivers/dma/hsu/hsu.c | 39 +-
+ drivers/dma/hsu/hsu.h | 1 -
+ drivers/dma/imx-dma.c | 25 +-
+ drivers/dma/imx-sdma.c | 254 ++-
+ drivers/dma/ioat/Makefile | 2 +-
+ drivers/dma/ioat/dca.c | 374 +----
+ drivers/dma/ioat/dma.c | 1655 ++++++++-----------
+ drivers/dma/ioat/dma.h | 353 ++--
+ drivers/dma/ioat/dma_v2.c | 916 -----------
+ drivers/dma/ioat/dma_v2.h | 175 --
+ drivers/dma/ioat/dma_v3.c | 1717 --------------------
+ drivers/dma/ioat/hw.h | 5 -
+ drivers/dma/ioat/init.c | 1284 +++++++++++++++
+ drivers/dma/ioat/pci.c | 258 ---
+ drivers/dma/ioat/prep.c | 715 ++++++++
+ drivers/dma/ioat/sysfs.c | 135 ++
+ drivers/dma/ipu/ipu_irq.c | 64 +-
+ drivers/dma/k3dma.c | 3 +-
+ drivers/dma/lpc18xx-dmamux.c | 183 +++
+ drivers/dma/mic_x100_dma.h | 2 +-
+ drivers/dma/mmp_pdma.c | 3 +-
+ drivers/dma/mmp_tdma.c | 3 +-
+ drivers/dma/mv_xor.c | 69 +-
+ drivers/dma/pch_dma.c | 4 -
+ drivers/dma/pl330.c | 3 +
+ drivers/dma/pxa_dma.c | 15 +-
+ drivers/dma/sh/Kconfig | 24 +-
+ drivers/dma/sh/Makefile | 4 +-
+ drivers/dma/sirf-dma.c | 3 +
+ drivers/dma/ste_dma40.c | 2 +-
+ drivers/dma/sun4i-dma.c | 1288 +++++++++++++++
+ drivers/dma/sun6i-dma.c | 2 +-
+ drivers/dma/tegra20-apb-dma.c | 63 +-
+ drivers/dma/ti-dma-crossbar.c | 41 +-
+ drivers/dma/timb_dma.c | 4 -
+ drivers/dma/xgene-dma.c | 66 +-
+ drivers/dma/zx296702_dma.c | 951 +++++++++++
+ drivers/gpu/ipu-v3/ipu-common.c | 4 +-
+ include/dt-bindings/dma/axi-dmac.h | 48 +
+ include/dt-bindings/dma/jz4780-dma.h | 49 -
+ include/linux/dmaengine.h | 75 +-
+ include/linux/shdma-base.h | 5 +-
+ 61 files changed, 7971 insertions(+), 5235 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/dma/adi,axi-dmac.txt
+ create mode 100644 Documentation/devicetree/bindings/dma/arm-pl08x.txt
+ create mode 100644 Documentation/devicetree/bindings/dma/lpc1850-dmamux.txt
+ create mode 100644 Documentation/devicetree/bindings/dma/sun4i-dma.txt
+ create mode 100644 Documentation/devicetree/bindings/dma/zxdma.txt
+ create mode 100644 drivers/dma/dma-axi-dmac.c
+ delete mode 100644 drivers/dma/ioat/dma_v2.c
+ delete mode 100644 drivers/dma/ioat/dma_v2.h
+ delete mode 100644 drivers/dma/ioat/dma_v3.c
+ create mode 100644 drivers/dma/ioat/init.c
+ delete mode 100644 drivers/dma/ioat/pci.c
+ create mode 100644 drivers/dma/ioat/prep.c
+ create mode 100644 drivers/dma/ioat/sysfs.c
+ create mode 100644 drivers/dma/lpc18xx-dmamux.c
+ create mode 100644 drivers/dma/sun4i-dma.c
+ create mode 100644 drivers/dma/zx296702_dma.c
+ create mode 100644 include/dt-bindings/dma/axi-dmac.h
+ delete mode 100644 include/dt-bindings/dma/jz4780-dma.h
+Merging net-next/master (69dba9bbc506 sock: fix kernel doc error)
+$ git merge net-next/master
+Removing net/openvswitch/vport-vxlan.h
+Auto-merging net/ipv6/ip6_gre.c
+Removing net/ipv4/geneve_core.c
+Auto-merging net/core/skbuff.c
+Removing lib/average.c
+Auto-merging lib/Makefile
+Auto-merging lib/Kconfig
+Auto-merging include/linux/skbuff.h
+Removing include/linux/platform_data/st_nci.h
+Auto-merging drivers/net/vxlan.c
+Auto-merging drivers/net/phy/phy.c
+Auto-merging drivers/net/phy/fixed_phy.c
+Auto-merging drivers/net/ethernet/sfc/ef10.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/igb/igb_main.c
+Auto-merging drivers/net/ethernet/freescale/fec_main.c
+Auto-merging drivers/net/ethernet/broadcom/genet/bcmgenet.c
+Auto-merging drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+Auto-merging drivers/net/ethernet/Makefile
+Auto-merging drivers/base/property.c
+Auto-merging arch/arm/boot/dts/dra7.dtsi
+Auto-merging arch/arm/boot/dts/am33xx.dtsi
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/net/dsa/dsa.txt | 38 +-
+ Documentation/devicetree/bindings/net/ethernet.txt | 4 +
+ .../devicetree/bindings/net/keystone-netcp.txt | 6 +-
+ .../devicetree/bindings/net/nfc/s3fwrn5.txt | 27 +
+ .../net/nfc/{st-nci.txt => st-nci-i2c.txt} | 0
+ .../devicetree/bindings/net/nfc/st-nci-spi.txt | 31 +
+ .../bindings/net/snps,dwc-qos-ethernet.txt | 75 +
+ Documentation/networking/6lowpan.txt | 50 +
+ Documentation/networking/dsa/bcm_sf2.txt | 114 +
+ Documentation/networking/dsa/dsa.txt | 615 ++++
+ Documentation/networking/ip-sysctl.txt | 65 +-
+ Documentation/networking/stmmac.txt | 14 +-
+ Documentation/networking/switchdev.txt | 17 +-
+ Documentation/networking/timestamping.txt | 7 +
+ Documentation/networking/vxlan.txt | 52 +-
+ MAINTAINERS | 35 +-
+ arch/arm/boot/dts/am33xx.dtsi | 2 +-
+ arch/arm/boot/dts/dra7.dtsi | 2 +-
+ arch/arm/net/bpf_jit_32.c | 41 +-
+ arch/arm/net/bpf_jit_32.h | 3 +
+ arch/s390/net/bpf_jit.h | 5 +-
+ arch/s390/net/bpf_jit_comp.c | 93 +-
+ arch/sparc/net/bpf_jit_comp.c | 2 +-
+ arch/x86/net/bpf_jit_comp.c | 88 +-
+ drivers/base/property.c | 95 +-
+ drivers/bcma/Kconfig | 2 +-
+ drivers/bcma/bcma_private.h | 1 +
+ drivers/bcma/driver_gpio.c | 92 +-
+ drivers/bcma/main.c | 36 +
+ drivers/bluetooth/Kconfig | 18 +
+ drivers/bluetooth/Makefile | 2 +
+ drivers/bluetooth/bfusb.c | 2 +-
+ drivers/bluetooth/bt3c_cs.c | 2 +-
+ drivers/bluetooth/btbcm.c | 8 +-
+ drivers/bluetooth/btintel.c | 80 +
+ drivers/bluetooth/btintel.h | 19 +
+ drivers/bluetooth/btmrvl_drv.h | 6 +-
+ drivers/bluetooth/btmrvl_sdio.c | 4 +-
+ drivers/bluetooth/btqca.c | 392 +++
+ drivers/bluetooth/btqca.h | 135 +
+ drivers/bluetooth/btusb.c | 97 +-
+ drivers/bluetooth/dtl1_cs.c | 6 +-
+ drivers/bluetooth/hci_bcm.c | 310 +-
+ drivers/bluetooth/hci_h5.c | 2 +-
+ drivers/bluetooth/hci_intel.c | 561 ++++
+ drivers/bluetooth/hci_ldisc.c | 14 +-
+ drivers/bluetooth/hci_qca.c | 969 ++++++
+ drivers/bluetooth/hci_uart.h | 13 +-
+ drivers/infiniband/hw/mlx4/cq.c | 2 +-
+ drivers/isdn/mISDN/dsp_audio.c | 22 +-
+ drivers/net/Kconfig | 19 +-
+ drivers/net/Makefile | 3 +
+ drivers/net/bonding/bond_3ad.c | 2 -
+ drivers/net/bonding/bond_main.c | 5 +-
+ drivers/net/bonding/bond_netlink.c | 17 +-
+ drivers/net/bonding/bond_options.c | 7 +
+ drivers/net/bonding/bond_sysfs.c | 20 +-
+ drivers/net/caif/caif_hsi.c | 2 +-
+ drivers/net/caif/caif_serial.c | 2 +-
+ drivers/net/caif/caif_spi.c | 2 +-
+ drivers/net/can/flexcan.c | 2 +-
+ drivers/net/can/usb/gs_usb.c | 8 +-
+ drivers/net/dsa/Kconfig | 6 +-
+ drivers/net/dsa/bcm_sf2.c | 18 +-
+ drivers/net/dsa/mv88e6171.c | 6 +-
+ drivers/net/dsa/mv88e6352.c | 114 +-
+ drivers/net/dsa/mv88e6xxx.c | 926 +++++-
+ drivers/net/dsa/mv88e6xxx.h | 87 +-
+ drivers/net/dummy.c | 3 +-
+ drivers/net/ethernet/3com/3c59x.c | 23 +-
+ drivers/net/ethernet/Kconfig | 1 +
+ drivers/net/ethernet/Makefile | 1 +
+ drivers/net/ethernet/allwinner/sun4i-emac.c | 13 +-
+ drivers/net/ethernet/altera/altera_sgdma.c | 8 +-
+ drivers/net/ethernet/altera/altera_sgdmahw.h | 1 +
+ drivers/net/ethernet/altera/altera_tse.h | 1 -
+ drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 16 +-
+ drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 312 +-
+ drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 12 +
+ drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 8 +-
+ drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h | 2 +
+ drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 10 +
+ drivers/net/ethernet/broadcom/Kconfig | 10 +
+ drivers/net/ethernet/broadcom/bcmsysport.c | 18 +
+ drivers/net/ethernet/broadcom/bgmac.c | 28 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 63 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 100 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 71 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 12 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h | 10 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h | 10 +-
+ .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 22 +-
+ .../net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h | 6 +-
+ .../ethernet/broadcom/bnx2x/bnx2x_fw_file_hdr.h | 2 +
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 204 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h | 4 +-
+ .../net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h | 4 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 254 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | 10 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 587 +++-
+ .../net/ethernet/broadcom/bnx2x/bnx2x_mfw_req.h | 4 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 79 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 325 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 77 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 358 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 58 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 4 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h | 4 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 212 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h | 37 +-
+ drivers/net/ethernet/broadcom/cnic.c | 36 +-
+ drivers/net/ethernet/broadcom/cnic_if.h | 21 +-
+ drivers/net/ethernet/broadcom/genet/bcmgenet.c | 79 +-
+ drivers/net/ethernet/broadcom/genet/bcmgenet.h | 5 +-
+ drivers/net/ethernet/broadcom/genet/bcmmii.c | 111 +-
+ drivers/net/ethernet/cadence/macb.c | 6 +-
+ drivers/net/ethernet/cadence/macb.h | 2 +-
+ drivers/net/ethernet/cavium/Kconfig | 2 +
+ drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 134 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 9 +
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c | 42 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 775 ++++-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 14 +
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 83 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 10 +-
+ drivers/net/ethernet/chelsio/cxgb4/l2t.c | 94 +-
+ drivers/net/ethernet/chelsio/cxgb4/l2t.h | 18 +-
+ drivers/net/ethernet/chelsio/cxgb4/sge.c | 23 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 290 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.h | 1 -
+ drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 3 +
+ drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 18 +
+ drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 197 +-
+ drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 30 +-
+ drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 3 +-
+ drivers/net/ethernet/cisco/enic/enic.h | 21 +-
+ drivers/net/ethernet/cisco/enic/enic_ethtool.c | 113 +-
+ drivers/net/ethernet/cisco/enic/enic_main.c | 142 +-
+ drivers/net/ethernet/cisco/enic/vnic_cq.c | 3 +-
+ drivers/net/ethernet/cisco/enic/vnic_dev.c | 277 +-
+ drivers/net/ethernet/cisco/enic/vnic_dev.h | 44 +-
+ drivers/net/ethernet/cisco/enic/vnic_devcmd.h | 28 +
+ drivers/net/ethernet/cisco/enic/vnic_intr.c | 3 +-
+ drivers/net/ethernet/cisco/enic/vnic_resource.h | 7 +
+ drivers/net/ethernet/cisco/enic/vnic_rq.c | 6 +-
+ drivers/net/ethernet/cisco/enic/vnic_wq.c | 33 +-
+ drivers/net/ethernet/cisco/enic/vnic_wq.h | 18 +
+ drivers/net/ethernet/ec_bhf.c | 14 +-
+ drivers/net/ethernet/emulex/benet/be.h | 7 +-
+ drivers/net/ethernet/emulex/benet/be_cmds.c | 71 +-
+ drivers/net/ethernet/emulex/benet/be_cmds.h | 11 +-
+ drivers/net/ethernet/emulex/benet/be_ethtool.c | 17 +-
+ drivers/net/ethernet/emulex/benet/be_main.c | 69 +-
+ drivers/net/ethernet/ezchip/nps_enet.c | 37 +-
+ drivers/net/ethernet/ezchip/nps_enet.h | 20 -
+ drivers/net/ethernet/freescale/fec_main.c | 41 +-
+ drivers/net/ethernet/freescale/fec_ptp.c | 6 -
+ drivers/net/ethernet/freescale/gianfar.c | 502 +--
+ drivers/net/ethernet/freescale/gianfar.h | 77 +-
+ drivers/net/ethernet/freescale/gianfar_ethtool.c | 4 +-
+ drivers/net/ethernet/hisilicon/hip04_eth.c | 1 -
+ drivers/net/ethernet/hisilicon/hip04_mdio.c | 1 -
+ drivers/net/ethernet/ibm/ibmveth.c | 145 +-
+ drivers/net/ethernet/ibm/ibmveth.h | 18 +-
+ drivers/net/ethernet/intel/e100.c | 12 +-
+ drivers/net/ethernet/intel/e1000e/ich8lan.h | 4 +-
+ drivers/net/ethernet/intel/e1000e/netdev.c | 89 +-
+ drivers/net/ethernet/intel/e1000e/regs.h | 5 +-
+ drivers/net/ethernet/intel/i40e/i40e.h | 73 +-
+ drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 72 +-
+ drivers/net/ethernet/intel/i40e/i40e_common.c | 407 ++-
+ drivers/net/ethernet/intel/i40e/i40e_dcb.c | 4 +
+ drivers/net/ethernet/intel/i40e/i40e_dcb.h | 8 +-
+ drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c | 2 +-
+ drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 10 +-
+ drivers/net/ethernet/intel/i40e/i40e_diag.c | 11 +-
+ drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 151 +-
+ drivers/net/ethernet/intel/i40e/i40e_fcoe.c | 12 +-
+ drivers/net/ethernet/intel/i40e/i40e_fcoe.h | 4 +-
+ drivers/net/ethernet/intel/i40e/i40e_hmc.c | 67 +-
+ drivers/net/ethernet/intel/i40e/i40e_hmc.h | 10 +-
+ drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 18 +-
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 759 +++--
+ drivers/net/ethernet/intel/i40e/i40e_nvm.c | 135 +-
+ drivers/net/ethernet/intel/i40e/i40e_prototype.h | 13 +
+ drivers/net/ethernet/intel/i40e/i40e_ptp.c | 7 +-
+ drivers/net/ethernet/intel/i40e/i40e_register.h | 1938 ++++++++++-
+ drivers/net/ethernet/intel/i40e/i40e_txrx.c | 259 +-
+ drivers/net/ethernet/intel/i40e/i40e_txrx.h | 60 +-
+ drivers/net/ethernet/intel/i40e/i40e_type.h | 85 +-
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl.h | 17 +-
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 91 +-
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 5 +
+ drivers/net/ethernet/intel/i40evf/i40e_adminq.c | 17 +-
+ .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 67 +-
+ drivers/net/ethernet/intel/i40evf/i40e_common.c | 380 ++-
+ drivers/net/ethernet/intel/i40evf/i40e_hmc.h | 10 +-
+ drivers/net/ethernet/intel/i40evf/i40e_prototype.h | 13 +
+ drivers/net/ethernet/intel/i40evf/i40e_register.h | 3155 +-----------------
+ drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 199 +-
+ drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 58 +-
+ drivers/net/ethernet/intel/i40evf/i40e_type.h | 81 +-
+ drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h | 17 +-
+ drivers/net/ethernet/intel/i40evf/i40evf.h | 61 +-
+ drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 44 +-
+ drivers/net/ethernet/intel/i40evf/i40evf_main.c | 350 +-
+ .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 51 +-
+ drivers/net/ethernet/intel/igb/e1000_82575.c | 38 +-
+ drivers/net/ethernet/intel/igb/e1000_defines.h | 5 +
+ drivers/net/ethernet/intel/igb/e1000_phy.c | 109 +-
+ drivers/net/ethernet/intel/igb/e1000_phy.h | 1 +
+ drivers/net/ethernet/intel/igb/e1000_regs.h | 2 +
+ drivers/net/ethernet/intel/igb/igb.h | 1 +
+ drivers/net/ethernet/intel/igb/igb_ethtool.c | 30 +-
+ drivers/net/ethernet/intel/igb/igb_main.c | 136 +-
+ drivers/net/ethernet/intel/igb/igb_ptp.c | 72 +-
+ drivers/net/ethernet/intel/igbvf/netdev.c | 1 +
+ drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 2 -
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 8 -
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 28 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 18 +-
+ drivers/net/ethernet/intel/ixgbevf/defines.h | 12 +
+ drivers/net/ethernet/intel/ixgbevf/ethtool.c | 51 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 9 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 114 +-
+ drivers/net/ethernet/marvell/mvneta.c | 9 +-
+ drivers/net/ethernet/mellanox/Kconfig | 1 +
+ drivers/net/ethernet/mellanox/Makefile | 1 +
+ drivers/net/ethernet/mellanox/mlx4/en_cq.c | 5 +-
+ drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 51 +-
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 46 +
+ drivers/net/ethernet/mellanox/mlx4/en_rx.c | 30 +-
+ drivers/net/ethernet/mellanox/mlx4/en_tx.c | 13 +-
+ drivers/net/ethernet/mellanox/mlx4/fw.c | 82 +
+ drivers/net/ethernet/mellanox/mlx4/fw.h | 1 +
+ drivers/net/ethernet/mellanox/mlx4/main.c | 45 +-
+ drivers/net/ethernet/mellanox/mlx4/mlx4.h | 3 +
+ drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 1 +
+ drivers/net/ethernet/mellanox/mlx5/core/alloc.c | 48 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en.h | 172 +-
+ .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 259 +-
+ .../ethernet/mellanox/mlx5/core/en_flow_table.c | 371 ++-
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1017 ++++--
+ drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 46 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 36 +-
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 32 +-
+ .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 7 +-
+ drivers/net/ethernet/mellanox/mlx5/core/port.c | 56 +-
+ drivers/net/ethernet/mellanox/mlx5/core/transobj.c | 53 +
+ drivers/net/ethernet/mellanox/mlx5/core/transobj.h | 8 +
+ drivers/net/ethernet/mellanox/mlx5/core/uar.c | 6 +
+ drivers/net/ethernet/mellanox/mlx5/core/wq.c | 12 +-
+ drivers/net/ethernet/mellanox/mlx5/core/wq.h | 3 +-
+ drivers/net/ethernet/mellanox/mlxsw/Kconfig | 32 +
+ drivers/net/ethernet/mellanox/mlxsw/Makefile | 6 +
+ drivers/net/ethernet/mellanox/mlxsw/cmd.h | 1090 ++++++
+ drivers/net/ethernet/mellanox/mlxsw/core.c | 1295 ++++++++
+ drivers/net/ethernet/mellanox/mlxsw/core.h | 207 ++
+ drivers/net/ethernet/mellanox/mlxsw/emad.h | 127 +
+ drivers/net/ethernet/mellanox/mlxsw/item.h | 405 +++
+ drivers/net/ethernet/mellanox/mlxsw/pci.c | 1826 ++++++++++
+ drivers/net/ethernet/mellanox/mlxsw/pci.h | 227 ++
+ drivers/net/ethernet/mellanox/mlxsw/port.h | 75 +
+ drivers/net/ethernet/mellanox/mlxsw/reg.h | 1349 ++++++++
+ drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 1568 +++++++++
+ drivers/net/ethernet/mellanox/mlxsw/trap.h | 66 +
+ drivers/net/ethernet/mellanox/mlxsw/txheader.h | 80 +
+ drivers/net/ethernet/neterion/s2io.c | 26 +-
+ drivers/net/ethernet/neterion/s2io.h | 2 -
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 19 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 31 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 2 +
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 4 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 6 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h | 1 +
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 15 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | 41 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h | 3 +-
+ .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 3 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c | 3 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 7 +-
+ drivers/net/ethernet/realtek/r8169.c | 163 +-
+ drivers/net/ethernet/renesas/ravb.h | 5 +-
+ drivers/net/ethernet/renesas/ravb_main.c | 116 +-
+ drivers/net/ethernet/rocker/rocker.c | 212 +-
+ drivers/net/ethernet/rocker/rocker.h | 2 +
+ drivers/net/ethernet/sfc/ef10.c | 519 ++-
+ drivers/net/ethernet/sfc/mcdi.c | 28 +-
+ drivers/net/ethernet/sfc/mcdi.h | 3 +-
+ drivers/net/ethernet/sfc/mcdi_pcol.h | 3463 ++++++++++++++-----
+ drivers/net/ethernet/sfc/net_driver.h | 2 +
+ drivers/net/ethernet/sfc/nic.h | 2 +
+ drivers/net/ethernet/sfc/selftest.c | 14 +-
+ drivers/net/ethernet/sfc/siena.c | 6 +-
+ drivers/net/ethernet/smsc/smc9194.c | 32 +-
+ drivers/net/ethernet/smsc/smsc911x.c | 60 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-generic.c | 42 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 50 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-lpc18xx.c | 59 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c | 31 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 73 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 78 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 83 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 95 +-
+ .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 138 +-
+ .../net/ethernet/stmicro/stmmac/stmmac_platform.h | 9 +-
+ drivers/net/ethernet/synopsys/Kconfig | 27 +
+ drivers/net/ethernet/synopsys/Makefile | 5 +
+ drivers/net/ethernet/synopsys/dwc_eth_qos.c | 3019 +++++++++++++++++
+ drivers/net/ethernet/ti/cpsw.c | 156 +-
+ drivers/net/ethernet/ti/davinci_emac.c | 4 +-
+ drivers/net/ethernet/ti/netcp_core.c | 16 +-
+ drivers/net/ethernet/ti/netcp_ethss.c | 401 ++-
+ drivers/net/fddi/skfp/h/hwmtm.h | 9 -
+ drivers/net/fjes/Makefile | 30 +
+ drivers/net/fjes/fjes.h | 77 +
+ drivers/net/fjes/fjes_ethtool.c | 137 +
+ drivers/net/fjes/fjes_hw.c | 1125 +++++++
+ drivers/net/fjes/fjes_hw.h | 334 ++
+ drivers/net/fjes/fjes_main.c | 1383 ++++++++
+ drivers/net/fjes/fjes_regs.h | 142 +
+ drivers/net/geneve.c | 739 ++++-
+ drivers/net/hyperv/hyperv_net.h | 33 +
+ drivers/net/hyperv/netvsc.c | 43 +-
+ drivers/net/hyperv/netvsc_drv.c | 164 +-
+ drivers/net/hyperv/rndis_filter.c | 37 +-
+ drivers/net/ieee802154/at86rf230.c | 56 +-
+ drivers/net/ieee802154/cc2520.c | 2 +-
+ drivers/net/ieee802154/mrf24j40.c | 1 -
+ drivers/net/ifb.c | 207 +-
+ drivers/net/ipvlan/ipvlan_main.c | 3 +-
+ drivers/net/loopback.c | 3 +-
+ drivers/net/macvlan.c | 1 +
+ drivers/net/nlmon.c | 2 +-
+ drivers/net/phy/Kconfig | 20 +-
+ drivers/net/phy/Makefile | 2 +
+ drivers/net/phy/aquantia.c | 201 ++
+ drivers/net/phy/dp83640.c | 10 +-
+ drivers/net/phy/dp83867.c | 6 +-
+ drivers/net/phy/fixed_phy.c | 8 +-
+ drivers/net/phy/marvell.c | 53 +-
+ drivers/net/phy/mdio-octeon.c | 136 +-
+ drivers/net/phy/phy.c | 3 +
+ drivers/net/phy/realtek.c | 14 +
+ drivers/net/phy/spi_ks8995.c | 22 -
+ drivers/net/phy/teranetics.c | 135 +
+ drivers/net/ppp/ppp_generic.c | 17 +-
+ drivers/net/team/team.c | 2 +-
+ drivers/net/tun.c | 1 +
+ drivers/net/usb/Kconfig | 10 +
+ drivers/net/usb/Makefile | 1 +
+ drivers/net/usb/lan78xx.c | 3495 ++++++++++++++++++++
+ drivers/net/usb/lan78xx.h | 1069 ++++++
+ drivers/net/usb/qmi_wwan.c | 1 +
+ drivers/net/usb/r8152.c | 23 +-
+ drivers/net/veth.c | 2 +
+ drivers/net/virtio_net.c | 30 +-
+ drivers/net/vrf.c | 668 ++++
+ drivers/net/vxlan.c | 727 ++--
+ drivers/net/wan/hdlc_fr.c | 2 +-
+ drivers/net/wireless/ath/ath10k/Makefile | 3 +-
+ drivers/net/wireless/ath/ath10k/bmi.h | 2 +-
+ drivers/net/wireless/ath/ath10k/ce.c | 1 +
+ drivers/net/wireless/ath/ath10k/ce.h | 17 +-
+ drivers/net/wireless/ath/ath10k/core.c | 183 +-
+ drivers/net/wireless/ath/ath10k/core.h | 65 +-
+ drivers/net/wireless/ath/ath10k/debug.c | 30 +-
+ drivers/net/wireless/ath/ath10k/htc.c | 4 +-
+ drivers/net/wireless/ath/ath10k/htt.c | 66 +-
+ drivers/net/wireless/ath/ath10k/htt.h | 89 +-
+ drivers/net/wireless/ath/ath10k/htt_rx.c | 49 +-
+ drivers/net/wireless/ath/ath10k/htt_tx.c | 145 +-
+ drivers/net/wireless/ath/ath10k/hw.c | 90 +-
+ drivers/net/wireless/ath/ath10k/hw.h | 135 +-
+ drivers/net/wireless/ath/ath10k/mac.c | 376 ++-
+ drivers/net/wireless/ath/ath10k/mac.h | 6 +-
+ drivers/net/wireless/ath/ath10k/pci.c | 236 +-
+ drivers/net/wireless/ath/ath10k/pci.h | 13 +-
+ drivers/net/wireless/ath/ath10k/rx_desc.h | 173 +-
+ drivers/net/wireless/ath/ath10k/spectral.c | 18 +-
+ drivers/net/wireless/ath/ath10k/spectral.h | 4 +-
+ drivers/net/wireless/ath/ath10k/swap.c | 208 ++
+ drivers/net/wireless/ath/ath10k/swap.h | 72 +
+ drivers/net/wireless/ath/ath10k/targaddrs.h | 3 +
+ drivers/net/wireless/ath/ath10k/txrx.c | 23 +-
+ drivers/net/wireless/ath/ath10k/wmi-ops.h | 32 +-
+ drivers/net/wireless/ath/ath10k/wmi-tlv.c | 169 +-
+ drivers/net/wireless/ath/ath10k/wmi.c | 1350 +++++++-
+ drivers/net/wireless/ath/ath10k/wmi.h | 1024 +++++-
+ drivers/net/wireless/ath/ath10k/wow.c | 20 +-
+ drivers/net/wireless/ath/ath5k/Kconfig | 1 -
+ drivers/net/wireless/ath/ath5k/ani.c | 4 +-
+ drivers/net/wireless/ath/ath5k/ath5k.h | 4 +-
+ drivers/net/wireless/ath/ath5k/base.c | 4 +-
+ drivers/net/wireless/ath/ath5k/debug.c | 2 +-
+ drivers/net/wireless/ath/ath6kl/htc.h | 2 +-
+ drivers/net/wireless/ath/ath9k/ar9003_phy.h | 25 +-
+ drivers/net/wireless/ath/ath9k/ath9k.h | 22 +-
+ drivers/net/wireless/ath/ath9k/channel.c | 23 +-
+ drivers/net/wireless/ath/ath9k/debug.c | 2 +
+ drivers/net/wireless/ath/ath9k/debug.h | 2 +
+ drivers/net/wireless/ath/ath9k/debug_sta.c | 20 +-
+ drivers/net/wireless/ath/ath9k/dfs.c | 170 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_init.c | 2 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_main.c | 13 +-
+ drivers/net/wireless/ath/ath9k/htc_hst.c | 9 +-
+ drivers/net/wireless/ath/ath9k/hw.c | 1 +
+ drivers/net/wireless/ath/ath9k/init.c | 8 +-
+ drivers/net/wireless/ath/ath9k/link.c | 2 +-
+ drivers/net/wireless/ath/ath9k/main.c | 11 +-
+ drivers/net/wireless/ath/ath9k/recv.c | 7 +-
+ drivers/net/wireless/ath/ath9k/wmi.c | 3 +-
+ drivers/net/wireless/ath/ath9k/xmit.c | 156 +-
+ drivers/net/wireless/ath/debug.c | 2 +
+ drivers/net/wireless/ath/dfs_pri_detector.c | 2 +-
+ drivers/net/wireless/ath/wil6210/Makefile | 1 +
+ drivers/net/wireless/ath/wil6210/boot_loader.h | 61 +
+ drivers/net/wireless/ath/wil6210/cfg80211.c | 244 +-
+ drivers/net/wireless/ath/wil6210/debugfs.c | 16 +-
+ drivers/net/wireless/ath/wil6210/ethtool.c | 14 +-
+ drivers/net/wireless/ath/wil6210/fw.c | 10 -
+ drivers/net/wireless/ath/wil6210/fw_inc.c | 16 +-
+ drivers/net/wireless/ath/wil6210/interrupt.c | 165 +-
+ drivers/net/wireless/ath/wil6210/ioctl.c | 4 +-
+ drivers/net/wireless/ath/wil6210/main.c | 198 +-
+ drivers/net/wireless/ath/wil6210/netdev.c | 5 +-
+ drivers/net/wireless/ath/wil6210/pcie_bus.c | 127 +-
+ drivers/net/wireless/ath/wil6210/pm.c | 98 +
+ drivers/net/wireless/ath/wil6210/rx_reorder.c | 6 +
+ drivers/net/wireless/ath/wil6210/txrx.c | 383 ++-
+ drivers/net/wireless/ath/wil6210/txrx.h | 8 +
+ drivers/net/wireless/ath/wil6210/wil6210.h | 64 +-
+ drivers/net/wireless/ath/wil6210/wil_platform.c | 2 +-
+ drivers/net/wireless/ath/wil6210/wmi.c | 132 +-
+ drivers/net/wireless/b43/lo.c | 4 +-
+ drivers/net/wireless/b43/lo.h | 2 +-
+ drivers/net/wireless/b43/phy_g.c | 2 +-
+ drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 216 +-
+ drivers/net/wireless/brcm80211/brcmfmac/core.h | 3 +
+ drivers/net/wireless/brcm80211/brcmfmac/firmware.c | 39 +-
+ drivers/net/wireless/brcm80211/brcmfmac/flowring.c | 10 +-
+ drivers/net/wireless/brcm80211/brcmfmac/fweh.h | 10 +-
+ drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c | 56 +
+ drivers/net/wireless/brcm80211/brcmfmac/sdio.c | 13 +-
+ .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 4 +-
+ drivers/net/wireless/cw1200/cw1200_spi.c | 1 -
+ drivers/net/wireless/hostap/hostap_main.c | 4 +-
+ drivers/net/wireless/ipw2x00/ipw2100.c | 2 +-
+ drivers/net/wireless/iwlegacy/3945-mac.c | 2 +-
+ drivers/net/wireless/iwlegacy/debug.c | 8 +-
+ drivers/net/wireless/iwlwifi/dvm/agn.h | 21 +-
+ drivers/net/wireless/iwlwifi/dvm/debugfs.c | 8 +-
+ drivers/net/wireless/iwlwifi/dvm/dev.h | 7 +-
+ drivers/net/wireless/iwlwifi/dvm/lib.c | 8 +-
+ drivers/net/wireless/iwlwifi/dvm/mac80211.c | 14 +-
+ drivers/net/wireless/iwlwifi/dvm/main.c | 12 -
+ drivers/net/wireless/iwlwifi/dvm/rs.c | 51 +-
+ drivers/net/wireless/iwlwifi/dvm/rx.c | 109 +-
+ drivers/net/wireless/iwlwifi/dvm/rxon.c | 3 +-
+ drivers/net/wireless/iwlwifi/dvm/scan.c | 25 +-
+ drivers/net/wireless/iwlwifi/dvm/sta.c | 111 +-
+ drivers/net/wireless/iwlwifi/dvm/tx.c | 18 +-
+ drivers/net/wireless/iwlwifi/dvm/ucode.c | 5 +-
+ drivers/net/wireless/iwlwifi/iwl-7000.c | 4 +-
+ drivers/net/wireless/iwlwifi/iwl-8000.c | 12 +-
+ drivers/net/wireless/iwlwifi/iwl-config.h | 2 +
+ drivers/net/wireless/iwlwifi/iwl-csr.h | 3 +
+ drivers/net/wireless/iwlwifi/iwl-devtrace-data.h | 7 +-
+ .../net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h | 14 +-
+ drivers/net/wireless/iwlwifi/iwl-drv.c | 72 +-
+ drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c | 4 +-
+ drivers/net/wireless/iwlwifi/iwl-fh.h | 6 -
+ drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h | 17 +
+ drivers/net/wireless/iwlwifi/iwl-fw-file.h | 53 +-
+ drivers/net/wireless/iwlwifi/iwl-fw.h | 68 +
+ drivers/net/wireless/iwlwifi/iwl-notif-wait.c | 8 +-
+ drivers/net/wireless/iwlwifi/iwl-notif-wait.h | 5 +-
+ drivers/net/wireless/iwlwifi/iwl-op-mode.h | 32 +-
+ drivers/net/wireless/iwlwifi/iwl-prph.h | 12 +
+ drivers/net/wireless/iwlwifi/iwl-trans.h | 125 +-
+ drivers/net/wireless/iwlwifi/mvm/Makefile | 1 +
+ drivers/net/wireless/iwlwifi/mvm/coex.c | 44 +-
+ drivers/net/wireless/iwlwifi/mvm/coex_legacy.c | 31 +-
+ drivers/net/wireless/iwlwifi/mvm/constants.h | 1 +
+ drivers/net/wireless/iwlwifi/mvm/d3.c | 74 +-
+ drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c | 751 +++++
+ drivers/net/wireless/iwlwifi/mvm/debugfs.c | 14 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h | 7 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 31 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 147 -
+ drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h | 4 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-tof.h | 386 +++
+ drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h | 12 +
+ drivers/net/wireless/iwlwifi/mvm/fw-api.h | 86 +-
+ drivers/net/wireless/iwlwifi/mvm/fw.c | 389 ++-
+ drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 13 +-
+ drivers/net/wireless/iwlwifi/mvm/mac80211.c | 78 +-
+ drivers/net/wireless/iwlwifi/mvm/mvm.h | 154 +-
+ drivers/net/wireless/iwlwifi/mvm/nvm.c | 23 +-
+ drivers/net/wireless/iwlwifi/mvm/ops.c | 114 +-
+ drivers/net/wireless/iwlwifi/mvm/power.c | 46 +-
+ drivers/net/wireless/iwlwifi/mvm/rs.c | 160 +-
+ drivers/net/wireless/iwlwifi/mvm/rs.h | 10 +
+ drivers/net/wireless/iwlwifi/mvm/rx.c | 43 +-
+ drivers/net/wireless/iwlwifi/mvm/scan.c | 319 +-
+ drivers/net/wireless/iwlwifi/mvm/sta.c | 43 +-
+ drivers/net/wireless/iwlwifi/mvm/sta.h | 5 +-
+ drivers/net/wireless/iwlwifi/mvm/tdls.c | 33 +-
+ drivers/net/wireless/iwlwifi/mvm/time-event.c | 14 +-
+ drivers/net/wireless/iwlwifi/mvm/time-event.h | 5 +-
+ drivers/net/wireless/iwlwifi/mvm/tof.c | 304 ++
+ drivers/net/wireless/iwlwifi/mvm/tof.h | 94 +
+ drivers/net/wireless/iwlwifi/mvm/tt.c | 13 +-
+ drivers/net/wireless/iwlwifi/mvm/tx.c | 94 +-
+ drivers/net/wireless/iwlwifi/mvm/utils.c | 13 +-
+ drivers/net/wireless/iwlwifi/pcie/drv.c | 17 +-
+ drivers/net/wireless/iwlwifi/pcie/internal.h | 64 +-
+ drivers/net/wireless/iwlwifi/pcie/rx.c | 496 ++-
+ drivers/net/wireless/iwlwifi/pcie/trans.c | 414 ++-
+ drivers/net/wireless/iwlwifi/pcie/tx.c | 135 +-
+ drivers/net/wireless/mac80211_hwsim.c | 7 +-
+ drivers/net/wireless/mediatek/mt7601u/dma.c | 34 +-
+ drivers/net/wireless/mediatek/mt7601u/init.c | 2 +
+ drivers/net/wireless/mediatek/mt7601u/mac.c | 4 +
+ drivers/net/wireless/mediatek/mt7601u/mt7601u.h | 10 +-
+ drivers/net/wireless/mediatek/mt7601u/tx.c | 3 +
+ drivers/net/wireless/mediatek/mt7601u/usb.c | 63 +-
+ drivers/net/wireless/mediatek/mt7601u/usb.h | 2 +
+ drivers/net/wireless/mwifiex/Kconfig | 12 +-
+ drivers/net/wireless/mwifiex/cfg80211.c | 130 +-
+ drivers/net/wireless/mwifiex/cmdevt.c | 39 +-
+ drivers/net/wireless/mwifiex/decl.h | 3 +
+ drivers/net/wireless/mwifiex/fw.h | 95 +-
+ drivers/net/wireless/mwifiex/ie.c | 3 +
+ drivers/net/wireless/mwifiex/init.c | 10 +-
+ drivers/net/wireless/mwifiex/join.c | 2 +
+ drivers/net/wireless/mwifiex/main.c | 63 +-
+ drivers/net/wireless/mwifiex/main.h | 40 +
+ drivers/net/wireless/mwifiex/pcie.c | 14 +-
+ drivers/net/wireless/mwifiex/pcie.h | 45 +-
+ drivers/net/wireless/mwifiex/scan.c | 157 +-
+ drivers/net/wireless/mwifiex/sdio.c | 207 +-
+ drivers/net/wireless/mwifiex/sdio.h | 77 +
+ drivers/net/wireless/mwifiex/sta_cmd.c | 90 +-
+ drivers/net/wireless/mwifiex/sta_cmdresp.c | 7 +-
+ drivers/net/wireless/mwifiex/sta_event.c | 207 +-
+ drivers/net/wireless/mwifiex/sta_ioctl.c | 4 +-
+ drivers/net/wireless/mwifiex/tdls.c | 80 +-
+ drivers/net/wireless/mwifiex/txrx.c | 22 +-
+ drivers/net/wireless/mwifiex/uap_cmd.c | 7 +-
+ drivers/net/wireless/mwifiex/uap_event.c | 15 +
+ drivers/net/wireless/mwifiex/usb.c | 24 +-
+ drivers/net/wireless/mwifiex/usb.h | 3 +
+ drivers/net/wireless/mwifiex/util.c | 75 +-
+ drivers/net/wireless/mwifiex/wmm.c | 156 +-
+ drivers/net/wireless/mwifiex/wmm.h | 8 +
+ drivers/net/wireless/mwl8k.c | 49 +-
+ drivers/net/wireless/orinoco/main.c | 2 -
+ drivers/net/wireless/orinoco/orinoco_cs.c | 1 +
+ drivers/net/wireless/orinoco/orinoco_nortel.c | 5 +-
+ drivers/net/wireless/orinoco/orinoco_pci.c | 5 +-
+ drivers/net/wireless/orinoco/orinoco_plx.c | 5 +-
+ drivers/net/wireless/orinoco/orinoco_usb.c | 2 +
+ drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 8 +-
+ drivers/net/wireless/rsi/rsi_91x_usb_ops.c | 8 +-
+ drivers/net/wireless/rt2x00/Kconfig | 1 -
+ drivers/net/wireless/rt2x00/rt2500usb.h | 2 +-
+ drivers/net/wireless/rt2x00/rt2x00.h | 6 +-
+ drivers/net/wireless/rt2x00/rt2x00link.c | 18 +-
+ drivers/net/wireless/rtlwifi/rtl8188ee/fw.c | 10 +-
+ drivers/net/wireless/rtlwifi/rtl8188ee/fw.h | 21 +-
+ drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 11 +-
+ drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 12 +-
+ drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h | 19 -
+ drivers/net/wireless/rtlwifi/rtl8192cu/def.h | 9 -
+ drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 110 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 105 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/mac.h | 10 -
+ drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 1 +
+ drivers/net/wireless/rtlwifi/rtl8192de/dm.c | 2 +-
+ drivers/net/wireless/rtlwifi/rtl8192de/fw.h | 22 -
+ drivers/net/wireless/rtlwifi/rtl8192de/phy.c | 4 +-
+ drivers/net/wireless/rtlwifi/rtl8192ee/fw.c | 12 +-
+ drivers/net/wireless/rtlwifi/rtl8192ee/fw.h | 21 +-
+ drivers/net/wireless/rtlwifi/rtl8192ee/phy.c | 6 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/sw.c | 4 +-
+ drivers/net/wireless/rtlwifi/rtl8723be/sw.c | 4 +-
+ .../net/wireless/rtlwifi/rtl8723com/fw_common.c | 10 +-
+ .../net/wireless/rtlwifi/rtl8723com/fw_common.h | 19 -
+ drivers/net/wireless/rtlwifi/rtl8821ae/fw.c | 14 +-
+ drivers/net/wireless/rtlwifi/rtl8821ae/fw.h | 23 +-
+ drivers/net/wireless/rtlwifi/rtl8821ae/hw.c | 2 +-
+ drivers/net/wireless/rtlwifi/rtl8821ae/reg.h | 1 +
+ drivers/net/wireless/rtlwifi/wifi.h | 25 +-
+ drivers/net/wireless/ti/wl12xx/scan.c | 6 +-
+ drivers/net/wireless/ti/wl18xx/acx.c | 27 +
+ drivers/net/wireless/ti/wl18xx/acx.h | 138 +-
+ drivers/net/wireless/ti/wl18xx/debugfs.c | 230 +-
+ drivers/net/wireless/ti/wl18xx/event.c | 13 +
+ drivers/net/wireless/ti/wl18xx/event.h | 12 +-
+ drivers/net/wireless/ti/wl18xx/main.c | 59 +-
+ drivers/net/wireless/ti/wl18xx/scan.c | 23 +-
+ drivers/net/wireless/ti/wl18xx/scan.h | 4 +-
+ drivers/net/wireless/ti/wlcore/cmd.c | 56 +-
+ drivers/net/wireless/ti/wlcore/cmd.h | 15 +
+ drivers/net/wireless/ti/wlcore/conf.h | 11 +-
+ drivers/net/wireless/ti/wlcore/init.c | 2 +-
+ drivers/net/wireless/ti/wlcore/init.h | 1 +
+ drivers/net/wireless/ti/wlcore/main.c | 69 +-
+ drivers/net/wireless/ti/wlcore/rx.c | 9 +-
+ drivers/net/wireless/ti/wlcore/rx.h | 3 +
+ drivers/net/wireless/ti/wlcore/scan.h | 6 +
+ drivers/net/wireless/ti/wlcore/sdio.c | 3 +-
+ drivers/net/wireless/ti/wlcore/wlcore.h | 3 +
+ drivers/net/wireless/ti/wlcore/wlcore_i.h | 5 +
+ drivers/net/xen-netback/common.h | 3 -
+ drivers/net/xen-netfront.c | 5 +-
+ drivers/nfc/Kconfig | 1 +
+ drivers/nfc/Makefile | 1 +
+ drivers/nfc/s3fwrn5/Kconfig | 19 +
+ drivers/nfc/s3fwrn5/Makefile | 11 +
+ drivers/nfc/s3fwrn5/core.c | 219 ++
+ drivers/nfc/s3fwrn5/firmware.c | 511 +++
+ drivers/nfc/s3fwrn5/firmware.h | 111 +
+ drivers/nfc/s3fwrn5/i2c.c | 306 ++
+ drivers/nfc/s3fwrn5/nci.c | 165 +
+ drivers/nfc/s3fwrn5/nci.h | 89 +
+ drivers/nfc/s3fwrn5/s3fwrn5.h | 99 +
+ drivers/nfc/st-nci/Kconfig | 11 +
+ drivers/nfc/st-nci/Makefile | 3 +
+ drivers/nfc/st-nci/i2c.c | 23 +-
+ drivers/nfc/st-nci/ndlc.c | 7 +-
+ drivers/nfc/st-nci/spi.c | 392 +++
+ drivers/nfc/st-nci/st-nci_se.c | 8 +-
+ drivers/nfc/st21nfca/st21nfca.c | 11 +-
+ drivers/nfc/trf7970a.c | 6 +-
+ drivers/of/of_mdio.c | 19 +-
+ drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 66 +
+ drivers/staging/wilc1000/linux_mon.c | 2 +-
+ include/linux/average.h | 61 +-
+ include/linux/bcma/bcma_driver_chipcommon.h | 1 -
+ include/linux/bpf.h | 12 +-
+ include/linux/etherdevice.h | 2 +-
+ include/linux/filter.h | 17 +-
+ include/linux/ieee80211.h | 2 +-
+ include/linux/ipv6.h | 5 +-
+ include/linux/mlx4/cq.h | 3 +-
+ include/linux/mlx4/device.h | 5 +
+ include/linux/mlx4/qp.h | 3 +-
+ include/linux/mlx5/device.h | 10 +
+ include/linux/mlx5/driver.h | 29 +-
+ include/linux/mlx5/mlx5_ifc.h | 24 +-
+ include/linux/mpls_iptunnel.h | 6 +
+ include/linux/net.h | 8 +
+ include/linux/netdevice.h | 176 +-
+ include/linux/netfilter.h | 42 +-
+ include/linux/netfilter/nfnetlink_acct.h | 3 +-
+ include/linux/netfilter/x_tables.h | 8 +-
+ include/linux/netfilter_bridge.h | 12 +-
+ include/linux/netfilter_ipv6.h | 18 +-
+ include/linux/perf_event.h | 10 +
+ include/linux/phy.h | 2 +
+ include/linux/platform_data/st_nci.h | 29 -
+ include/linux/property.h | 4 +
+ include/linux/skbuff.h | 56 +-
+ include/linux/stmmac.h | 22 -
+ include/net/6lowpan.h | 23 +
+ include/net/act_api.h | 16 +-
+ include/net/addrconf.h | 4 +-
+ include/net/bluetooth/hci_core.h | 31 +-
+ include/net/bluetooth/l2cap.h | 2 +
+ include/net/bond_options.h | 1 +
+ include/net/cfg80211.h | 3 +-
+ include/net/cfg802154.h | 10 +
+ include/net/checksum.h | 8 +-
+ include/net/cls_cgroup.h | 29 +
+ include/net/dsa.h | 33 +-
+ include/net/dst.h | 23 +-
+ include/net/dst_metadata.h | 112 +
+ include/net/fib_rules.h | 1 +
+ include/net/flow.h | 10 +
+ include/net/geneve.h | 35 +-
+ include/net/gre.h | 92 +-
+ include/net/inet_hashtables.h | 4 +-
+ include/net/inet_timewait_sock.h | 8 +-
+ include/net/inetpeer.h | 67 -
+ include/net/ip.h | 16 -
+ include/net/ip6_fib.h | 2 +
+ include/net/ip_fib.h | 5 +-
+ include/net/ip_tunnels.h | 145 +-
+ include/net/ipv6.h | 76 +-
+ include/net/lwtunnel.h | 175 +
+ include/net/mac80211.h | 69 +-
+ include/net/mac802154.h | 17 -
+ include/net/mpls_iptunnel.h | 29 +
+ include/net/ndisc.h | 3 +-
+ include/net/neighbour.h | 1 +
+ include/net/net_namespace.h | 3 +
+ include/net/netfilter/ipv4/nf_dup_ipv4.h | 7 +
+ include/net/netfilter/ipv6/nf_dup_ipv6.h | 7 +
+ include/net/netfilter/nf_conntrack.h | 10 +-
+ include/net/netfilter/nf_conntrack_core.h | 3 +-
+ include/net/netfilter/nf_conntrack_expect.h | 11 +-
+ include/net/netfilter/nf_conntrack_labels.h | 4 +
+ include/net/netfilter/nf_conntrack_zones.h | 99 +-
+ include/net/netfilter/nft_dup.h | 9 +
+ include/net/netns/ipv6.h | 1 +
+ include/net/netns/netfilter.h | 1 +
+ include/net/nfc/nci_core.h | 3 +
+ include/net/nfc/nfc.h | 41 +
+ include/net/nl802154.h | 4 +
+ include/net/pkt_sched.h | 4 +-
+ include/net/route.h | 7 +
+ include/net/rtnetlink.h | 1 +
+ include/net/sch_generic.h | 31 +-
+ include/net/sock.h | 18 +
+ include/net/switchdev.h | 10 +
+ include/net/tc_act/tc_bpf.h | 2 +-
+ include/net/tc_act/tc_gact.h | 7 +-
+ include/net/tc_act/tc_mirred.h | 2 +-
+ include/net/tcp.h | 22 +-
+ include/net/timewait_sock.h | 3 -
+ include/net/udp_tunnel.h | 4 +
+ include/net/vrf.h | 178 +
+ include/net/vxlan.h | 90 +-
+ include/net/xfrm.h | 7 +-
+ include/uapi/linux/Kbuild | 1 +
+ include/uapi/linux/bpf.h | 29 +
+ include/uapi/linux/ethtool.h | 5 +
+ include/uapi/linux/fib_rules.h | 2 +-
+ include/uapi/linux/if_bridge.h | 1 +
+ include/uapi/linux/if_link.h | 16 +
+ include/uapi/linux/if_packet.h | 3 +
+ include/uapi/linux/if_tunnel.h | 1 +
+ include/uapi/linux/ila.h | 15 +
+ include/uapi/linux/ipv6.h | 3 +
+ include/uapi/linux/lwtunnel.h | 47 +
+ include/uapi/linux/mpls.h | 2 +
+ include/uapi/linux/mpls_iptunnel.h | 28 +
+ include/uapi/linux/neighbour.h | 1 +
+ include/uapi/linux/netfilter/nf_conntrack_sctp.h | 2 +
+ include/uapi/linux/netfilter/nf_tables.h | 23 +
+ include/uapi/linux/netfilter/nfnetlink_conntrack.h | 1 +
+ include/uapi/linux/netfilter/nfnetlink_cttimeout.h | 2 +
+ include/uapi/linux/netfilter/xt_CT.h | 8 +-
+ include/uapi/linux/openvswitch.h | 60 +-
+ include/uapi/linux/rtnetlink.h | 2 +
+ include/uapi/linux/snmp.h | 2 +
+ kernel/bpf/arraymap.c | 137 +-
+ kernel/bpf/core.c | 9 +-
+ kernel/bpf/syscall.c | 2 +-
+ kernel/bpf/verifier.c | 54 +-
+ kernel/events/core.c | 78 +
+ kernel/trace/bpf_trace.c | 31 +
+ lib/Kconfig | 10 -
+ lib/Makefile | 2 -
+ lib/average.c | 64 -
+ lib/test_bpf.c | 817 ++++-
+ lib/test_rhashtable.c | 163 +-
+ net/6lowpan/Makefile | 2 +-
+ net/6lowpan/core.c | 40 +
+ net/6lowpan/iphc.c | 19 +-
+ net/8021q/vlan_dev.c | 3 +-
+ net/Kconfig | 7 +
+ net/atm/br2684.c | 9 +-
+ net/batman-adv/bat_iv_ogm.c | 102 +-
+ net/batman-adv/bitarray.c | 6 +-
+ net/batman-adv/bitarray.h | 10 +-
+ net/batman-adv/bridge_loop_avoidance.c | 78 +-
+ net/batman-adv/bridge_loop_avoidance.h | 8 +-
+ net/batman-adv/debugfs.h | 1 -
+ net/batman-adv/distributed-arp-table.c | 69 +-
+ net/batman-adv/distributed-arp-table.h | 8 +-
+ net/batman-adv/fragmentation.c | 13 +-
+ net/batman-adv/gateway_client.c | 33 +-
+ net/batman-adv/gateway_client.h | 2 +-
+ net/batman-adv/gateway_common.c | 67 +-
+ net/batman-adv/gateway_common.h | 1 -
+ net/batman-adv/hash.c | 6 +-
+ net/batman-adv/hash.h | 12 +-
+ net/batman-adv/icmp_socket.c | 6 +-
+ net/batman-adv/icmp_socket.h | 1 -
+ net/batman-adv/main.c | 84 +-
+ net/batman-adv/main.h | 48 +-
+ net/batman-adv/multicast.c | 114 +-
+ net/batman-adv/multicast.h | 2 -
+ net/batman-adv/network-coding.c | 62 +-
+ net/batman-adv/network-coding.h | 4 -
+ net/batman-adv/originator.c | 27 +-
+ net/batman-adv/originator.h | 11 +-
+ net/batman-adv/packet.h | 204 +-
+ net/batman-adv/routing.c | 24 +-
+ net/batman-adv/routing.h | 6 +-
+ net/batman-adv/send.c | 11 +-
+ net/batman-adv/send.h | 11 +-
+ net/batman-adv/soft-interface.c | 35 +-
+ net/batman-adv/soft-interface.h | 4 -
+ net/batman-adv/sysfs.c | 4 +-
+ net/batman-adv/sysfs.h | 2 -
+ net/batman-adv/translation-table.c | 315 +-
+ net/batman-adv/translation-table.h | 31 +-
+ net/batman-adv/types.h | 128 +-
+ net/bluetooth/6lowpan.c | 32 +-
+ net/bluetooth/Kconfig | 5 +
+ net/bluetooth/Makefile | 3 +-
+ net/bluetooth/a2mp.c | 17 +-
+ net/bluetooth/a2mp.h | 19 +
+ net/bluetooth/amp.c | 134 +-
+ net/bluetooth/amp.h | 14 +
+ net/bluetooth/cmtp/capi.c | 8 +-
+ net/bluetooth/hci_conn.c | 235 +-
+ net/bluetooth/hci_core.c | 44 +-
+ net/bluetooth/hci_event.c | 212 +-
+ net/bluetooth/hci_request.c | 6 +-
+ net/bluetooth/l2cap_core.c | 6 +-
+ net/bluetooth/l2cap_sock.c | 41 +-
+ net/bluetooth/mgmt.c | 38 +-
+ net/bridge/br_device.c | 4 +-
+ net/bridge/br_if.c | 1 +
+ net/bridge/br_mdb.c | 144 +-
+ net/bridge/br_multicast.c | 44 +-
+ net/bridge/br_netfilter_hooks.c | 20 +-
+ net/bridge/br_netfilter_ipv6.c | 2 +-
+ net/bridge/br_netlink.c | 52 +-
+ net/bridge/br_private.h | 21 +-
+ net/bridge/br_vlan.c | 53 +-
+ net/caif/caif_dev.c | 2 +-
+ net/core/Makefile | 1 +
+ net/core/dev.c | 61 +-
+ net/core/dst.c | 111 +-
+ net/core/fib_rules.c | 24 +-
+ net/core/filter.c | 153 +-
+ net/core/flow_dissector.c | 58 +-
+ net/core/lwtunnel.c | 249 ++
+ net/core/neighbour.c | 14 +-
+ net/core/net-sysfs.c | 31 +-
+ net/core/pktgen.c | 5 +-
+ net/core/rtnetlink.c | 42 +-
+ net/core/skbuff.c | 4 +-
+ net/core/sock.c | 2 +-
+ net/core/timestamping.c | 6 +-
+ net/core/utils.c | 17 +-
+ net/dsa/dsa.c | 52 +-
+ net/dsa/dsa_priv.h | 8 +-
+ net/dsa/slave.c | 394 ++-
+ net/dsa/tag_brcm.c | 15 +-
+ net/dsa/tag_dsa.c | 12 +-
+ net/dsa/tag_edsa.c | 12 +-
+ net/dsa/tag_trailer.c | 12 +-
+ net/ethernet/eth.c | 2 +-
+ net/hsr/hsr_device.c | 2 +-
+ net/ieee802154/6lowpan/6lowpan_i.h | 11 +-
+ net/ieee802154/6lowpan/core.c | 81 +-
+ net/ieee802154/6lowpan/rx.c | 45 +-
+ net/ieee802154/6lowpan/tx.c | 4 +-
+ net/ieee802154/nl802154.c | 33 +
+ net/ieee802154/rdev-ops.h | 33 +
+ net/ieee802154/sysfs.c | 38 +
+ net/ieee802154/trace.h | 41 +
+ net/ipv4/Kconfig | 14 -
+ net/ipv4/Makefile | 1 -
+ net/ipv4/af_inet.c | 8 +-
+ net/ipv4/ah4.c | 4 +-
+ net/ipv4/arp.c | 80 +-
+ net/ipv4/datagram.c | 2 +-
+ net/ipv4/fib_frontend.c | 73 +-
+ net/ipv4/fib_semantics.c | 158 +-
+ net/ipv4/fib_trie.c | 7 +-
+ net/ipv4/fou.c | 30 +-
+ net/ipv4/geneve_core.c | 447 ---
+ net/ipv4/gre_demux.c | 235 +-
+ net/ipv4/icmp.c | 10 +-
+ net/ipv4/inet_hashtables.c | 38 +-
+ net/ipv4/inet_timewait_sock.c | 55 +-
+ net/ipv4/ip_fragment.c | 44 +-
+ net/ipv4/ip_gre.c | 435 ++-
+ net/ipv4/ip_input.c | 3 +-
+ net/ipv4/ip_output.c | 7 +-
+ net/ipv4/ip_tunnel.c | 37 +-
+ net/ipv4/ip_tunnel_core.c | 232 ++
+ net/ipv4/ipconfig.c | 2 +-
+ net/ipv4/ipip.c | 2 +-
+ net/ipv4/netfilter/Kconfig | 12 +
+ net/ipv4/netfilter/Makefile | 3 +
+ net/ipv4/netfilter/arp_tables.c | 32 +-
+ net/ipv4/netfilter/ip_tables.c | 68 +-
+ net/ipv4/netfilter/ipt_ECN.c | 2 +-
+ net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 2 +-
+ net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 4 +-
+ net/ipv4/netfilter/nf_defrag_ipv4.c | 22 +-
+ net/ipv4/netfilter/nf_dup_ipv4.c | 120 +
+ net/ipv4/netfilter/nf_nat_l3proto_ipv4.c | 4 +-
+ net/ipv4/netfilter/nf_nat_proto_icmp.c | 2 +-
+ net/ipv4/netfilter/nft_dup_ipv4.c | 110 +
+ net/ipv4/ping.c | 3 +-
+ net/ipv4/proc.c | 2 +
+ net/ipv4/route.c | 36 +-
+ net/ipv4/sysctl_net_ipv4.c | 19 +
+ net/ipv4/tcp.c | 2 +
+ net/ipv4/tcp_bic.c | 2 +-
+ net/ipv4/tcp_cdg.c | 2 +-
+ net/ipv4/tcp_cong.c | 6 +-
+ net/ipv4/tcp_cubic.c | 4 +-
+ net/ipv4/tcp_highspeed.c | 2 +-
+ net/ipv4/tcp_htcp.c | 2 +-
+ net/ipv4/tcp_hybla.c | 2 +-
+ net/ipv4/tcp_illinois.c | 2 +-
+ net/ipv4/tcp_input.c | 85 +-
+ net/ipv4/tcp_ipv4.c | 7 +-
+ net/ipv4/tcp_metrics.c | 2 +-
+ net/ipv4/tcp_minisocks.c | 6 +-
+ net/ipv4/tcp_output.c | 61 +-
+ net/ipv4/tcp_scalable.c | 2 +-
+ net/ipv4/tcp_timer.c | 1 -
+ net/ipv4/tcp_vegas.c | 6 +-
+ net/ipv4/tcp_veno.c | 2 +-
+ net/ipv4/udp.c | 22 +-
+ net/ipv4/udp_tunnel.c | 25 +-
+ net/ipv4/xfrm4_policy.c | 18 +-
+ net/ipv6/Kconfig | 30 +-
+ net/ipv6/Makefile | 1 +
+ net/ipv6/addrconf.c | 343 +-
+ net/ipv6/addrconf_core.c | 11 +-
+ net/ipv6/af_inet6.c | 12 +-
+ net/ipv6/ah6.c | 4 +-
+ net/ipv6/datagram.c | 10 +-
+ net/ipv6/exthdrs.c | 2 +-
+ net/ipv6/icmp.c | 6 +-
+ net/ipv6/ila.c | 229 ++
+ net/ipv6/inet6_hashtables.c | 9 +-
+ net/ipv6/ip6_fib.c | 1 +
+ net/ipv6/ip6_gre.c | 5 +-
+ net/ipv6/ip6_input.c | 5 +-
+ net/ipv6/ip6_output.c | 18 +-
+ net/ipv6/ip6_tunnel.c | 2 +-
+ net/ipv6/ndisc.c | 26 +-
+ net/ipv6/netfilter/Kconfig | 12 +
+ net/ipv6/netfilter/Makefile | 3 +
+ net/ipv6/netfilter/ip6_tables.c | 52 +-
+ net/ipv6/netfilter/ip6t_REJECT.c | 5 -
+ net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 2 +-
+ net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 5 +-
+ net/ipv6/netfilter/nf_conntrack_reasm.c | 1 +
+ net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 23 +-
+ net/ipv6/netfilter/nf_dup_ipv6.c | 96 +
+ net/ipv6/netfilter/nf_nat_l3proto_ipv6.c | 4 +-
+ net/ipv6/netfilter/nf_nat_proto_icmpv6.c | 2 +-
+ net/ipv6/netfilter/nft_dup_ipv6.c | 108 +
+ net/ipv6/raw.c | 3 +-
+ net/ipv6/route.c | 104 +-
+ net/ipv6/sit.c | 2 +-
+ net/ipv6/sysctl_net_ipv6.c | 15 +-
+ net/ipv6/tcp_ipv6.c | 7 +-
+ net/ipv6/udp.c | 3 +-
+ net/ipv6/xfrm6_mode_tunnel.c | 3 +-
+ net/ipv6/xfrm6_policy.c | 14 +-
+ net/mac80211/Kconfig | 1 -
+ net/mac80211/Makefile | 1 +
+ net/mac80211/aes_cmac.c | 17 -
+ net/mac80211/cfg.c | 161 +-
+ net/mac80211/chan.c | 31 +-
+ net/mac80211/debugfs.c | 2 +-
+ net/mac80211/debugfs_key.c | 2 -
+ net/mac80211/debugfs_netdev.c | 34 +
+ net/mac80211/driver-ops.c | 41 +
+ net/mac80211/driver-ops.h | 29 +-
+ net/mac80211/ieee80211_i.h | 42 +-
+ net/mac80211/iface.c | 16 +-
+ net/mac80211/key.c | 1 -
+ net/mac80211/key.h | 3 -
+ net/mac80211/main.c | 17 +-
+ net/mac80211/mesh.c | 2 +-
+ net/mac80211/mesh_hwmp.c | 80 +-
+ net/mac80211/mesh_plink.c | 326 +-
+ net/mac80211/mesh_ps.c | 42 +-
+ net/mac80211/mesh_sync.c | 16 +-
+ net/mac80211/mlme.c | 61 +-
+ net/mac80211/ocb.c | 2 +-
+ net/mac80211/rate.c | 310 +-
+ net/mac80211/rate.h | 60 +-
+ net/mac80211/rc80211_minstrel_ht.c | 8 +-
+ net/mac80211/rx.c | 101 +-
+ net/mac80211/sta_info.c | 52 +-
+ net/mac80211/sta_info.h | 120 +-
+ net/mac80211/status.c | 5 +-
+ net/mac80211/tdls.c | 242 +-
+ net/mac80211/tx.c | 35 +-
+ net/mac80211/util.c | 75 +-
+ net/mac80211/vht.c | 34 +-
+ net/mac80211/wpa.c | 83 +-
+ net/mac802154/cfg.c | 81 +-
+ net/mac802154/ieee802154_i.h | 11 +-
+ net/mac802154/iface.c | 32 +-
+ net/mac802154/main.c | 19 +-
+ net/mac802154/rx.c | 14 +-
+ net/mac802154/tx.c | 27 +-
+ net/mac802154/util.c | 8 +
+ net/mpls/Kconfig | 8 +-
+ net/mpls/Makefile | 1 +
+ net/mpls/af_mpls.c | 197 +-
+ net/mpls/internal.h | 9 +-
+ net/mpls/mpls_iptunnel.c | 231 ++
+ net/netfilter/Kconfig | 2 +
+ net/netfilter/core.c | 225 +-
+ net/netfilter/ipvs/ip_vs_nfct.c | 2 +-
+ net/netfilter/ipvs/ip_vs_sched.c | 2 +-
+ net/netfilter/nf_conntrack_core.c | 134 +-
+ net/netfilter/nf_conntrack_expect.c | 21 +-
+ net/netfilter/nf_conntrack_labels.c | 34 +-
+ net/netfilter/nf_conntrack_netlink.c | 228 +-
+ net/netfilter/nf_conntrack_pptp.c | 3 +-
+ net/netfilter/nf_conntrack_proto_sctp.c | 101 +-
+ net/netfilter/nf_conntrack_seqadj.c | 9 +-
+ net/netfilter/nf_conntrack_standalone.c | 39 +-
+ net/netfilter/nf_internals.h | 2 +-
+ net/netfilter/nf_nat_core.c | 24 +-
+ net/netfilter/nf_nat_proto_dccp.c | 2 +-
+ net/netfilter/nf_nat_proto_tcp.c | 2 +-
+ net/netfilter/nf_nat_proto_udp.c | 2 +-
+ net/netfilter/nf_nat_proto_udplite.c | 2 +-
+ net/netfilter/nf_queue.c | 12 +-
+ net/netfilter/nf_synproxy_core.c | 6 +-
+ net/netfilter/nf_tables_api.c | 8 +-
+ net/netfilter/nf_tables_core.c | 5 -
+ net/netfilter/nfnetlink_acct.c | 71 +-
+ net/netfilter/nft_counter.c | 97 +-
+ net/netfilter/nft_limit.c | 188 +-
+ net/netfilter/nft_meta.c | 4 +
+ net/netfilter/nft_payload.c | 57 +-
+ net/netfilter/x_tables.c | 29 +-
+ net/netfilter/xt_CT.c | 26 +-
+ net/netfilter/xt_TCPMSS.c | 8 +-
+ net/netfilter/xt_TCPOPTSTRIP.c | 2 +-
+ net/netfilter/xt_TEE.c | 163 +-
+ net/netfilter/xt_TPROXY.c | 6 +-
+ net/netfilter/xt_connlabel.c | 16 +-
+ net/netfilter/xt_connlimit.c | 9 +-
+ net/netfilter/xt_nfacct.c | 2 +-
+ net/nfc/nci/core.c | 18 +
+ net/nfc/nci/hci.c | 2 +-
+ net/nfc/netlink.c | 91 +-
+ net/openvswitch/Kconfig | 15 +-
+ net/openvswitch/Makefile | 4 +-
+ net/openvswitch/actions.c | 259 +-
+ net/openvswitch/conntrack.c | 744 +++++
+ net/openvswitch/conntrack.h | 86 +
+ net/openvswitch/datapath.c | 105 +-
+ net/openvswitch/datapath.h | 18 +-
+ net/openvswitch/dp_notify.c | 5 +-
+ net/openvswitch/flow.c | 10 +-
+ net/openvswitch/flow.h | 90 +-
+ net/openvswitch/flow_netlink.c | 231 +-
+ net/openvswitch/flow_netlink.h | 16 +-
+ net/openvswitch/flow_table.c | 6 +-
+ net/openvswitch/vport-geneve.c | 180 +-
+ net/openvswitch/vport-gre.c | 239 +-
+ net/openvswitch/vport-internal_dev.c | 40 +-
+ net/openvswitch/vport-netdev.c | 117 +-
+ net/openvswitch/vport-netdev.h | 16 +-
+ net/openvswitch/vport-vxlan.c | 224 +-
+ net/openvswitch/vport-vxlan.h | 11 -
+ net/openvswitch/vport.c | 35 +-
+ net/openvswitch/vport.h | 27 +-
+ net/packet/af_packet.c | 136 +-
+ net/packet/internal.h | 5 +-
+ net/rds/af_rds.c | 9 +
+ net/rds/bind.c | 3 +-
+ net/rds/connection.c | 18 +-
+ net/rds/ib.c | 11 +-
+ net/rds/ib.h | 4 +-
+ net/rds/ib_cm.c | 22 +-
+ net/rds/ib_rdma.c | 57 +-
+ net/rds/ib_recv.c | 76 +-
+ net/rds/ib_send.c | 5 +
+ net/rds/iw.c | 2 +-
+ net/rds/iw_cm.c | 5 +-
+ net/rds/rdma.c | 9 +-
+ net/rds/rdma_transport.c | 15 +-
+ net/rds/rds.h | 24 +-
+ net/rds/send.c | 57 +-
+ net/rds/tcp.c | 165 +-
+ net/rds/tcp.h | 7 +-
+ net/rds/tcp_connect.c | 9 +-
+ net/rds/tcp_listen.c | 40 +-
+ net/rds/transport.c | 4 +-
+ net/rfkill/Kconfig | 3 +-
+ net/rfkill/rfkill-gpio.c | 1 -
+ net/sched/act_api.c | 47 +-
+ net/sched/act_bpf.c | 87 +-
+ net/sched/act_connmark.c | 9 +-
+ net/sched/act_csum.c | 3 +-
+ net/sched/act_gact.c | 44 +-
+ net/sched/act_ipt.c | 2 +-
+ net/sched/act_mirred.c | 58 +-
+ net/sched/act_nat.c | 10 +-
+ net/sched/act_pedit.c | 3 +-
+ net/sched/act_simple.c | 3 +-
+ net/sched/act_skbedit.c | 3 +-
+ net/sched/act_vlan.c | 3 +-
+ net/sched/cls_cgroup.c | 23 +-
+ net/sched/cls_rsvp.h | 18 +-
+ net/sched/cls_tcindex.c | 29 +-
+ net/sched/sch_api.c | 55 +-
+ net/sched/sch_atm.c | 2 +-
+ net/sched/sch_cbq.c | 2 +-
+ net/sched/sch_choke.c | 2 +-
+ net/sched/sch_drr.c | 2 +-
+ net/sched/sch_dsmark.c | 2 +-
+ net/sched/sch_fifo.c | 2 +-
+ net/sched/sch_fq_codel.c | 2 +-
+ net/sched/sch_generic.c | 6 +-
+ net/sched/sch_gred.c | 8 +-
+ net/sched/sch_hfsc.c | 2 +-
+ net/sched/sch_htb.c | 8 +-
+ net/sched/sch_multiq.c | 2 +-
+ net/sched/sch_plug.c | 8 +-
+ net/sched/sch_prio.c | 2 +-
+ net/sched/sch_qfq.c | 3 +-
+ net/sched/sch_sfb.c | 4 +-
+ net/sched/sch_sfq.c | 2 +-
+ net/sctp/protocol.c | 42 +-
+ net/sctp/sm_statefuns.c | 2 +-
+ net/switchdev/switchdev.c | 113 +-
+ net/tipc/bcast.c | 31 +-
+ net/tipc/bcast.h | 1 +
+ net/tipc/bearer.c | 30 +-
+ net/tipc/bearer.h | 3 +
+ net/tipc/core.h | 10 +
+ net/tipc/discover.c | 130 +-
+ net/tipc/link.c | 2031 +++++-------
+ net/tipc/link.h | 109 +-
+ net/tipc/msg.c | 86 +-
+ net/tipc/msg.h | 112 +-
+ net/tipc/name_distr.c | 6 +-
+ net/tipc/netlink_compat.c | 2 +-
+ net/tipc/node.c | 979 +++++-
+ net/tipc/node.h | 84 +-
+ net/tipc/socket.c | 385 +--
+ net/tipc/socket.h | 2 +-
+ net/tipc/udp_media.c | 3 +-
+ net/wimax/op-rfkill.c | 3 +-
+ net/wireless/core.c | 5 +
+ net/wireless/core.h | 5 +
+ net/wireless/mlme.c | 75 +-
+ net/wireless/nl80211.c | 4 +-
+ net/wireless/rdev-ops.h | 2 +
+ net/wireless/reg.c | 73 +-
+ net/xfrm/xfrm_policy.c | 24 +-
+ net/xfrm/xfrm_user.c | 8 +-
+ samples/bpf/Makefile | 4 +
+ samples/bpf/bpf_helpers.h | 27 +
+ samples/bpf/test_verifier.c | 59 +
+ samples/bpf/tracex1_kern.c | 2 +-
+ samples/bpf/tracex2_kern.c | 6 +-
+ samples/bpf/tracex3_kern.c | 4 +-
+ samples/bpf/tracex4_kern.c | 6 +-
+ samples/bpf/tracex5_kern.c | 6 +-
+ samples/bpf/tracex6_kern.c | 27 +
+ samples/bpf/tracex6_user.c | 72 +
+ tools/net/bpf_jit_disasm.c | 109 +-
+ tools/testing/selftests/net/psock_fanout.c | 69 +-
+ tools/testing/selftests/net/psock_lib.h | 29 +-
+ 1162 files changed, 74581 insertions(+), 20546 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/net/nfc/s3fwrn5.txt
+ rename Documentation/devicetree/bindings/net/nfc/{st-nci.txt => st-nci-i2c.txt} (100%)
+ create mode 100644 Documentation/devicetree/bindings/net/nfc/st-nci-spi.txt
+ create mode 100644 Documentation/devicetree/bindings/net/snps,dwc-qos-ethernet.txt
+ create mode 100644 Documentation/networking/6lowpan.txt
+ create mode 100644 Documentation/networking/dsa/bcm_sf2.txt
+ create mode 100644 Documentation/networking/dsa/dsa.txt
+ create mode 100644 drivers/bluetooth/btqca.c
+ create mode 100644 drivers/bluetooth/btqca.h
+ create mode 100644 drivers/bluetooth/hci_qca.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/Kconfig
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/Makefile
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/cmd.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/core.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/core.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/emad.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/item.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/pci.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/pci.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/port.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/reg.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/switchx2.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/trap.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/txheader.h
+ create mode 100644 drivers/net/ethernet/synopsys/Kconfig
+ create mode 100644 drivers/net/ethernet/synopsys/Makefile
+ create mode 100644 drivers/net/ethernet/synopsys/dwc_eth_qos.c
+ create mode 100644 drivers/net/fjes/Makefile
+ create mode 100644 drivers/net/fjes/fjes.h
+ create mode 100644 drivers/net/fjes/fjes_ethtool.c
+ create mode 100644 drivers/net/fjes/fjes_hw.c
+ create mode 100644 drivers/net/fjes/fjes_hw.h
+ create mode 100644 drivers/net/fjes/fjes_main.c
+ create mode 100644 drivers/net/fjes/fjes_regs.h
+ create mode 100644 drivers/net/phy/aquantia.c
+ create mode 100644 drivers/net/phy/teranetics.c
+ create mode 100644 drivers/net/usb/lan78xx.c
+ create mode 100644 drivers/net/usb/lan78xx.h
+ create mode 100644 drivers/net/vrf.c
+ create mode 100644 drivers/net/wireless/ath/ath10k/swap.c
+ create mode 100644 drivers/net/wireless/ath/ath10k/swap.h
+ create mode 100644 drivers/net/wireless/ath/wil6210/boot_loader.h
+ create mode 100644 drivers/net/wireless/ath/wil6210/pm.c
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/fw-api-tof.h
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/tof.c
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/tof.h
+ create mode 100644 drivers/nfc/s3fwrn5/Kconfig
+ create mode 100644 drivers/nfc/s3fwrn5/Makefile
+ create mode 100644 drivers/nfc/s3fwrn5/core.c
+ create mode 100644 drivers/nfc/s3fwrn5/firmware.c
+ create mode 100644 drivers/nfc/s3fwrn5/firmware.h
+ create mode 100644 drivers/nfc/s3fwrn5/i2c.c
+ create mode 100644 drivers/nfc/s3fwrn5/nci.c
+ create mode 100644 drivers/nfc/s3fwrn5/nci.h
+ create mode 100644 drivers/nfc/s3fwrn5/s3fwrn5.h
+ create mode 100644 drivers/nfc/st-nci/spi.c
+ create mode 100644 include/linux/mpls_iptunnel.h
+ delete mode 100644 include/linux/platform_data/st_nci.h
+ create mode 100644 include/net/dst_metadata.h
+ create mode 100644 include/net/lwtunnel.h
+ create mode 100644 include/net/mpls_iptunnel.h
+ create mode 100644 include/net/netfilter/ipv4/nf_dup_ipv4.h
+ create mode 100644 include/net/netfilter/ipv6/nf_dup_ipv6.h
+ create mode 100644 include/net/netfilter/nft_dup.h
+ create mode 100644 include/net/vrf.h
+ create mode 100644 include/uapi/linux/ila.h
+ create mode 100644 include/uapi/linux/lwtunnel.h
+ create mode 100644 include/uapi/linux/mpls_iptunnel.h
+ delete mode 100644 lib/average.c
+ create mode 100644 net/6lowpan/core.c
+ create mode 100644 net/core/lwtunnel.c
+ delete mode 100644 net/ipv4/geneve_core.c
+ create mode 100644 net/ipv4/netfilter/nf_dup_ipv4.c
+ create mode 100644 net/ipv4/netfilter/nft_dup_ipv4.c
+ create mode 100644 net/ipv6/ila.c
+ create mode 100644 net/ipv6/netfilter/nf_dup_ipv6.c
+ create mode 100644 net/ipv6/netfilter/nft_dup_ipv6.c
+ create mode 100644 net/mac80211/driver-ops.c
+ create mode 100644 net/mpls/mpls_iptunnel.c
+ create mode 100644 net/openvswitch/conntrack.c
+ create mode 100644 net/openvswitch/conntrack.h
+ delete mode 100644 net/openvswitch/vport-vxlan.h
+ create mode 100644 samples/bpf/tracex6_kern.c
+ create mode 100644 samples/bpf/tracex6_user.c
+Merging ipsec-next/master (e69948a0a530 net: Document xfrm4_gc_thresh and xfrm6_gc_thresh)
+$ git merge ipsec-next/master
+Already up-to-date.
+Merging wireless-drivers-next/master (0ba3ac03c1f3 Merge ath-next from ath.git)
+$ git merge wireless-drivers-next/master
+Already up-to-date.
+Merging bluetooth/master (d3ea6a7190f3 Bluetooth: hci_intel: Add support for platform driver)
+$ git merge bluetooth/master
+Merge made by the 'recursive' strategy.
+ drivers/bluetooth/btintel.c | 2 +
+ drivers/bluetooth/btmrvl_sdio.c | 3 +-
+ drivers/bluetooth/btusb.c | 4 +-
+ drivers/bluetooth/hci_bcm.c | 4 +-
+ drivers/bluetooth/hci_h4.c | 9 +-
+ drivers/bluetooth/hci_intel.c | 321 ++++++++++++++++++++++++++++++++++++++--
+ net/bluetooth/a2mp.c | 2 +-
+ net/bluetooth/sco.c | 5 +-
+ net/ieee802154/nl802154.c | 16 +-
+ 9 files changed, 337 insertions(+), 29 deletions(-)
+Merging rdma/for-next (153b7306b7c6 Merge branch 'hfi1-v4' into to-be-rebased/for-4.3)
+$ git merge rdma/for-next
+error: cannot run gpg2: No such file or directory
+error: could not run gpg.
+Recorded preimage for 'net/core/dev.c'
+Auto-merging net/sunrpc/xprtrdma/svc_rdma_transport.c
+Auto-merging net/sunrpc/xprtrdma/frwr_ops.c
+Auto-merging net/rds/iw.c
+Auto-merging net/rds/ib_send.c
+Auto-merging net/rds/ib_recv.c
+Auto-merging net/rds/ib_cm.c
+Auto-merging net/rds/ib.h
+Auto-merging net/rds/ib.c
+Auto-merging net/ipv6/addrconf.c
+Auto-merging net/core/dev.c
+CONFLICT (content): Merge conflict in net/core/dev.c
+Auto-merging include/rdma/ib_verbs.h
+Auto-merging include/net/addrconf.h
+Auto-merging include/linux/sunrpc/svc_rdma.h
+Auto-merging include/linux/netdevice.h
+Auto-merging include/linux/mlx5/driver.h
+Auto-merging include/linux/mlx5/device.h
+Auto-merging include/linux/mlx4/device.h
+Auto-merging drivers/staging/ipath/ipath_verbs.c
+Auto-merging drivers/staging/ipath/Kconfig
+Auto-merging drivers/net/bonding/bond_options.c
+Auto-merging drivers/infiniband/ulp/isert/ib_isert.c
+Auto-merging drivers/infiniband/ulp/ipoib/ipoib_verbs.c
+Auto-merging drivers/infiniband/hw/ocrdma/ocrdma_verbs.h
+Auto-merging drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+Auto-merging drivers/infiniband/hw/ocrdma/ocrdma_sli.h
+Auto-merging drivers/infiniband/hw/ocrdma/ocrdma_main.c
+Auto-merging drivers/infiniband/hw/ocrdma/ocrdma.h
+Auto-merging drivers/infiniband/hw/cxgb3/iwch_provider.c
+Auto-merging drivers/infiniband/core/verbs.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'net/core/dev.c'.
+[master 2532948991bf] Merge remote-tracking branch 'rdma/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/infiniband/sysfs.txt | 22 +
+ MAINTAINERS | 2 +-
+ drivers/infiniband/Kconfig | 2 -
+ drivers/infiniband/core/Makefile | 3 +-
+ drivers/infiniband/core/cache.c | 704 +-
+ drivers/infiniband/core/cm.c | 215 +-
+ drivers/infiniband/core/cma.c | 646 +-
+ drivers/infiniband/core/core_priv.h | 50 +-
+ drivers/infiniband/core/device.c | 229 +-
+ drivers/infiniband/core/mad.c | 28 +-
+ drivers/infiniband/core/mad_priv.h | 1 -
+ drivers/infiniband/core/multicast.c | 7 +-
+ drivers/infiniband/core/netlink.c | 55 +
+ drivers/infiniband/core/roce_gid_mgmt.c | 730 ++
+ drivers/infiniband/core/sa_query.c | 479 +-
+ drivers/infiniband/core/sysfs.c | 1 +
+ drivers/infiniband/core/ucm.c | 9 +-
+ drivers/infiniband/core/user_mad.c | 6 +-
+ drivers/infiniband/core/uverbs_main.c | 6 +-
+ drivers/infiniband/core/verbs.c | 109 +-
+ drivers/infiniband/hw/Makefile | 2 -
+ drivers/infiniband/hw/cxgb3/iwch_provider.c | 14 +-
+ drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 4 +-
+ drivers/infiniband/hw/cxgb4/mem.c | 12 +-
+ drivers/infiniband/hw/cxgb4/provider.c | 2 +-
+ drivers/infiniband/hw/mlx4/ah.c | 8 +-
+ drivers/infiniband/hw/mlx4/mad.c | 23 +-
+ drivers/infiniband/hw/mlx4/main.c | 752 +-
+ drivers/infiniband/hw/mlx4/mcg.c | 15 +-
+ drivers/infiniband/hw/mlx4/mlx4_ib.h | 27 +-
+ drivers/infiniband/hw/mlx4/mr.c | 11 +-
+ drivers/infiniband/hw/mlx4/qp.c | 10 +-
+ drivers/infiniband/hw/mlx4/sysfs.c | 5 +-
+ drivers/infiniband/hw/mlx5/main.c | 30 +-
+ drivers/infiniband/hw/mlx5/mlx5_ib.h | 9 +-
+ drivers/infiniband/hw/mlx5/mr.c | 112 +-
+ drivers/infiniband/hw/mthca/mthca_provider.c | 1 +
+ drivers/infiniband/hw/nes/nes_verbs.c | 19 +-
+ drivers/infiniband/hw/ocrdma/ocrdma.h | 1 -
+ drivers/infiniband/hw/ocrdma/ocrdma_main.c | 236 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_sli.h | 2 +
+ drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 56 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 15 +-
+ drivers/infiniband/hw/qib/qib_keys.c | 4 +
+ drivers/infiniband/hw/qib/qib_mad.h | 147 +-
+ drivers/infiniband/hw/qib/qib_mr.c | 9 +-
+ drivers/infiniband/hw/qib/qib_verbs.c | 17 +-
+ drivers/infiniband/hw/qib/qib_verbs.h | 6 +-
+ drivers/infiniband/ulp/ipoib/ipoib.h | 1 -
+ drivers/infiniband/ulp/ipoib/ipoib_cm.c | 4 +-
+ drivers/infiniband/ulp/ipoib/ipoib_main.c | 236 +-
+ drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 18 +-
+ drivers/infiniband/ulp/iser/iscsi_iser.c | 82 +-
+ drivers/infiniband/ulp/iser/iscsi_iser.h | 206 +-
+ drivers/infiniband/ulp/iser/iser_initiator.c | 38 +-
+ drivers/infiniband/ulp/iser/iser_memory.c | 482 +-
+ drivers/infiniband/ulp/iser/iser_verbs.c | 337 +-
+ drivers/infiniband/ulp/isert/ib_isert.c | 47 +-
+ drivers/infiniband/ulp/isert/ib_isert.h | 1 -
+ drivers/infiniband/ulp/srp/ib_srp.c | 51 +-
+ drivers/infiniband/ulp/srp/ib_srp.h | 2 +-
+ drivers/infiniband/ulp/srpt/ib_srpt.c | 22 +-
+ drivers/infiniband/ulp/srpt/ib_srpt.h | 1 -
+ drivers/net/bonding/bond_options.c | 13 -
+ drivers/net/ethernet/mellanox/mlx4/en_main.c | 36 +-
+ drivers/net/ethernet/mellanox/mlx4/intf.c | 3 +
+ drivers/net/ethernet/mellanox/mlx5/core/fw.c | 22 +
+ drivers/staging/Kconfig | 6 +
+ drivers/staging/Makefile | 3 +
+ drivers/{infiniband/hw => staging}/amso1100/Kbuild | 0
+ .../{infiniband/hw => staging}/amso1100/Kconfig | 0
+ drivers/staging/amso1100/TODO | 4 +
+ drivers/{infiniband/hw => staging}/amso1100/c2.c | 0
+ drivers/{infiniband/hw => staging}/amso1100/c2.h | 0
+ .../{infiniband/hw => staging}/amso1100/c2_ae.c | 0
+ .../{infiniband/hw => staging}/amso1100/c2_ae.h | 0
+ .../{infiniband/hw => staging}/amso1100/c2_alloc.c | 0
+ .../{infiniband/hw => staging}/amso1100/c2_cm.c | 0
+ .../{infiniband/hw => staging}/amso1100/c2_cq.c | 0
+ .../{infiniband/hw => staging}/amso1100/c2_intr.c | 0
+ .../{infiniband/hw => staging}/amso1100/c2_mm.c | 0
+ .../{infiniband/hw => staging}/amso1100/c2_mq.c | 0
+ .../{infiniband/hw => staging}/amso1100/c2_mq.h | 0
+ .../{infiniband/hw => staging}/amso1100/c2_pd.c | 0
+ .../hw => staging}/amso1100/c2_provider.c | 0
+ .../hw => staging}/amso1100/c2_provider.h | 0
+ .../{infiniband/hw => staging}/amso1100/c2_qp.c | 0
+ .../{infiniband/hw => staging}/amso1100/c2_rnic.c | 0
+ .../hw => staging}/amso1100/c2_status.h | 0
+ .../{infiniband/hw => staging}/amso1100/c2_user.h | 0
+ .../{infiniband/hw => staging}/amso1100/c2_vq.c | 0
+ .../{infiniband/hw => staging}/amso1100/c2_vq.h | 0
+ .../{infiniband/hw => staging}/amso1100/c2_wr.h | 0
+ drivers/staging/hfi1/Kconfig | 37 +
+ drivers/staging/hfi1/Makefile | 19 +
+ drivers/staging/hfi1/TODO | 7 +
+ drivers/staging/hfi1/chip.c | 10798 +++++++++++++++++++
+ drivers/staging/hfi1/chip.h | 1035 ++
+ drivers/staging/hfi1/chip_registers.h | 1289 +++
+ drivers/staging/hfi1/common.h | 415 +
+ drivers/staging/hfi1/cq.c | 558 +
+ drivers/staging/hfi1/debugfs.c | 899 ++
+ drivers/staging/hfi1/debugfs.h | 78 +
+ drivers/staging/hfi1/device.c | 142 +
+ drivers/staging/hfi1/device.h | 61 +
+ drivers/staging/hfi1/diag.c | 1873 ++++
+ drivers/staging/hfi1/dma.c | 186 +
+ drivers/staging/hfi1/driver.c | 1241 +++
+ drivers/staging/hfi1/eprom.c | 475 +
+ drivers/staging/hfi1/eprom.h | 55 +
+ drivers/staging/hfi1/file_ops.c | 2140 ++++
+ drivers/staging/hfi1/firmware.c | 1620 +++
+ drivers/staging/hfi1/hfi.h | 1821 ++++
+ drivers/staging/hfi1/init.c | 1722 +++
+ drivers/staging/hfi1/intr.c | 207 +
+ drivers/staging/hfi1/iowait.h | 186 +
+ drivers/staging/hfi1/keys.c | 411 +
+ drivers/staging/hfi1/mad.c | 4257 ++++++++
+ drivers/staging/hfi1/mad.h | 325 +
+ drivers/staging/hfi1/mmap.c | 192 +
+ drivers/staging/hfi1/mr.c | 546 +
+ drivers/staging/hfi1/opa_compat.h | 129 +
+ drivers/staging/hfi1/pcie.c | 1253 +++
+ drivers/staging/hfi1/pio.c | 1771 +++
+ drivers/staging/hfi1/pio.h | 224 +
+ drivers/staging/hfi1/pio_copy.c | 858 ++
+ drivers/staging/hfi1/platform_config.h | 286 +
+ drivers/staging/hfi1/qp.c | 1687 +++
+ drivers/staging/hfi1/qp.h | 235 +
+ drivers/staging/hfi1/qsfp.c | 546 +
+ drivers/staging/hfi1/qsfp.h | 222 +
+ drivers/staging/hfi1/rc.c | 2426 +++++
+ drivers/staging/hfi1/ruc.c | 948 ++
+ drivers/staging/hfi1/sdma.c | 2962 +++++
+ drivers/staging/hfi1/sdma.h | 1123 ++
+ drivers/staging/hfi1/srq.c | 397 +
+ drivers/staging/hfi1/sysfs.c | 761 ++
+ drivers/staging/hfi1/trace.c | 211 +
+ drivers/staging/hfi1/trace.h | 1421 +++
+ drivers/staging/hfi1/twsi.c | 518 +
+ drivers/staging/hfi1/twsi.h | 68 +
+ drivers/staging/hfi1/uc.c | 585 +
+ drivers/staging/hfi1/ud.c | 885 ++
+ drivers/staging/hfi1/user_pages.c | 156 +
+ drivers/staging/hfi1/user_sdma.c | 1444 +++
+ drivers/staging/hfi1/user_sdma.h | 89 +
+ drivers/staging/hfi1/verbs.c | 2142 ++++
+ drivers/staging/hfi1/verbs.h | 1149 ++
+ drivers/staging/hfi1/verbs_mcast.c | 385 +
+ drivers/{infiniband/hw => staging}/ipath/Kconfig | 4 +-
+ drivers/{infiniband/hw => staging}/ipath/Makefile | 0
+ drivers/staging/ipath/TODO | 5 +
+ .../hw => staging}/ipath/ipath_common.h | 0
+ .../{infiniband/hw => staging}/ipath/ipath_cq.c | 0
+ .../{infiniband/hw => staging}/ipath/ipath_debug.h | 0
+ .../{infiniband/hw => staging}/ipath/ipath_diag.c | 0
+ .../{infiniband/hw => staging}/ipath/ipath_dma.c | 0
+ .../hw => staging}/ipath/ipath_driver.c | 0
+ .../hw => staging}/ipath/ipath_eeprom.c | 0
+ .../hw => staging}/ipath/ipath_file_ops.c | 0
+ .../{infiniband/hw => staging}/ipath/ipath_fs.c | 0
+ .../hw => staging}/ipath/ipath_iba6110.c | 0
+ .../hw => staging}/ipath/ipath_init_chip.c | 0
+ .../{infiniband/hw => staging}/ipath/ipath_intr.c | 0
+ .../hw => staging}/ipath/ipath_kernel.h | 0
+ .../{infiniband/hw => staging}/ipath/ipath_keys.c | 0
+ .../{infiniband/hw => staging}/ipath/ipath_mad.c | 0
+ .../{infiniband/hw => staging}/ipath/ipath_mmap.c | 0
+ .../{infiniband/hw => staging}/ipath/ipath_mr.c | 0
+ .../{infiniband/hw => staging}/ipath/ipath_qp.c | 0
+ .../{infiniband/hw => staging}/ipath/ipath_rc.c | 0
+ .../hw => staging}/ipath/ipath_registers.h | 0
+ .../{infiniband/hw => staging}/ipath/ipath_ruc.c | 0
+ .../{infiniband/hw => staging}/ipath/ipath_sdma.c | 0
+ .../{infiniband/hw => staging}/ipath/ipath_srq.c | 0
+ .../{infiniband/hw => staging}/ipath/ipath_stats.c | 0
+ .../{infiniband/hw => staging}/ipath/ipath_sysfs.c | 0
+ .../{infiniband/hw => staging}/ipath/ipath_uc.c | 0
+ .../{infiniband/hw => staging}/ipath/ipath_ud.c | 0
+ .../hw => staging}/ipath/ipath_user_pages.c | 0
+ .../hw => staging}/ipath/ipath_user_sdma.c | 0
+ .../hw => staging}/ipath/ipath_user_sdma.h | 0
+ .../{infiniband/hw => staging}/ipath/ipath_verbs.c | 1 +
+ .../{infiniband/hw => staging}/ipath/ipath_verbs.h | 0
+ .../hw => staging}/ipath/ipath_verbs_mcast.c | 0
+ .../hw => staging}/ipath/ipath_wc_ppc64.c | 0
+ .../hw => staging}/ipath/ipath_wc_x86_64.c | 0
+ include/linux/mlx4/device.h | 3 +-
+ include/linux/mlx4/driver.h | 1 +
+ include/linux/mlx5/device.h | 11 +
+ include/linux/mlx5/driver.h | 1 +
+ include/linux/netdevice.h | 14 +
+ include/linux/sunrpc/svc_rdma.h | 1 +
+ include/net/addrconf.h | 31 +
+ include/net/bonding.h | 7 +
+ include/rdma/ib_cm.h | 25 +-
+ include/rdma/ib_mad.h | 139 +-
+ include/rdma/ib_pack.h | 1 +
+ include/rdma/ib_verbs.h | 196 +-
+ include/rdma/opa_port_info.h | 433 +
+ include/rdma/opa_smi.h | 47 +
+ include/rdma/rdma_netlink.h | 7 +
+ include/uapi/rdma/hfi/hfi1_user.h | 427 +
+ include/uapi/rdma/rdma_netlink.h | 83 +
+ net/9p/trans_rdma.c | 26 +-
+ net/core/dev.c | 2 +
+ net/ipv6/addrconf.c | 31 -
+ net/rds/ib.c | 13 +-
+ net/rds/ib.h | 2 -
+ net/rds/ib_cm.c | 4 +-
+ net/rds/ib_recv.c | 6 +-
+ net/rds/ib_send.c | 8 +-
+ net/rds/iw.c | 5 +-
+ net/rds/iw_rdma.c | 5 +-
+ net/rds/iw_send.c | 5 +-
+ net/sunrpc/xprtrdma/frwr_ops.c | 6 +-
+ net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 12 +-
+ net/sunrpc/xprtrdma/svc_rdma_transport.c | 6 +-
+ 218 files changed, 63212 insertions(+), 2300 deletions(-)
+ create mode 100644 drivers/infiniband/core/roce_gid_mgmt.c
+ rename drivers/{infiniband/hw => staging}/amso1100/Kbuild (100%)
+ rename drivers/{infiniband/hw => staging}/amso1100/Kconfig (100%)
+ create mode 100644 drivers/staging/amso1100/TODO
+ rename drivers/{infiniband/hw => staging}/amso1100/c2.c (100%)
+ rename drivers/{infiniband/hw => staging}/amso1100/c2.h (100%)
+ rename drivers/{infiniband/hw => staging}/amso1100/c2_ae.c (100%)
+ rename drivers/{infiniband/hw => staging}/amso1100/c2_ae.h (100%)
+ rename drivers/{infiniband/hw => staging}/amso1100/c2_alloc.c (100%)
+ rename drivers/{infiniband/hw => staging}/amso1100/c2_cm.c (100%)
+ rename drivers/{infiniband/hw => staging}/amso1100/c2_cq.c (100%)
+ rename drivers/{infiniband/hw => staging}/amso1100/c2_intr.c (100%)
+ rename drivers/{infiniband/hw => staging}/amso1100/c2_mm.c (100%)
+ rename drivers/{infiniband/hw => staging}/amso1100/c2_mq.c (100%)
+ rename drivers/{infiniband/hw => staging}/amso1100/c2_mq.h (100%)
+ rename drivers/{infiniband/hw => staging}/amso1100/c2_pd.c (100%)
+ rename drivers/{infiniband/hw => staging}/amso1100/c2_provider.c (100%)
+ rename drivers/{infiniband/hw => staging}/amso1100/c2_provider.h (100%)
+ rename drivers/{infiniband/hw => staging}/amso1100/c2_qp.c (100%)
+ rename drivers/{infiniband/hw => staging}/amso1100/c2_rnic.c (100%)
+ rename drivers/{infiniband/hw => staging}/amso1100/c2_status.h (100%)
+ rename drivers/{infiniband/hw => staging}/amso1100/c2_user.h (100%)
+ rename drivers/{infiniband/hw => staging}/amso1100/c2_vq.c (100%)
+ rename drivers/{infiniband/hw => staging}/amso1100/c2_vq.h (100%)
+ rename drivers/{infiniband/hw => staging}/amso1100/c2_wr.h (100%)
+ create mode 100644 drivers/staging/hfi1/Kconfig
+ create mode 100644 drivers/staging/hfi1/Makefile
+ create mode 100644 drivers/staging/hfi1/TODO
+ create mode 100644 drivers/staging/hfi1/chip.c
+ create mode 100644 drivers/staging/hfi1/chip.h
+ create mode 100644 drivers/staging/hfi1/chip_registers.h
+ create mode 100644 drivers/staging/hfi1/common.h
+ create mode 100644 drivers/staging/hfi1/cq.c
+ create mode 100644 drivers/staging/hfi1/debugfs.c
+ create mode 100644 drivers/staging/hfi1/debugfs.h
+ create mode 100644 drivers/staging/hfi1/device.c
+ create mode 100644 drivers/staging/hfi1/device.h
+ create mode 100644 drivers/staging/hfi1/diag.c
+ create mode 100644 drivers/staging/hfi1/dma.c
+ create mode 100644 drivers/staging/hfi1/driver.c
+ create mode 100644 drivers/staging/hfi1/eprom.c
+ create mode 100644 drivers/staging/hfi1/eprom.h
+ create mode 100644 drivers/staging/hfi1/file_ops.c
+ create mode 100644 drivers/staging/hfi1/firmware.c
+ create mode 100644 drivers/staging/hfi1/hfi.h
+ create mode 100644 drivers/staging/hfi1/init.c
+ create mode 100644 drivers/staging/hfi1/intr.c
+ create mode 100644 drivers/staging/hfi1/iowait.h
+ create mode 100644 drivers/staging/hfi1/keys.c
+ create mode 100644 drivers/staging/hfi1/mad.c
+ create mode 100644 drivers/staging/hfi1/mad.h
+ create mode 100644 drivers/staging/hfi1/mmap.c
+ create mode 100644 drivers/staging/hfi1/mr.c
+ create mode 100644 drivers/staging/hfi1/opa_compat.h
+ create mode 100644 drivers/staging/hfi1/pcie.c
+ create mode 100644 drivers/staging/hfi1/pio.c
+ create mode 100644 drivers/staging/hfi1/pio.h
+ create mode 100644 drivers/staging/hfi1/pio_copy.c
+ create mode 100644 drivers/staging/hfi1/platform_config.h
+ create mode 100644 drivers/staging/hfi1/qp.c
+ create mode 100644 drivers/staging/hfi1/qp.h
+ create mode 100644 drivers/staging/hfi1/qsfp.c
+ create mode 100644 drivers/staging/hfi1/qsfp.h
+ create mode 100644 drivers/staging/hfi1/rc.c
+ create mode 100644 drivers/staging/hfi1/ruc.c
+ create mode 100644 drivers/staging/hfi1/sdma.c
+ create mode 100644 drivers/staging/hfi1/sdma.h
+ create mode 100644 drivers/staging/hfi1/srq.c
+ create mode 100644 drivers/staging/hfi1/sysfs.c
+ create mode 100644 drivers/staging/hfi1/trace.c
+ create mode 100644 drivers/staging/hfi1/trace.h
+ create mode 100644 drivers/staging/hfi1/twsi.c
+ create mode 100644 drivers/staging/hfi1/twsi.h
+ create mode 100644 drivers/staging/hfi1/uc.c
+ create mode 100644 drivers/staging/hfi1/ud.c
+ create mode 100644 drivers/staging/hfi1/user_pages.c
+ create mode 100644 drivers/staging/hfi1/user_sdma.c
+ create mode 100644 drivers/staging/hfi1/user_sdma.h
+ create mode 100644 drivers/staging/hfi1/verbs.c
+ create mode 100644 drivers/staging/hfi1/verbs.h
+ create mode 100644 drivers/staging/hfi1/verbs_mcast.c
+ rename drivers/{infiniband/hw => staging}/ipath/Kconfig (81%)
+ rename drivers/{infiniband/hw => staging}/ipath/Makefile (100%)
+ create mode 100644 drivers/staging/ipath/TODO
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_common.h (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_cq.c (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_debug.h (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_diag.c (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_dma.c (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_driver.c (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_eeprom.c (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_file_ops.c (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_fs.c (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_iba6110.c (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_init_chip.c (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_intr.c (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_kernel.h (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_keys.c (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_mad.c (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_mmap.c (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_mr.c (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_qp.c (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_rc.c (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_registers.h (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_ruc.c (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_sdma.c (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_srq.c (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_stats.c (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_sysfs.c (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_uc.c (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_ud.c (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_user_pages.c (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_user_sdma.c (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_user_sdma.h (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_verbs.c (99%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_verbs.h (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_verbs_mcast.c (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_wc_ppc64.c (100%)
+ rename drivers/{infiniband/hw => staging}/ipath/ipath_wc_x86_64.c (100%)
+ create mode 100644 include/rdma/opa_port_info.h
+ create mode 100644 include/uapi/rdma/hfi/hfi1_user.h
+$ git am -3 ../patches/0001-net-merge-change-upper-notifier-changes.patch
+Applying: net: merge change upper notifier changes
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/infiniband/core/roce_gid_mgmt.c
+M include/linux/netdevice.h
+$ git add -A .
+$ git commit -v -a --amend
+[master 55f7ca47f985] Merge remote-tracking branch 'rdma/for-next'
+ Date: Fri Aug 28 11:09:42 2015 +1000
+Merging mtd/master (5f867db63473 mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict)
+$ git merge mtd/master
+Already up-to-date.
+Merging l2-mtd/master (cc7fce802290 mtd: blkdevs: fix switch-bool compilation warning)
+$ git merge l2-mtd/master
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mtd/fsl-quadspi.txt | 3 +-
+ .../devicetree/bindings/mtd/nxp-spifi.txt | 58 +++
+ drivers/mtd/devices/m25p80.c | 18 +-
+ drivers/mtd/devices/mtd_dataflash.c | 1 +
+ drivers/mtd/maps/nettel.c | 13 +-
+ drivers/mtd/maps/physmap_of.c | 6 +
+ drivers/mtd/mtd_blkdevs.c | 8 +-
+ drivers/mtd/nand/Kconfig | 13 +-
+ drivers/mtd/nand/brcmnand/brcmnand.h | 4 +-
+ drivers/mtd/nand/davinci_nand.c | 42 +-
+ drivers/mtd/nand/denali_pci.c | 43 +-
+ drivers/mtd/nand/nand_ids.c | 4 +
+ drivers/mtd/nand/nandsim.c | 28 +-
+ drivers/mtd/nand/omap_elm.c | 2 +-
+ drivers/mtd/nand/pxa3xx_nand.c | 61 ++-
+ drivers/mtd/nand/r852.c | 2 +-
+ drivers/mtd/nand/sunxi_nand.c | 88 +++-
+ drivers/mtd/spi-nor/Kconfig | 14 +-
+ drivers/mtd/spi-nor/Makefile | 1 +
+ drivers/mtd/spi-nor/fsl-quadspi.c | 265 ++++++++---
+ drivers/mtd/spi-nor/nxp-spifi.c | 482 +++++++++++++++++++++
+ drivers/mtd/spi-nor/spi-nor.c | 69 ++-
+ 22 files changed, 998 insertions(+), 227 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mtd/nxp-spifi.txt
+ create mode 100644 drivers/mtd/spi-nor/nxp-spifi.c
+Merging crypto/master (bf433416e675 crypto: algif_aead - fix for multiple operations on AF_ALG sockets)
+$ git merge crypto/master
+Resolved 'arch/arm/configs/imx_v6_v7_defconfig' using previous resolution.
+Auto-merging drivers/pci/quirks.c
+Auto-merging drivers/crypto/qat/qat_dh895xccvf/adf_drv.h
+Removing drivers/crypto/qat/qat_dh895xcc/adf_admin.c
+Auto-merging drivers/crypto/qat/qat_common/adf_hw_arbiter.c
+Removing drivers/crypto/nx/nx-842-platform.c
+Removing drivers/crypto/nx/nx-842-crypto.c
+Auto-merging drivers/crypto/caam/caamhash.c
+Auto-merging drivers/clk/imx/clk-imx6q.c
+Auto-merging arch/powerpc/kernel/process.c
+Auto-merging arch/arm/configs/imx_v6_v7_defconfig
+CONFLICT (content): Merge conflict in arch/arm/configs/imx_v6_v7_defconfig
+Auto-merging arch/arm/boot/dts/sun7i-a20.dtsi
+Auto-merging arch/arm/boot/dts/sun6i-a31.dtsi
+Auto-merging arch/arm/boot/dts/sun4i-a10.dtsi
+Auto-merging arch/arm/boot/dts/imx6sx.dtsi
+Auto-merging arch/arm/boot/dts/imx6qdl.dtsi
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/crypto/fsl-sec4.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 0907607669a2] Merge remote-tracking branch 'crypto/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/crypto-API.tmpl | 8 +-
+ .../devicetree/bindings/crypto/fsl-sec4.txt | 17 +
+ .../devicetree/bindings/crypto/sun4i-ss.txt | 23 +
+ MAINTAINERS | 24 +-
+ arch/arm/boot/dts/imx6qdl.dtsi | 29 +-
+ arch/arm/boot/dts/imx6sx.dtsi | 27 +
+ arch/arm/boot/dts/sun4i-a10.dtsi | 8 +
+ arch/arm/boot/dts/sun6i-a31.dtsi | 18 +
+ arch/arm/boot/dts/sun7i-a20.dtsi | 8 +
+ arch/arm/configs/imx_v6_v7_defconfig | 2 +-
+ arch/arm/crypto/.gitignore | 2 +
+ arch/arm64/crypto/aes-ce-ccm-glue.c | 68 +-
+ arch/powerpc/include/asm/switch_to.h | 1 +
+ arch/powerpc/kernel/process.c | 3 -
+ arch/x86/crypto/Makefile | 6 +
+ arch/x86/crypto/aesni-intel_glue.c | 53 +-
+ arch/x86/crypto/chacha20-avx2-x86_64.S | 443 +++
+ arch/x86/crypto/chacha20-ssse3-x86_64.S | 625 +++++
+ arch/x86/crypto/chacha20_glue.c | 150 +
+ arch/x86/crypto/poly1305-avx2-x86_64.S | 386 +++
+ arch/x86/crypto/poly1305-sse2-x86_64.S | 582 ++++
+ arch/x86/crypto/poly1305_glue.c | 207 ++
+ crypto/Kconfig | 40 +-
+ crypto/Makefile | 3 +-
+ crypto/aead.c | 635 +----
+ crypto/algapi.c | 25 +-
+ crypto/algboss.c | 12 +-
+ crypto/algif_aead.c | 4 +-
+ crypto/authenc.c | 580 ++--
+ crypto/authencesn.c | 716 ++---
+ crypto/ccm.c | 380 +--
+ crypto/chacha20_generic.c | 28 +-
+ crypto/chacha20poly1305.c | 216 +-
+ crypto/cryptd.c | 23 +-
+ crypto/crypto_user.c | 32 -
+ crypto/echainiv.c | 86 +-
+ crypto/gcm.c | 102 +-
+ crypto/jitterentropy-kcapi.c | 2 +-
+ crypto/pcrypt.c | 7 +
+ crypto/poly1305_generic.c | 73 +-
+ crypto/rsa.c | 26 +-
+ crypto/rsa_helper.c | 4 +-
+ crypto/seqiv.c | 445 +--
+ crypto/skcipher.c | 245 ++
+ crypto/tcrypt.c | 82 +-
+ crypto/tcrypt.h | 20 +
+ crypto/testmgr.c | 63 +-
+ crypto/testmgr.h | 2948 +++++++++++++++-----
+ drivers/clk/imx/clk-imx6q.c | 3 +
+ drivers/crypto/Kconfig | 17 +
+ drivers/crypto/Makefile | 1 +
+ drivers/crypto/amcc/crypto4xx_core.c | 2 +-
+ drivers/crypto/caam/Kconfig | 10 +-
+ drivers/crypto/caam/caamalg.c | 2877 ++++++++++---------
+ drivers/crypto/caam/caamhash.c | 69 +-
+ drivers/crypto/caam/caamrng.c | 26 +-
+ drivers/crypto/caam/compat.h | 1 +
+ drivers/crypto/caam/ctrl.c | 154 +-
+ drivers/crypto/caam/desc.h | 23 +-
+ drivers/crypto/caam/desc_constr.h | 2 +-
+ drivers/crypto/caam/intern.h | 5 +
+ drivers/crypto/caam/jr.c | 30 +-
+ drivers/crypto/caam/regs.h | 64 +-
+ drivers/crypto/caam/sg_sw_sec4.h | 25 +-
+ drivers/crypto/ccp/ccp-platform.c | 2 +
+ drivers/crypto/img-hash.c | 2 +-
+ drivers/crypto/ixp4xx_crypto.c | 312 ++-
+ drivers/crypto/marvell/cesa.c | 1 -
+ drivers/crypto/nx/Kconfig | 17 +-
+ drivers/crypto/nx/Makefile | 8 +-
+ drivers/crypto/nx/nx-842-crypto.c | 580 ----
+ drivers/crypto/nx/nx-842-platform.c | 84 -
+ drivers/crypto/nx/nx-842-powernv.c | 42 +-
+ drivers/crypto/nx/nx-842-pseries.c | 139 +-
+ drivers/crypto/nx/nx-842.c | 554 +++-
+ drivers/crypto/nx/nx-842.h | 65 +-
+ drivers/crypto/nx/nx-aes-ccm.c | 151 +-
+ drivers/crypto/nx/nx-aes-ctr.c | 21 -
+ drivers/crypto/nx/nx-aes-gcm.c | 64 +-
+ drivers/crypto/nx/nx.c | 30 +-
+ drivers/crypto/nx/nx.h | 9 +-
+ drivers/crypto/omap-aes.c | 86 +-
+ drivers/crypto/picoxcell_crypto.c | 677 ++---
+ drivers/crypto/qat/Kconfig | 15 +
+ drivers/crypto/qat/Makefile | 1 +
+ drivers/crypto/qat/qat_common/.gitignore | 1 +
+ drivers/crypto/qat/qat_common/Makefile | 8 +
+ drivers/crypto/qat/qat_common/adf_accel_devices.h | 46 +-
+ drivers/crypto/qat/qat_common/adf_accel_engine.c | 42 +-
+ drivers/crypto/qat/qat_common/adf_admin.c | 290 ++
+ drivers/crypto/qat/qat_common/adf_aer.c | 5 +-
+ drivers/crypto/qat/qat_common/adf_cfg.c | 9 +-
+ drivers/crypto/qat/qat_common/adf_cfg_common.h | 3 +-
+ drivers/crypto/qat/qat_common/adf_common_drv.h | 53 +-
+ drivers/crypto/qat/qat_common/adf_ctl_drv.c | 6 +-
+ drivers/crypto/qat/qat_common/adf_dev_mgr.c | 286 +-
+ .../{qat_dh895xcc => qat_common}/adf_hw_arbiter.c | 37 +-
+ drivers/crypto/qat/qat_common/adf_init.c | 104 +-
+ drivers/crypto/qat/qat_common/adf_pf2vf_msg.c | 438 +++
+ drivers/crypto/qat/qat_common/adf_pf2vf_msg.h | 146 +
+ drivers/crypto/qat/qat_common/adf_sriov.c | 309 ++
+ drivers/crypto/qat/qat_common/adf_transport.c | 13 +-
+ .../qat/qat_common/adf_transport_access_macros.h | 5 +-
+ drivers/crypto/qat/qat_common/icp_qat_fw.h | 2 +
+ drivers/crypto/qat/qat_common/icp_qat_fw_pke.h | 112 +
+ drivers/crypto/qat/qat_common/qat_algs.c | 338 +--
+ drivers/crypto/qat/qat_common/qat_asym_algs.c | 652 +++++
+ drivers/crypto/qat/qat_common/qat_crypto.c | 26 +-
+ drivers/crypto/qat/qat_common/qat_crypto.h | 2 -
+ drivers/crypto/qat/qat_common/qat_hal.c | 14 +-
+ drivers/crypto/qat/qat_common/qat_rsakey.asn1 | 5 +
+ drivers/crypto/qat/qat_common/qat_uclo.c | 27 +-
+ drivers/crypto/qat/qat_dh895xcc/Makefile | 5 +-
+ drivers/crypto/qat/qat_dh895xcc/adf_admin.c | 145 -
+ .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 38 +-
+ .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h | 12 +-
+ drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 97 +-
+ drivers/crypto/qat/qat_dh895xcc/adf_drv.h | 9 -
+ drivers/crypto/qat/qat_dh895xcc/adf_isr.c | 139 +-
+ drivers/crypto/qat/qat_dh895xccvf/Makefile | 5 +
+ .../qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c | 172 ++
+ .../qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.h | 68 +
+ drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 393 +++
+ .../qat_admin.c => qat_dh895xccvf/adf_drv.h} | 70 +-
+ drivers/crypto/qat/qat_dh895xccvf/adf_isr.c | 258 ++
+ drivers/crypto/sahara.c | 46 +-
+ drivers/crypto/sunxi-ss/Makefile | 2 +
+ drivers/crypto/sunxi-ss/sun4i-ss-cipher.c | 542 ++++
+ drivers/crypto/sunxi-ss/sun4i-ss-core.c | 425 +++
+ drivers/crypto/sunxi-ss/sun4i-ss-hash.c | 492 ++++
+ drivers/crypto/sunxi-ss/sun4i-ss.h | 201 ++
+ drivers/crypto/talitos.c | 618 ++--
+ drivers/crypto/talitos.h | 8 +-
+ drivers/crypto/vmx/aes.c | 3 +
+ drivers/crypto/vmx/aes_cbc.c | 3 +
+ drivers/crypto/vmx/aes_ctr.c | 11 +-
+ drivers/crypto/vmx/aesp8-ppc.pl | 34 +-
+ drivers/crypto/vmx/ghash.c | 4 +
+ drivers/crypto/vmx/ghashp8-ppc.pl | 6 +
+ drivers/crypto/vmx/ppc-xlate.pl | 1 +
+ drivers/pci/quirks.c | 85 +
+ include/crypto/aead.h | 172 +-
+ include/crypto/algapi.h | 3 +-
+ include/crypto/chacha20.h | 25 +
+ include/crypto/hash.h | 5 +
+ include/crypto/internal/aead.h | 72 +-
+ include/crypto/internal/geniv.h | 9 +
+ include/crypto/internal/skcipher.h | 15 +
+ include/crypto/poly1305.h | 41 +
+ include/crypto/skcipher.h | 391 ++-
+ include/dt-bindings/clock/imx6qdl-clock.h | 5 +-
+ include/linux/crypto.h | 54 +-
+ lib/mpi/mpicoder.c | 38 +-
+ net/xfrm/xfrm_algo.c | 14 +-
+ 154 files changed, 15834 insertions(+), 7537 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/crypto/sun4i-ss.txt
+ create mode 100644 arch/x86/crypto/chacha20-avx2-x86_64.S
+ create mode 100644 arch/x86/crypto/chacha20-ssse3-x86_64.S
+ create mode 100644 arch/x86/crypto/chacha20_glue.c
+ create mode 100644 arch/x86/crypto/poly1305-avx2-x86_64.S
+ create mode 100644 arch/x86/crypto/poly1305-sse2-x86_64.S
+ create mode 100644 arch/x86/crypto/poly1305_glue.c
+ create mode 100644 crypto/skcipher.c
+ delete mode 100644 drivers/crypto/nx/nx-842-crypto.c
+ delete mode 100644 drivers/crypto/nx/nx-842-platform.c
+ create mode 100644 drivers/crypto/qat/qat_common/.gitignore
+ create mode 100644 drivers/crypto/qat/qat_common/adf_admin.c
+ rename drivers/crypto/qat/{qat_dh895xcc => qat_common}/adf_hw_arbiter.c (85%)
+ create mode 100644 drivers/crypto/qat/qat_common/adf_pf2vf_msg.c
+ create mode 100644 drivers/crypto/qat/qat_common/adf_pf2vf_msg.h
+ create mode 100644 drivers/crypto/qat/qat_common/adf_sriov.c
+ create mode 100644 drivers/crypto/qat/qat_common/icp_qat_fw_pke.h
+ create mode 100644 drivers/crypto/qat/qat_common/qat_asym_algs.c
+ create mode 100644 drivers/crypto/qat/qat_common/qat_rsakey.asn1
+ delete mode 100644 drivers/crypto/qat/qat_dh895xcc/adf_admin.c
+ create mode 100644 drivers/crypto/qat/qat_dh895xccvf/Makefile
+ create mode 100644 drivers/crypto/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c
+ create mode 100644 drivers/crypto/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.h
+ create mode 100644 drivers/crypto/qat/qat_dh895xccvf/adf_drv.c
+ rename drivers/crypto/qat/{qat_dh895xcc/qat_admin.c => qat_dh895xccvf/adf_drv.h} (61%)
+ create mode 100644 drivers/crypto/qat/qat_dh895xccvf/adf_isr.c
+ create mode 100644 drivers/crypto/sunxi-ss/Makefile
+ create mode 100644 drivers/crypto/sunxi-ss/sun4i-ss-cipher.c
+ create mode 100644 drivers/crypto/sunxi-ss/sun4i-ss-core.c
+ create mode 100644 drivers/crypto/sunxi-ss/sun4i-ss-hash.c
+ create mode 100644 drivers/crypto/sunxi-ss/sun4i-ss.h
+ create mode 100644 include/crypto/chacha20.h
+ create mode 100644 include/crypto/poly1305.h
+Merging drm/drm-next (d7b273685fed Merge branch 'drm-dwhdmi-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into drm-next)
+$ git merge drm/drm-next
+Resolved 'arch/arm/configs/multi_v7_defconfig' using previous resolution.
+Auto-merging drivers/mfd/Kconfig
+Removing drivers/gpu/drm/vmwgfx/svga_types.h
+Removing drivers/gpu/drm/vmwgfx/svga3d_surfacedefs.h
+Removing drivers/gpu/drm/vmwgfx/svga3d_reg.h
+Auto-merging drivers/gpu/drm/vmwgfx/device_include/svga_reg.h
+Auto-merging drivers/gpu/drm/vmwgfx/device_include/svga_overlay.h
+Auto-merging drivers/gpu/drm/vmwgfx/device_include/svga_escape.h
+Removing drivers/gpu/drm/sti/sti_layer.h
+Removing drivers/gpu/drm/sti/sti_layer.c
+Removing drivers/gpu/drm/sti/sti_hqvdp.h
+Auto-merging drivers/gpu/drm/sti/sti_drv.h
+Auto-merging drivers/gpu/drm/sti/sti_drv.c
+Removing drivers/gpu/drm/sti/sti_drm_plane.h
+Removing drivers/gpu/drm/sti/sti_drm_plane.c
+Removing drivers/gpu/drm/sti/sti_drm_crtc.h
+Auto-merging drivers/gpu/drm/sti/sti_crtc.c
+Auto-merging drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c
+Auto-merging drivers/gpu/drm/panel/panel-samsung-ld9040.c
+Auto-merging drivers/gpu/drm/msm/dsi/phy/dsi_phy.c
+Auto-merging drivers/gpu/drm/i915/i915_irq.c
+Auto-merging drivers/gpu/drm/i915/i915_gem.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.c
+Auto-merging drivers/gpu/drm/exynos/exynos_drm_gem.c
+Auto-merging drivers/gpu/drm/exynos/exynos_drm_g2d.c
+Removing drivers/gpu/drm/exynos/exynos_drm_encoder.h
+Removing drivers/gpu/drm/exynos/exynos_drm_encoder.c
+Removing drivers/gpu/drm/exynos/exynos_drm_dmabuf.h
+Removing drivers/gpu/drm/exynos/exynos_drm_dmabuf.c
+Removing drivers/gpu/drm/exynos/exynos_drm_buf.h
+Removing drivers/gpu/drm/exynos/exynos_drm_buf.c
+Auto-merging drivers/gpu/drm/exynos/Kconfig
+Auto-merging drivers/gpu/drm/amd/include/pptable.h
+Auto-merging drivers/gpu/drm/amd/amdgpu/fiji_smumgr.h
+Auto-merging arch/arm/configs/multi_v7_defconfig
+CONFLICT (content): Merge conflict in arch/arm/configs/multi_v7_defconfig
+Auto-merging arch/arm/configs/exynos_defconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master df022326bc20] Merge remote-tracking branch 'drm/drm-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/drm.tmpl | 24 +-
+ Documentation/devicetree/bindings/drm/msm/dsi.txt | 41 +-
+ Documentation/devicetree/bindings/drm/msm/hdmi.txt | 3 +-
+ .../bindings/gpu/nvidia,tegra20-host1x.txt | 8 +-
+ .../devicetree/bindings/gpu/st,stih4xx.txt | 72 +-
+ .../devicetree/bindings/panel/auo,b080uan01.txt | 7 +
+ .../devicetree/bindings/panel/lg,lg4573.txt | 19 +
+ .../bindings/panel/nec,nl4827hc19-05b.txt | 7 +
+ .../bindings/panel/okaya,rs800480t-7x0gp.txt | 7 +
+ .../devicetree/bindings/vendor-prefixes.txt | 2 +
+ .../devicetree/bindings/video/fsl,dcu.txt | 22 +
+ MAINTAINERS | 14 +
+ arch/arm/configs/exynos_defconfig | 6 +-
+ arch/arm/configs/multi_v7_defconfig | 6 +-
+ arch/x86/configs/x86_64_defconfig | 1 -
+ drivers/char/agp/intel-gtt.c | 4 +-
+ drivers/gpio/gpiolib.c | 13 +
+ drivers/gpu/drm/Kconfig | 28 +-
+ drivers/gpu/drm/Makefile | 3 +-
+ drivers/gpu/drm/amd/amdgpu/Makefile | 22 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 184 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 269 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 65 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 670 +++
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 543 ++
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 838 +++
+ drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 5 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 281 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 213 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 33 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 81 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 154 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 45 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 606 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 40 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 29 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 5 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 25 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 24 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 56 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 121 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_semaphore.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 155 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 51 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 73 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 102 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 179 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 287 +-
+ drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/cik.c | 23 +-
+ drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 48 +-
+ drivers/gpu/drm/amd/amdgpu/cikd.h | 6 +
+ drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 27 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/fiji_dpm.c | 181 +
+ drivers/gpu/drm/amd/amdgpu/fiji_ppsmc.h | 182 +
+ drivers/gpu/drm/amd/amdgpu/fiji_smc.c | 853 +++
+ .../amd/amdgpu/{amdgpu_family.h => fiji_smumgr.h} | 52 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 38 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 144 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 33 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 51 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 81 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/vi.c | 120 +-
+ drivers/gpu/drm/amd/amdgpu/vi_dpm.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/vid.h | 5 +
+ drivers/gpu/drm/amd/amdkfd/Kconfig | 2 +-
+ drivers/gpu/drm/amd/amdkfd/Makefile | 3 +-
+ drivers/gpu/drm/amd/amdkfd/cik_regs.h | 11 -
+ drivers/gpu/drm/amd/amdkfd/kfd_device.c | 7 +-
+ .../drm/amd/amdkfd/kfd_device_queue_manager_cik.c | 12 +-
+ .../drm/amd/amdkfd/kfd_device_queue_manager_vi.c | 103 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 20 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 249 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 99 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_vi.h | 398 ++
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 5 +
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 1 +
+ drivers/gpu/drm/amd/include/amd_shared.h | 39 +
+ .../gpu/drm/amd/include/asic_reg/smu/smu_7_1_3_d.h | 1246 ++++
+ .../drm/amd/include/asic_reg/smu/smu_7_1_3_enum.h | 1282 +++++
+ .../amd/include/asic_reg/smu/smu_7_1_3_sh_mask.h | 6080 ++++++++++++++++++++
+ .../gpu/drm/amd/{amdgpu => include}/atom-bits.h | 0
+ .../gpu/drm/amd/{amdgpu => include}/atom-names.h | 0
+ .../gpu/drm/amd/{amdgpu => include}/atom-types.h | 0
+ drivers/gpu/drm/amd/{amdgpu => include}/atombios.h | 0
+ drivers/gpu/drm/amd/include/cgs_common.h | 624 ++
+ drivers/gpu/drm/amd/include/cgs_linux.h | 135 +
+ drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 3 +-
+ drivers/gpu/drm/amd/{amdgpu => include}/pptable.h | 6 +-
+ drivers/gpu/drm/amd/include/vi_structs.h | 417 ++
+ drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 389 ++
+ drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 131 +
+ drivers/gpu/drm/amd/scheduler/sched_fence.c | 81 +
+ drivers/gpu/drm/armada/armada_fbdev.c | 33 +-
+ drivers/gpu/drm/ast/ast_fb.c | 48 +-
+ drivers/gpu/drm/ast/ast_main.c | 16 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 6 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 216 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 4 +
+ drivers/gpu/drm/bochs/bochs_drv.c | 4 +-
+ drivers/gpu/drm/bochs/bochs_fbdev.c | 36 +-
+ drivers/gpu/drm/bochs/bochs_mm.c | 16 +-
+ drivers/gpu/drm/bridge/Kconfig | 24 +-
+ drivers/gpu/drm/bridge/Makefile | 4 +-
+ .../gpu/drm/bridge/{ptn3460.c => nxp-ptn3460.c} | 0
+ .../gpu/drm/bridge/{ps8622.c => parade-ps8622.c} | 0
+ drivers/gpu/drm/cirrus/cirrus_drv.c | 4 +-
+ drivers/gpu/drm/cirrus/cirrus_fbdev.c | 41 +-
+ drivers/gpu/drm/cirrus/cirrus_main.c | 15 +-
+ drivers/gpu/drm/drm_atomic.c | 90 +-
+ drivers/gpu/drm/drm_atomic_helper.c | 125 +-
+ drivers/gpu/drm/drm_context.c | 51 +-
+ drivers/gpu/drm/drm_crtc.c | 229 +-
+ drivers/gpu/drm/drm_crtc_helper.c | 75 +-
+ drivers/gpu/drm/drm_dp_mst_topology.c | 10 +
+ drivers/gpu/drm/drm_drv.c | 19 +-
+ drivers/gpu/drm/drm_edid.c | 4 +-
+ drivers/gpu/drm/drm_fb_cma_helper.c | 63 +-
+ drivers/gpu/drm/drm_fb_helper.c | 379 +-
+ drivers/gpu/drm/drm_gem.c | 13 +-
+ drivers/gpu/drm/drm_gem_cma_helper.c | 10 +-
+ drivers/gpu/drm/drm_ioc32.c | 55 +-
+ drivers/gpu/drm/drm_ioctl.c | 3 +-
+ drivers/gpu/drm/drm_irq.c | 332 +-
+ drivers/gpu/drm/drm_legacy.h | 2 +-
+ drivers/gpu/drm/drm_lock.c | 6 +
+ drivers/gpu/drm/drm_modeset_lock.c | 59 +-
+ drivers/gpu/drm/drm_of.c | 2 +-
+ drivers/gpu/drm/drm_plane_helper.c | 23 +-
+ drivers/gpu/drm/drm_probe_helper.c | 45 +-
+ drivers/gpu/drm/exynos/Kconfig | 2 +-
+ drivers/gpu/drm/exynos/Makefile | 7 +-
+ drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 65 +-
+ drivers/gpu/drm/exynos/exynos7_drm_decon.c | 94 +-
+ drivers/gpu/drm/exynos/exynos_dp_core.c | 123 +-
+ drivers/gpu/drm/exynos/exynos_dp_core.h | 3 +-
+ drivers/gpu/drm/exynos/exynos_drm_buf.c | 186 -
+ drivers/gpu/drm/exynos/exynos_drm_buf.h | 33 -
+ drivers/gpu/drm/exynos/exynos_drm_core.c | 36 -
+ drivers/gpu/drm/exynos/exynos_drm_crtc.c | 25 +-
+ drivers/gpu/drm/exynos/exynos_drm_crtc.h | 4 +-
+ drivers/gpu/drm/exynos/exynos_drm_dmabuf.c | 286 -
+ drivers/gpu/drm/exynos/exynos_drm_dmabuf.h | 20 -
+ drivers/gpu/drm/exynos/exynos_drm_dpi.c | 111 +-
+ drivers/gpu/drm/exynos/exynos_drm_drv.c | 28 +-
+ drivers/gpu/drm/exynos/exynos_drm_drv.h | 110 +-
+ drivers/gpu/drm/exynos/exynos_drm_dsi.c | 138 +-
+ drivers/gpu/drm/exynos/exynos_drm_encoder.c | 174 -
+ drivers/gpu/drm/exynos/exynos_drm_encoder.h | 23 -
+ drivers/gpu/drm/exynos/exynos_drm_fb.c | 14 +-
+ drivers/gpu/drm/exynos/exynos_drm_fb.h | 4 +-
+ drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 77 +-
+ drivers/gpu/drm/exynos/exynos_drm_fimd.c | 106 +-
+ drivers/gpu/drm/exynos/exynos_drm_g2d.c | 6 -
+ drivers/gpu/drm/exynos/exynos_drm_gem.c | 352 +-
+ drivers/gpu/drm/exynos/exynos_drm_gem.h | 58 +-
+ drivers/gpu/drm/exynos/exynos_drm_gsc.c | 16 +
+ drivers/gpu/drm/exynos/exynos_drm_iommu.c | 20 +-
+ drivers/gpu/drm/exynos/exynos_drm_iommu.h | 15 -
+ drivers/gpu/drm/exynos/exynos_drm_ipp.c | 16 +-
+ drivers/gpu/drm/exynos/exynos_drm_plane.c | 41 +-
+ drivers/gpu/drm/exynos/exynos_drm_vidi.c | 107 +-
+ drivers/gpu/drm/exynos/exynos_hdmi.c | 1014 ++--
+ drivers/gpu/drm/exynos/exynos_mixer.c | 185 +-
+ drivers/gpu/drm/fsl-dcu/Kconfig | 18 +
+ drivers/gpu/drm/fsl-dcu/Makefile | 7 +
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 210 +
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.h | 19 +
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 404 ++
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h | 197 +
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_fbdev.c | 23 +
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c | 43 +
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_output.h | 33 +
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 261 +
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.h | 17 +
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 182 +
+ drivers/gpu/drm/gma500/accel_2d.c | 6 +-
+ drivers/gpu/drm/gma500/framebuffer.c | 48 +-
+ drivers/gpu/drm/i915/Kconfig | 24 -
+ drivers/gpu/drm/i915/Makefile | 21 +-
+ drivers/gpu/drm/i915/dvo_ivch.c | 63 +-
+ drivers/gpu/drm/i915/i915_cmd_parser.c | 10 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 340 +-
+ drivers/gpu/drm/i915/i915_dma.c | 42 +-
+ drivers/gpu/drm/i915/i915_drv.c | 74 +-
+ drivers/gpu/drm/i915/i915_drv.h | 291 +-
+ drivers/gpu/drm/i915/i915_gem.c | 861 +--
+ drivers/gpu/drm/i915/i915_gem_context.c | 94 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 160 +-
+ drivers/gpu/drm/i915/i915_gem_fence.c | 787 +++
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 732 +--
+ drivers/gpu/drm/i915/i915_gem_gtt.h | 64 +-
+ drivers/gpu/drm/i915/i915_gem_render_state.c | 70 +-
+ drivers/gpu/drm/i915/i915_gem_render_state.h | 4 +-
+ drivers/gpu/drm/i915/i915_gem_stolen.c | 306 +-
+ drivers/gpu/drm/i915/i915_gem_tiling.c | 303 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c | 5 +
+ drivers/gpu/drm/i915/i915_guc_reg.h | 102 +
+ drivers/gpu/drm/i915/i915_ioc32.c | 138 +-
+ drivers/gpu/drm/i915/i915_irq.c | 501 +-
+ drivers/gpu/drm/i915/i915_params.c | 24 +-
+ drivers/gpu/drm/i915/i915_reg.h | 169 +-
+ drivers/gpu/drm/i915/i915_suspend.c | 2 +-
+ drivers/gpu/drm/i915/i915_sysfs.c | 22 +-
+ drivers/gpu/drm/i915/i915_trace.h | 16 +-
+ drivers/gpu/drm/i915/intel_atomic.c | 220 +-
+ drivers/gpu/drm/i915/intel_atomic_plane.c | 41 +-
+ drivers/gpu/drm/i915/intel_audio.c | 3 +-
+ drivers/gpu/drm/i915/intel_bios.c | 106 +-
+ drivers/gpu/drm/i915/intel_bios.h | 16 +
+ drivers/gpu/drm/i915/intel_crt.c | 49 +-
+ drivers/gpu/drm/i915/intel_csr.c | 22 +-
+ drivers/gpu/drm/i915/intel_ddi.c | 1131 ++--
+ drivers/gpu/drm/i915/intel_display.c | 4315 +++++++-------
+ drivers/gpu/drm/i915/intel_dp.c | 413 +-
+ drivers/gpu/drm/i915/intel_dp_mst.c | 34 +-
+ drivers/gpu/drm/i915/intel_drv.h | 162 +-
+ drivers/gpu/drm/i915/intel_dsi.c | 51 +-
+ drivers/gpu/drm/i915/intel_dsi.h | 3 +
+ drivers/gpu/drm/i915/intel_dsi_pll.c | 97 +-
+ drivers/gpu/drm/i915/intel_dvo.c | 46 +-
+ drivers/gpu/drm/i915/intel_fbc.c | 540 +-
+ drivers/gpu/drm/i915/intel_fbdev.c | 110 +-
+ drivers/gpu/drm/i915/intel_frontbuffer.c | 117 +-
+ drivers/gpu/drm/i915/intel_guc_fwif.h | 245 +
+ drivers/gpu/drm/i915/intel_hdmi.c | 425 +-
+ drivers/gpu/drm/i915/intel_hotplug.c | 505 ++
+ drivers/gpu/drm/i915/intel_lrc.c | 893 ++-
+ drivers/gpu/drm/i915/intel_lrc.h | 21 +-
+ drivers/gpu/drm/i915/intel_lvds.c | 74 +-
+ drivers/gpu/drm/i915/intel_mocs.c | 335 ++
+ drivers/gpu/drm/i915/intel_mocs.h | 57 +
+ drivers/gpu/drm/i915/intel_opregion.c | 104 +-
+ drivers/gpu/drm/i915/intel_overlay.c | 63 +-
+ drivers/gpu/drm/i915/intel_panel.c | 94 +-
+ drivers/gpu/drm/i915/intel_pm.c | 827 ++-
+ drivers/gpu/drm/i915/intel_psr.c | 81 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 408 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 92 +-
+ drivers/gpu/drm/i915/intel_runtime_pm.c | 113 +-
+ drivers/gpu/drm/i915/intel_sdvo.c | 47 +-
+ drivers/gpu/drm/i915/intel_sprite.c | 205 +-
+ drivers/gpu/drm/i915/intel_tv.c | 2 +-
+ drivers/gpu/drm/i915/intel_uncore.c | 74 +-
+ drivers/gpu/drm/mgag200/mgag200_cursor.c | 22 +-
+ drivers/gpu/drm/mgag200/mgag200_drv.c | 1 +
+ drivers/gpu/drm/mgag200/mgag200_drv.h | 1 +
+ drivers/gpu/drm/mgag200/mgag200_fb.c | 41 +-
+ drivers/gpu/drm/mgag200/mgag200_i2c.c | 1 +
+ drivers/gpu/drm/mgag200/mgag200_main.c | 25 +-
+ drivers/gpu/drm/mgag200/mgag200_mode.c | 221 +-
+ drivers/gpu/drm/mgag200/mgag200_ttm.c | 8 +-
+ drivers/gpu/drm/msm/Kconfig | 15 +
+ drivers/gpu/drm/msm/Makefile | 15 +-
+ drivers/gpu/drm/msm/adreno/a2xx.xml.h | 18 +-
+ drivers/gpu/drm/msm/adreno/a3xx.xml.h | 33 +-
+ drivers/gpu/drm/msm/adreno/a4xx.xml.h | 206 +-
+ drivers/gpu/drm/msm/adreno/adreno_common.xml.h | 18 +-
+ drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h | 18 +-
+ drivers/gpu/drm/msm/dsi/dsi.c | 58 +-
+ drivers/gpu/drm/msm/dsi/dsi.h | 43 +-
+ drivers/gpu/drm/msm/dsi/dsi.xml.h | 211 +-
+ drivers/gpu/drm/msm/dsi/dsi_cfg.c | 92 +
+ drivers/gpu/drm/msm/dsi/dsi_cfg.h | 44 +
+ drivers/gpu/drm/msm/dsi/dsi_host.c | 270 +-
+ drivers/gpu/drm/msm/dsi/dsi_manager.c | 216 +-
+ drivers/gpu/drm/msm/dsi/mmss_cc.xml.h | 26 +-
+ drivers/gpu/drm/msm/dsi/{ => phy}/dsi_phy.c | 413 +-
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 89 +
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c | 150 +
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 166 +
+ drivers/gpu/drm/msm/dsi/pll/dsi_pll.c | 42 +-
+ drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 9 +
+ drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c | 31 +-
+ drivers/gpu/drm/msm/dsi/sfpb.xml.h | 26 +-
+ drivers/gpu/drm/msm/edp/edp.xml.h | 22 +-
+ drivers/gpu/drm/msm/edp/edp_ctrl.c | 17 +-
+ drivers/gpu/drm/msm/hdmi/hdmi.c | 79 +-
+ drivers/gpu/drm/msm/hdmi/hdmi.h | 32 +-
+ drivers/gpu/drm/msm/hdmi/hdmi.xml.h | 28 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_audio.c | 1 -
+ drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 16 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 101 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c | 1437 +++++
+ drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c | 52 -
+ drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.c | 32 -
+ drivers/gpu/drm/msm/hdmi/hdmi_phy_8x74.c | 57 -
+ drivers/gpu/drm/msm/hdmi/qfprom.xml.h | 26 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h | 22 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 8 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c | 19 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 38 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 24 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c | 8 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 9 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h | 180 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c | 180 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h | 13 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c | 12 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 139 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.c | 243 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.h | 43 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 18 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c | 19 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 80 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 57 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 334 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.c | 26 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.h | 3 +-
+ drivers/gpu/drm/msm/mdp/mdp_common.xml.h | 28 +-
+ drivers/gpu/drm/msm/mdp/mdp_format.c | 46 +-
+ drivers/gpu/drm/msm/mdp/mdp_kms.c | 3 +-
+ drivers/gpu/drm/msm/mdp/mdp_kms.h | 20 +-
+ drivers/gpu/drm/msm/msm_drv.c | 82 +-
+ drivers/gpu/drm/msm/msm_drv.h | 19 +
+ drivers/gpu/drm/msm/msm_fbdev.c | 34 +-
+ drivers/gpu/drm/nouveau/dispnv04/overlay.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_connector.c | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_drm.c | 3 +-
+ drivers/gpu/drm/nouveau/nouveau_fbcon.c | 39 +-
+ drivers/gpu/drm/nouveau/nouveau_ttm.c | 2 -
+ drivers/gpu/drm/omapdrm/omap_crtc.c | 6 +-
+ drivers/gpu/drm/omapdrm/omap_fbdev.c | 38 +-
+ drivers/gpu/drm/panel/Kconfig | 16 +-
+ drivers/gpu/drm/panel/Makefile | 5 +-
+ drivers/gpu/drm/panel/panel-lg-lg4573.c | 298 +
+ .../{panel-ld9040.c => panel-samsung-ld9040.c} | 2 +-
+ .../{panel-s6e8aa0.c => panel-samsung-s6e8aa0.c} | 2 +-
+ drivers/gpu/drm/panel/panel-simple.c | 99 +-
+ drivers/gpu/drm/qxl/qxl_fb.c | 40 +-
+ drivers/gpu/drm/qxl/qxl_object.c | 4 +-
+ drivers/gpu/drm/radeon/dce6_afmt.c | 29 +-
+ drivers/gpu/drm/radeon/radeon_connectors.c | 5 +
+ drivers/gpu/drm/radeon/radeon_dp_mst.c | 14 +-
+ drivers/gpu/drm/radeon/radeon_fb.c | 42 +-
+ drivers/gpu/drm/radeon/radeon_kfd.c | 3 +-
+ drivers/gpu/drm/radeon/radeon_object.c | 4 +-
+ drivers/gpu/drm/radeon/radeon_pm.c | 5 -
+ drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 6 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 47 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 12 +-
+ drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 2 +-
+ drivers/gpu/drm/sti/Makefile | 7 +-
+ drivers/gpu/drm/sti/sti_compositor.c | 141 +-
+ drivers/gpu/drm/sti/sti_compositor.h | 12 +-
+ drivers/gpu/drm/sti/{sti_drm_crtc.c => sti_crtc.c} | 211 +-
+ drivers/gpu/drm/sti/sti_crtc.h | 22 +
+ drivers/gpu/drm/sti/sti_cursor.c | 243 +-
+ drivers/gpu/drm/sti/sti_cursor.h | 5 +-
+ drivers/gpu/drm/sti/sti_drm_crtc.h | 22 -
+ drivers/gpu/drm/sti/sti_drm_plane.c | 251 -
+ drivers/gpu/drm/sti/sti_drm_plane.h | 18 -
+ drivers/gpu/drm/sti/{sti_drm_drv.c => sti_drv.c} | 147 +-
+ drivers/gpu/drm/sti/{sti_drm_drv.h => sti_drv.h} | 6 +-
+ drivers/gpu/drm/sti/sti_gdp.c | 536 +-
+ drivers/gpu/drm/sti/sti_gdp.h | 7 +-
+ drivers/gpu/drm/sti/sti_hdmi.c | 27 +-
+ drivers/gpu/drm/sti/sti_hqvdp.c | 482 +-
+ drivers/gpu/drm/sti/sti_hqvdp.h | 12 -
+ drivers/gpu/drm/sti/sti_layer.c | 213 -
+ drivers/gpu/drm/sti/sti_layer.h | 131 -
+ drivers/gpu/drm/sti/sti_mixer.c | 72 +-
+ drivers/gpu/drm/sti/sti_mixer.h | 27 +-
+ drivers/gpu/drm/sti/sti_plane.c | 122 +
+ drivers/gpu/drm/sti/sti_plane.h | 71 +
+ drivers/gpu/drm/sti/sti_tvout.c | 54 +-
+ drivers/gpu/drm/sti/sti_vid.c | 72 +-
+ drivers/gpu/drm/sti/sti_vid.h | 19 +-
+ drivers/gpu/drm/tegra/dc.c | 300 +-
+ drivers/gpu/drm/tegra/dc.h | 24 +-
+ drivers/gpu/drm/tegra/dpaux.c | 63 +-
+ drivers/gpu/drm/tegra/dpaux.h | 2 +
+ drivers/gpu/drm/tegra/drm.c | 16 +-
+ drivers/gpu/drm/tegra/drm.h | 10 +
+ drivers/gpu/drm/tegra/dsi.c | 126 +-
+ drivers/gpu/drm/tegra/dsi.h | 4 +
+ drivers/gpu/drm/tegra/fb.c | 35 +-
+ drivers/gpu/drm/tegra/hdmi.c | 78 +-
+ drivers/gpu/drm/tegra/output.c | 20 +-
+ drivers/gpu/drm/tegra/rgb.c | 49 +-
+ drivers/gpu/drm/tegra/sor.c | 1664 ++++--
+ drivers/gpu/drm/tegra/sor.h | 298 +-
+ drivers/gpu/drm/ttm/ttm_tt.c | 4 +-
+ drivers/gpu/drm/udl/udl_fb.c | 41 +-
+ drivers/gpu/drm/virtio/virtgpu_fb.c | 32 +-
+ drivers/gpu/drm/vmwgfx/Makefile | 3 +-
+ .../gpu/drm/vmwgfx/device_include/includeCheck.h | 3 +
+ .../gpu/drm/vmwgfx/device_include/svga3d_caps.h | 110 +
+ drivers/gpu/drm/vmwgfx/device_include/svga3d_cmd.h | 2071 +++++++
+ .../gpu/drm/vmwgfx/device_include/svga3d_devcaps.h | 457 ++
+ drivers/gpu/drm/vmwgfx/device_include/svga3d_dx.h | 1487 +++++
+ .../gpu/drm/vmwgfx/device_include/svga3d_limits.h | 99 +
+ drivers/gpu/drm/vmwgfx/device_include/svga3d_reg.h | 50 +
+ .../drm/vmwgfx/device_include/svga3d_surfacedefs.h | 1204 ++++
+ .../gpu/drm/vmwgfx/device_include/svga3d_types.h | 1633 ++++++
+ .../drm/vmwgfx/{ => device_include}/svga_escape.h | 2 +-
+ .../drm/vmwgfx/{ => device_include}/svga_overlay.h | 10 +-
+ .../gpu/drm/vmwgfx/{ => device_include}/svga_reg.h | 664 ++-
+ drivers/gpu/drm/vmwgfx/device_include/svga_types.h | 46 +
+ .../gpu/drm/vmwgfx/device_include/vm_basic_types.h | 21 +
+ .../drm/vmwgfx/device_include/vmware_pack_begin.h | 25 +
+ .../drm/vmwgfx/device_include/vmware_pack_end.h | 25 +
+ drivers/gpu/drm/vmwgfx/svga3d_reg.h | 2627 ---------
+ drivers/gpu/drm/vmwgfx/svga3d_surfacedefs.h | 912 ---
+ drivers/gpu/drm/vmwgfx/svga_types.h | 45 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_binding.c | 1294 +++++
+ drivers/gpu/drm/vmwgfx/vmwgfx_binding.h | 209 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 24 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 1303 +++++
+ drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 26 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 786 +--
+ drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 662 +++
+ drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c | 184 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 501 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 335 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2053 ++++++-
+ drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 575 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 10 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_fence.h | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 145 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 18 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 47 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 1700 +++---
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 194 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 49 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 212 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 16 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_reg.h | 12 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 277 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_resource_priv.h | 14 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 556 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 500 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_so.c | 555 ++
+ drivers/gpu/drm/vmwgfx/vmwgfx_so.h | 160 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 1266 ++++
+ drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 309 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | 2 +-
+ drivers/gpu/host1x/mipi.c | 253 +-
+ drivers/gpu/vga/vga_switcheroo.c | 95 +-
+ drivers/gpu/vga/vgaarb.c | 142 +-
+ drivers/mfd/Kconfig | 1 +
+ drivers/mfd/intel_soc_pmic_core.c | 29 +
+ drivers/mfd/intel_soc_pmic_crc.c | 3 +
+ drivers/pwm/Kconfig | 7 +
+ drivers/pwm/Makefile | 1 +
+ drivers/pwm/pwm-crc.c | 143 +
+ drivers/video/Kconfig | 2 -
+ include/drm/drmP.h | 57 +-
+ include/drm/drm_atomic.h | 3 +-
+ include/drm/drm_atomic_helper.h | 4 +-
+ include/drm/drm_crtc.h | 83 +-
+ include/drm/drm_crtc_helper.h | 8 +-
+ include/drm/drm_dp_helper.h | 3 +-
+ include/drm/drm_fb_helper.h | 212 +
+ include/drm/drm_modeset_lock.h | 1 -
+ include/drm/drm_plane_helper.h | 45 +-
+ include/drm/intel-gtt.h | 4 +-
+ include/linux/gpio/machine.h | 1 +
+ include/uapi/drm/drm_fourcc.h | 7 +
+ include/uapi/drm/i915_drm.h | 16 +-
+ include/uapi/drm/vmwgfx_drm.h | 38 +-
+ 480 files changed, 60049 insertions(+), 22282 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/panel/auo,b080uan01.txt
+ create mode 100644 Documentation/devicetree/bindings/panel/lg,lg4573.txt
+ create mode 100644 Documentation/devicetree/bindings/panel/nec,nl4827hc19-05b.txt
+ create mode 100644 Documentation/devicetree/bindings/panel/okaya,rs800480t-7x0gp.txt
+ create mode 100644 Documentation/devicetree/bindings/video/fsl,dcu.txt
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/fiji_dpm.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/fiji_ppsmc.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/fiji_smc.c
+ rename drivers/gpu/drm/amd/amdgpu/{amdgpu_family.h => fiji_smumgr.h} (56%)
+ create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_vi.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_3_d.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_3_enum.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_3_sh_mask.h
+ rename drivers/gpu/drm/amd/{amdgpu => include}/atom-bits.h (100%)
+ rename drivers/gpu/drm/amd/{amdgpu => include}/atom-names.h (100%)
+ rename drivers/gpu/drm/amd/{amdgpu => include}/atom-types.h (100%)
+ rename drivers/gpu/drm/amd/{amdgpu => include}/atombios.h (100%)
+ create mode 100644 drivers/gpu/drm/amd/include/cgs_common.h
+ create mode 100644 drivers/gpu/drm/amd/include/cgs_linux.h
+ rename drivers/gpu/drm/amd/{amdgpu => include}/pptable.h (98%)
+ create mode 100644 drivers/gpu/drm/amd/include/vi_structs.h
+ create mode 100644 drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
+ create mode 100644 drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
+ create mode 100644 drivers/gpu/drm/amd/scheduler/sched_fence.c
+ rename drivers/gpu/drm/bridge/{ptn3460.c => nxp-ptn3460.c} (100%)
+ rename drivers/gpu/drm/bridge/{ps8622.c => parade-ps8622.c} (100%)
+ delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_buf.c
+ delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_buf.h
+ delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_dmabuf.c
+ delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_dmabuf.h
+ delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_encoder.c
+ delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_encoder.h
+ create mode 100644 drivers/gpu/drm/fsl-dcu/Kconfig
+ create mode 100644 drivers/gpu/drm/fsl-dcu/Makefile
+ create mode 100644 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c
+ create mode 100644 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.h
+ create mode 100644 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
+ create mode 100644 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h
+ create mode 100644 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_fbdev.c
+ create mode 100644 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c
+ create mode 100644 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_output.h
+ create mode 100644 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c
+ create mode 100644 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.h
+ create mode 100644 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
+ create mode 100644 drivers/gpu/drm/i915/i915_gem_fence.c
+ create mode 100644 drivers/gpu/drm/i915/i915_guc_reg.h
+ create mode 100644 drivers/gpu/drm/i915/intel_guc_fwif.h
+ create mode 100644 drivers/gpu/drm/i915/intel_hotplug.c
+ create mode 100644 drivers/gpu/drm/i915/intel_mocs.c
+ create mode 100644 drivers/gpu/drm/i915/intel_mocs.h
+ create mode 100644 drivers/gpu/drm/msm/dsi/dsi_cfg.c
+ create mode 100644 drivers/gpu/drm/msm/dsi/dsi_cfg.h
+ rename drivers/gpu/drm/msm/dsi/{ => phy}/dsi_phy.c (54%)
+ create mode 100644 drivers/gpu/drm/msm/dsi/phy/dsi_phy.h
+ create mode 100644 drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c
+ create mode 100644 drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c
+ create mode 100644 drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c
+ create mode 100644 drivers/gpu/drm/panel/panel-lg-lg4573.c
+ rename drivers/gpu/drm/panel/{panel-ld9040.c => panel-samsung-ld9040.c} (99%)
+ rename drivers/gpu/drm/panel/{panel-s6e8aa0.c => panel-samsung-s6e8aa0.c} (99%)
+ rename drivers/gpu/drm/sti/{sti_drm_crtc.c => sti_crtc.c} (56%)
+ create mode 100644 drivers/gpu/drm/sti/sti_crtc.h
+ delete mode 100644 drivers/gpu/drm/sti/sti_drm_crtc.h
+ delete mode 100644 drivers/gpu/drm/sti/sti_drm_plane.c
+ delete mode 100644 drivers/gpu/drm/sti/sti_drm_plane.h
+ rename drivers/gpu/drm/sti/{sti_drm_drv.c => sti_drv.c} (61%)
+ rename drivers/gpu/drm/sti/{sti_drm_drv.h => sti_drv.h} (90%)
+ delete mode 100644 drivers/gpu/drm/sti/sti_hqvdp.h
+ delete mode 100644 drivers/gpu/drm/sti/sti_layer.c
+ delete mode 100644 drivers/gpu/drm/sti/sti_layer.h
+ create mode 100644 drivers/gpu/drm/sti/sti_plane.c
+ create mode 100644 drivers/gpu/drm/sti/sti_plane.h
+ create mode 100644 drivers/gpu/drm/vmwgfx/device_include/includeCheck.h
+ create mode 100644 drivers/gpu/drm/vmwgfx/device_include/svga3d_caps.h
+ create mode 100644 drivers/gpu/drm/vmwgfx/device_include/svga3d_cmd.h
+ create mode 100644 drivers/gpu/drm/vmwgfx/device_include/svga3d_devcaps.h
+ create mode 100644 drivers/gpu/drm/vmwgfx/device_include/svga3d_dx.h
+ create mode 100644 drivers/gpu/drm/vmwgfx/device_include/svga3d_limits.h
+ create mode 100644 drivers/gpu/drm/vmwgfx/device_include/svga3d_reg.h
+ create mode 100644 drivers/gpu/drm/vmwgfx/device_include/svga3d_surfacedefs.h
+ create mode 100644 drivers/gpu/drm/vmwgfx/device_include/svga3d_types.h
+ rename drivers/gpu/drm/vmwgfx/{ => device_include}/svga_escape.h (97%)
+ rename drivers/gpu/drm/vmwgfx/{ => device_include}/svga_overlay.h (96%)
+ rename drivers/gpu/drm/vmwgfx/{ => device_include}/svga_reg.h (74%)
+ create mode 100644 drivers/gpu/drm/vmwgfx/device_include/svga_types.h
+ create mode 100644 drivers/gpu/drm/vmwgfx/device_include/vm_basic_types.h
+ create mode 100644 drivers/gpu/drm/vmwgfx/device_include/vmware_pack_begin.h
+ create mode 100644 drivers/gpu/drm/vmwgfx/device_include/vmware_pack_end.h
+ delete mode 100644 drivers/gpu/drm/vmwgfx/svga3d_reg.h
+ delete mode 100644 drivers/gpu/drm/vmwgfx/svga3d_surfacedefs.h
+ delete mode 100644 drivers/gpu/drm/vmwgfx/svga_types.h
+ create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_binding.c
+ create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_binding.h
+ create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
+ create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c
+ create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_so.c
+ create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_so.h
+ create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
+ create mode 100644 drivers/pwm/pwm-crc.c
+Merging drm-panel/drm/panel/for-next (a33ee95f8f45 drm/bridge: Put Kconfig entries in a separate menu)
+$ git merge drm-panel/drm/panel/for-next
+Already up-to-date.
+Merging drm-intel/for-linux-next (7616d2410010 drm/i915: Set the map-and-fenceable flag for preallocated objects)
+$ git merge drm-intel/for-linux-next
+Auto-merging drivers/gpu/drm/i915/i915_irq.c
+Auto-merging drivers/gpu/drm/i915/i915_gem.c
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/i915/i915_drv.h | 2 +
+ drivers/gpu/drm/i915/i915_gem.c | 43 +++++++++--------
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 1 +
+ drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +-
+ drivers/gpu/drm/i915/i915_irq.c | 48 +++++++++++++++++--
+ drivers/gpu/drm/i915/i915_reg.h | 12 +++++
+ drivers/gpu/drm/i915/intel_bios.c | 87 ++++++++++++++++++++++------------
+ drivers/gpu/drm/i915/intel_bios.h | 6 ++-
+ drivers/gpu/drm/i915/intel_ddi.c | 75 ++++++++++-------------------
+ drivers/gpu/drm/i915/intel_display.c | 3 ++
+ drivers/gpu/drm/i915/intel_dp.c | 22 +++++----
+ drivers/gpu/drm/i915/intel_fbdev.c | 15 ++++++
+ drivers/gpu/drm/i915/intel_hotplug.c | 3 ++
+ 13 files changed, 206 insertions(+), 113 deletions(-)
+Merging drm-tegra/drm/tegra/for-next (459cc2c6800b drm/tegra: sor: Add HDMI support)
+$ git merge drm-tegra/drm/tegra/for-next
+Already up-to-date.
+Merging drm-misc/topic/drm-misc (301eb794baef drm/atomic: refuse changing CRTC for planes directly)
+$ git merge drm-misc/topic/drm-misc
+Auto-merging drivers/gpu/drm/drm_crtc.c
+Auto-merging drivers/gpu/drm/drm_atomic_helper.c
+Auto-merging drivers/gpu/drm/drm_atomic.c
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/drm_atomic.c | 25 +++++++++++++++++++
+ drivers/gpu/drm/drm_atomic_helper.c | 14 +++++------
+ drivers/gpu/drm/drm_crtc.c | 14 +++++++++--
+ drivers/gpu/drm/drm_drv.c | 2 ++
+ drivers/gpu/drm/drm_fb_helper.c | 48 ++++++++++++++++++++++++++++++-------
+ drivers/gpu/drm/drm_mm.c | 6 ++---
+ include/drm/drm_fb_helper.h | 6 ++---
+ include/drm/drm_modeset_lock.h | 10 ++++----
+ include/uapi/drm/drm_mode.h | 42 ++++++++++++++++++++++----------
+ 9 files changed, 127 insertions(+), 40 deletions(-)
+Merging drm-exynos/exynos-drm/for-next (1b647a166f07 Merge tag 'dmaengine-fix-4.2-rc8' of git://git.infradead.org/users/vkoul/slave-dma)
+$ git merge drm-exynos/exynos-drm/for-next
+Already up-to-date.
+Merging drm-msm/msm-next (d248b61f6114 drm/msm/dsi: Introduce DSI configuration module)
+$ git merge drm-msm/msm-next
+Already up-to-date.
+Merging sound/for-next (0662292aec05 ALSA: usb-audio: Handle normal and auto-suspend equally)
+$ git merge sound/for-next
+Merge made by the 'recursive' strategy.
+ drivers/input/touchscreen/wm97xx-core.c | 13 +-
+ include/sound/hda_register.h | 4 +
+ include/sound/hdaudio.h | 19 +-
+ include/sound/hdaudio_ext.h | 71 ++++++++
+ sound/ac97_bus.c | 26 ---
+ sound/aoa/codecs/onyx.c | 1 -
+ sound/aoa/codecs/tas.c | 1 -
+ sound/aoa/fabrics/layout.c | 21 ++-
+ sound/aoa/soundbus/core.c | 28 ---
+ sound/aoa/soundbus/soundbus.h | 2 -
+ sound/firewire/oxfw/oxfw-stream.c | 9 +-
+ sound/hda/ext/hdac_ext_bus.c | 98 +++++++++-
+ sound/hda/ext/hdac_ext_controller.c | 30 +++-
+ sound/hda/ext/hdac_ext_stream.c | 62 ++++++-
+ sound/hda/hdac_device.c | 56 +++++-
+ sound/hda/hdac_regmap.c | 10 +-
+ sound/hda/hdac_stream.c | 22 +++
+ sound/hda/hdac_sysfs.c | 6 +-
+ sound/pci/echoaudio/darla20_dsp.c | 6 +-
+ sound/pci/echoaudio/darla24_dsp.c | 6 +-
+ sound/pci/echoaudio/echo3g_dsp.c | 16 +-
+ sound/pci/echoaudio/echoaudio.c | 2 +-
+ sound/pci/echoaudio/echoaudio.h | 7 +-
+ sound/pci/echoaudio/echoaudio_3g.c | 12 +-
+ sound/pci/echoaudio/echoaudio_dsp.c | 26 +--
+ sound/pci/echoaudio/echoaudio_gml.c | 4 +-
+ sound/pci/echoaudio/gina20.c | 2 +-
+ sound/pci/echoaudio/gina20_dsp.c | 8 +-
+ sound/pci/echoaudio/gina24_dsp.c | 22 +--
+ sound/pci/echoaudio/indigo_dsp.c | 6 +-
+ sound/pci/echoaudio/indigodj_dsp.c | 6 +-
+ sound/pci/echoaudio/indigodjx_dsp.c | 6 +-
+ sound/pci/echoaudio/indigoio_dsp.c | 6 +-
+ sound/pci/echoaudio/indigoiox_dsp.c | 6 +-
+ sound/pci/echoaudio/layla20.c | 2 +-
+ sound/pci/echoaudio/layla20_dsp.c | 12 +-
+ sound/pci/echoaudio/layla24_dsp.c | 26 +--
+ sound/pci/echoaudio/mia.c | 2 +-
+ sound/pci/echoaudio/mia_dsp.c | 8 +-
+ sound/pci/echoaudio/mona_dsp.c | 20 +--
+ sound/pci/emu10k1/emumixer.c | 25 +--
+ sound/pci/hda/hda_auto_parser.c | 27 ++-
+ sound/pci/hda/hda_codec.c | 77 +-------
+ sound/pci/hda/hda_codec.h | 7 -
+ sound/pci/hda/hda_eld.c | 10 +-
+ sound/pci/hda/hda_proc.c | 107 ++++++++---
+ sound/pci/hda/patch_ca0132.c | 87 ++++++---
+ sound/pci/hda/patch_realtek.c | 308 ++++----------------------------
+ sound/pci/rme9652/hdsp.c | 7 +-
+ sound/ppc/keywest.c | 2 +
+ sound/usb/card.c | 108 ++++++-----
+ sound/usb/endpoint.c | 10 +-
+ sound/usb/mixer.c | 112 +++++++-----
+ sound/usb/mixer.h | 2 +
+ sound/usb/mixer_quirks.c | 126 ++++++-------
+ sound/usb/pcm.c | 64 +++++--
+ sound/usb/proc.c | 4 +-
+ sound/usb/usbaudio.h | 11 +-
+ 58 files changed, 930 insertions(+), 854 deletions(-)
+Merging sound-asoc/for-next (999b3fa781af Merge remote-tracking branch 'asoc/topic/xtensa' into asoc-next)
+$ git merge sound-asoc/for-next
+Auto-merging sound/ac97_bus.c
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/sound/cs4349.txt | 19 +
+ .../devicetree/bindings/sound/ics43432.txt | 17 +
+ .../devicetree/bindings/sound/max98357a.txt | 6 +-
+ .../devicetree/bindings/sound/renesas,rsnd.txt | 22 +
+ .../bindings/sound/renesas,rsrc-card.txt | 7 +
+ .../bindings/sound/rockchip-max98090.txt | 19 +
+ .../devicetree/bindings/sound/rockchip-rt5645.txt | 17 +
+ .../devicetree/bindings/sound/st,sti-asoc-card.txt | 155 +++
+ .../devicetree/bindings/vendor-prefixes.txt | 2 +
+ drivers/base/regmap/internal.h | 2 +-
+ drivers/base/regmap/regmap.c | 73 +-
+ drivers/gpu/drm/i2c/adv7511.c | 2 +-
+ drivers/input/misc/drv260x.c | 6 +-
+ drivers/input/misc/drv2665.c | 2 +-
+ drivers/input/misc/drv2667.c | 4 +-
+ drivers/mfd/arizona-core.c | 2 +-
+ drivers/mfd/twl6040.c | 2 +-
+ drivers/mfd/wm5102-tables.c | 6 +-
+ drivers/mfd/wm5110-tables.c | 22 +-
+ drivers/mfd/wm8994-core.c | 8 +-
+ drivers/mfd/wm8997-tables.c | 2 +-
+ include/linux/mfd/arizona/registers.h | 37 +
+ include/linux/regmap.h | 28 +-
+ include/sound/ac97_codec.h | 2 +
+ include/sound/rcar_snd.h | 14 +
+ include/sound/rt298.h | 20 +
+ include/sound/soc-dapm.h | 84 +-
+ include/sound/soc-topology.h | 13 +-
+ include/sound/soc.h | 18 +-
+ include/trace/events/asoc.h | 53 +-
+ sound/ac97_bus.c | 62 +
+ sound/soc/Kconfig | 1 +
+ sound/soc/Makefile | 1 +
+ sound/soc/atmel/atmel_ssc_dai.c | 2 +-
+ sound/soc/bcm/bcm2835-i2s.c | 2 +
+ sound/soc/blackfin/bfin-eval-adau1x61.c | 1 +
+ sound/soc/codecs/88pm860x-codec.c | 32 +-
+ sound/soc/codecs/Kconfig | 25 +
+ sound/soc/codecs/Makefile | 10 +
+ sound/soc/codecs/ab8500-codec.c | 7 +-
+ sound/soc/codecs/ad1980.c | 36 +-
+ sound/soc/codecs/adau1373.c | 22 +-
+ sound/soc/codecs/adau1701.c | 1 -
+ sound/soc/codecs/adau1761-i2c.c | 1 -
+ sound/soc/codecs/adau1781-i2c.c | 1 -
+ sound/soc/codecs/adau1977-i2c.c | 1 -
+ sound/soc/codecs/adav803.c | 1 -
+ sound/soc/codecs/adav80x.c | 3 +-
+ sound/soc/codecs/ak4535.c | 1 -
+ sound/soc/codecs/ak4641.c | 1 -
+ sound/soc/codecs/ak4642.c | 34 +-
+ sound/soc/codecs/ak4671.c | 1 -
+ sound/soc/codecs/alc5623.c | 8 +-
+ sound/soc/codecs/alc5632.c | 10 +-
+ sound/soc/codecs/arizona.c | 129 +-
+ sound/soc/codecs/arizona.h | 20 +-
+ sound/soc/codecs/cs35l32.c | 60 +-
+ sound/soc/codecs/cs35l32.h | 2 +-
+ sound/soc/codecs/cs4265.c | 19 +-
+ sound/soc/codecs/cs4270.c | 1 -
+ sound/soc/codecs/cs4271-i2c.c | 1 -
+ sound/soc/codecs/cs42l51-i2c.c | 1 -
+ sound/soc/codecs/cs42l52.c | 65 +-
+ sound/soc/codecs/cs42l56.c | 71 +-
+ sound/soc/codecs/cs42l73.c | 115 +-
+ sound/soc/codecs/cs42xx8-i2c.c | 4 +-
+ sound/soc/codecs/cs42xx8.c | 19 +-
+ sound/soc/codecs/cs42xx8.h | 1 +
+ sound/soc/codecs/cs4349.c | 392 ++++++
+ sound/soc/codecs/cs4349.h | 136 +++
+ sound/soc/codecs/da7210.c | 29 +-
+ sound/soc/codecs/da7213.c | 18 +-
+ sound/soc/codecs/da732x.c | 15 +-
+ sound/soc/codecs/da9055.c | 19 +-
+ sound/soc/codecs/gtm601.c | 95 ++
+ sound/soc/codecs/ics43432.c | 77 ++
+ sound/soc/codecs/isabelle.c | 11 +-
+ sound/soc/codecs/jz4740.c | 7 +-
+ sound/soc/codecs/lm4857.c | 1 -
+ sound/soc/codecs/lm49453.c | 19 +-
+ sound/soc/codecs/max9768.c | 71 +-
+ sound/soc/codecs/max98088.c | 329 +----
+ sound/soc/codecs/max98088.h | 2 +-
+ sound/soc/codecs/max98090.c | 171 ++-
+ sound/soc/codecs/max98090.h | 1 +
+ sound/soc/codecs/max98095.c | 354 +-----
+ sound/soc/codecs/max98357a.c | 25 +-
+ sound/soc/codecs/max9850.c | 8 +-
+ sound/soc/codecs/max9877.c | 33 +-
+ sound/soc/codecs/max98925.c | 6 +-
+ sound/soc/codecs/mc13783.c | 6 +-
+ sound/soc/codecs/ml26124.c | 3 +-
+ sound/soc/codecs/pcm1681.c | 14 +-
+ sound/soc/codecs/pcm512x-i2c.c | 1 -
+ sound/soc/codecs/pcm512x.c | 4 +-
+ sound/soc/codecs/rl6231.c | 104 +-
+ sound/soc/codecs/rl6231.h | 1 +
+ sound/soc/codecs/rt286.c | 11 +-
+ sound/soc/codecs/rt298.c | 1271 ++++++++++++++++++++
+ sound/soc/codecs/rt298.h | 206 ++++
+ sound/soc/codecs/rt5631.c | 8 +-
+ sound/soc/codecs/rt5640.c | 59 +-
+ sound/soc/codecs/rt5645.c | 443 +++----
+ sound/soc/codecs/rt5645.h | 27 +-
+ sound/soc/codecs/rt5651.c | 19 +-
+ sound/soc/codecs/rt5670.c | 21 +-
+ sound/soc/codecs/rt5677-spi.c | 233 +++-
+ sound/soc/codecs/rt5677-spi.h | 8 +-
+ sound/soc/codecs/rt5677.c | 159 +--
+ sound/soc/codecs/rt5677.h | 5 +-
+ sound/soc/codecs/sgtl5000.c | 8 +-
+ sound/soc/codecs/si476x.c | 2 +-
+ sound/soc/codecs/sirf-audio-codec.c | 4 +-
+ sound/soc/codecs/ssm2518.c | 10 +-
+ sound/soc/codecs/ssm2602-i2c.c | 1 -
+ sound/soc/codecs/ssm2602.c | 7 +-
+ sound/soc/codecs/ssm4567.c | 34 +-
+ sound/soc/codecs/sta32x.c | 1 -
+ sound/soc/codecs/sta350.c | 1 -
+ sound/soc/codecs/sta529.c | 4 -
+ sound/soc/codecs/stac9766.c | 57 +-
+ sound/soc/codecs/sti-sas.c | 628 ++++++++++
+ sound/soc/codecs/tas2552.c | 20 +-
+ sound/soc/codecs/tas2552.h | 2 +-
+ sound/soc/codecs/tas5086.c | 11 +-
+ sound/soc/codecs/tas571x.c | 2 +-
+ sound/soc/codecs/tfa9879.c | 3 +-
+ sound/soc/codecs/tlv320aic31xx.c | 3 +-
+ sound/soc/codecs/tlv320aic32x4.c | 1 -
+ sound/soc/codecs/tlv320aic3x.c | 3 +-
+ sound/soc/codecs/tlv320dac33.c | 1 -
+ sound/soc/codecs/tpa6130a2.c | 15 +-
+ sound/soc/codecs/ts3a227e.c | 48 +-
+ sound/soc/codecs/twl4030.c | 7 +-
+ sound/soc/codecs/uda134x.c | 180 ++-
+ sound/soc/codecs/uda134x.h | 2 -
+ sound/soc/codecs/uda1380.c | 15 +-
+ sound/soc/codecs/wm0010.c | 3 +-
+ sound/soc/codecs/wm1250-ev1.c | 1 -
+ sound/soc/codecs/wm2000.c | 1 -
+ sound/soc/codecs/wm2200.c | 9 +-
+ sound/soc/codecs/wm5100.c | 13 +-
+ sound/soc/codecs/wm5102.c | 27 +-
+ sound/soc/codecs/wm5110.c | 315 ++++-
+ sound/soc/codecs/wm8350.c | 7 +-
+ sound/soc/codecs/wm8400.c | 5 +-
+ sound/soc/codecs/wm8510.c | 2 +-
+ sound/soc/codecs/wm8523.c | 2 +-
+ sound/soc/codecs/wm8580.c | 2 +-
+ sound/soc/codecs/wm8711.c | 1 -
+ sound/soc/codecs/wm8728.c | 1 -
+ sound/soc/codecs/wm8731.c | 88 +-
+ sound/soc/codecs/wm8737.c | 8 +-
+ sound/soc/codecs/wm8741.c | 63 +-
+ sound/soc/codecs/wm8750.c | 1 -
+ sound/soc/codecs/wm8753.c | 14 +-
+ sound/soc/codecs/wm8776.c | 5 +-
+ sound/soc/codecs/wm8804-i2c.c | 1 -
+ sound/soc/codecs/wm8804.c | 2 +-
+ sound/soc/codecs/wm8900.c | 1 -
+ sound/soc/codecs/wm8903.c | 1 -
+ sound/soc/codecs/wm8904.c | 5 +-
+ sound/soc/codecs/wm8940.c | 1 -
+ sound/soc/codecs/wm8955.c | 1 -
+ sound/soc/codecs/wm8960.c | 221 +++-
+ sound/soc/codecs/wm8960.h | 1 +
+ sound/soc/codecs/wm8961.c | 8 +-
+ sound/soc/codecs/wm8962.c | 21 +-
+ sound/soc/codecs/wm8971.c | 1 -
+ sound/soc/codecs/wm8974.c | 1 -
+ sound/soc/codecs/wm8978.c | 1 -
+ sound/soc/codecs/wm8983.c | 81 +-
+ sound/soc/codecs/wm8985.c | 1 -
+ sound/soc/codecs/wm8988.c | 1 -
+ sound/soc/codecs/wm8990.c | 6 +-
+ sound/soc/codecs/wm8991.c | 53 +-
+ sound/soc/codecs/wm8993.c | 12 +-
+ sound/soc/codecs/wm8994.c | 18 +-
+ sound/soc/codecs/wm8995.c | 1 -
+ sound/soc/codecs/wm8996.c | 11 +-
+ sound/soc/codecs/wm8997.c | 20 +-
+ sound/soc/codecs/wm9081.c | 10 +-
+ sound/soc/codecs/wm9090.c | 22 +-
+ sound/soc/codecs/wm9705.c | 40 +-
+ sound/soc/codecs/wm9712.c | 45 +-
+ sound/soc/codecs/wm9713.c | 55 +-
+ sound/soc/codecs/wm9713.h | 2 -
+ sound/soc/codecs/wm_hubs.c | 7 +-
+ sound/soc/davinci/davinci-i2s.c | 25 +-
+ sound/soc/davinci/davinci-mcasp.c | 18 +-
+ sound/soc/davinci/davinci-vcif.c | 14 +-
+ sound/soc/fsl/eukrea-tlv320.c | 2 +-
+ sound/soc/fsl/fsl-asoc-card.c | 16 +-
+ sound/soc/fsl/fsl_asrc.c | 25 +-
+ sound/soc/fsl/fsl_esai.c | 2 +-
+ sound/soc/fsl/fsl_sai.c | 2 +-
+ sound/soc/fsl/fsl_sai.h | 15 +-
+ sound/soc/fsl/fsl_spdif.c | 25 +-
+ sound/soc/fsl/fsl_ssi.c | 68 +-
+ sound/soc/fsl/imx-pcm-dma.c | 25 +-
+ sound/soc/fsl/imx-pcm.h | 9 +-
+ sound/soc/fsl/imx-ssi.c | 2 +-
+ sound/soc/generic/simple-card.c | 9 +
+ sound/soc/intel/Kconfig | 29 +-
+ sound/soc/intel/Makefile | 1 +
+ sound/soc/intel/atom/sst-atom-controls.c | 6 +-
+ sound/soc/intel/atom/sst-mfld-platform-pcm.c | 1 -
+ sound/soc/intel/atom/sst-mfld-platform.h | 1 +
+ sound/soc/intel/atom/sst/sst_drv_interface.c | 9 +-
+ sound/soc/intel/atom/sst/sst_ipc.c | 3 +-
+ sound/soc/intel/boards/byt-max98090.c | 1 +
+ sound/soc/intel/boards/byt-rt5640.c | 1 +
+ sound/soc/intel/boards/bytcr_rt5640.c | 1 +
+ sound/soc/intel/boards/cht_bsw_max98090_ti.c | 19 +-
+ sound/soc/intel/boards/cht_bsw_rt5645.c | 2 +
+ sound/soc/intel/boards/cht_bsw_rt5672.c | 1 +
+ sound/soc/intel/common/sst-dsp-priv.h | 23 +-
+ sound/soc/intel/common/sst-dsp.c | 71 ++
+ sound/soc/intel/common/sst-dsp.h | 6 +
+ sound/soc/intel/skylake/Makefile | 9 +
+ sound/soc/intel/skylake/skl-messages.c | 884 ++++++++++++++
+ sound/soc/intel/skylake/skl-nhlt.c | 140 +++
+ sound/soc/intel/skylake/skl-nhlt.h | 106 ++
+ sound/soc/intel/skylake/skl-pcm.c | 916 ++++++++++++++
+ sound/soc/intel/skylake/skl-sst-cldma.c | 327 +++++
+ sound/soc/intel/skylake/skl-sst-cldma.h | 251 ++++
+ sound/soc/intel/skylake/skl-sst-dsp.c | 342 ++++++
+ sound/soc/intel/skylake/skl-sst-dsp.h | 145 +++
+ sound/soc/intel/skylake/skl-sst-ipc.c | 771 ++++++++++++
+ sound/soc/intel/skylake/skl-sst-ipc.h | 125 ++
+ sound/soc/intel/skylake/skl-sst.c | 280 +++++
+ sound/soc/intel/skylake/skl-topology.h | 286 +++++
+ sound/soc/intel/skylake/skl-tplg-interface.h | 88 ++
+ sound/soc/intel/skylake/skl.c | 536 +++++++++
+ sound/soc/intel/skylake/skl.h | 84 ++
+ sound/soc/kirkwood/kirkwood-dma.c | 4 +
+ sound/soc/mediatek/mt8173-max98090.c | 2 +-
+ sound/soc/mediatek/mt8173-rt5650-rt5676.c | 2 +-
+ sound/soc/mediatek/mtk-afe-common.h | 8 -
+ sound/soc/mediatek/mtk-afe-pcm.c | 89 +-
+ sound/soc/omap/mcbsp.c | 20 +-
+ sound/soc/omap/omap-hdmi-audio.c | 10 +-
+ sound/soc/omap/omap3pandora.c | 6 +-
+ sound/soc/qcom/Kconfig | 7 +-
+ sound/soc/qcom/lpass-ipq806x.c | 2 +-
+ sound/soc/rockchip/Kconfig | 19 +
+ sound/soc/rockchip/Makefile | 6 +
+ sound/soc/rockchip/rockchip_i2s.c | 8 +-
+ sound/soc/rockchip/rockchip_max98090.c | 236 ++++
+ sound/soc/rockchip/rockchip_rt5645.c | 225 ++++
+ sound/soc/samsung/arndale_rt5631.c | 11 +-
+ sound/soc/samsung/snow.c | 1 +
+ sound/soc/sh/fsi.c | 1 -
+ sound/soc/sh/rcar/Makefile | 2 +-
+ sound/soc/sh/rcar/core.c | 195 ++-
+ sound/soc/sh/rcar/ctu.c | 171 +++
+ sound/soc/sh/rcar/dma.c | 128 +-
+ sound/soc/sh/rcar/dvc.c | 73 +-
+ sound/soc/sh/rcar/gen.c | 33 +-
+ sound/soc/sh/rcar/mix.c | 200 +++
+ sound/soc/sh/rcar/rsnd.h | 111 +-
+ sound/soc/sh/rcar/rsrc-card.c | 22 +-
+ sound/soc/sh/rcar/src.c | 117 +-
+ sound/soc/sh/rcar/ssi.c | 4 +-
+ sound/soc/soc-ac97.c | 30 +-
+ sound/soc/soc-core.c | 73 +-
+ sound/soc/soc-dapm.c | 501 ++++----
+ sound/soc/soc-pcm.c | 16 +-
+ sound/soc/soc-topology.c | 145 +--
+ sound/soc/spear/spdif_in.c | 20 +-
+ sound/soc/sti/Kconfig | 11 +
+ sound/soc/sti/Makefile | 4 +
+ sound/soc/sti/sti_uniperif.c | 254 ++++
+ sound/soc/sti/uniperif.h | 1229 +++++++++++++++++++
+ sound/soc/sti/uniperif_player.c | 1110 +++++++++++++++++
+ sound/soc/sti/uniperif_reader.c | 362 ++++++
+ sound/soc/tegra/tegra20_das.c | 23 +-
+ sound/soc/tegra/tegra20_i2s.c | 23 +-
+ sound/soc/tegra/tegra20_spdif.c | 47 +-
+ sound/soc/tegra/tegra30_ahub.c | 80 +-
+ sound/soc/tegra/tegra30_i2s.c | 23 +-
+ sound/soc/ux500/ux500_msp_dai.c | 29 +-
+ sound/soc/xtensa/xtfpga-i2s.c | 8 +-
+ 283 files changed, 15956 insertions(+), 3614 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/cs4349.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/ics43432.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/rockchip-max98090.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/rockchip-rt5645.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt
+ create mode 100644 include/sound/rt298.h
+ create mode 100644 sound/soc/codecs/cs4349.c
+ create mode 100644 sound/soc/codecs/cs4349.h
+ create mode 100644 sound/soc/codecs/gtm601.c
+ create mode 100644 sound/soc/codecs/ics43432.c
+ create mode 100644 sound/soc/codecs/rt298.c
+ create mode 100644 sound/soc/codecs/rt298.h
+ create mode 100644 sound/soc/codecs/sti-sas.c
+ create mode 100644 sound/soc/intel/skylake/Makefile
+ create mode 100644 sound/soc/intel/skylake/skl-messages.c
+ create mode 100644 sound/soc/intel/skylake/skl-nhlt.c
+ create mode 100644 sound/soc/intel/skylake/skl-nhlt.h
+ create mode 100644 sound/soc/intel/skylake/skl-pcm.c
+ create mode 100644 sound/soc/intel/skylake/skl-sst-cldma.c
+ create mode 100644 sound/soc/intel/skylake/skl-sst-cldma.h
+ create mode 100644 sound/soc/intel/skylake/skl-sst-dsp.c
+ create mode 100644 sound/soc/intel/skylake/skl-sst-dsp.h
+ create mode 100644 sound/soc/intel/skylake/skl-sst-ipc.c
+ create mode 100644 sound/soc/intel/skylake/skl-sst-ipc.h
+ create mode 100644 sound/soc/intel/skylake/skl-sst.c
+ create mode 100644 sound/soc/intel/skylake/skl-topology.h
+ create mode 100644 sound/soc/intel/skylake/skl-tplg-interface.h
+ create mode 100644 sound/soc/intel/skylake/skl.c
+ create mode 100644 sound/soc/intel/skylake/skl.h
+ create mode 100644 sound/soc/rockchip/rockchip_max98090.c
+ create mode 100644 sound/soc/rockchip/rockchip_rt5645.c
+ create mode 100644 sound/soc/sh/rcar/ctu.c
+ create mode 100644 sound/soc/sh/rcar/mix.c
+ create mode 100644 sound/soc/sti/Kconfig
+ create mode 100644 sound/soc/sti/Makefile
+ create mode 100644 sound/soc/sti/sti_uniperif.c
+ create mode 100644 sound/soc/sti/uniperif.h
+ create mode 100644 sound/soc/sti/uniperif_player.c
+ create mode 100644 sound/soc/sti/uniperif_reader.c
+$ git am -3 ../patches/0001-Revert-ASoC-ics43432-Add-codec-driver-for-InvenSense.patch
+Applying: Revert "ASoC: ics43432: Add codec driver for InvenSense ICS-43432"
+$ git reset HEAD^
+Unstaged changes after reset:
+D Documentation/devicetree/bindings/sound/ics43432.txt
+M Documentation/devicetree/bindings/vendor-prefixes.txt
+M sound/soc/codecs/Kconfig
+M sound/soc/codecs/Makefile
+D sound/soc/codecs/ics43432.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 8eecfe99fad0] Merge remote-tracking branch 'sound-asoc/for-next'
+ Date: Fri Aug 28 11:35:10 2015 +1000
+Merging modules/modules-next (5cfb203a304d modpost: abort if a module symbol is too long)
+$ git merge modules/modules-next
+Merge made by the 'recursive' strategy.
+ scripts/mod/modpost.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+Merging input/next (66bc2f51ef7d Input: psmouse - add small delay for IBM trackpoint pass-through mode)
+$ git merge input/next
+Auto-merging include/linux/platform_data/pixcir_i2c_ts.h
+Auto-merging include/linux/platform_data/atmel_mxt_ts.h
+Auto-merging drivers/input/touchscreen/goodix.c
+Auto-merging drivers/input/misc/drv2667.c
+Auto-merging drivers/input/misc/drv2665.c
+Auto-merging drivers/input/misc/drv260x.c
+Auto-merging drivers/input/keyboard/gpio_keys_polled.c
+Auto-merging drivers/input/keyboard/Kconfig
+Auto-merging drivers/hid/hid-core.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/kernel-parameters.txt
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/input/ads7846.txt | 2 +-
+ .../devicetree/bindings/input/cap11xx.txt | 19 +
+ .../devicetree/bindings/input/cypress,cyapa.txt | 44 +
+ .../devicetree/bindings/input/elants_i2c.txt | 3 +
+ .../devicetree/bindings/input/gpio-keys-polled.txt | 2 +-
+ .../devicetree/bindings/input/gpio-keys.txt | 2 +-
+ .../bindings/input/gpio-matrix-keypad.txt | 2 +-
+ .../bindings/input/qcom,pm8xxx-keypad.txt | 2 +-
+ .../devicetree/bindings/input/samsung-keypad.txt | 4 +-
+ .../bindings/input/touchscreen/pixcir_i2c_ts.txt | 3 +
+ .../bindings/input/touchscreen/zforce_ts.txt | 8 +-
+ Documentation/devicetree/bindings/mfd/tc3589x.txt | 4 +-
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ Documentation/kernel-parameters.txt | 4 +
+ MAINTAINERS | 8 +
+ drivers/hid/hid-core.c | 2 +
+ drivers/input/ff-core.c | 5 +-
+ drivers/input/input.c | 10 +-
+ drivers/input/joydev.c | 11 +-
+ drivers/input/joystick/zhenhua.c | 13 +-
+ drivers/input/keyboard/Kconfig | 6 +-
+ drivers/input/keyboard/adp5589-keys.c | 1 -
+ drivers/input/keyboard/cap11xx.c | 145 ++-
+ drivers/input/keyboard/gpio_keys.c | 9 +-
+ drivers/input/keyboard/gpio_keys_polled.c | 5 +-
+ drivers/input/keyboard/lm8333.c | 1 -
+ drivers/input/keyboard/matrix_keypad.c | 6 +-
+ drivers/input/keyboard/mcs_touchkey.c | 1 -
+ drivers/input/keyboard/mpr121_touchkey.c | 1 -
+ drivers/input/keyboard/pmic8xxx-keypad.c | 10 +-
+ drivers/input/keyboard/qt1070.c | 1 -
+ drivers/input/keyboard/qt2160.c | 1 -
+ drivers/input/keyboard/samsung-keypad.c | 6 +-
+ drivers/input/keyboard/tc3589x-keypad.c | 63 +-
+ drivers/input/keyboard/tca8418_keypad.c | 1 -
+ drivers/input/misc/Kconfig | 11 +-
+ drivers/input/misc/adxl34x-i2c.c | 1 -
+ drivers/input/misc/arizona-haptics.c | 26 +-
+ drivers/input/misc/bma150.c | 8 +-
+ drivers/input/misc/cma3000_d0x_i2c.c | 1 -
+ drivers/input/misc/drv260x.c | 3 +-
+ drivers/input/misc/drv2665.c | 3 +-
+ drivers/input/misc/drv2667.c | 3 +-
+ drivers/input/misc/gp2ap002a00f.c | 2 +-
+ drivers/input/misc/kxtj9.c | 1 -
+ drivers/input/misc/mpu3050.c | 1 -
+ drivers/input/misc/pcf8574_keypad.c | 1 -
+ drivers/input/misc/pmic8xxx-pwrkey.c | 268 ++++-
+ drivers/input/misc/uinput.c | 6 +-
+ drivers/input/mouse/Kconfig | 2 +-
+ drivers/input/mouse/Makefile | 2 +-
+ drivers/input/mouse/cyapa.c | 183 ++-
+ drivers/input/mouse/cyapa.h | 157 ++-
+ drivers/input/mouse/cyapa_gen3.c | 15 +-
+ drivers/input/mouse/cyapa_gen5.c | 1255 +++++++++++---------
+ drivers/input/mouse/cyapa_gen6.c | 749 ++++++++++++
+ drivers/input/mouse/elan_i2c_core.c | 7 +-
+ drivers/input/mouse/psmouse-base.c | 4 +
+ drivers/input/mouse/sentelic.c | 14 +-
+ drivers/input/mouse/synaptics_i2c.c | 1 -
+ drivers/input/serio/ambakmi.c | 8 +-
+ drivers/input/serio/i8042.c | 43 +-
+ drivers/input/serio/i8042.h | 13 +
+ drivers/input/serio/serio.c | 5 +-
+ drivers/input/touchscreen/Kconfig | 21 +-
+ drivers/input/touchscreen/Makefile | 2 +-
+ drivers/input/touchscreen/ad7879-i2c.c | 1 -
+ drivers/input/touchscreen/ads7846.c | 3 +-
+ drivers/input/touchscreen/ar1021_i2c.c | 1 -
+ drivers/input/touchscreen/atmel_mxt_ts.c | 240 ++--
+ drivers/input/touchscreen/auo-pixcir-ts.c | 1 -
+ drivers/input/touchscreen/bu21013_ts.c | 1 -
+ drivers/input/touchscreen/chipone_icn8318.c | 1 -
+ drivers/input/touchscreen/cy8ctmg110_ts.c | 1 -
+ drivers/input/touchscreen/cyttsp4_i2c.c | 1 -
+ drivers/input/touchscreen/cyttsp_i2c.c | 1 -
+ drivers/input/touchscreen/edt-ft5x06.c | 3 +-
+ drivers/input/touchscreen/egalax_ts.c | 2 +-
+ drivers/input/touchscreen/elants_i2c.c | 186 ++-
+ drivers/input/touchscreen/goodix.c | 2 +-
+ drivers/input/touchscreen/ili210x.c | 1 -
+ drivers/input/touchscreen/max11801_ts.c | 1 -
+ drivers/input/touchscreen/mms114.c | 2 +-
+ drivers/input/touchscreen/of_touchscreen.c | 68 +-
+ drivers/input/touchscreen/pixcir_i2c_ts.c | 147 +--
+ drivers/input/touchscreen/st1232.c | 1 -
+ drivers/input/touchscreen/sur40.c | 1 +
+ drivers/input/touchscreen/tsc2005.c | 264 ++--
+ drivers/input/touchscreen/tsc2007.c | 1 -
+ drivers/input/touchscreen/wacom_i2c.c | 1 -
+ drivers/input/touchscreen/wdt87xx_i2c.c | 49 +-
+ drivers/input/touchscreen/zforce_ts.c | 98 +-
+ drivers/platform/chrome/chromeos_laptop.c | 4 +-
+ include/linux/input/touchscreen.h | 11 +-
+ .../linux/{i2c => platform_data}/atmel_mxt_ts.h | 12 +-
+ .../pixcir_ts.h => platform_data/pixcir_i2c_ts.h} | 1 -
+ include/linux/platform_data/zforce_ts.h | 3 -
+ include/linux/serio.h | 2 +
+ 98 files changed, 3054 insertions(+), 1279 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/input/cypress,cyapa.txt
+ create mode 100644 drivers/input/mouse/cyapa_gen6.c
+ rename include/linux/{i2c => platform_data}/atmel_mxt_ts.h (70%)
+ rename include/linux/{input/pixcir_ts.h => platform_data/pixcir_i2c_ts.h} (96%)
+Merging block/for-next (721cb0165e64 Merge branch 'for-4.3/drivers' into for-next)
+$ git merge block/for-next
+Resolved 'block/bounce.c' using previous resolution.
+Resolved 'crypto/ccm.c' using previous resolution.
+Resolved 'drivers/md/dm.c' using previous resolution.
+Resolved 'fs/btrfs/inode.c' using previous resolution.
+Resolved 'fs/btrfs/raid56.c' using previous resolution.
+Resolved 'fs/btrfs/scrub.c' using previous resolution.
+Resolved 'fs/btrfs/volumes.c' using previous resolution.
+Resolved 'fs/f2fs/data.c' using previous resolution.
+Resolved 'fs/fs-writeback.c' using previous resolution.
+Auto-merging mm/page-writeback.c
+Auto-merging mm/backing-dev.c
+Auto-merging lib/Makefile
+Auto-merging lib/Kconfig
+Auto-merging include/linux/blk_types.h
+Auto-merging fs/xfs/xfs_buf.c
+Auto-merging fs/xfs/xfs_aops.c
+Auto-merging fs/gfs2/lops.c
+Auto-merging fs/fs-writeback.c
+CONFLICT (content): Merge conflict in fs/fs-writeback.c
+Auto-merging fs/f2fs/data.c
+CONFLICT (content): Merge conflict in fs/f2fs/data.c
+Auto-merging fs/ext4/page-io.c
+Auto-merging fs/btrfs/volumes.c
+CONFLICT (content): Merge conflict in fs/btrfs/volumes.c
+Auto-merging fs/btrfs/scrub.c
+CONFLICT (content): Merge conflict in fs/btrfs/scrub.c
+Auto-merging fs/btrfs/raid56.c
+CONFLICT (content): Merge conflict in fs/btrfs/raid56.c
+Auto-merging fs/btrfs/inode.c
+CONFLICT (content): Merge conflict in fs/btrfs/inode.c
+Auto-merging fs/btrfs/extent_io.c
+Auto-merging fs/btrfs/disk-io.c
+Auto-merging drivers/target/target_core_rd.c
+Auto-merging drivers/scsi/sd.c
+Auto-merging drivers/s390/block/dcssblk.c
+Auto-merging drivers/mtd/mtd_blkdevs.c
+Auto-merging drivers/md/raid5.c
+Auto-merging drivers/md/raid1.c
+Auto-merging drivers/md/md.c
+Auto-merging drivers/md/dm.c
+CONFLICT (content): Merge conflict in drivers/md/dm.c
+Auto-merging drivers/md/dm-thin.c
+Auto-merging drivers/md/dm-cache-target.c
+Auto-merging drivers/iommu/intel-iommu.c
+Auto-merging drivers/crypto/talitos.c
+Auto-merging drivers/crypto/sahara.c
+Auto-merging drivers/block/zram/zram_drv.c
+Auto-merging drivers/block/rbd.c
+Auto-merging crypto/gcm.c
+Auto-merging crypto/ccm.c
+CONFLICT (content): Merge conflict in crypto/ccm.c
+Auto-merging block/bounce.c
+CONFLICT (content): Merge conflict in block/bounce.c
+Auto-merging block/blk-settings.c
+Auto-merging arch/arm/mm/dma-mapping.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 2595da06b0c1] Merge remote-tracking branch 'block/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/block/biodoc.txt | 2 +-
+ Documentation/block/biovecs.txt | 10 +-
+ Documentation/block/queue-sysfs.txt | 10 +-
+ Documentation/cgroups/blkio-controller.txt | 24 +-
+ Documentation/cgroups/unified-hierarchy.txt | 137 +++++-
+ arch/arm/mm/dma-mapping.c | 2 +-
+ arch/m68k/emu/nfblock.c | 2 +-
+ arch/microblaze/kernel/dma.c | 3 +-
+ arch/powerpc/sysdev/axonram.c | 2 +-
+ arch/xtensa/platforms/iss/simdisk.c | 12 +-
+ block/bio-integrity.c | 11 +-
+ block/bio.c | 214 ++++-----
+ block/blk-cgroup.c | 524 +++++++++++++--------
+ block/blk-core.c | 40 +-
+ block/blk-flush.c | 15 +-
+ block/blk-lib.c | 77 +---
+ block/blk-map.c | 4 +-
+ block/blk-merge.c | 171 +++++--
+ block/blk-mq-sysfs.c | 25 +-
+ block/blk-mq-tag.c | 4 +-
+ block/blk-mq-tag.h | 12 +
+ block/blk-mq.c | 26 +-
+ block/blk-settings.c | 44 +-
+ block/blk-sysfs.c | 43 +-
+ block/blk-throttle.c | 505 ++++++++-------------
+ block/blk.h | 11 +-
+ block/bounce.c | 27 +-
+ block/cfq-iosched.c | 651 +++++++++++++++------------
+ block/genhd.c | 9 +-
+ block/partition-generic.c | 12 +-
+ crypto/algif_skcipher.c | 2 +-
+ crypto/gcm.c | 4 +-
+ drivers/block/aoe/aoeblk.c | 2 +-
+ drivers/block/aoe/aoecmd.c | 10 +-
+ drivers/block/aoe/aoedev.c | 2 +-
+ drivers/block/brd.c | 15 +-
+ drivers/block/drbd/drbd_actlog.c | 4 +-
+ drivers/block/drbd/drbd_bitmap.c | 19 +-
+ drivers/block/drbd/drbd_int.h | 12 +-
+ drivers/block/drbd/drbd_main.c | 1 -
+ drivers/block/drbd/drbd_nl.c | 4 +-
+ drivers/block/drbd/drbd_req.c | 47 +-
+ drivers/block/drbd/drbd_worker.c | 44 +-
+ drivers/block/floppy.c | 7 +-
+ drivers/block/loop.c | 4 +-
+ drivers/block/nbd.c | 364 ++++++++++++---
+ drivers/block/null_blk.c | 2 +-
+ drivers/block/nvme-core.c | 271 ++++++++---
+ drivers/block/pktcdvd.c | 59 +--
+ drivers/block/ps3vram.c | 5 +-
+ drivers/block/rbd.c | 49 +-
+ drivers/block/rsxx/dev.c | 11 +-
+ drivers/block/skd_main.c | 2 +-
+ drivers/block/umem.c | 6 +-
+ drivers/block/xen-blkback/blkback.c | 4 +-
+ drivers/block/xen-blkfront.c | 9 +-
+ drivers/block/zram/zram_drv.c | 9 +-
+ drivers/crypto/bfin_crc.c | 3 +-
+ drivers/crypto/omap-sham.c | 2 +-
+ drivers/crypto/qce/sha.c | 2 +-
+ drivers/crypto/sahara.c | 2 +-
+ drivers/crypto/talitos.c | 2 +-
+ drivers/iommu/intel-iommu.c | 4 +-
+ drivers/iommu/iommu.c | 2 +-
+ drivers/md/bcache/bcache.h | 18 -
+ drivers/md/bcache/btree.c | 10 +-
+ drivers/md/bcache/closure.h | 2 +-
+ drivers/md/bcache/io.c | 101 +----
+ drivers/md/bcache/journal.c | 12 +-
+ drivers/md/bcache/movinggc.c | 8 +-
+ drivers/md/bcache/request.c | 43 +-
+ drivers/md/bcache/super.c | 48 +-
+ drivers/md/bcache/util.h | 5 +-
+ drivers/md/bcache/writeback.c | 14 +-
+ drivers/md/dm-bio-prison.c | 6 +-
+ drivers/md/dm-bufio.c | 26 +-
+ drivers/md/dm-cache-target.c | 45 +-
+ drivers/md/dm-crypt.c | 26 +-
+ drivers/md/dm-era-target.c | 15 -
+ drivers/md/dm-flakey.c | 18 +-
+ drivers/md/dm-io.c | 8 +-
+ drivers/md/dm-linear.c | 16 -
+ drivers/md/dm-log-writes.c | 27 +-
+ drivers/md/dm-raid.c | 19 -
+ drivers/md/dm-raid1.c | 24 +-
+ drivers/md/dm-snap.c | 21 +-
+ drivers/md/dm-stripe.c | 23 +-
+ drivers/md/dm-table.c | 21 -
+ drivers/md/dm-thin.c | 72 +--
+ drivers/md/dm-verity.c | 25 +-
+ drivers/md/dm-zero.c | 2 +-
+ drivers/md/dm.c | 137 +-----
+ drivers/md/dm.h | 2 -
+ drivers/md/faulty.c | 4 +-
+ drivers/md/linear.c | 45 +-
+ drivers/md/md.c | 46 +-
+ drivers/md/md.h | 12 -
+ drivers/md/multipath.c | 33 +-
+ drivers/md/raid0.c | 58 +--
+ drivers/md/raid0.h | 2 -
+ drivers/md/raid1.c | 115 ++---
+ drivers/md/raid10.c | 182 ++------
+ drivers/md/raid5.c | 147 +++---
+ drivers/mmc/card/queue.c | 6 +-
+ drivers/mtd/mtd_blkdevs.c | 2 +-
+ drivers/nvdimm/blk.c | 5 +-
+ drivers/nvdimm/btt.c | 5 +-
+ drivers/nvdimm/pmem.c | 2 +-
+ drivers/s390/block/dcssblk.c | 4 +-
+ drivers/s390/block/xpram.c | 5 +-
+ drivers/scsi/sd.c | 4 +-
+ drivers/staging/android/ion/ion_chunk_heap.c | 4 +-
+ drivers/staging/lustre/lustre/llite/lloop.c | 2 +
+ drivers/target/target_core_iblock.c | 21 +-
+ drivers/target/target_core_pscsi.c | 6 +-
+ drivers/target/target_core_rd.c | 44 --
+ fs/btrfs/check-integrity.c | 10 +-
+ fs/btrfs/compression.c | 29 +-
+ fs/btrfs/disk-io.c | 35 +-
+ fs/btrfs/extent_io.c | 39 +-
+ fs/btrfs/inode.c | 53 +--
+ fs/btrfs/raid56.c | 64 ++-
+ fs/btrfs/scrub.c | 42 +-
+ fs/btrfs/volumes.c | 105 +----
+ fs/buffer.c | 13 +-
+ fs/direct-io.c | 18 +-
+ fs/ext4/page-io.c | 18 +-
+ fs/ext4/readpage.c | 8 +-
+ fs/f2fs/data.c | 12 +-
+ fs/fs-writeback.c | 139 ++----
+ fs/gfs2/lops.c | 19 +-
+ fs/gfs2/ops_fstype.c | 6 +-
+ fs/jfs/jfs_logmgr.c | 22 +-
+ fs/jfs/jfs_metapage.c | 8 +-
+ fs/kernfs/dir.c | 23 +
+ fs/logfs/dev_bdev.c | 16 +-
+ fs/mpage.c | 8 +-
+ fs/nfs/blocklayout/blocklayout.c | 14 +-
+ fs/nilfs2/segbuf.c | 7 +-
+ fs/ocfs2/cluster/heartbeat.c | 9 +-
+ fs/xfs/xfs_aops.c | 8 +-
+ fs/xfs/xfs_buf.c | 7 +-
+ include/crypto/scatterwalk.h | 10 +-
+ include/linux/backing-dev.h | 26 +-
+ include/linux/bio.h | 38 +-
+ include/linux/blk-cgroup.h | 340 +++++++++-----
+ include/linux/blk_types.h | 10 +-
+ include/linux/blkdev.h | 36 +-
+ include/linux/cgroup-defs.h | 5 +-
+ include/linux/cgroup.h | 9 +
+ include/linux/cgroup_subsys.h | 2 +-
+ include/linux/device-mapper.h | 4 -
+ include/linux/genhd.h | 33 +-
+ include/linux/kernfs.h | 4 +
+ include/linux/nvme.h | 22 +-
+ include/linux/scatterlist.h | 9 +-
+ include/linux/swap.h | 4 +-
+ include/trace/events/writeback.h | 180 ++++++--
+ include/uapi/linux/nvme.h | 1 +
+ kernel/cgroup.c | 41 +-
+ kernel/power/swap.c | 12 +-
+ kernel/trace/blktrace.c | 10 +-
+ lib/Kconfig | 7 +
+ lib/Makefile | 1 +
+ lib/scatterlist.c | 4 -
+ lib/sg_split.c | 202 +++++++++
+ mm/backing-dev.c | 4 +-
+ mm/page-writeback.c | 6 +-
+ mm/page_io.c | 20 +-
+ 169 files changed, 3468 insertions(+), 3466 deletions(-)
+ create mode 100644 lib/sg_split.c
+$ git am -3 ../patches/0001-block-lustre-temporary-fix-for-bio_endio-API-change.patch
+Applying: block: lustre: temporary fix for bio_endio API change
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
+$ git add -A .
+$ git commit -v -a --amend
+[master aa67dd0b0154] Merge remote-tracking branch 'block/for-next'
+ Date: Fri Aug 28 11:51:41 2015 +1000
+Merging device-mapper/for-next (bd49784fd1e8 dm stats: report precise_timestamps and histogram in @stats_list output)
+$ git merge device-mapper/for-next
+Auto-merging drivers/md/dm.c
+Auto-merging drivers/md/dm-verity.c
+Auto-merging drivers/md/dm-thin.c
+Auto-merging drivers/md/dm-stripe.c
+Auto-merging drivers/md/dm-snap.c
+Auto-merging drivers/md/dm-raid1.c
+Auto-merging drivers/md/dm-log-writes.c
+Auto-merging drivers/md/dm-linear.c
+Auto-merging drivers/md/dm-flakey.c
+Auto-merging drivers/md/dm-crypt.c
+Auto-merging drivers/md/dm-cache-target.c
+Merge made by the 'recursive' strategy.
+ Documentation/device-mapper/statistics.txt | 4 +
+ drivers/md/dm-cache-policy-smq.c | 110 +++++++++-----------------
+ drivers/md/dm-cache-target.c | 3 +-
+ drivers/md/dm-crypt.c | 4 +-
+ drivers/md/dm-delay.c | 16 ++--
+ drivers/md/dm-flakey.c | 6 +-
+ drivers/md/dm-linear.c | 7 +-
+ drivers/md/dm-log-writes.c | 11 ++-
+ drivers/md/dm-raid1.c | 8 +-
+ drivers/md/dm-snap-persistent.c | 2 +-
+ drivers/md/dm-snap.c | 20 ++++-
+ drivers/md/dm-stats.c | 14 +++-
+ drivers/md/dm-stripe.c | 8 +-
+ drivers/md/dm-thin.c | 89 ++++-----------------
+ drivers/md/dm-verity.c | 17 +---
+ drivers/md/dm.c | 2 +-
+ drivers/md/persistent-data/dm-block-manager.c | 8 +-
+ drivers/md/persistent-data/dm-btree-remove.c | 22 ------
+ drivers/md/persistent-data/dm-btree.c | 6 +-
+ include/uapi/linux/dm-ioctl.h | 4 +-
+ 20 files changed, 142 insertions(+), 219 deletions(-)
+Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
+$ git merge pcmcia/master
+Already up-to-date.
+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 (987e05c9c3fb mmc: host: omap_hsmmc: remove CONFIG_REGULATOR check)
+$ git merge mmc-uh/next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mmc/arasan,sdhci.txt | 2 +-
+ .../devicetree/bindings/mmc/fsl-imx-esdhc.txt | 6 +
+ .../devicetree/bindings/mmc/sdhci-atmel.txt | 21 ++
+ .../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 2 +-
+ MAINTAINERS | 6 +
+ drivers/mmc/card/block.c | 17 +
+ drivers/mmc/core/core.c | 40 ++-
+ drivers/mmc/core/host.c | 42 +--
+ drivers/mmc/host/Kconfig | 8 +
+ drivers/mmc/host/Makefile | 1 +
+ drivers/mmc/host/atmel-mci.c | 1 -
+ drivers/mmc/host/dw_mmc-rockchip.c | 3 +
+ drivers/mmc/host/dw_mmc.c | 284 +++++++++++------
+ drivers/mmc/host/omap.c | 9 +-
+ drivers/mmc/host/omap_hsmmc.c | 347 +++++++++++++--------
+ drivers/mmc/host/pxamci.c | 200 +++++++-----
+ drivers/mmc/host/sdhci-esdhc-imx.c | 114 ++++++-
+ drivers/mmc/host/sdhci-esdhc.h | 3 +-
+ drivers/mmc/host/sdhci-msm.c | 5 +
+ drivers/mmc/host/sdhci-of-arasan.c | 4 +
+ drivers/mmc/host/sdhci-of-at91.c | 191 ++++++++++++
+ drivers/mmc/host/sdhci-of-esdhc.c | 6 +
+ drivers/mmc/host/sdhci-pci.c | 1 +
+ drivers/mmc/host/sdhci-sirf.c | 4 +-
+ drivers/mmc/host/sdhci.c | 123 ++++----
+ drivers/mmc/host/sdhci.h | 10 +-
+ drivers/mmc/host/sh_mmcif.c | 2 +
+ drivers/mmc/host/sunxi-mmc.c | 2 +-
+ drivers/mmc/host/tmio_mmc_pio.c | 6 +-
+ drivers/mmc/host/usdhi6rol0.c | 15 +-
+ include/linux/mmc/card.h | 3 +
+ include/linux/mmc/dw_mmc.h | 9 +-
+ include/linux/mmc/host.h | 3 +-
+ include/linux/platform_data/mmc-esdhc-imx.h | 1 +
+ 34 files changed, 1075 insertions(+), 416 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-atmel.txt
+ create mode 100644 drivers/mmc/host/sdhci-of-at91.c
+Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
+$ git merge kgdb/kgdb-next
+Merge made by the 'recursive' strategy.
+ kernel/debug/kdb/kdb_io.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging md/for-next (8f4a806e5c12 md-cluster: remove inappropriate try_module_get from join())
+$ git merge md/for-next
+Resolved 'drivers/md/raid0.c' using previous resolution.
+Resolved 'drivers/md/raid5.c' using previous resolution.
+Auto-merging drivers/md/raid5.c
+CONFLICT (content): Merge conflict in drivers/md/raid5.c
+Auto-merging drivers/md/raid10.c
+Auto-merging drivers/md/raid1.c
+Auto-merging drivers/md/raid0.c
+CONFLICT (content): Merge conflict in drivers/md/raid0.c
+Auto-merging drivers/md/md.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 51e3b7a8451c] Merge remote-tracking branch 'md/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/md-cluster.txt | 4 +-
+ drivers/md/md-cluster.c | 159 ++++++++++++++++++++++++++++---------------
+ drivers/md/md.c | 109 ++++++++++++++++++-----------
+ drivers/md/raid0.c | 75 ++++++++++----------
+ drivers/md/raid1.c | 1 +
+ drivers/md/raid10.c | 4 +-
+ drivers/md/raid5.c | 77 +++++++++++++--------
+ lib/raid6/neon.c | 13 +++-
+ lib/raid6/neon.uc | 46 +++++++++++++
+ 9 files changed, 324 insertions(+), 164 deletions(-)
+Merging mfd/for-mfd-next (5a688c455066 mfd: jz4740-adc: Init mask cache in generic IRQ chip)
+$ git merge mfd/for-mfd-next
+Resolved 'drivers/mfd/Kconfig' using previous resolution.
+Auto-merging include/linux/mfd/arizona/registers.h
+Auto-merging drivers/mfd/wm8997-tables.c
+Auto-merging drivers/mfd/wm8994-core.c
+Auto-merging drivers/mfd/wm5110-tables.c
+Auto-merging drivers/mfd/wm5102-tables.c
+Auto-merging drivers/mfd/twl6040.c
+Auto-merging drivers/mfd/stmpe-spi.c
+Auto-merging drivers/mfd/stmpe-i2c.c
+Auto-merging drivers/mfd/intel_soc_pmic_core.c
+Auto-merging drivers/mfd/arizona-core.c
+Auto-merging drivers/mfd/Kconfig
+CONFLICT (content): Merge conflict in drivers/mfd/Kconfig
+Auto-merging drivers/clocksource/Makefile
+Auto-merging drivers/clocksource/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 41e69087e943] Merge remote-tracking branch 'mfd/for-mfd-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/mfd/atmel-hlcdc.txt | 4 +
+ Documentation/devicetree/bindings/mfd/axp20x.txt | 4 +-
+ Documentation/devicetree/bindings/mfd/da9062.txt | 88 ++
+ Documentation/devicetree/bindings/mfd/max77686.txt | 65 +-
+ Documentation/devicetree/bindings/mfd/max77802.txt | 26 +
+ Documentation/devicetree/bindings/mfd/rk808.txt | 8 +-
+ .../devicetree/bindings/regulator/max77686.txt | 71 +
+ .../devicetree/bindings/rtc/rtc-st-lpc.txt | 15 +-
+ .../devicetree/bindings/timer/st,stih407-lpc | 28 +
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ .../devicetree/bindings/watchdog/st_lpc_wdt.txt | 12 +-
+ MAINTAINERS | 11 +-
+ drivers/clocksource/Kconfig | 8 +
+ drivers/clocksource/Makefile | 1 +
+ drivers/clocksource/clksrc_st_lpc.c | 131 ++
+ drivers/mfd/88pm800.c | 1 -
+ drivers/mfd/88pm805.c | 1 -
+ drivers/mfd/88pm860x-core.c | 5 -
+ drivers/mfd/Kconfig | 25 +-
+ drivers/mfd/Makefile | 6 +-
+ drivers/mfd/aat2870-core.c | 1 -
+ drivers/mfd/ab3100-core.c | 1 -
+ drivers/mfd/ab8500-core.c | 4 -
+ drivers/mfd/adp5520.c | 1 -
+ drivers/mfd/arizona-core.c | 138 +-
+ drivers/mfd/arizona-i2c.c | 9 +-
+ drivers/mfd/arizona-irq.c | 16 +-
+ drivers/mfd/arizona.h | 5 +
+ drivers/mfd/as3711.c | 1 -
+ drivers/mfd/as3722.c | 1 -
+ drivers/mfd/asic3.c | 4 +-
+ drivers/mfd/atmel-hlcdc.c | 55 +-
+ drivers/mfd/axp20x.c | 112 +-
+ drivers/mfd/bcm590xx.c | 1 -
+ drivers/mfd/cros_ec_i2c.c | 1 -
+ drivers/mfd/cros_ec_spi.c | 7 +
+ drivers/mfd/da903x.c | 1 -
+ drivers/mfd/da9052-i2c.c | 1 -
+ drivers/mfd/da9055-i2c.c | 1 -
+ drivers/mfd/da9062-core.c | 533 +++++++
+ drivers/mfd/da9063-i2c.c | 1 -
+ drivers/mfd/da9063-irq.c | 4 +
+ drivers/mfd/db8500-prcmu.c | 1 -
+ drivers/mfd/ezx-pcap.c | 11 +-
+ drivers/mfd/htc-egpio.c | 8 +-
+ drivers/mfd/htc-i2cpld.c | 6 +-
+ drivers/mfd/intel_soc_pmic_core.c | 3 +-
+ drivers/mfd/ipaq-micro.c | 38 +-
+ drivers/mfd/jz4740-adc.c | 9 +-
+ drivers/mfd/kempld-core.c | 16 +
+ drivers/mfd/lm3533-core.c | 1 -
+ drivers/mfd/lp3943.c | 1 -
+ drivers/mfd/lp8788-irq.c | 5 -
+ drivers/mfd/lp8788.c | 1 -
+ drivers/mfd/max14577.c | 1 -
+ drivers/mfd/max77686.c | 1 -
+ drivers/mfd/max77693.c | 1 -
+ drivers/mfd/max8907.c | 1 -
+ drivers/mfd/max8925-core.c | 5 +-
+ drivers/mfd/max8925-i2c.c | 1 -
+ drivers/mfd/max8997-irq.c | 20 +-
+ drivers/mfd/max8997.c | 1 -
+ drivers/mfd/max8998-irq.c | 14 +-
+ drivers/mfd/max8998.c | 1 -
+ drivers/mfd/mc13xxx-i2c.c | 1 -
+ drivers/mfd/mt6397-core.c | 61 +-
+ drivers/mfd/palmas.c | 1 -
+ drivers/mfd/pm8921-core.c | 52 +-
+ drivers/mfd/qcom_rpm.c | 1 +
+ drivers/mfd/rc5t583-irq.c | 4 +-
+ drivers/mfd/rc5t583.c | 1 -
+ drivers/mfd/retu-mfd.c | 1 -
+ drivers/mfd/rt5033.c | 1 +
+ drivers/mfd/sec-core.c | 1 -
+ drivers/mfd/si476x-i2c.c | 1 -
+ drivers/mfd/smsc-ece1099.c | 1 -
+ drivers/mfd/stmpe-i2c.c | 1 -
+ drivers/mfd/stmpe-spi.c | 13 +
+ drivers/mfd/stmpe.c | 7 -
+ drivers/mfd/stw481x.c | 1 +
+ drivers/mfd/t7l66xb.c | 18 +-
+ drivers/mfd/tc3589x.c | 8 -
+ drivers/mfd/tc6393xb.c | 13 +-
+ drivers/mfd/tps6507x.c | 1 -
+ drivers/mfd/tps65090.c | 1 -
+ drivers/mfd/tps65217.c | 2 +-
+ drivers/mfd/tps65218.c | 2 +-
+ drivers/mfd/tps6586x.c | 12 +-
+ drivers/mfd/tps65910.c | 1 -
+ drivers/mfd/tps65912-i2c.c | 1 -
+ drivers/mfd/tps65912-irq.c | 8 +-
+ drivers/mfd/tps80031.c | 1 -
+ drivers/mfd/twl4030-irq.c | 11 +-
+ drivers/mfd/twl6030-irq.c | 15 +-
+ drivers/mfd/twl6040.c | 1 -
+ drivers/mfd/ucb1x00-core.c | 6 +-
+ drivers/mfd/wm5102-tables.c | 51 +-
+ drivers/mfd/wm5110-tables.c | 14 +-
+ drivers/mfd/wm831x-i2c.c | 1 -
+ drivers/mfd/wm831x-irq.c | 7 -
+ drivers/mfd/wm8350-i2c.c | 1 -
+ drivers/mfd/wm8350-irq.c | 8 +-
+ drivers/mfd/wm8400-core.c | 1 -
+ drivers/mfd/wm8994-core.c | 1 -
+ drivers/mfd/wm8994-irq.c | 9 +-
+ drivers/mfd/wm8994-regmap.c | 6 +-
+ drivers/mfd/wm8997-tables.c | 8 +-
+ drivers/mfd/wm8998-tables.c | 1594 ++++++++++++++++++++
+ drivers/rtc/rtc-st-lpc.c | 2 +-
+ include/dt-bindings/mfd/st-lpc.h | 1 +
+ include/linux/mfd/88pm80x.h | 162 +-
+ include/linux/mfd/arizona/core.h | 3 +
+ include/linux/mfd/arizona/pdata.h | 14 +-
+ include/linux/mfd/arizona/registers.h | 220 +++
+ include/linux/mfd/axp20x.h | 67 +-
+ include/linux/mfd/da9062/core.h | 50 +
+ include/linux/mfd/da9062/registers.h | 1108 ++++++++++++++
+ include/linux/mfd/da9063/core.h | 1 +
+ include/linux/mfd/mt6397/core.h | 1 +
+ 119 files changed, 4601 insertions(+), 533 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mfd/da9062.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/max77802.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/max77686.txt
+ create mode 100644 Documentation/devicetree/bindings/timer/st,stih407-lpc
+ create mode 100644 drivers/clocksource/clksrc_st_lpc.c
+ create mode 100644 drivers/mfd/da9062-core.c
+ create mode 100644 drivers/mfd/wm8998-tables.c
+ create mode 100644 include/linux/mfd/da9062/core.h
+ create mode 100644 include/linux/mfd/da9062/registers.h
+Merging backlight/for-backlight-next (13d20b3b618a backlight: tosa: Export I2C module alias information)
+$ git merge backlight/for-backlight-next
+Auto-merging drivers/video/backlight/pm8941-wled.c
+Auto-merging drivers/leds/Makefile
+Auto-merging drivers/leds/Kconfig
+Auto-merging Documentation/devicetree/bindings/video/backlight/pm8941-wled.txt
+Merge made by the 'recursive' strategy.
+ .../backlight/pm8941-wled.txt} | 5 +-
+ drivers/leds/Kconfig | 8 ---
+ drivers/leds/Makefile | 1 -
+ drivers/video/backlight/Kconfig | 7 +++
+ drivers/video/backlight/Makefile | 1 +
+ drivers/video/backlight/lp855x_bl.c | 23 +++++----
+ drivers/video/backlight/lp8788_bl.c | 3 +-
+ .../backlight/pm8941-wled.c} | 60 ++++++++++------------
+ drivers/video/backlight/sky81452-backlight.c | 26 +++++-----
+ drivers/video/backlight/tosa_bl.c | 1 +
+ include/linux/platform_data/lp855x.h | 2 -
+ 11 files changed, 62 insertions(+), 75 deletions(-)
+ rename Documentation/devicetree/bindings/{leds/leds-pm8941-wled.txt => video/backlight/pm8941-wled.txt} (84%)
+ rename drivers/{leds/leds-pm8941-wled.c => video/backlight/pm8941-wled.c} (90%)
+Merging battery/master (b68c3161430a bq2415x_charger: Allow to load and use driver even if notify device is not registered yet)
+$ git merge battery/master
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/arm/atmel-at91.txt
+Merge made by the 'recursive' strategy.
+ .../ABI/testing/sysfs-class-power-twl4030 | 45 ++
+ .../devicetree/bindings/arm/atmel-at91.txt | 2 +-
+ MAINTAINERS | 1 +
+ drivers/mfd/twl-core.c | 9 +-
+ drivers/power/Kconfig | 17 +-
+ drivers/power/bq2415x_charger.c | 143 ++---
+ drivers/power/bq24190_charger.c | 4 +-
+ drivers/power/bq24735-charger.c | 52 +-
+ drivers/power/bq27x00_battery.c | 123 +++--
+ drivers/power/ds2780_battery.c | 20 +-
+ drivers/power/ds2781_battery.c | 8 -
+ drivers/power/ltc2941-battery-gauge.c | 54 +-
+ drivers/power/olpc_battery.c | 7 +-
+ drivers/power/pm2301_charger.c | 1 -
+ drivers/power/reset/Kconfig | 7 +
+ drivers/power/reset/Makefile | 1 +
+ drivers/power/reset/at91-reset.c | 26 +-
+ drivers/power/reset/zx-reboot.c | 80 +++
+ drivers/power/rt5033_battery.c | 2 +-
+ drivers/power/rt9455_charger.c | 16 +-
+ drivers/power/rx51_battery.c | 2 +-
+ drivers/power/twl4030_charger.c | 598 +++++++++++++++++----
+ 22 files changed, 862 insertions(+), 356 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-class-power-twl4030
+ create mode 100644 drivers/power/reset/zx-reboot.c
+Merging omap_dss2/for-next (b06ece93cf96 video: fbdev: s3c-fb: Constify platform_device_id)
+$ git merge omap_dss2/for-next
+Merge made by the 'recursive' strategy.
+ drivers/video/console/Kconfig | 2 +-
+ drivers/video/fbdev/Kconfig | 2 +-
+ drivers/video/fbdev/atmel_lcdfb.c | 2 +-
+ drivers/video/fbdev/core/fbmon.c | 4 ++--
+ drivers/video/fbdev/core/modedb.c | 2 +-
+ drivers/video/fbdev/omap2/displays-new/encoder-opa362.c | 1 -
+ drivers/video/fbdev/s3c-fb.c | 2 +-
+ drivers/video/fbdev/ssd1307fb.c | 1 -
+ drivers/video/fbdev/udlfb.c | 10 ++++------
+ drivers/video/fbdev/vfb.c | 17 ++++++++---------
+ include/linux/fb.h | 2 +-
+ 11 files changed, 20 insertions(+), 25 deletions(-)
+Merging regulator/for-next (2795987874ec Merge remote-tracking branches 'regulator/topic/stub', 'regulator/topic/tol' and 'regulator/topic/tps6586x' into regulator-next)
+$ git merge regulator/for-next
+Removing drivers/regulator/max77843.c
+Auto-merging drivers/mfd/max77693.c
+Removing drivers/input/misc/max77843-haptic.c
+Auto-merging drivers/input/misc/Kconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/regulator/da9210.txt | 4 +
+ .../devicetree/bindings/regulator/da9211.txt | 32 +-
+ .../bindings/regulator/max8973-regulator.txt | 6 +
+ .../bindings/regulator/mt6311-regulator.txt | 35 ++
+ .../bindings/regulator/pwm-regulator.txt | 65 +++-
+ .../bindings/regulator/qcom,spmi-regulator.txt | 60 +++-
+ .../devicetree/bindings/regulator/regulator.txt | 1 +
+ drivers/extcon/extcon-max77693.c | 94 +++---
+ drivers/extcon/extcon-max77843.c | 66 ++--
+ drivers/input/misc/Kconfig | 18 +-
+ drivers/input/misc/Makefile | 1 -
+ drivers/input/misc/max77693-haptic.c | 92 +++++-
+ drivers/input/misc/max77843-haptic.c | 358 ---------------------
+ drivers/leds/leds-max77693.c | 1 +
+ drivers/mfd/max77693.c | 31 +-
+ drivers/mfd/max77843.c | 20 +-
+ drivers/power/max77693_charger.c | 1 +
+ drivers/regulator/88pm800.c | 236 +++++---------
+ drivers/regulator/Kconfig | 43 ++-
+ drivers/regulator/Makefile | 3 +-
+ drivers/regulator/act8865-regulator.c | 1 -
+ drivers/regulator/axp20x-regulator.c | 1 +
+ drivers/regulator/core.c | 145 +++++----
+ drivers/regulator/da9062-regulator.c | 1 -
+ drivers/regulator/da9210-regulator.c | 76 ++++-
+ drivers/regulator/da9211-regulator.c | 41 ++-
+ drivers/regulator/da9211-regulator.h | 18 +-
+ drivers/regulator/fan53555.c | 1 +
+ drivers/regulator/isl6271a-regulator.c | 1 -
+ drivers/regulator/isl9305.c | 2 +-
+ drivers/regulator/lp3971.c | 1 -
+ drivers/regulator/lp3972.c | 1 -
+ drivers/regulator/lp872x.c | 17 +-
+ drivers/regulator/ltc3589.c | 3 +-
+ drivers/regulator/max1586.c | 1 -
+ drivers/regulator/max77693.c | 173 ++++++++--
+ drivers/regulator/max77843.c | 201 ------------
+ drivers/regulator/max8660.c | 1 -
+ drivers/regulator/max8973-regulator.c | 81 ++++-
+ drivers/regulator/mt6311-regulator.c | 180 +++++++++++
+ drivers/regulator/mt6311-regulator.h | 65 ++++
+ drivers/regulator/of_regulator.c | 3 +
+ drivers/regulator/pbias-regulator.c | 5 +
+ drivers/regulator/pfuze100-regulator.c | 1 -
+ drivers/regulator/pwm-regulator.c | 160 ++++++---
+ drivers/regulator/qcom_smd-regulator.c | 350 ++++++++++++++++++++
+ drivers/regulator/qcom_spmi-regulator.c | 203 +++++++++++-
+ drivers/regulator/rk808-regulator.c | 212 +++++++++++-
+ drivers/regulator/tps51632-regulator.c | 1 -
+ drivers/regulator/tps62360-regulator.c | 1 -
+ drivers/regulator/tps65023-regulator.c | 1 -
+ drivers/regulator/tps6586x-regulator.c | 4 +-
+ include/linux/mfd/max77693-common.h | 49 +++
+ include/linux/mfd/max77693-private.h | 134 +++-----
+ include/linux/mfd/max77843-private.h | 174 +++++-----
+ include/linux/regulator/consumer.h | 16 +
+ include/linux/regulator/da9211.h | 19 +-
+ include/linux/regulator/driver.h | 1 +
+ include/linux/regulator/machine.h | 1 +
+ include/linux/regulator/mt6311.h | 29 ++
+ 60 files changed, 2295 insertions(+), 1247 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/regulator/mt6311-regulator.txt
+ delete mode 100644 drivers/input/misc/max77843-haptic.c
+ delete mode 100644 drivers/regulator/max77843.c
+ create mode 100644 drivers/regulator/mt6311-regulator.c
+ create mode 100644 drivers/regulator/mt6311-regulator.h
+ create mode 100644 drivers/regulator/qcom_smd-regulator.c
+ create mode 100644 include/linux/mfd/max77693-common.h
+ create mode 100644 include/linux/regulator/mt6311.h
+Merging security/next (3f1d44ae6401 Documentation/Changes: Now need OpenSSL devel packages for module signing)
+$ git merge security/next
+Resolved 'security/yama/yama_lsm.c' using previous resolution.
+Auto-merging security/yama/yama_lsm.c
+CONFLICT (content): Merge conflict in security/yama/yama_lsm.c
+Auto-merging security/security.c
+Removing scripts/sign-file
+Auto-merging init/Kconfig
+Auto-merging crypto/Kconfig
+Auto-merging certs/system_keyring.c
+Auto-merging certs/system_certificates.S
+Auto-merging Makefile
+Auto-merging MAINTAINERS
+Auto-merging .gitignore
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 596a6ecb6612] Merge remote-tracking branch 'security/next'
+$ git diff -M --stat --summary HEAD^..
+ .gitignore | 1 +
+ Documentation/Changes | 17 +-
+ Documentation/kbuild/kbuild.txt | 5 +
+ Documentation/module-signing.txt | 56 +++-
+ Documentation/security/Smack.txt | 27 +-
+ Documentation/security/Yama.txt | 10 +-
+ MAINTAINERS | 21 +-
+ Makefile | 13 +-
+ arch/mips/configs/pistachio_defconfig | 1 -
+ arch/x86/kernel/kexec-bzimage64.c | 4 +-
+ certs/Kconfig | 42 +++
+ certs/Makefile | 94 ++++++
+ {kernel => certs}/system_certificates.S | 5 +-
+ {kernel => certs}/system_keyring.c | 53 +++-
+ crypto/Kconfig | 1 +
+ crypto/asymmetric_keys/Makefile | 8 +-
+ crypto/asymmetric_keys/asymmetric_type.c | 11 +
+ crypto/asymmetric_keys/pkcs7.asn1 | 22 +-
+ crypto/asymmetric_keys/pkcs7_key_type.c | 17 +-
+ crypto/asymmetric_keys/pkcs7_parser.c | 269 +++++++++++++++-
+ crypto/asymmetric_keys/pkcs7_parser.h | 20 +-
+ crypto/asymmetric_keys/pkcs7_trust.c | 10 +-
+ crypto/asymmetric_keys/pkcs7_verify.c | 145 +++++++--
+ crypto/asymmetric_keys/public_key.c | 1 +
+ crypto/asymmetric_keys/verify_pefile.c | 7 +-
+ crypto/asymmetric_keys/x509_akid.asn1 | 35 ++
+ crypto/asymmetric_keys/x509_cert_parser.c | 231 +++++++++-----
+ crypto/asymmetric_keys/x509_parser.h | 12 +-
+ crypto/asymmetric_keys/x509_public_key.c | 95 ++++--
+ include/crypto/pkcs7.h | 13 +-
+ include/crypto/public_key.h | 18 +-
+ include/keys/system_keyring.h | 7 +
+ include/linux/asn1_ber_bytecode.h | 16 +-
+ include/linux/lsm_audit.h | 7 +
+ include/linux/lsm_hooks.h | 6 +-
+ include/linux/oid_registry.h | 4 +-
+ include/linux/ptrace.h | 1 +
+ include/linux/seccomp.h | 2 +-
+ include/linux/verify_pefile.h | 6 +-
+ include/uapi/linux/ptrace.h | 6 +-
+ init/Kconfig | 40 +--
+ kernel/Makefile | 97 ------
+ kernel/module_signing.c | 213 ++-----------
+ kernel/ptrace.c | 13 +
+ kernel/seccomp.c | 17 +-
+ lib/asn1_decoder.c | 27 +-
+ scripts/.gitignore | 2 +
+ scripts/Kbuild.include | 51 +++
+ scripts/Makefile | 4 +
+ scripts/Makefile.modinst | 2 +-
+ scripts/asn1_compiler.c | 248 +++++++++------
+ scripts/extract-cert.c | 166 ++++++++++
+ scripts/selinux/mdp/mdp.c | 1 +
+ scripts/sign-file | 421 ------------------------
+ scripts/sign-file.c | 260 +++++++++++++++
+ security/Kconfig | 5 -
+ security/lsm_audit.c | 15 +
+ security/security.c | 11 +-
+ security/selinux/avc.c | 418 +++++++++++++++++++++++-
+ security/selinux/hooks.c | 147 ++++++---
+ security/selinux/include/avc.h | 6 +
+ security/selinux/include/security.h | 32 +-
+ security/selinux/ss/avtab.c | 104 +++++-
+ security/selinux/ss/avtab.h | 33 +-
+ security/selinux/ss/conditional.c | 32 +-
+ security/selinux/ss/conditional.h | 6 +-
+ security/selinux/ss/policydb.c | 5 +
+ security/selinux/ss/services.c | 213 +++++++++++--
+ security/selinux/ss/services.h | 6 +
+ security/smack/smack.h | 66 +++-
+ security/smack/smack_access.c | 6 +
+ security/smack/smack_lsm.c | 511 +++++++++++++++++++++++-------
+ security/smack/smackfs.c | 436 ++++++++++++++++++++-----
+ security/yama/Kconfig | 9 +-
+ security/yama/yama_lsm.c | 33 +-
+ 75 files changed, 3568 insertions(+), 1407 deletions(-)
+ create mode 100644 certs/Kconfig
+ create mode 100644 certs/Makefile
+ rename {kernel => certs}/system_certificates.S (80%)
+ rename {kernel => certs}/system_keyring.c (68%)
+ create mode 100644 crypto/asymmetric_keys/x509_akid.asn1
+ create mode 100644 scripts/extract-cert.c
+ delete mode 100755 scripts/sign-file
+ create mode 100755 scripts/sign-file.c
+Merging integrity/next (24fd03c87695 ima: update builtin policies)
+$ git merge integrity/next
+Already up-to-date.
+Merging selinux/next (fda4d578ed0a selinux: explicitly declare the role "base_r")
+$ git merge selinux/next
+Already up-to-date.
+Merging lblnet/next (b2776bf7149b Linux 3.18)
+$ git merge lblnet/next
+Already up-to-date.
+Merging watchdog/master (c13dcf9f2d6f Linux 4.2-rc8)
+$ git merge watchdog/master
+Already up-to-date.
+Merging iommu/next (4d400e71a1ee Merge branches 'arm/omap', 'arm/msm', 'arm/smmu', 'arm/tegra', 'x86/vt-d', 'x86/amd', 'ppc/pamu' and 'core' into next)
+$ git merge iommu/next
+Auto-merging drivers/iommu/intel-iommu.c
+Auto-merging drivers/iommu/Kconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/iommu/arm,smmu.txt | 6 +
+ .../devicetree/bindings/iommu/ti,omap-iommu.txt | 6 +
+ drivers/iommu/Kconfig | 3 +-
+ drivers/iommu/amd_iommu.c | 21 +-
+ drivers/iommu/amd_iommu_init.c | 2 +-
+ drivers/iommu/amd_iommu_v2.c | 4 +-
+ drivers/iommu/arm-smmu-v3.c | 66 +-
+ drivers/iommu/arm-smmu.c | 45 +-
+ drivers/iommu/dmar.c | 2 +-
+ drivers/iommu/fsl_pamu.c | 26 +-
+ drivers/iommu/intel-iommu.c | 714 ++++++++++-----------
+ drivers/iommu/intel_irq_remapping.c | 6 +-
+ drivers/iommu/io-pgtable-arm.c | 143 ++++-
+ drivers/iommu/io-pgtable.c | 5 -
+ drivers/iommu/io-pgtable.h | 14 +-
+ drivers/iommu/ipmmu-vmsa.c | 19 +-
+ drivers/iommu/irq_remapping.c | 2 +-
+ drivers/iommu/msm_iommu.c | 4 +-
+ drivers/iommu/of_iommu.c | 8 +-
+ drivers/iommu/omap-iommu-debug.c | 131 +++-
+ drivers/iommu/omap-iommu.c | 198 +-----
+ drivers/iommu/omap-iommu.h | 79 +--
+ drivers/iommu/omap-iopgtable.h | 27 +-
+ include/linux/intel-iommu.h | 2 +-
+ 24 files changed, 739 insertions(+), 794 deletions(-)
+Merging dwmw2-iommu/master (5dbaf90a6780 iommu/vt-d: Add initial shell of SVM support)
+$ git merge dwmw2-iommu/master
+Auto-merging include/linux/intel-iommu.h
+Auto-merging drivers/iommu/intel-iommu.c
+Auto-merging drivers/iommu/Kconfig
+Merge made by the 'recursive' strategy.
+ drivers/iommu/Kconfig | 10 +++-
+ drivers/iommu/Makefile | 1 +
+ drivers/iommu/intel-iommu.c | 19 +++++--
+ drivers/iommu/intel-svm.c | 71 ++++++++++++++++++++++++++
+ drivers/iommu/iova.c | 120 +++++++++++++++++++++++++-------------------
+ include/linux/intel-iommu.h | 15 ++++++
+ include/linux/iova.h | 4 +-
+ 7 files changed, 183 insertions(+), 57 deletions(-)
+ create mode 100644 drivers/iommu/intel-svm.c
+Merging vfio/next (a714ea5fa416 MAINTAINERS: Add vfio-platform sub-maintainer)
+$ git merge vfio/next
+Already up-to-date.
+Merging jc_docs/docs-next (0fe0965e63c8 Documentation/x86: Rename IRQSTACKSIZE to IRQ_STACK_SIZE)
+$ git merge jc_docs/docs-next
+Auto-merging MAINTAINERS
+Auto-merging Documentation/DocBook/device-drivers.tmpl
+Merge made by the 'recursive' strategy.
+ Documentation/CodingStyle | 2 -
+ Documentation/DocBook/Makefile | 53 ++-
+ Documentation/DocBook/device-drivers.tmpl | 1 +
+ Documentation/DocBook/stylesheet.xsl | 1 +
+ Documentation/HOWTO | 28 +-
+ Documentation/Intel-IOMMU.txt | 2 +-
+ Documentation/SubmittingPatches | 12 +-
+ Documentation/adding-syscalls.txt | 527 +++++++++++++++++++++
+ Documentation/arm/Samsung/Bootloader-interface.txt | 15 +-
+ Documentation/arm/keystone/Overview.txt | 73 +++
+ Documentation/email-clients.txt | 2 +-
+ Documentation/filesystems/btrfs.txt | 16 +-
+ Documentation/filesystems/debugfs.txt | 40 ++
+ Documentation/kernel-doc-nano-HOWTO.txt | 2 +-
+ Documentation/mailbox.txt | 6 +-
+ Documentation/men-chameleon-bus.txt | 163 +++++++
+ Documentation/networking/can.txt | 4 +-
+ Documentation/powerpc/cxl.txt | 2 +-
+ Documentation/powerpc/dscr.txt | 6 +-
+ Documentation/powerpc/qe_firmware.txt | 2 +-
+ Documentation/pps/pps.txt | 2 +-
+ Documentation/sysctl/vm.txt | 10 +-
+ Documentation/x86/kernel-stacks | 2 +-
+ MAINTAINERS | 2 +
+ README | 2 +-
+ scripts/kernel-doc | 96 +++-
+ scripts/kernel-doc-xml-ref | 198 ++++++++
+ 27 files changed, 1193 insertions(+), 76 deletions(-)
+ create mode 100644 Documentation/adding-syscalls.txt
+ create mode 100644 Documentation/arm/keystone/Overview.txt
+ create mode 100644 Documentation/men-chameleon-bus.txt
+ create mode 100755 scripts/kernel-doc-xml-ref
+Merging trivial/for-next (e5f6450c3f40 MAINTAINERS: update my e-mail address)
+$ git merge trivial/for-next
+Resolved 'drivers/media/v4l2-core/videobuf2-memops.c' using previous resolution.
+Auto-merging sound/soc/fsl/fsl_esai.c
+Auto-merging fs/btrfs/qgroup.c
+CONFLICT (modify/delete): drivers/regulator/max77843.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of drivers/regulator/max77843.c left in tree.
+Auto-merging drivers/media/v4l2-core/videobuf2-memops.c
+CONFLICT (content): Merge conflict in drivers/media/v4l2-core/videobuf2-memops.c
+Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
+Auto-merging drivers/input/touchscreen/ili210x.c
+Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+Auto-merging drivers/gpu/drm/drm_atomic_helper.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/SubmittingPatches
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f drivers/regulator/max77843.c
+drivers/regulator/max77843.c: needs merge
+rm 'drivers/regulator/max77843.c'
+$ git commit -v -a
+[master 45000b41c56a] Merge remote-tracking branch 'trivial/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/SubmittingPatches | 2 +-
+ Documentation/pcmcia/locking.txt | 2 +-
+ MAINTAINERS | 18 +++++++++---------
+ arch/ia64/mm/tlb.c | 4 ++--
+ arch/metag/include/asm/elf.h | 2 +-
+ arch/mips/kernel/setup.c | 2 +-
+ arch/powerpc/kvm/book3s.c | 2 +-
+ arch/powerpc/sysdev/fsl_pci.c | 2 +-
+ arch/sparc/include/uapi/asm/pstate.h | 2 +-
+ drivers/gpio/gpiolib-acpi.c | 2 +-
+ drivers/gpu/drm/drm_atomic_helper.c | 4 ++--
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.c | 4 ++--
+ drivers/gpu/drm/via/via_dmablit.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 2 +-
+ drivers/input/touchscreen/ili210x.c | 4 ++--
+ drivers/isdn/mISDN/dsp_cmx.c | 2 +-
+ drivers/mailbox/arm_mhu.c | 2 +-
+ drivers/md/Kconfig | 2 +-
+ drivers/media/dvb-frontends/au8522_dig.c | 2 +-
+ drivers/media/platform/exynos4-is/fimc-m2m.c | 2 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 2 +-
+ drivers/net/ethernet/amd/xgbe/xgbe.h | 2 +-
+ drivers/net/wireless/ath/ath6kl/wmi.c | 4 ++--
+ drivers/net/wireless/ipw2x00/ipw2100.h | 2 +-
+ drivers/scsi/53c700.c | 2 +-
+ drivers/scsi/a100u2w.c | 2 +-
+ drivers/scsi/aic7xxx/aic7xxx_core.c | 2 +-
+ drivers/scsi/arcmsr/arcmsr_hba.c | 2 +-
+ drivers/scsi/fcoe/fcoe_transport.c | 8 ++++----
+ drivers/scsi/scsi_transport_iscsi.c | 2 +-
+ drivers/scsi/scsi_transport_spi.c | 4 ++--
+ drivers/scsi/wd719x.c | 2 +-
+ drivers/staging/comedi/Kconfig | 2 +-
+ drivers/usb/dwc2/core.c | 2 +-
+ drivers/usb/gadget/composite.c | 4 ++--
+ drivers/usb/gadget/udc/bdc/bdc.h | 2 +-
+ drivers/w1/masters/matrox_w1.c | 2 +-
+ fs/btrfs/qgroup.c | 2 +-
+ fs/ecryptfs/mmap.c | 2 +-
+ fs/freevxfs/vxfs_lookup.c | 2 +-
+ fs/ntfs/super.c | 2 +-
+ fs/ocfs2/ocfs2_fs.h | 4 ++--
+ include/linux/mod_devicetable.h | 2 +-
+ include/linux/proportions.h | 2 +-
+ include/media/videobuf-core.h | 2 +-
+ kernel/exit.c | 2 +-
+ mm/nommu.c | 10 +++++-----
+ sound/soc/fsl/fsl_esai.c | 2 +-
+ sound/soc/omap/Kconfig | 2 +-
+ 49 files changed, 72 insertions(+), 72 deletions(-)
+Merging audit/next (15ce414b82b0 fixup: audit: implement audit by executable)
+$ git merge audit/next
+Resolved 'kernel/audit.c' using previous resolution.
+Auto-merging kernel/auditsc.c
+Auto-merging kernel/audit_watch.c
+Auto-merging kernel/audit_tree.c
+Auto-merging kernel/audit.h
+Auto-merging kernel/audit.c
+CONFLICT (content): Merge conflict in kernel/audit.c
+Auto-merging kernel/Makefile
+Auto-merging include/uapi/linux/audit.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 92ae28b5d45b] Merge remote-tracking branch 'audit/next'
+$ git diff -M --stat --summary HEAD^..
+ include/linux/audit.h | 4 +
+ include/uapi/linux/audit.h | 5 +-
+ kernel/Makefile | 2 +-
+ kernel/audit.c | 2 +-
+ kernel/audit.h | 18 ++++
+ kernel/audit_fsnotify.c | 216 +++++++++++++++++++++++++++++++++++++++++++++
+ kernel/audit_tree.c | 2 +
+ kernel/audit_watch.c | 56 +++++++++---
+ kernel/auditfilter.c | 83 ++++++++++++-----
+ kernel/auditsc.c | 9 +-
+ 10 files changed, 359 insertions(+), 38 deletions(-)
+ create mode 100644 kernel/audit_fsnotify.c
+Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
+$ git merge devicetree/devicetree/next
+Already up-to-date.
+Merging dt-rh/for-next (126b16e2ad98 Docs: dt: add generic MSI bindings)
+$ git merge dt-rh/for-next
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Merge made by the 'recursive' strategy.
+ .../bindings/interrupt-controller/msi.txt | 135 +++++++++++++++++++++
+ .../devicetree/bindings/vendor-prefixes.txt | 2 +
+ drivers/base/platform.c | 8 +-
+ drivers/of/address.c | 6 +-
+ drivers/of/platform.c | 9 ++
+ include/linux/of_platform.h | 9 ++
+ 6 files changed, 160 insertions(+), 9 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/msi.txt
+Merging mailbox/mailbox-for-next (86e488adaab7 mailbox: arm_mhu: reduce txpoll_period from 10ms to 1 ms)
+$ git merge mailbox/mailbox-for-next
+Auto-merging drivers/mailbox/arm_mhu.c
+Merge made by the 'recursive' strategy.
+ drivers/mailbox/arm_mhu.c | 2 +-
+ drivers/mailbox/bcm2835-mailbox.c | 1 -
+ drivers/mailbox/mailbox.c | 27 +++++++++++++++------------
+ include/linux/mailbox_controller.h | 7 ++++---
+ 4 files changed, 20 insertions(+), 17 deletions(-)
+Merging spi/for-next (9b0a1ebd079f Merge remote-tracking branch 'spi/topic/xcomm' into spi-next)
+$ git merge spi/for-next
+Merge made by the 'recursive' strategy.
+ .../bindings/powerpc/fsl/mpc5121-psc.txt | 24 +-
+ .../devicetree/bindings/spi/snps,dw-apb-ssi.txt | 2 +
+ .../devicetree/bindings/spi/spi-davinci.txt | 2 +
+ .../devicetree/bindings/spi/spi-img-spfi.txt | 1 +
+ .../devicetree/bindings/spi/spi-mt65xx.txt | 51 ++
+ arch/arm/mach-davinci/devices-da8xx.c | 2 +
+ arch/arm/mach-davinci/dm355.c | 1 +
+ arch/arm/mach-davinci/dm365.c | 1 +
+ arch/powerpc/include/asm/mpc52xx_psc.h | 5 +-
+ drivers/spi/Kconfig | 9 +
+ drivers/spi/Makefile | 1 +
+ drivers/spi/spi-atmel.c | 1 -
+ drivers/spi/spi-bcm2835.c | 38 +-
+ drivers/spi/spi-bcm63xx-hsspi.c | 13 +-
+ drivers/spi/spi-bitbang-txrx.h | 4 +-
+ drivers/spi/spi-davinci.c | 50 +-
+ drivers/spi/spi-dw-mmio.c | 3 +
+ drivers/spi/spi-dw.c | 4 +-
+ drivers/spi/spi-dw.h | 35 +
+ drivers/spi/spi-img-spfi.c | 73 ++-
+ drivers/spi/spi-mpc512x-psc.c | 70 +-
+ drivers/spi/spi-mt65xx.c | 726 +++++++++++++++++++++
+ drivers/spi/spi-omap2-mcspi.c | 10 +
+ drivers/spi/spi-orion.c | 54 +-
+ drivers/spi/spi-pxa2xx-pci.c | 1 -
+ drivers/spi/spi-pxa2xx.c | 66 +-
+ drivers/spi/spi-pxa2xx.h | 5 -
+ drivers/spi/spi-rockchip.c | 1 -
+ drivers/spi/spi-rspi.c | 19 +-
+ drivers/spi/spi-s3c24xx.c | 1 -
+ drivers/spi/spi-s3c64xx.c | 4 +-
+ drivers/spi/spi-sh-msiof.c | 20 +-
+ drivers/spi/spi-ti-qspi.c | 34 +-
+ drivers/spi/spi-xcomm.c | 2 +-
+ drivers/spi/spi-xilinx.c | 20 +-
+ drivers/spi/spi.c | 235 ++++++-
+ drivers/spi/spidev.c | 8 +-
+ include/linux/platform_data/spi-davinci.h | 1 +
+ include/linux/platform_data/spi-mt65xx.h | 20 +
+ include/linux/pxa2xx_ssp.h | 1 +
+ include/linux/spi/spi.h | 64 ++
+ 41 files changed, 1537 insertions(+), 145 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/spi/spi-mt65xx.txt
+ create mode 100644 drivers/spi/spi-mt65xx.c
+ create mode 100644 include/linux/platform_data/spi-mt65xx.h
+Merging tip/auto-latest (9cc8370f6130 Merge branch 'x86/platform')
+$ git merge tip/auto-latest
+Resolved 'arch/arm/mach-shmobile/setup-r8a7779.c' using previous resolution.
+Resolved 'arch/arm64/include/asm/barrier.h' using previous resolution.
+Resolved 'arch/mips/include/asm/switch_to.h' using previous resolution.
+Resolved 'arch/s390/lib/uaccess.c' using previous resolution.
+Removing tools/lib/lockdep/uinclude/linux/rbtree.h
+Removing scripts/rt-tester/t5-l4-pi-boost-deboost.tst
+Removing scripts/rt-tester/t5-l4-pi-boost-deboost-setsched.tst
+Removing scripts/rt-tester/t4-l2-pi-deboost.tst
+Removing scripts/rt-tester/t3-l2-pi.tst
+Removing scripts/rt-tester/t3-l1-pi-steal.tst
+Removing scripts/rt-tester/t3-l1-pi-signal.tst
+Removing scripts/rt-tester/t3-l1-pi-3rt.tst
+Removing scripts/rt-tester/t3-l1-pi-2rt.tst
+Removing scripts/rt-tester/t3-l1-pi-1rt.tst
+Removing scripts/rt-tester/t2-l2-2rt-deadlock.tst
+Removing scripts/rt-tester/t2-l1-signal.tst
+Removing scripts/rt-tester/t2-l1-pi.tst
+Removing scripts/rt-tester/t2-l1-2rt-sameprio.tst
+Removing scripts/rt-tester/rt-tester.py
+Removing scripts/rt-tester/check-all.sh
+Auto-merging lib/Makefile
+Auto-merging lib/Kconfig.debug
+Removing kernel/locking/rtmutex-tester.c
+Auto-merging kernel/locking/Makefile
+Auto-merging kernel/events/core.c
+Auto-merging kernel/cgroup.c
+Auto-merging init/Kconfig
+Auto-merging include/linux/pci.h
+Auto-merging include/linux/device.h
+Auto-merging drivers/thermal/intel_powerclamp.c
+Auto-merging drivers/pci/probe.c
+Auto-merging drivers/pci/pci.c
+Auto-merging drivers/pci/msi.c
+Auto-merging drivers/pci/host/pcie-xilinx.c
+Auto-merging drivers/pci/host/pcie-designware.c
+Auto-merging drivers/pci/host/pci-xgene-msi.c
+Auto-merging drivers/pci/host/pci-keystone-dw.c
+Auto-merging drivers/of/platform.c
+Auto-merging drivers/of/irq.c
+Removing drivers/irqchip/irqchip.h
+Auto-merging drivers/irqchip/irq-mips-gic.c
+Auto-merging drivers/irqchip/irq-i8259.c
+Auto-merging drivers/cpufreq/intel_pstate.c
+Auto-merging drivers/clocksource/mips-gic-timer.c
+Auto-merging drivers/clocksource/Kconfig
+Auto-merging drivers/base/power/opp.c
+Auto-merging drivers/base/core.c
+Auto-merging arch/xtensa/kernel/irq.c
+Auto-merging arch/x86/ras/mce_amd_inj.c
+Auto-merging arch/x86/platform/intel/iosf_mbi.c
+Auto-merging arch/x86/platform/atom/pmc_atom.c
+Auto-merging arch/x86/pci/intel_mid_pci.c
+Auto-merging arch/x86/kernel/kexec-bzimage64.c
+Auto-merging arch/x86/kernel/acpi/boot.c
+Auto-merging arch/x86/include/asm/msr-index.h
+Removing arch/x86/include/asm/context_tracking.h
+Auto-merging arch/x86/configs/x86_64_defconfig
+Removing arch/x86/boot/mca.c
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/um/kernel/trap.c
+Auto-merging arch/sparc/kernel/pci.c
+Auto-merging arch/s390/pci/pci.c
+Auto-merging arch/s390/lib/uaccess.c
+CONFLICT (content): Merge conflict in arch/s390/lib/uaccess.c
+Auto-merging arch/s390/kernel/jump_label.c
+Auto-merging arch/powerpc/sysdev/ppc4xx_hsta_msi.c
+Auto-merging arch/powerpc/platforms/powernv/pci.c
+Auto-merging arch/mips/kernel/Makefile
+Auto-merging arch/mips/include/asm/switch_to.h
+CONFLICT (content): Merge conflict in arch/mips/include/asm/switch_to.h
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/arm64/include/asm/barrier.h
+CONFLICT (content): Merge conflict in arch/arm64/include/asm/barrier.h
+Auto-merging arch/arm/mach-zynq/common.c
+Auto-merging arch/arm/mach-shmobile/setup-r8a7779.c
+CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-r8a7779.c
+CONFLICT (modify/delete): arch/arm/mach-shmobile/intc-sh73a0.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of arch/arm/mach-shmobile/intc-sh73a0.c left in tree.
+Auto-merging arch/arm/include/asm/barrier.h
+Auto-merging arch/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/kernel-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f arch/arm/mach-shmobile/intc-sh73a0.c
+arch/arm/mach-shmobile/intc-sh73a0.c: needs merge
+rm 'arch/arm/mach-shmobile/intc-sh73a0.c'
+$ git commit -v -a
+[master 3887006e561d] Merge remote-tracking branch 'tip/auto-latest'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/RCU/rcu_dereference.txt | 2 +-
+ Documentation/RCU/stallwarn.txt | 29 +-
+ Documentation/RCU/trace.txt | 36 +-
+ Documentation/RCU/whatisRCU.txt | 2 +-
+ Documentation/atomic_ops.txt | 4 +-
+ .../brcm,bcm2835-armctrl-ic.txt | 25 +-
+ .../interrupt-controller/brcm,bcm2836-l1-intc.txt | 37 +
+ Documentation/fault-injection/fault-injection.txt | 11 +
+ Documentation/kernel-parameters.txt | 35 +-
+ Documentation/memory-barriers.txt | 410 ++---
+ Documentation/static-keys.txt | 99 +-
+ Documentation/x86/zero-page.txt | 3 +-
+ MAINTAINERS | 6 +-
+ arch/Kconfig | 6 +
+ arch/alpha/kernel/irq.c | 2 +-
+ arch/alpha/kernel/osf_sys.c | 13 +-
+ arch/alpha/kernel/time.c | 18 +-
+ arch/arc/kernel/mcip.c | 3 +-
+ arch/arm/include/asm/atomic.h | 37 +-
+ arch/arm/include/asm/barrier.h | 4 +-
+ arch/arm/include/asm/cmpxchg.h | 47 +-
+ arch/arm/include/asm/jump_label.h | 25 +-
+ arch/arm/kernel/jump_label.c | 2 +-
+ arch/arm/mach-shmobile/setup-r8a7779.c | 2 -
+ arch/arm/mach-ux500/cpu.c | 1 -
+ arch/arm/mach-vexpress/tc2_pm.c | 2 +-
+ arch/arm/mach-zynq/common.c | 1 -
+ arch/arm64/include/asm/jump_label.h | 18 +-
+ arch/arm64/kernel/jump_label.c | 2 +-
+ arch/avr32/include/asm/io.h | 1 +
+ arch/avr32/include/asm/switch_to.h | 7 +-
+ arch/avr32/mach-at32ap/extint.c | 4 +-
+ arch/avr32/mach-at32ap/pio.c | 6 +-
+ arch/blackfin/kernel/time-ts.c | 136 +-
+ arch/blackfin/mach-bf537/ints-priority.c | 4 +-
+ arch/blackfin/mach-common/ints-priority.c | 15 +-
+ arch/c6x/platforms/megamod-pic.c | 7 +-
+ arch/c6x/platforms/timer64.c | 52 +-
+ arch/cris/arch-v32/kernel/time.c | 8 +-
+ arch/frv/include/asm/io.h | 1 +
+ arch/ia64/include/asm/barrier.h | 4 +-
+ arch/ia64/kernel/iosapic.c | 8 +-
+ arch/ia64/kernel/irq.c | 6 +-
+ arch/ia64/kernel/msi_ia64.c | 6 +-
+ arch/ia64/sn/kernel/msi_sn.c | 4 +-
+ arch/m32r/include/asm/io.h | 1 +
+ arch/m68k/coldfire/intc-5272.c | 4 +-
+ arch/m68k/include/asm/io_mm.h | 1 +
+ arch/m68k/mac/oss.c | 6 +-
+ arch/m68k/mac/psc.c | 3 +-
+ arch/metag/include/asm/barrier.h | 4 +-
+ arch/microblaze/kernel/intc.c | 3 +-
+ arch/microblaze/kernel/timer.c | 46 +-
+ arch/mips/Kconfig | 4 -
+ arch/mips/bmips/irq.c | 2 +-
+ arch/mips/include/asm/barrier.h | 4 +-
+ arch/mips/include/asm/jump_label.h | 19 +-
+ arch/mips/kernel/Makefile | 1 -
+ arch/mips/kernel/jump_label.c | 2 +-
+ arch/mips/pci/msi-octeon.c | 2 +-
+ arch/mn10300/include/asm/io.h | 1 +
+ arch/mn10300/kernel/cevt-mn10300.c | 9 +-
+ arch/mn10300/kernel/irq.c | 13 +-
+ arch/openrisc/kernel/time.c | 24 -
+ arch/parisc/configs/c8000_defconfig | 1 -
+ arch/parisc/configs/generic-32bit_defconfig | 1 -
+ arch/parisc/kernel/irq.c | 12 +-
+ arch/powerpc/include/asm/barrier.h | 4 +-
+ arch/powerpc/include/asm/io.h | 1 +
+ arch/powerpc/include/asm/jump_label.h | 19 +-
+ arch/powerpc/include/asm/spinlock.h | 2 -
+ arch/powerpc/kernel/jump_label.c | 2 +-
+ arch/powerpc/kernel/time.c | 24 +-
+ arch/powerpc/kvm/book3s_hv.c | 2 +-
+ arch/powerpc/platforms/512x/mpc5121_ads_cpld.c | 3 +-
+ arch/powerpc/platforms/cell/axon_msi.c | 6 +-
+ arch/powerpc/platforms/cell/interrupt.c | 3 +-
+ arch/powerpc/platforms/embedded6xx/flipper-pic.c | 3 +-
+ arch/powerpc/platforms/pasemi/msi.c | 4 +-
+ arch/powerpc/platforms/powermac/pic.c | 3 +-
+ arch/powerpc/platforms/powernv/opal-irqchip.c | 3 +-
+ arch/powerpc/platforms/powernv/pci.c | 4 +-
+ arch/powerpc/platforms/ps3/interrupt.c | 3 +-
+ arch/powerpc/platforms/pseries/msi.c | 6 +-
+ arch/powerpc/sysdev/ehv_pic.c | 3 +-
+ arch/powerpc/sysdev/fsl_msi.c | 4 +-
+ arch/powerpc/sysdev/i8259.c | 3 +-
+ arch/powerpc/sysdev/ipic.c | 3 +-
+ arch/powerpc/sysdev/mpic.c | 3 +-
+ arch/powerpc/sysdev/mpic_u3msi.c | 4 +-
+ arch/powerpc/sysdev/ppc4xx_hsta_msi.c | 4 +-
+ arch/powerpc/sysdev/ppc4xx_msi.c | 4 +-
+ arch/powerpc/sysdev/qe_lib/qe_ic.c | 3 +-
+ arch/powerpc/sysdev/xics/ics-opal.c | 2 +-
+ arch/powerpc/sysdev/xics/ics-rtas.c | 2 +-
+ arch/powerpc/sysdev/xics/xics-common.c | 3 +-
+ arch/s390/include/asm/barrier.h | 4 +-
+ arch/s390/include/asm/jump_label.h | 19 +-
+ arch/s390/kernel/jump_label.c | 2 +-
+ arch/s390/kernel/time.c | 6 -
+ arch/s390/lib/uaccess.c | 12 +-
+ arch/s390/pci/pci.c | 6 +-
+ arch/score/include/asm/switch_to.h | 2 -
+ arch/score/kernel/time.c | 31 +-
+ arch/sh/boards/mach-se/7343/irq.c | 2 +-
+ arch/sh/boards/mach-se/7722/irq.c | 2 +-
+ arch/sh/boards/mach-se/7724/irq.c | 3 +-
+ arch/sh/boards/mach-x3proto/gpio.c | 2 +-
+ arch/sh/include/asm/io.h | 1 +
+ arch/sh/include/asm/switch_to_32.h | 8 +-
+ arch/sh/kernel/irq.c | 9 +-
+ arch/sh/kernel/localtimer.c | 6 -
+ arch/sparc/include/asm/barrier_64.h | 4 +-
+ arch/sparc/include/asm/jump_label.h | 35 +-
+ arch/sparc/kernel/irq_64.c | 27 +-
+ arch/sparc/kernel/jump_label.c | 2 +-
+ arch/sparc/kernel/leon_kernel.c | 6 +-
+ arch/sparc/kernel/pci.c | 2 +-
+ arch/sparc/kernel/process_32.c | 10 +-
+ arch/sparc/kernel/sun4d_irq.c | 4 +-
+ arch/sparc/kernel/sun4m_irq.c | 6 +-
+ arch/sparc/kernel/sun4m_smp.c | 2 +-
+ arch/sparc/kernel/time_32.c | 57 +-
+ arch/sparc/kernel/time_64.c | 33 +-
+ arch/tile/include/asm/io.h | 1 +
+ arch/tile/kernel/pci_gx.c | 5 +-
+ arch/um/include/shared/kern_util.h | 3 +-
+ arch/um/kernel/process.c | 6 +-
+ arch/um/kernel/signal.c | 8 +-
+ arch/um/kernel/time.c | 44 +-
+ arch/um/kernel/tlb.c | 2 +-
+ arch/um/kernel/trap.c | 2 +-
+ arch/unicore32/kernel/irq.c | 5 +-
+ arch/unicore32/kernel/time.c | 29 +-
+ arch/x86/Kconfig | 61 +-
+ arch/x86/Makefile | 15 +-
+ arch/x86/boot/Makefile | 2 +-
+ arch/x86/boot/boot.h | 3 -
+ arch/x86/boot/compressed/aslr.c | 2 +-
+ arch/x86/boot/compressed/eboot.c | 4 -
+ arch/x86/boot/compressed/misc.c | 24 +
+ arch/x86/boot/compressed/misc.h | 11 +
+ arch/x86/boot/main.c | 3 -
+ arch/x86/boot/mca.c | 38 -
+ arch/x86/configs/i386_defconfig | 1 +
+ arch/x86/configs/x86_64_defconfig | 1 +
+ arch/x86/entry/Makefile | 1 +
+ arch/x86/entry/calling.h | 9 -
+ arch/x86/entry/common.c | 318 ++++
+ arch/x86/entry/entry_32.S | 130 +-
+ arch/x86/entry/entry_64.S | 197 +-
+ arch/x86/entry/entry_64_compat.S | 61 +-
+ arch/x86/entry/syscalls/syscall_32.tbl | 15 +
+ arch/x86/entry/vdso/Makefile | 8 +-
+ arch/x86/entry/vdso/vclock_gettime.c | 16 +-
+ arch/x86/entry/vdso/vma.c | 7 +-
+ arch/x86/entry/vsyscall/vsyscall_64.c | 2 +-
+ arch/x86/ia32/ia32_signal.c | 93 -
+ arch/x86/include/asm/apic.h | 2 -
+ arch/x86/include/asm/arch_hweight.h | 13 +-
+ arch/x86/include/asm/barrier.h | 19 +-
+ arch/x86/include/asm/context_tracking.h | 10 -
+ arch/x86/include/asm/cpufeature.h | 3 +
+ arch/x86/include/asm/delay.h | 1 +
+ arch/x86/include/asm/elf.h | 17 +-
+ arch/x86/include/asm/hw_irq.h | 6 +-
+ arch/x86/include/asm/ia32.h | 9 -
+ arch/x86/include/asm/io.h | 2 +
+ arch/x86/include/asm/iosf_mbi.h | 8 +-
+ arch/x86/include/asm/irq.h | 4 +-
+ arch/x86/include/asm/irq_vectors.h | 10 -
+ arch/x86/include/asm/jump_label.h | 23 +-
+ arch/x86/include/asm/kasan.h | 3 +
+ arch/x86/include/asm/math_emu.h | 6 +-
+ arch/x86/include/asm/mce.h | 8 +-
+ arch/x86/include/asm/microcode_amd.h | 1 +
+ arch/x86/include/asm/mmu.h | 2 +
+ arch/x86/include/asm/mmu_context.h | 28 +-
+ arch/x86/include/asm/msr-index.h | 14 +
+ arch/x86/include/asm/msr.h | 70 +-
+ arch/x86/include/asm/mwait.h | 45 +
+ arch/x86/include/asm/paravirt.h | 40 +-
+ arch/x86/include/asm/paravirt_types.h | 2 -
+ arch/x86/include/asm/perf_event.h | 7 +
+ arch/x86/include/asm/pmc_atom.h | 29 +
+ arch/x86/include/asm/preempt.h | 4 +-
+ arch/x86/include/asm/processor.h | 21 +-
+ arch/x86/include/asm/ptrace.h | 1 -
+ arch/x86/include/asm/pvclock.h | 10 +-
+ arch/x86/include/asm/qrwlock.h | 10 -
+ arch/x86/include/asm/sigframe.h | 10 +
+ arch/x86/include/asm/signal.h | 2 +-
+ arch/x86/include/asm/stackprotector.h | 2 +-
+ arch/x86/include/asm/syscalls.h | 1 +
+ arch/x86/include/asm/thread_info.h | 27 +-
+ arch/x86/include/asm/traps.h | 4 +-
+ arch/x86/include/asm/tsc.h | 19 +-
+ arch/x86/include/asm/vm86.h | 57 +-
+ arch/x86/include/uapi/asm/bootparam.h | 2 +-
+ arch/x86/include/uapi/asm/mce.h | 3 +-
+ arch/x86/kernel/Makefile | 6 +-
+ arch/x86/kernel/acpi/boot.c | 8 +-
+ arch/x86/kernel/apb_timer.c | 8 +-
+ arch/x86/kernel/apic/apic.c | 92 +-
+ arch/x86/kernel/apic/apic_flat_64.c | 2 -
+ arch/x86/kernel/apic/apic_noop.c | 1 -
+ arch/x86/kernel/apic/apic_numachip.c | 2 -
+ arch/x86/kernel/apic/bigsmp_32.c | 1 -
+ arch/x86/kernel/apic/io_apic.c | 2 +-
+ arch/x86/kernel/apic/msi.c | 2 +-
+ arch/x86/kernel/apic/probe_32.c | 1 -
+ arch/x86/kernel/apic/vector.c | 85 +-
+ arch/x86/kernel/apic/x2apic_cluster.c | 3 +-
+ arch/x86/kernel/apic/x2apic_phys.c | 1 -
+ arch/x86/kernel/apic/x2apic_uv_x.c | 2 -
+ arch/x86/kernel/apm_32.c | 2 +-
+ arch/x86/kernel/check.c | 5 +-
+ arch/x86/kernel/cpu/Makefile | 2 +
+ arch/x86/kernel/cpu/amd.c | 10 +-
+ arch/x86/kernel/cpu/common.c | 24 +-
+ arch/x86/kernel/cpu/cpu.h | 1 +
+ arch/x86/kernel/cpu/intel.c | 47 +-
+ arch/x86/kernel/cpu/intel_pt.h | 39 +-
+ arch/x86/kernel/cpu/mcheck/Makefile | 2 +-
+ arch/x86/kernel/cpu/mcheck/mce-apei.c | 1 -
+ arch/x86/kernel/cpu/mcheck/mce-genpool.c | 99 +
+ arch/x86/kernel/cpu/mcheck/mce-internal.h | 14 +
+ arch/x86/kernel/cpu/mcheck/mce.c | 244 ++-
+ arch/x86/kernel/cpu/mcheck/mce_intel.c | 61 +-
+ arch/x86/kernel/cpu/mcheck/p5.c | 5 +-
+ arch/x86/kernel/cpu/mcheck/winchip.c | 4 +-
+ arch/x86/kernel/cpu/microcode/amd.c | 56 +-
+ arch/x86/kernel/cpu/microcode/amd_early.c | 24 +-
+ arch/x86/kernel/cpu/microcode/core.c | 2 +-
+ arch/x86/kernel/cpu/microcode/intel_early.c | 6 +-
+ arch/x86/kernel/cpu/mshyperv.c | 1 +
+ arch/x86/kernel/cpu/perf_event.c | 8 +-
+ arch/x86/kernel/cpu/perf_event.h | 25 +-
+ arch/x86/kernel/cpu/perf_event_intel.c | 280 ++-
+ arch/x86/kernel/cpu/perf_event_intel_bts.c | 3 -
+ arch/x86/kernel/cpu/perf_event_intel_ds.c | 106 +-
+ arch/x86/kernel/cpu/perf_event_intel_lbr.c | 58 +-
+ arch/x86/kernel/cpu/perf_event_intel_pt.c | 85 +-
+ arch/x86/kernel/cpu/perf_event_intel_rapl.c | 20 +
+ arch/x86/kernel/cpu/perf_event_intel_uncore.c | 11 +
+ arch/x86/kernel/cpu/perf_event_intel_uncore.h | 2 +
+ arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c | 23 +-
+ .../x86/kernel/cpu/perf_event_intel_uncore_snbep.c | 166 +-
+ arch/x86/kernel/cpu/perf_event_msr.c | 242 +++
+ arch/x86/kernel/cpuid.c | 2 +-
+ arch/x86/kernel/espfix_64.c | 2 +-
+ arch/x86/kernel/hpet.c | 206 ++-
+ arch/x86/kernel/hw_breakpoint.c | 31 +-
+ arch/x86/kernel/i8253.c | 2 +-
+ arch/x86/kernel/irq.c | 128 +-
+ arch/x86/kernel/irq_32.c | 9 +-
+ arch/x86/kernel/irq_64.c | 9 +-
+ arch/x86/kernel/irqinit.c | 6 +-
+ arch/x86/kernel/jump_label.c | 2 +-
+ arch/x86/kernel/kexec-bzimage64.c | 3 -
+ arch/x86/kernel/nmi.c | 10 +-
+ arch/x86/kernel/paravirt.c | 2 -
+ arch/x86/kernel/paravirt_patch_32.c | 2 -
+ arch/x86/kernel/process.c | 5 +
+ arch/x86/kernel/process_32.c | 1 +
+ arch/x86/kernel/process_64.c | 6 +-
+ arch/x86/kernel/ptrace.c | 340 +---
+ arch/x86/kernel/setup.c | 5 -
+ arch/x86/kernel/signal.c | 33 +-
+ arch/x86/kernel/signal_compat.c | 95 +
+ arch/x86/kernel/smp.c | 2 +
+ arch/x86/kernel/smpboot.c | 28 +-
+ arch/x86/kernel/step.c | 2 +
+ arch/x86/kernel/topology.c | 4 +-
+ arch/x86/kernel/trace_clock.c | 7 +-
+ arch/x86/kernel/traps.c | 90 +-
+ arch/x86/kernel/tsc.c | 38 +-
+ arch/x86/kernel/tsc_sync.c | 14 +-
+ arch/x86/kernel/uprobes.c | 9 +
+ arch/x86/kernel/vm86_32.c | 373 ++--
+ arch/x86/kvm/lapic.c | 4 +-
+ arch/x86/kvm/svm.c | 4 +-
+ arch/x86/kvm/vmx.c | 4 +-
+ arch/x86/kvm/x86.c | 26 +-
+ arch/x86/lguest/boot.c | 89 +-
+ arch/x86/lib/delay.c | 60 +-
+ arch/x86/math-emu/get_address.c | 1 +
+ arch/x86/mm/fault.c | 7 +-
+ arch/x86/mm/init.c | 7 +-
+ arch/x86/mm/init_32.c | 1 +
+ arch/x86/mm/kasan_init_64.c | 123 +-
+ arch/x86/mm/pageattr-test.c | 4 +-
+ arch/x86/mm/pageattr.c | 1 -
+ arch/x86/pci/intel_mid_pci.c | 36 +-
+ arch/x86/pci/xen.c | 8 +-
+ arch/x86/platform/Makefile | 1 +
+ arch/x86/platform/atom/Makefile | 3 +-
+ arch/x86/{kernel => platform/atom}/pmc_atom.c | 315 ++--
+ arch/x86/platform/intel/Makefile | 1 +
+ arch/x86/{kernel => platform/intel}/iosf_mbi.c | 27 +-
+ arch/x86/platform/uv/uv_irq.c | 2 +-
+ arch/x86/platform/uv/uv_time.c | 37 +-
+ arch/x86/ras/Kconfig | 11 +
+ arch/x86/ras/Makefile | 2 +
+ {drivers/edac => arch/x86/ras}/mce_amd_inj.c | 6 +-
+ arch/x86/um/asm/barrier.h | 13 -
+ arch/x86/xen/enlighten.c | 3 -
+ arch/x86/xen/time.c | 80 +-
+ arch/xtensa/configs/iss_defconfig | 1 -
+ arch/xtensa/kernel/irq.c | 10 +-
+ arch/xtensa/kernel/time.c | 53 +-
+ drivers/base/Makefile | 1 +
+ drivers/base/core.c | 3 +
+ drivers/base/platform-msi.c | 282 +++
+ drivers/base/power/opp.c | 4 +-
+ drivers/clocksource/Kconfig | 2 +-
+ drivers/clocksource/arm_arch_timer.c | 52 +-
+ drivers/clocksource/arm_global_timer.c | 37 +-
+ drivers/clocksource/asm9260_timer.c | 64 +-
+ drivers/clocksource/bcm2835_timer.c | 16 -
+ drivers/clocksource/bcm_kona_timer.c | 17 +-
+ drivers/clocksource/cadence_ttc_timer.c | 59 +-
+ drivers/clocksource/clps711x-timer.c | 6 -
+ drivers/clocksource/cs5535-clockevt.c | 24 +-
+ drivers/clocksource/dummy_timer.c | 10 -
+ drivers/clocksource/dw_apb_timer.c | 146 +-
+ drivers/clocksource/em_sti.c | 39 +-
+ drivers/clocksource/exynos_mct.c | 101 +-
+ drivers/clocksource/fsl_ftm_timer.c | 35 +-
+ drivers/clocksource/h8300_timer8.c | 51 +-
+ drivers/clocksource/i8253.c | 77 +-
+ drivers/clocksource/meson6_timer.c | 50 +-
+ drivers/clocksource/metag_generic.c | 20 -
+ drivers/clocksource/mips-gic-timer.c | 7 -
+ drivers/clocksource/moxart_timer.c | 49 +-
+ drivers/clocksource/mtk_timer.c | 32 +-
+ drivers/clocksource/mxs_timer.c | 80 +-
+ drivers/clocksource/nomadik-mtu.c | 58 +-
+ drivers/clocksource/pxa_timer.c | 39 +-
+ drivers/clocksource/qcom-timer.c | 24 +-
+ drivers/clocksource/rockchip_timer.c | 32 +-
+ drivers/clocksource/samsung_pwm_timer.c | 41 +-
+ drivers/clocksource/sh_cmt.c | 65 +-
+ drivers/clocksource/sh_mtu2.c | 42 +-
+ drivers/clocksource/sh_tmu.c | 64 +-
+ drivers/clocksource/sun4i_timer.c | 41 +-
+ drivers/clocksource/tcb_clksrc.c | 93 +-
+ drivers/clocksource/tegra20_timer.c | 45 +-
+ drivers/clocksource/time-armada-370-xp.c | 53 +-
+ drivers/clocksource/time-efm32.c | 66 +-
+ drivers/clocksource/time-orion.c | 46 +-
+ drivers/clocksource/timer-atlas7.c | 19 +-
+ drivers/clocksource/timer-atmel-pit.c | 45 +-
+ drivers/clocksource/timer-atmel-st.c | 69 +-
+ drivers/clocksource/timer-digicolor.c | 41 +-
+ drivers/clocksource/timer-imx-gpt.c | 75 +-
+ drivers/clocksource/timer-integrator-ap.c | 58 +-
+ drivers/clocksource/timer-keystone.c | 44 +-
+ drivers/clocksource/timer-prima2.c | 34 +-
+ drivers/clocksource/timer-sp804.c | 54 +-
+ drivers/clocksource/timer-stm32.c | 30 +-
+ drivers/clocksource/timer-sun5i.c | 45 +-
+ drivers/clocksource/timer-u300.c | 155 +-
+ drivers/clocksource/vf_pit_timer.c | 27 +-
+ drivers/clocksource/vt8500_timer.c | 29 +-
+ drivers/clocksource/zevio-timer.c | 44 +-
+ drivers/cpufreq/intel_pstate.c | 2 +-
+ drivers/cpuidle/cpuidle.c | 4 +
+ drivers/dma/iop-adma.c | 9 +-
+ drivers/edac/Kconfig | 10 -
+ drivers/edac/Makefile | 1 -
+ drivers/input/gameport/gameport.c | 4 +-
+ drivers/input/joystick/analog.c | 4 +-
+ drivers/irqchip/Kconfig | 10 +
+ drivers/irqchip/Makefile | 5 +-
+ drivers/irqchip/exynos-combiner.c | 20 +-
+ drivers/irqchip/irq-armada-370-xp.c | 5 +-
+ drivers/irqchip/irq-atmel-aic.c | 4 +-
+ drivers/irqchip/irq-atmel-aic5.c | 4 +-
+ drivers/irqchip/irq-bcm2835.c | 111 +-
+ drivers/irqchip/irq-bcm2836.c | 275 +++
+ drivers/irqchip/irq-bcm7038-l1.c | 7 +-
+ drivers/irqchip/irq-bcm7120-l2.c | 76 +-
+ drivers/irqchip/irq-brcmstb-l2.c | 10 +-
+ drivers/irqchip/irq-clps711x.c | 3 +-
+ drivers/irqchip/irq-crossbar.c | 3 +-
+ drivers/irqchip/irq-digicolor.c | 3 +-
+ drivers/irqchip/irq-dw-apb-ictl.c | 56 +-
+ drivers/irqchip/irq-gic-v2m.c | 52 +-
+ drivers/irqchip/irq-gic-v3-its-pci-msi.c | 140 ++
+ drivers/irqchip/irq-gic-v3-its-platform-msi.c | 93 +
+ drivers/irqchip/irq-gic-v3-its.c | 144 +-
+ drivers/irqchip/irq-gic-v3.c | 2 +-
+ drivers/irqchip/irq-gic.c | 81 +-
+ drivers/irqchip/irq-hip04.c | 6 +-
+ .../kernel/i8259.c => drivers/irqchip/irq-i8259.c | 8 +-
+ drivers/irqchip/irq-imgpdc.c | 11 +-
+ drivers/irqchip/irq-imx-gpcv2.c | 278 +++
+ drivers/irqchip/irq-ingenic.c | 3 +-
+ drivers/irqchip/irq-keystone.c | 6 +-
+ drivers/irqchip/irq-metag-ext.c | 9 +-
+ drivers/irqchip/irq-metag.c | 3 +-
+ drivers/irqchip/irq-mips-cpu.c | 3 +-
+ drivers/irqchip/irq-mips-gic.c | 20 +-
+ drivers/irqchip/irq-mmp.c | 6 +-
+ drivers/irqchip/irq-moxart.c | 3 +-
+ drivers/irqchip/irq-mtk-sysirq.c | 3 +-
+ drivers/irqchip/irq-mxs.c | 3 +-
+ drivers/irqchip/irq-nvic.c | 3 +-
+ drivers/irqchip/irq-omap-intc.c | 38 +-
+ drivers/irqchip/irq-or1k-pic.c | 3 +-
+ drivers/irqchip/irq-orion.c | 9 +-
+ drivers/irqchip/irq-renesas-h8300h.c | 2 -
+ drivers/irqchip/irq-renesas-h8s.c | 2 +-
+ drivers/irqchip/irq-renesas-irqc.c | 16 +-
+ drivers/irqchip/irq-s3c24xx.c | 11 +-
+ drivers/irqchip/irq-sirfsoc.c | 50 +-
+ drivers/irqchip/irq-sun4i.c | 3 +-
+ drivers/irqchip/irq-sunxi-nmi.c | 7 +-
+ drivers/irqchip/irq-tb10x.c | 9 +-
+ drivers/irqchip/irq-tegra.c | 3 +-
+ drivers/irqchip/irq-versatile-fpga.c | 10 +-
+ drivers/irqchip/irq-vf610-mscm-ir.c | 3 +-
+ drivers/irqchip/irq-vic.c | 7 +-
+ drivers/irqchip/irq-vt8500.c | 9 +-
+ drivers/irqchip/irq-xtensa-mx.c | 3 +-
+ drivers/irqchip/irq-xtensa-pic.c | 3 +-
+ drivers/irqchip/irq-zevio.c | 3 +-
+ drivers/irqchip/irqchip.h | 11 -
+ drivers/irqchip/spear-shirq.c | 7 +-
+ drivers/net/ethernet/tile/tilegx.c | 4 +-
+ drivers/net/hamradio/baycom_epp.c | 2 +-
+ drivers/of/irq.c | 21 +
+ drivers/of/platform.c | 1 +
+ drivers/parisc/iosapic.c | 2 +-
+ drivers/pci/host/pci-keystone-dw.c | 21 +-
+ drivers/pci/host/pci-keystone.c | 13 +-
+ drivers/pci/host/pci-xgene-msi.c | 55 +-
+ drivers/pci/host/pcie-designware.c | 6 +-
+ drivers/pci/host/pcie-xilinx.c | 12 +-
+ drivers/pci/msi.c | 106 +-
+ drivers/pci/of.c | 30 +
+ drivers/pci/pci.c | 14 +
+ drivers/pci/probe.c | 45 +
+ drivers/pci/xen-pcifront.c | 2 +-
+ drivers/ras/Kconfig | 37 +-
+ drivers/scsi/dpt_i2o.c | 3 +
+ drivers/sh/intc/chip.c | 6 +-
+ drivers/sh/intc/core.c | 2 +-
+ drivers/sh/intc/virq.c | 29 +-
+ drivers/spmi/spmi-pmic-arb.c | 13 +-
+ drivers/staging/media/lirc/lirc_serial.c | 63 +-
+ drivers/staging/ozwpan/ozproto.c | 17 +-
+ drivers/thermal/intel_powerclamp.c | 4 +-
+ drivers/video/fbdev/arkfb.c | 36 +-
+ drivers/video/fbdev/aty/atyfb.h | 5 +-
+ drivers/video/fbdev/aty/atyfb_base.c | 109 +-
+ drivers/video/fbdev/gxt4500.c | 2 +-
+ drivers/video/fbdev/i740fb.c | 35 +-
+ drivers/video/fbdev/kyro/fbdev.c | 33 +-
+ drivers/video/fbdev/s3fb.c | 35 +-
+ drivers/video/fbdev/vt8623fb.c | 31 +-
+ drivers/xen/events/events_base.c | 4 +-
+ drivers/xen/preempt.c | 2 +-
+ include/asm-generic/atomic-long.h | 263 +--
+ include/asm-generic/barrier.h | 4 +-
+ include/asm-generic/io.h | 30 +-
+ include/asm-generic/pci_iomap.h | 14 +
+ include/asm-generic/preempt.h | 5 +-
+ include/asm-generic/qrwlock.h | 78 +-
+ include/linux/atomic.h | 323 ++++
+ include/linux/bitmap.h | 2 +-
+ include/linux/bitops.h | 6 +-
+ include/linux/clockchips.h | 3 -
+ include/linux/compiler.h | 7 +-
+ include/linux/context_tracking.h | 15 +
+ include/linux/context_tracking_state.h | 1 +
+ include/linux/device.h | 24 +
+ include/linux/fdtable.h | 4 +-
+ include/linux/init_task.h | 10 +
+ include/linux/irq.h | 19 +-
+ include/linux/irqchip/arm-gic-v3.h | 1 +
+ include/linux/irqchip/arm-gic.h | 3 +-
+ include/linux/irqdesc.h | 8 +-
+ include/linux/irqdomain.h | 26 +-
+ include/linux/jiffies.h | 35 +-
+ include/linux/jump_label.h | 261 ++-
+ include/linux/kasan.h | 10 +-
+ include/linux/kprobes.h | 2 +
+ include/linux/kthread.h | 1 +
+ include/linux/llist.h | 2 +-
+ include/linux/msi.h | 109 +-
+ include/linux/of_irq.h | 1 +
+ include/linux/pci.h | 6 +-
+ include/linux/preempt.h | 19 +-
+ include/linux/rcupdate.h | 144 +-
+ include/linux/rcutiny.h | 10 +
+ include/linux/rcutree.h | 2 +
+ include/linux/sched.h | 98 +-
+ include/linux/spinlock.h | 40 +-
+ include/linux/stop_machine.h | 28 +-
+ include/linux/tick.h | 25 +-
+ include/linux/time64.h | 35 +
+ include/linux/timekeeping.h | 9 +-
+ include/linux/trace_events.h | 7 +-
+ include/linux/types.h | 3 +
+ include/linux/uprobes.h | 17 +
+ include/trace/events/rcu.h | 1 -
+ include/trace/events/sched.h | 30 +-
+ include/uapi/linux/perf_event.h | 35 +-
+ include/video/kyro.h | 4 +-
+ init/Kconfig | 10 +-
+ kernel/cgroup.c | 4 +-
+ kernel/cpu.c | 12 +-
+ kernel/events/core.c | 109 +-
+ kernel/events/ring_buffer.c | 5 +-
+ kernel/events/uprobes.c | 228 ++-
+ kernel/fork.c | 7 +-
+ kernel/futex.c | 100 +-
+ kernel/irq/chip.c | 24 +-
+ kernel/irq/generic-chip.c | 6 +
+ kernel/irq/handle.c | 4 +-
+ kernel/irq/internals.h | 11 +-
+ kernel/irq/irqdesc.c | 2 +-
+ kernel/irq/irqdomain.c | 18 +-
+ kernel/irq/manage.c | 64 +-
+ kernel/irq/msi.c | 17 +
+ kernel/irq/pm.c | 12 +-
+ kernel/irq/resend.c | 4 +-
+ kernel/irq/spurious.c | 26 +-
+ kernel/jump_label.c | 158 +-
+ kernel/kprobes.c | 2 +-
+ kernel/kthread.c | 20 +-
+ kernel/locking/Makefile | 1 -
+ kernel/locking/qrwlock.c | 47 +-
+ kernel/locking/qspinlock.c | 6 +-
+ kernel/locking/qspinlock_paravirt.h | 102 +-
+ kernel/locking/rtmutex-tester.c | 420 -----
+ kernel/locking/rtmutex.c | 2 +-
+ kernel/locking/rtmutex_common.h | 22 -
+ kernel/notifier.c | 1 +
+ kernel/pid.c | 5 +-
+ kernel/rcu/rcutorture.c | 42 +-
+ kernel/rcu/srcu.c | 15 +-
+ kernel/rcu/tiny.c | 8 +-
+ kernel/rcu/tree.c | 681 ++++---
+ kernel/rcu/tree.h | 96 +-
+ kernel/rcu/tree_plugin.h | 130 +-
+ kernel/rcu/tree_trace.c | 19 +-
+ kernel/rcu/update.c | 90 +-
+ kernel/sched/core.c | 117 +-
+ kernel/sched/cputime.c | 101 +-
+ kernel/sched/deadline.c | 40 +-
+ kernel/sched/debug.c | 48 +-
+ kernel/sched/fair.c | 937 ++++------
+ kernel/sched/features.h | 18 +-
+ kernel/sched/idle.c | 14 +-
+ kernel/sched/idle_task.c | 1 +
+ kernel/sched/rt.c | 42 +-
+ kernel/sched/sched.h | 39 +-
+ kernel/sched/stop_task.c | 1 +
+ kernel/stop_machine.c | 44 +-
+ kernel/sys_ni.c | 1 +
+ kernel/time/Kconfig | 2 -
+ kernel/time/clocksource.c | 2 +-
+ kernel/time/hrtimer.c | 38 +-
+ kernel/time/ntp.c | 5 +
+ kernel/time/tick-broadcast-hrtimer.c | 49 +-
+ kernel/time/tick-common.c | 3 -
+ kernel/time/tick-sched.c | 72 +-
+ kernel/time/time.c | 53 +-
+ kernel/time/timekeeping.c | 23 +-
+ kernel/time/timer_list.c | 2 +-
+ kernel/trace/Kconfig | 2 +-
+ kernel/trace/trace_sched_switch.c | 2 +-
+ kernel/trace/trace_sched_wakeup.c | 2 +-
+ kernel/trace/trace_uprobe.c | 5 +
+ kernel/workqueue.c | 26 +-
+ lib/Kconfig.debug | 38 +-
+ lib/Makefile | 2 +
+ lib/lockref.c | 8 -
+ lib/pci_iomap.c | 66 +
+ lib/test_static_key_base.c | 68 +
+ lib/test_static_keys.c | 225 +++
+ mm/kasan/Makefile | 2 +-
+ mm/kasan/kasan_init.c | 152 ++
+ scripts/checkpatch.pl | 19 +
+ scripts/rt-tester/check-all.sh | 21 -
+ scripts/rt-tester/rt-tester.py | 218 ---
+ scripts/rt-tester/t2-l1-2rt-sameprio.tst | 94 -
+ scripts/rt-tester/t2-l1-pi.tst | 77 -
+ scripts/rt-tester/t2-l1-signal.tst | 72 -
+ scripts/rt-tester/t2-l2-2rt-deadlock.tst | 84 -
+ scripts/rt-tester/t3-l1-pi-1rt.tst | 87 -
+ scripts/rt-tester/t3-l1-pi-2rt.tst | 88 -
+ scripts/rt-tester/t3-l1-pi-3rt.tst | 87 -
+ scripts/rt-tester/t3-l1-pi-signal.tst | 93 -
+ scripts/rt-tester/t3-l1-pi-steal.tst | 91 -
+ scripts/rt-tester/t3-l2-pi.tst | 87 -
+ scripts/rt-tester/t4-l2-pi-deboost.tst | 118 --
+ .../rt-tester/t5-l4-pi-boost-deboost-setsched.tst | 178 --
+ scripts/rt-tester/t5-l4-pi-boost-deboost.tst | 138 --
+ security/device_cgroup.c | 6 +-
+ tools/build/Makefile.build | 2 +
+ tools/build/feature/Makefile | 13 +-
+ tools/build/feature/test-bpf.c | 18 +
+ tools/build/feature/test-glibc.c | 11 +
+ tools/include/linux/export.h | 10 +
+ tools/lib/api/fs/debugfs.c | 15 +-
+ tools/lib/bpf/.gitignore | 2 +
+ tools/lib/bpf/Build | 1 +
+ tools/lib/bpf/Makefile | 195 ++
+ tools/lib/bpf/bpf.c | 85 +
+ tools/lib/bpf/bpf.h | 23 +
+ tools/lib/bpf/libbpf.c | 1037 +++++++++++
+ tools/lib/bpf/libbpf.h | 81 +
+ tools/lib/lockdep/preload.c | 2 +-
+ tools/lib/lockdep/uinclude/linux/kernel.h | 2 +-
+ tools/lib/lockdep/uinclude/linux/rbtree.h | 1 -
+ tools/lib/traceevent/event-parse.c | 77 +-
+ tools/lib/traceevent/event-parse.h | 8 +
+ tools/perf/.gitignore | 1 +
+ tools/perf/Build | 1 +
+ tools/perf/Documentation/intel-bts.txt | 86 +
+ tools/perf/Documentation/intel-pt.txt | 588 ++++++
+ tools/perf/Documentation/itrace.txt | 22 +
+ tools/perf/Documentation/perf-bench.txt | 4 +
+ tools/perf/Documentation/perf-inject.txt | 23 +-
+ tools/perf/Documentation/perf-record.txt | 30 +-
+ tools/perf/Documentation/perf-report.txt | 39 +-
+ tools/perf/Documentation/perf-script.txt | 30 +-
+ tools/perf/Documentation/perf-top.txt | 21 +
+ tools/perf/MANIFEST | 1 +
+ tools/perf/Makefile.perf | 17 +-
+ tools/perf/arch/alpha/Build | 1 +
+ tools/perf/arch/mips/Build | 1 +
+ tools/perf/arch/parisc/Build | 1 +
+ tools/perf/arch/x86/util/Build | 5 +
+ tools/perf/arch/x86/util/auxtrace.c | 83 +
+ tools/perf/arch/x86/util/intel-bts.c | 458 +++++
+ tools/perf/arch/x86/util/intel-pt.c | 752 ++++++++
+ tools/perf/arch/x86/util/pmu.c | 18 +
+ tools/perf/bench/Build | 1 +
+ tools/perf/bench/bench.h | 2 +
+ tools/perf/bench/futex-lock-pi.c | 219 +++
+ tools/perf/bench/futex.h | 20 +
+ tools/perf/builtin-annotate.c | 3 +
+ tools/perf/builtin-bench.c | 2 +
+ tools/perf/builtin-buildid-cache.c | 16 +-
+ tools/perf/builtin-buildid-list.c | 4 +-
+ tools/perf/builtin-diff.c | 3 +
+ tools/perf/builtin-inject.c | 1 +
+ tools/perf/builtin-probe.c | 3 +-
+ tools/perf/builtin-record.c | 25 +-
+ tools/perf/builtin-report.c | 19 +
+ tools/perf/builtin-script.c | 68 +-
+ tools/perf/builtin-stat.c | 225 +--
+ tools/perf/builtin-top.c | 9 +
+ tools/perf/builtin-trace.c | 450 +++--
+ tools/perf/config/Makefile | 14 +-
+ tools/perf/perf-with-kcore.sh | 28 +-
+ tools/perf/perf.h | 3 +
+ tools/perf/python/twatch.py | 12 +-
+ .../scripts/python/call-graph-from-postgresql.py | 327 ++++
+ tools/perf/scripts/python/export-to-postgresql.py | 47 +
+ tools/perf/tests/Build | 1 +
+ tools/perf/tests/builtin-test.c | 4 +
+ tools/perf/tests/hists_cumulate.c | 4 +
+ tools/perf/tests/llvm.c | 98 +
+ tools/perf/tests/make | 13 +-
+ tools/perf/tests/parse-events.c | 50 +-
+ tools/perf/tests/tests.h | 1 +
+ tools/perf/tests/thread-map.c | 4 +
+ tools/perf/trace/strace/groups/file | 18 +
+ tools/perf/ui/browser.c | 17 +-
+ tools/perf/ui/browser.h | 3 +
+ tools/perf/ui/browsers/annotate.c | 149 +-
+ tools/perf/ui/browsers/header.c | 2 +-
+ tools/perf/ui/browsers/hists.c | 54 +-
+ tools/perf/ui/browsers/map.c | 11 +-
+ tools/perf/ui/browsers/scripts.c | 2 +-
+ tools/perf/ui/libslang.h | 3 +
+ tools/perf/ui/tui/util.c | 2 +-
+ tools/perf/util/Build | 6 +
+ tools/perf/util/annotate.c | 128 +-
+ tools/perf/util/annotate.h | 19 +
+ tools/perf/util/auxtrace.c | 15 +-
+ tools/perf/util/auxtrace.h | 2 +
+ tools/perf/util/build-id.c | 6 +-
+ tools/perf/util/build-id.h | 3 +-
+ tools/perf/util/callchain.c | 93 +-
+ tools/perf/util/callchain.h | 3 +-
+ tools/perf/util/cloexec.h | 2 +-
+ tools/perf/util/color.c | 21 +-
+ tools/perf/util/color.h | 1 -
+ tools/perf/util/config.c | 4 +
+ tools/perf/util/counts.c | 52 +
+ tools/perf/util/counts.h | 37 +
+ tools/perf/util/debug.c | 5 +
+ tools/perf/util/debug.h | 1 +
+ tools/perf/util/dso.h | 4 +
+ tools/perf/util/dwarf-aux.c | 21 +-
+ tools/perf/util/event.c | 28 +
+ tools/perf/util/event.h | 15 +-
+ tools/perf/util/evlist.c | 46 +-
+ tools/perf/util/evlist.h | 14 +-
+ tools/perf/util/evsel.c | 171 +-
+ tools/perf/util/evsel.h | 38 +-
+ tools/perf/util/header.c | 35 +-
+ tools/perf/util/header.h | 1 +
+ tools/perf/util/hist.c | 59 +-
+ tools/perf/util/hist.h | 5 +
+ tools/perf/util/intel-bts.c | 933 ++++++++++
+ tools/perf/util/intel-bts.h | 43 +
+ tools/perf/util/intel-pt-decoder/Build | 11 +
+ .../util/intel-pt-decoder/gen-insn-attr-x86.awk | 386 ++++
+ tools/perf/util/intel-pt-decoder/inat.c | 96 +
+ tools/perf/util/intel-pt-decoder/inat.h | 221 +++
+ tools/perf/util/intel-pt-decoder/insn.c | 594 ++++++
+ tools/perf/util/intel-pt-decoder/insn.h | 201 ++
+ .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 1816 +++++++++++++++++++
+ .../perf/util/intel-pt-decoder/intel-pt-decoder.h | 104 ++
+ .../util/intel-pt-decoder/intel-pt-insn-decoder.c | 246 +++
+ .../util/intel-pt-decoder/intel-pt-insn-decoder.h | 65 +
+ tools/perf/util/intel-pt-decoder/intel-pt-log.c | 155 ++
+ tools/perf/util/intel-pt-decoder/intel-pt-log.h | 52 +
+ .../util/intel-pt-decoder/intel-pt-pkt-decoder.c | 400 ++++
+ .../util/intel-pt-decoder/intel-pt-pkt-decoder.h | 64 +
+ .../perf/util/intel-pt-decoder/x86-opcode-map.txt | 970 ++++++++++
+ tools/perf/util/intel-pt.c | 1911 ++++++++++++++++++++
+ tools/perf/util/intel-pt.h | 51 +
+ tools/perf/util/llvm-utils.c | 408 +++++
+ tools/perf/util/llvm-utils.h | 49 +
+ tools/perf/util/machine.c | 27 +-
+ tools/perf/util/machine.h | 6 +
+ tools/perf/util/map.c | 27 +-
+ tools/perf/util/map.h | 7 +
+ tools/perf/util/parse-events.c | 184 +-
+ tools/perf/util/parse-events.h | 5 +
+ tools/perf/util/parse-events.l | 4 +
+ tools/perf/util/pmu.c | 55 +-
+ tools/perf/util/pmu.h | 1 +
+ tools/perf/util/probe-event.c | 395 +---
+ tools/perf/util/probe-event.h | 9 +
+ tools/perf/util/probe-file.c | 301 +++
+ tools/perf/util/probe-file.h | 18 +
+ tools/perf/util/probe-finder.c | 2 +-
+ tools/perf/util/python-ext-sources | 2 +-
+ tools/perf/util/python.c | 140 +-
+ tools/perf/util/record.c | 34 +
+ tools/perf/util/session.c | 41 +-
+ tools/perf/util/sort.c | 80 +-
+ tools/perf/util/sort.h | 3 +
+ tools/perf/util/srcline.c | 6 +-
+ tools/perf/util/stat.c | 188 +-
+ tools/perf/util/stat.h | 36 +-
+ tools/perf/util/string.c | 39 +
+ tools/perf/util/strlist.c | 43 +-
+ tools/perf/util/strlist.h | 9 +-
+ tools/perf/util/symbol-elf.c | 13 +-
+ tools/perf/util/symbol.c | 13 +-
+ tools/perf/util/symbol.h | 3 +-
+ tools/perf/util/thread_map.c | 6 +-
+ tools/perf/util/tool.h | 1 +
+ tools/perf/util/trace-event-info.c | 22 +-
+ tools/perf/util/trace-event-parse.c | 30 -
+ tools/perf/util/trace-event-read.c | 28 +-
+ tools/perf/util/trace-event.c | 44 +-
+ tools/perf/util/trace-event.h | 2 +
+ tools/perf/util/util.c | 90 +
+ tools/perf/util/util.h | 15 +
+ .../power/cpupower/debug/kernel/cpufreq-test_tsc.c | 4 +-
+ tools/testing/selftests/Makefile | 1 +
+ .../selftests/rcutorture/configs/rcu/TASKS01 | 4 +-
+ .../selftests/rcutorture/configs/rcu/TREE01 | 1 -
+ .../selftests/rcutorture/configs/rcu/TREE02 | 1 -
+ .../selftests/rcutorture/configs/rcu/TREE02-T | 1 -
+ .../selftests/rcutorture/configs/rcu/TREE03 | 1 -
+ .../selftests/rcutorture/configs/rcu/TREE04 | 1 -
+ .../selftests/rcutorture/configs/rcu/TREE05 | 1 -
+ .../selftests/rcutorture/configs/rcu/TREE06 | 1 -
+ .../selftests/rcutorture/configs/rcu/TREE07 | 1 -
+ .../selftests/rcutorture/configs/rcu/TREE08 | 1 -
+ .../selftests/rcutorture/configs/rcu/TREE08-T | 1 -
+ .../selftests/rcutorture/configs/rcu/TREE09 | 1 -
+ .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 1 -
+ tools/testing/selftests/static_keys/Makefile | 8 +
+ .../selftests/static_keys/test_static_keys.sh | 16 +
+ tools/testing/selftests/x86/Makefile | 4 +-
+ tools/testing/selftests/x86/entry_from_vm86.c | 139 +-
+ tools/testing/selftests/x86/ldt_gdt.c | 576 ++++++
+ tools/testing/selftests/x86/syscall_arg_fault.c | 130 ++
+ tools/testing/selftests/x86/syscall_nt.c | 54 +
+ 793 files changed, 28285 insertions(+), 11006 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2836-l1-intc.txt
+ delete mode 100644 arch/x86/boot/mca.c
+ create mode 100644 arch/x86/entry/common.c
+ delete mode 100644 arch/x86/include/asm/context_tracking.h
+ create mode 100644 arch/x86/kernel/cpu/mcheck/mce-genpool.c
+ create mode 100644 arch/x86/kernel/cpu/perf_event_msr.c
+ create mode 100644 arch/x86/kernel/signal_compat.c
+ rename arch/x86/{kernel => platform/atom}/pmc_atom.c (52%)
+ create mode 100644 arch/x86/platform/intel/Makefile
+ rename arch/x86/{kernel => platform/intel}/iosf_mbi.c (93%)
+ create mode 100644 arch/x86/ras/Kconfig
+ create mode 100644 arch/x86/ras/Makefile
+ rename {drivers/edac => arch/x86/ras}/mce_amd_inj.c (98%)
+ create mode 100644 drivers/base/platform-msi.c
+ create mode 100644 drivers/irqchip/irq-bcm2836.c
+ create mode 100644 drivers/irqchip/irq-gic-v3-its-pci-msi.c
+ create mode 100644 drivers/irqchip/irq-gic-v3-its-platform-msi.c
+ rename arch/mips/kernel/i8259.c => drivers/irqchip/irq-i8259.c (98%)
+ create mode 100644 drivers/irqchip/irq-imx-gpcv2.c
+ delete mode 100644 drivers/irqchip/irqchip.h
+ delete mode 100644 kernel/locking/rtmutex-tester.c
+ create mode 100644 lib/test_static_key_base.c
+ create mode 100644 lib/test_static_keys.c
+ create mode 100644 mm/kasan/kasan_init.c
+ delete mode 100644 scripts/rt-tester/check-all.sh
+ delete mode 100755 scripts/rt-tester/rt-tester.py
+ delete mode 100644 scripts/rt-tester/t2-l1-2rt-sameprio.tst
+ delete mode 100644 scripts/rt-tester/t2-l1-pi.tst
+ delete mode 100644 scripts/rt-tester/t2-l1-signal.tst
+ delete mode 100644 scripts/rt-tester/t2-l2-2rt-deadlock.tst
+ delete mode 100644 scripts/rt-tester/t3-l1-pi-1rt.tst
+ delete mode 100644 scripts/rt-tester/t3-l1-pi-2rt.tst
+ delete mode 100644 scripts/rt-tester/t3-l1-pi-3rt.tst
+ delete mode 100644 scripts/rt-tester/t3-l1-pi-signal.tst
+ delete mode 100644 scripts/rt-tester/t3-l1-pi-steal.tst
+ delete mode 100644 scripts/rt-tester/t3-l2-pi.tst
+ delete mode 100644 scripts/rt-tester/t4-l2-pi-deboost.tst
+ delete mode 100644 scripts/rt-tester/t5-l4-pi-boost-deboost-setsched.tst
+ delete mode 100644 scripts/rt-tester/t5-l4-pi-boost-deboost.tst
+ create mode 100644 tools/build/feature/test-bpf.c
+ create mode 100644 tools/include/linux/export.h
+ create mode 100644 tools/lib/bpf/.gitignore
+ create mode 100644 tools/lib/bpf/Build
+ create mode 100644 tools/lib/bpf/Makefile
+ create mode 100644 tools/lib/bpf/bpf.c
+ create mode 100644 tools/lib/bpf/bpf.h
+ create mode 100644 tools/lib/bpf/libbpf.c
+ create mode 100644 tools/lib/bpf/libbpf.h
+ delete mode 100644 tools/lib/lockdep/uinclude/linux/rbtree.h
+ create mode 100644 tools/perf/Documentation/intel-bts.txt
+ create mode 100644 tools/perf/Documentation/intel-pt.txt
+ create mode 100644 tools/perf/Documentation/itrace.txt
+ create mode 100644 tools/perf/arch/alpha/Build
+ create mode 100644 tools/perf/arch/mips/Build
+ create mode 100644 tools/perf/arch/parisc/Build
+ create mode 100644 tools/perf/arch/x86/util/auxtrace.c
+ create mode 100644 tools/perf/arch/x86/util/intel-bts.c
+ create mode 100644 tools/perf/arch/x86/util/intel-pt.c
+ create mode 100644 tools/perf/arch/x86/util/pmu.c
+ create mode 100644 tools/perf/bench/futex-lock-pi.c
+ create mode 100644 tools/perf/scripts/python/call-graph-from-postgresql.py
+ create mode 100644 tools/perf/tests/llvm.c
+ create mode 100644 tools/perf/trace/strace/groups/file
+ create mode 100644 tools/perf/util/counts.c
+ create mode 100644 tools/perf/util/counts.h
+ create mode 100644 tools/perf/util/intel-bts.c
+ create mode 100644 tools/perf/util/intel-bts.h
+ create mode 100644 tools/perf/util/intel-pt-decoder/Build
+ create mode 100644 tools/perf/util/intel-pt-decoder/gen-insn-attr-x86.awk
+ create mode 100644 tools/perf/util/intel-pt-decoder/inat.c
+ create mode 100644 tools/perf/util/intel-pt-decoder/inat.h
+ create mode 100644 tools/perf/util/intel-pt-decoder/insn.c
+ create mode 100644 tools/perf/util/intel-pt-decoder/insn.h
+ create mode 100644 tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
+ create mode 100644 tools/perf/util/intel-pt-decoder/intel-pt-decoder.h
+ create mode 100644 tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c
+ create mode 100644 tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.h
+ create mode 100644 tools/perf/util/intel-pt-decoder/intel-pt-log.c
+ create mode 100644 tools/perf/util/intel-pt-decoder/intel-pt-log.h
+ create mode 100644 tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c
+ create mode 100644 tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.h
+ create mode 100644 tools/perf/util/intel-pt-decoder/x86-opcode-map.txt
+ create mode 100644 tools/perf/util/intel-pt.c
+ create mode 100644 tools/perf/util/intel-pt.h
+ create mode 100644 tools/perf/util/llvm-utils.c
+ create mode 100644 tools/perf/util/llvm-utils.h
+ create mode 100644 tools/perf/util/probe-file.c
+ create mode 100644 tools/perf/util/probe-file.h
+ create mode 100644 tools/testing/selftests/static_keys/Makefile
+ create mode 100644 tools/testing/selftests/static_keys/test_static_keys.sh
+ create mode 100644 tools/testing/selftests/x86/ldt_gdt.c
+ create mode 100644 tools/testing/selftests/x86/syscall_arg_fault.c
+ create mode 100644 tools/testing/selftests/x86/syscall_nt.c
+Merging clockevents/clockevents/next (2b5cf544934f cris/time: Migrate to new 'set-state' interface)
+$ git merge clockevents/clockevents/next
+Already up-to-date.
+Merging edac/linux_next (fa2ce64f85be sb_edac: support for Broadwell -EP and -EX)
+$ git merge edac/linux_next
+Already up-to-date.
+Merging edac-amd/for-next (99e1dfb7d209 EDAC, mce_amd: Don't emit 'CE' for Deferred error)
+$ git merge edac-amd/for-next
+Merge made by the 'recursive' strategy.
+ drivers/edac/mce_amd.c | 3 ++-
+ drivers/edac/xgene_edac.c | 1 -
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Merging irqchip/irqchip/for-next (a8bcdc32fafb Merge branch 'irqchip/core' into irqchip/for-next)
+$ git merge irqchip/irqchip/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
+$ git merge tiny/tiny/next
+Already up-to-date.
+Merging ftrace/for-next (b44754d8262d ring_buffer: Allow to exit the ring buffer benchmark immediately)
+$ git merge ftrace/for-next
+Already up-to-date.
+Merging rcu/rcu/next (95f2435b1f83 rcu: Change _wait_rcu_gp() to work around gcc 67055 bug)
+$ git merge rcu/rcu/next
+Auto-merging kernel/locking/percpu-rwsem.c
+Auto-merging include/linux/percpu-rwsem.h
+Merge made by the 'recursive' strategy.
+ include/linux/percpu-rwsem.h | 3 +-
+ include/linux/rcupdate.h | 11 ++-
+ include/linux/rcusync.h | 56 ++++++++++++++++
+ kernel/locking/percpu-rwsem.c | 85 +++++++++---------------
+ kernel/rcu/Makefile | 2 +-
+ kernel/rcu/sync.c | 151 ++++++++++++++++++++++++++++++++++++++++++
+ 6 files changed, 245 insertions(+), 63 deletions(-)
+ create mode 100644 include/linux/rcusync.h
+ create mode 100644 kernel/rcu/sync.c
+Merging kvm/linux-next (4d283ec908e6 x86/kvm: Rename VMX's segment access rights defines)
+$ git merge kvm/linux-next
+Auto-merging arch/x86/kvm/x86.c
+Auto-merging arch/x86/kvm/vmx.c
+Auto-merging arch/x86/kvm/svm.c
+Auto-merging arch/x86/kvm/lapic.c
+Auto-merging arch/s390/kvm/kvm-s390.c
+Auto-merging arch/s390/kvm/interrupt.c
+Auto-merging arch/s390/kernel/time.c
+Auto-merging arch/s390/include/asm/kvm_host.h
+Removing Documentation/s390/kvm.txt
+Merge made by the 'recursive' strategy.
+ Documentation/s390/00-INDEX | 2 -
+ Documentation/s390/kvm.txt | 125 -------------
+ Documentation/virtual/kvm/api.txt | 5 +
+ arch/s390/include/asm/etr.h | 3 +
+ arch/s390/include/asm/kvm_host.h | 4 +-
+ arch/s390/kernel/time.c | 16 +-
+ arch/s390/kvm/diag.c | 13 +-
+ arch/s390/kvm/guestdbg.c | 35 ++++
+ arch/s390/kvm/interrupt.c | 98 +++++-----
+ arch/s390/kvm/kvm-s390.c | 114 ++++++++++--
+ arch/s390/kvm/kvm-s390.h | 11 +-
+ arch/s390/kvm/priv.c | 28 +--
+ arch/s390/kvm/sigp.c | 13 +-
+ arch/s390/kvm/trace-s390.h | 33 ++--
+ arch/x86/include/asm/kvm_host.h | 43 ++++-
+ arch/x86/include/asm/vmx.h | 47 ++---
+ arch/x86/include/uapi/asm/vmx.h | 2 +
+ arch/x86/kvm/Makefile | 4 +-
+ arch/x86/kvm/hyperv.c | 377 ++++++++++++++++++++++++++++++++++++++
+ arch/x86/kvm/hyperv.h | 32 ++++
+ arch/x86/kvm/i8259.c | 15 +-
+ arch/x86/kvm/irq.h | 8 +-
+ arch/x86/kvm/lapic.c | 5 +-
+ arch/x86/kvm/lapic.h | 2 +-
+ arch/x86/kvm/mmu.c | 285 ++++++++++++++++------------
+ arch/x86/kvm/mmu.h | 4 +-
+ arch/x86/kvm/paging_tmpl.h | 13 +-
+ arch/x86/kvm/pmu_amd.c | 2 -
+ arch/x86/kvm/svm.c | 16 +-
+ arch/x86/kvm/vmx.c | 181 +++++++++---------
+ arch/x86/kvm/x86.c | 323 +++++---------------------------
+ arch/x86/kvm/x86.h | 5 +
+ include/linux/kvm_host.h | 24 +--
+ include/uapi/linux/kvm.h | 2 +
+ virt/kvm/kvm_main.c | 19 +-
+ 35 files changed, 1084 insertions(+), 825 deletions(-)
+ delete mode 100644 Documentation/s390/kvm.txt
+ create mode 100644 arch/x86/kvm/hyperv.c
+ create mode 100644 arch/x86/kvm/hyperv.h
+Merging kvm-arm/next (054167b3d551 arm: KVM: keep arm vfp/simd exit handling consistent with arm64)
+$ git merge kvm-arm/next
+Auto-merging include/uapi/linux/kvm.h
+Auto-merging include/linux/irqchip/arm-gic.h
+Auto-merging include/linux/irqchip/arm-gic-v3.h
+Auto-merging arch/arm64/kvm/hyp.S
+Auto-merging arch/arm64/kernel/hw_breakpoint.c
+Auto-merging Documentation/virtual/kvm/api.txt
+Merge made by the 'recursive' strategy.
+ Documentation/virtual/kvm/api.txt | 15 +-
+ arch/arm/include/asm/kvm_host.h | 5 +
+ arch/arm/kvm/arm.c | 36 +-
+ arch/arm/kvm/guest.c | 6 +
+ arch/arm/kvm/interrupts.S | 14 +-
+ arch/arm/kvm/reset.c | 4 +-
+ arch/arm64/include/asm/hw_breakpoint.h | 14 +
+ arch/arm64/include/asm/kvm_arm.h | 5 +-
+ arch/arm64/include/asm/kvm_asm.h | 26 +-
+ arch/arm64/include/asm/kvm_host.h | 42 ++-
+ arch/arm64/include/uapi/asm/kvm.h | 37 +-
+ arch/arm64/kernel/asm-offsets.c | 9 +-
+ arch/arm64/kernel/hw_breakpoint.c | 12 -
+ arch/arm64/kvm/Makefile | 2 +-
+ arch/arm64/kvm/debug.c | 217 ++++++++++++
+ arch/arm64/kvm/guest.c | 43 ++-
+ arch/arm64/kvm/handle_exit.c | 44 +++
+ arch/arm64/kvm/hyp.S | 617 ++++++++++++---------------------
+ arch/arm64/kvm/reset.c | 20 +-
+ arch/arm64/kvm/sys_regs.c | 291 ++++++++++++++--
+ arch/arm64/kvm/sys_regs.h | 6 +
+ arch/arm64/kvm/sys_regs_generic_v8.c | 2 +
+ arch/arm64/kvm/trace.h | 123 +++++++
+ include/kvm/arm_arch_timer.h | 7 +-
+ include/kvm/arm_vgic.h | 39 ++-
+ include/linux/irqchip/arm-gic-v3.h | 3 +
+ include/linux/irqchip/arm-gic.h | 3 +-
+ include/uapi/linux/kvm.h | 5 +
+ virt/kvm/arm/arch_timer.c | 29 +-
+ virt/kvm/arm/vgic-v2.c | 16 +-
+ virt/kvm/arm/vgic-v3.c | 21 +-
+ virt/kvm/arm/vgic.c | 427 +++++++++++++++++++++--
+ 32 files changed, 1596 insertions(+), 544 deletions(-)
+ create mode 100644 arch/arm64/kvm/debug.c
+Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
+$ git merge kvm-ppc/kvm-ppc-next
+Resolved 'arch/powerpc/kvm/book3s_hv.c' using previous resolution.
+Auto-merging arch/powerpc/kvm/book3s_hv.c
+CONFLICT (content): Merge conflict in arch/powerpc/kvm/book3s_hv.c
+Auto-merging arch/powerpc/kvm/book3s.c
+Auto-merging arch/powerpc/kernel/asm-offsets.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 729438c4936b] Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/powerpc/include/asm/kvm_book3s.h | 5 +-
+ arch/powerpc/include/asm/kvm_book3s_asm.h | 22 +-
+ arch/powerpc/include/asm/kvm_booke.h | 4 +-
+ arch/powerpc/include/asm/kvm_host.h | 24 +-
+ arch/powerpc/include/asm/ppc-opcode.h | 2 +-
+ arch/powerpc/kernel/asm-offsets.c | 9 +
+ arch/powerpc/kvm/Kconfig | 8 +-
+ arch/powerpc/kvm/book3s.c | 3 +-
+ arch/powerpc/kvm/book3s_32_mmu_host.c | 1 +
+ arch/powerpc/kvm/book3s_64_mmu_host.c | 1 +
+ arch/powerpc/kvm/book3s_64_mmu_hv.c | 8 +-
+ arch/powerpc/kvm/book3s_emulate.c | 1 +
+ arch/powerpc/kvm/book3s_hv.c | 660 ++++++++++++++++++++++++++----
+ arch/powerpc/kvm/book3s_hv_builtin.c | 32 +-
+ arch/powerpc/kvm/book3s_hv_rm_mmu.c | 161 +++++++-
+ arch/powerpc/kvm/book3s_hv_rm_xics.c | 4 +-
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S | 128 +++++-
+ arch/powerpc/kvm/book3s_paired_singles.c | 2 +-
+ arch/powerpc/kvm/book3s_segment.S | 4 +-
+ arch/powerpc/kvm/booke.c | 1 +
+ arch/powerpc/kvm/e500_mmu.c | 2 +-
+ arch/powerpc/kvm/powerpc.c | 2 +-
+ 22 files changed, 938 insertions(+), 146 deletions(-)
+Merging kvms390/next (152b28392a8d KVM: s390: Fix assumption that kvm_set_irq_routing is always run successfully)
+$ git merge kvms390/next
+Already up-to-date.
+Merging xen-tip/linux-next (0ac7a1841284 xen/xenbus: Rename the variable xen_store_mfn to xen_store_gfn)
+$ git merge xen-tip/linux-next
+Resolved 'arch/x86/xen/enlighten.c' using previous resolution.
+Auto-merging drivers/xen/events/events_base.c
+Auto-merging drivers/net/xen-netfront.c
+Auto-merging drivers/block/xen-blkfront.c
+Removing arch/x86/xen/p2m.h
+Auto-merging arch/x86/xen/enlighten.c
+CONFLICT (content): Merge conflict in arch/x86/xen/enlighten.c
+Auto-merging arch/x86/xen/Kconfig
+Auto-merging Documentation/kernel-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 4f3c25130d87] Merge remote-tracking branch 'xen-tip/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-hypervisor-pmu | 23 +
+ Documentation/kernel-parameters.txt | 7 +
+ arch/arm/include/asm/xen/events.h | 6 +
+ arch/arm/include/asm/xen/page.h | 44 +-
+ arch/arm/xen/enlighten.c | 25 +-
+ arch/arm/xen/mm.c | 4 +-
+ arch/arm64/include/asm/xen/events.h | 6 +
+ arch/x86/include/asm/xen/events.h | 11 +
+ arch/x86/include/asm/xen/hypercall.h | 6 +
+ arch/x86/include/asm/xen/interface.h | 219 +++++++++-
+ arch/x86/include/asm/xen/page.h | 43 +-
+ arch/x86/xen/Kconfig | 21 +-
+ arch/x86/xen/Makefile | 2 +-
+ arch/x86/xen/apic.c | 6 +
+ arch/x86/xen/enlighten.c | 20 +-
+ arch/x86/xen/mmu.c | 431 +++++++++++++++++--
+ arch/x86/xen/p2m.c | 43 +-
+ arch/x86/xen/p2m.h | 15 -
+ arch/x86/xen/platform-pci-unplug.c | 2 +-
+ arch/x86/xen/pmu.c | 570 +++++++++++++++++++++++++
+ arch/x86/xen/pmu.h | 15 +
+ arch/x86/xen/setup.c | 414 +++++++++++++-----
+ arch/x86/xen/smp.c | 31 +-
+ arch/x86/xen/suspend.c | 23 +-
+ arch/x86/xen/xen-head.S | 2 +
+ arch/x86/xen/xen-ops.h | 7 +
+ drivers/block/xen-blkfront.c | 152 +++----
+ drivers/input/misc/xen-kbdfront.c | 4 +-
+ drivers/net/xen-netback/netback.c | 4 +-
+ drivers/net/xen-netfront.c | 12 +-
+ drivers/scsi/xen-scsifront.c | 10 +-
+ drivers/tty/hvc/hvc_xen.c | 18 +-
+ drivers/video/fbdev/xen-fbfront.c | 20 +-
+ drivers/xen/Kconfig | 11 +
+ drivers/xen/balloon.c | 2 +-
+ drivers/xen/biomerge.c | 6 +-
+ drivers/xen/events/events_base.c | 8 +-
+ drivers/xen/events/events_fifo.c | 4 +-
+ drivers/xen/gntalloc.c | 3 +-
+ drivers/xen/manage.c | 2 +-
+ drivers/xen/privcmd.c | 44 +-
+ drivers/xen/swiotlb-xen.c | 16 +-
+ drivers/xen/sys-hypervisor.c | 136 +++++-
+ drivers/xen/tmem.c | 24 +-
+ drivers/xen/xenbus/xenbus_client.c | 2 +-
+ drivers/xen/xenbus/xenbus_dev_backend.c | 2 +-
+ drivers/xen/xenbus/xenbus_probe.c | 16 +-
+ drivers/xen/xenfs/Makefile | 1 +
+ drivers/xen/xenfs/super.c | 3 +
+ drivers/xen/xenfs/xenfs.h | 1 +
+ drivers/xen/xenfs/xensyms.c | 152 +++++++
+ drivers/xen/xlate_mmu.c | 18 +-
+ include/asm-generic/early_ioremap.h | 2 +
+ include/asm-generic/fixmap.h | 3 +
+ include/uapi/xen/privcmd.h | 4 +
+ include/xen/events.h | 1 -
+ include/xen/interface/platform.h | 18 +
+ include/xen/interface/xen.h | 37 +-
+ include/xen/interface/xenpmu.h | 94 ++++
+ include/xen/page.h | 4 +-
+ include/xen/xen-ops.h | 10 +-
+ mm/early_ioremap.c | 12 +
+ 62 files changed, 2365 insertions(+), 487 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-hypervisor-pmu
+ delete mode 100644 arch/x86/xen/p2m.h
+ create mode 100644 arch/x86/xen/pmu.c
+ create mode 100644 arch/x86/xen/pmu.h
+ create mode 100644 drivers/xen/xenfs/xensyms.c
+ create mode 100644 include/xen/interface/xenpmu.h
+Merging percpu/for-next (292c24a073ee percpu: clean up of schunk->map[] assignment in pcpu_setup_first_chunk)
+$ git merge percpu/for-next
+Merge made by the 'recursive' strategy.
+ include/linux/percpu-defs.h | 6 ++----
+ mm/percpu.c | 5 ++---
+ 2 files changed, 4 insertions(+), 7 deletions(-)
+Merging workqueues/for-next (355c06633e23 workqueue: fix some docbook warnings)
+$ git merge workqueues/for-next
+Auto-merging kernel/workqueue.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 1 +
+ include/linux/workqueue.h | 6 +++---
+ kernel/workqueue.c | 2 +-
+ 3 files changed, 5 insertions(+), 4 deletions(-)
+Merging drivers-x86/for-next (fc0bfacd045a hp-wireless: remove unneeded goto/label in hpwl_init)
+$ git merge drivers-x86/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/ioctl/ioctl-number.txt | 2 +-
+ MAINTAINERS | 1 -
+ drivers/platform/x86/asus-laptop.c | 1 +
+ drivers/platform/x86/hp-wireless.c | 7 +-
+ drivers/platform/x86/ideapad-laptop.c | 14 +
+ drivers/platform/x86/toshiba_acpi.c | 805 ++++++++++++++++++----------------
+ include/uapi/linux/toshiba.h | 32 +-
+ 7 files changed, 473 insertions(+), 389 deletions(-)
+Merging chrome-platform/for-next (1d95e6f10fd8 platform/chrome: cros_ec: Fix possible leak in led_rgb_store())
+$ git merge chrome-platform/for-next
+Merge made by the 'recursive' strategy.
+ drivers/platform/chrome/Kconfig | 5 +++--
+ drivers/platform/chrome/cros_ec_dev.c | 6 ++++++
+ drivers/platform/chrome/cros_ec_lightbar.c | 31 ++++++++++++++++--------------
+ drivers/platform/chrome/cros_ec_lpc.c | 21 +++++++++-----------
+ 4 files changed, 35 insertions(+), 28 deletions(-)
+Merging regmap/for-next (579657f2e1ed Merge remote-tracking branches 'regmap/topic/lockdep', 'regmap/topic/raw' and 'regmap/topic/seq-delay' into regmap-next)
+$ git merge regmap/for-next
+Auto-merging drivers/thermal/st/st_thermal.c
+Auto-merging drivers/regulator/core.c
+Merge made by the 'recursive' strategy.
+ drivers/base/regmap/internal.h | 6 +-
+ drivers/base/regmap/regcache.c | 2 +-
+ drivers/base/regmap/regmap-ac97.c | 41 ++--
+ drivers/base/regmap/regmap-debugfs.c | 99 +++++++++-
+ drivers/base/regmap/regmap-i2c.c | 41 ++--
+ drivers/base/regmap/regmap-irq.c | 4 +-
+ drivers/base/regmap/regmap-mmio.c | 52 ++----
+ drivers/base/regmap/regmap-spi.c | 41 ++--
+ drivers/base/regmap/regmap-spmi.c | 78 +++-----
+ drivers/base/regmap/regmap.c | 163 ++++++++++------
+ drivers/bus/vexpress-config.c | 2 +-
+ drivers/regulator/core.c | 2 +-
+ drivers/thermal/st/st_thermal.c | 2 +-
+ fs/debugfs/file.c | 14 +-
+ include/linux/debugfs.h | 20 ++
+ include/linux/regmap.h | 353 ++++++++++++++++++++++++++++++-----
+ 16 files changed, 627 insertions(+), 293 deletions(-)
+$ git am -3 ../patches/mfd__Fixup_clients_of_multi_reg_write_register_patch.patch
+Applying: mfd: Fixup clients of multi_reg_write/register_patch
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/mfd/wm5110-tables.c
+M drivers/mfd/wm8998-tables.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 3485737a4316] Merge remote-tracking branch 'regmap/for-next'
+ Date: Fri Aug 28 14:30:18 2015 +1000
+Merging hsi/for-next (d770e558e219 Linux 4.2-rc1)
+$ git merge hsi/for-next
+Already up-to-date.
+Merging leds/for-next (5f414dd632fd leds: Export OF module alias information in missing drivers)
+$ git merge leds/for-next
+Auto-merging drivers/leds/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/leds/common.txt | 27 ++--
+ .../devicetree/bindings/leds/leds-ns2.txt | 9 ++
+ MAINTAINERS | 3 +-
+ arch/arm/boot/dts/kirkwood-d2net.dts | 5 +
+ arch/arm/boot/dts/kirkwood-is2.dts | 5 +
+ arch/arm/boot/dts/kirkwood-ns2.dts | 5 +
+ arch/arm/boot/dts/kirkwood-ns2max.dts | 5 +
+ arch/arm/boot/dts/kirkwood-ns2mini.dts | 5 +
+ drivers/leds/Kconfig | 19 ++-
+ drivers/leds/led-class.c | 7 +-
+ drivers/leds/leds-fsg.c | 52 ++-----
+ drivers/leds/leds-lm3530.c | 1 -
+ drivers/leds/leds-lm355x.c | 1 -
+ drivers/leds/leds-lm3642.c | 1 -
+ drivers/leds/leds-lp5521.c | 11 +-
+ drivers/leds/leds-lp5523.c | 11 +-
+ drivers/leds/leds-lp5562.c | 11 +-
+ drivers/leds/leds-lp55xx-common.c | 13 +-
+ drivers/leds/leds-lp55xx-common.h | 4 +-
+ drivers/leds/leds-lp8501.c | 11 +-
+ drivers/leds/leds-lp8860.c | 4 +-
+ drivers/leds/leds-ns2.c | 169 ++++++++++++---------
+ drivers/leds/leds-pca955x.c | 1 -
+ drivers/leds/leds-pca963x.c | 2 +-
+ drivers/leds/leds-syscon.c | 4 +-
+ drivers/leds/leds-tca6507.c | 2 +-
+ drivers/leds/leds-tlc591xx.c | 4 -
+ drivers/leds/trigger/Kconfig | 2 +-
+ include/dt-bindings/leds/leds-ns2.h | 8 +
+ include/linux/platform_data/leds-kirkwood-ns2.h | 14 ++
+ 30 files changed, 240 insertions(+), 176 deletions(-)
+ create mode 100644 include/dt-bindings/leds/leds-ns2.h
+Merging ipmi/for-next (43ad3e6dcf35 ipmi:ssif: Add a module parm to specify that SMBus alerts don't work)
+$ git merge ipmi/for-next
+Merge made by the 'recursive' strategy.
+ drivers/acpi/acpi_pnp.c | 2 -
+ drivers/char/ipmi/ipmi_bt_sm.c | 2 +-
+ drivers/char/ipmi/ipmi_kcs_sm.c | 2 +-
+ drivers/char/ipmi/ipmi_msghandler.c | 46 ++-
+ drivers/char/ipmi/ipmi_powernv.c | 14 +-
+ drivers/char/ipmi/ipmi_si_intf.c | 597 +++++++++++++++++++++---------------
+ drivers/char/ipmi/ipmi_si_sm.h | 10 +-
+ drivers/char/ipmi/ipmi_smic_sm.c | 2 +-
+ drivers/char/ipmi/ipmi_ssif.c | 14 +-
+ include/linux/ipmi_smi.h | 7 +-
+ 10 files changed, 414 insertions(+), 282 deletions(-)
+Merging driver-core/driver-core-next (71db87ba5700 bus: subsys: update return type of ->remove_dev() to void)
+$ git merge driver-core/driver-core-next
+Resolved 'drivers/cpufreq/cpufreq.c' using previous resolution.
+Auto-merging kernel/cpu.c
+Auto-merging include/linux/device.h
+Auto-merging drivers/cpufreq/cpufreq.c
+CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq.c
+Auto-merging drivers/base/dd.c
+Auto-merging drivers/base/core.c
+Auto-merging arch/x86/kernel/cpu/microcode/core.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 8479885b9a34] Merge remote-tracking branch 'driver-core/driver-core-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/filesystems/sysfs.txt | 5 ++-
+ arch/sh/kernel/cpu/sh4/sq.c | 3 +-
+ arch/tile/kernel/sysfs.c | 11 ++---
+ arch/x86/kernel/cpu/microcode/core.c | 5 +--
+ drivers/base/base.h | 3 +-
+ drivers/base/core.c | 49 +++++++++++++++++++++++
+ drivers/base/cpu.c | 2 +-
+ drivers/base/dd.c | 8 ++++
+ drivers/base/devres.c | 4 +-
+ drivers/base/firmware_class.c | 2 +-
+ drivers/cpufreq/cpufreq.c | 8 ++--
+ drivers/net/rionet.c | 4 +-
+ include/linux/device.h | 2 +-
+ kernel/cpu.c | 16 ++++----
+ tools/testing/selftests/firmware/fw_filesystem.sh | 25 +++++++++---
+ tools/testing/selftests/firmware/fw_userhelper.sh | 12 +++++-
+ 16 files changed, 118 insertions(+), 41 deletions(-)
+Merging tty/tty-next (c868cbb7e5c6 serial: imx: save and restore context in the suspend path)
+$ git merge tty/tty-next
+Auto-merging drivers/acpi/acpi_pnp.c
+Auto-merging arch/arm/boot/dts/dra7.dtsi
+Auto-merging arch/arm/boot/dts/am33xx.dtsi
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/serial/atmel-usart.txt | 3 +
+ .../bindings/serial/axis,etraxfs-uart.txt | 6 +-
+ .../devicetree/bindings/serial/omap_serial.txt | 3 +
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/am33xx.dtsi | 12 +-
+ arch/arm/boot/dts/dra7.dtsi | 20 +-
+ drivers/acpi/acpi_pnp.c | 1 +
+ drivers/tty/n_gsm.c | 2 +-
+ drivers/tty/n_tty.c | 15 +-
+ drivers/tty/pty.c | 8 +
+ drivers/tty/serial/8250/8250.h | 17 +-
+ drivers/tty/serial/8250/8250_core.c | 3260 ++------------------
+ drivers/tty/serial/8250/8250_dw.c | 27 +-
+ drivers/tty/serial/8250/8250_early.c | 4 +-
+ drivers/tty/serial/8250/8250_fintek.c | 172 +-
+ drivers/tty/serial/8250/8250_ingenic.c | 1 -
+ drivers/tty/serial/8250/8250_omap.c | 147 +-
+ drivers/tty/serial/8250/8250_pci.c | 164 +-
+ drivers/tty/serial/8250/8250_pnp.c | 11 +
+ drivers/tty/serial/8250/8250_port.c | 2912 +++++++++++++++++
+ drivers/tty/serial/8250/8250_uniphier.c | 1 +
+ drivers/tty/serial/8250/Makefile | 5 +-
+ drivers/tty/serial/Kconfig | 10 +-
+ drivers/tty/serial/amba-pl011.c | 503 ++-
+ drivers/tty/serial/atmel_serial.c | 484 ++-
+ drivers/tty/serial/etraxfs-uart.c | 59 +-
+ drivers/tty/serial/imx.c | 203 +-
+ drivers/tty/serial/lantiq.c | 8 +-
+ drivers/tty/serial/men_z135_uart.c | 10 +-
+ drivers/tty/serial/mpc52xx_uart.c | 5 +-
+ drivers/tty/serial/mxs-auart.c | 58 +-
+ drivers/tty/serial/samsung.c | 48 +-
+ drivers/tty/serial/samsung.h | 1 +
+ drivers/tty/serial/sc16is7xx.c | 113 +-
+ drivers/tty/serial/serial_core.c | 25 +-
+ drivers/tty/serial/sirfsoc_uart.c | 126 +-
+ drivers/tty/serial/sirfsoc_uart.h | 5 +-
+ drivers/tty/serial/sn_console.c | 32 +-
+ drivers/tty/serial/stm32-usart.c | 2 +-
+ drivers/tty/serial/suncore.c | 11 +-
+ drivers/tty/serial/sunhv.c | 13 +-
+ drivers/tty/serial/ucc_uart.c | 2 +-
+ drivers/tty/tty_buffer.c | 12 +-
+ drivers/tty/tty_io.c | 108 +-
+ drivers/tty/tty_ioctl.c | 11 +-
+ drivers/tty/tty_ldisc.c | 15 +-
+ include/linux/amba/serial.h | 14 +
+ include/linux/atmel_serial.h | 240 +-
+ include/linux/serial_8250.h | 7 +-
+ include/linux/tty.h | 6 +
+ include/linux/tty_driver.h | 2 +-
+ include/uapi/linux/gsmmux.h | 1 +
+ 52 files changed, 4927 insertions(+), 3999 deletions(-)
+ create mode 100644 drivers/tty/serial/8250/8250_port.c
+$ git am -3 ../patches/0001-serial-imx-partial-revert-of-introduce-serial_imx_en.patch
+Applying: serial: imx: partial revert of "introduce serial_imx_enable_wakeup()"
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/arm/boot/dts/Makefile
+$ git add -A .
+$ git commit -v -a --amend
+[master 23837d66999a] Merge remote-tracking branch 'tty/tty-next'
+ Date: Fri Aug 28 14:53:02 2015 +1000
+Merging usb/usb-next (44840dec6127 USB: qcserial: add HP lt4111 LTE/EV-DO/HSPA+ Gobi 4G Module)
+$ git merge usb/usb-next
+Auto-merging drivers/usb/serial/ftdi_sio_ids.h
+Removing drivers/usb/gadget/udc/gadget_chips.h
+Auto-merging drivers/usb/gadget/composite.c
+Merge made by the 'recursive' strategy.
+ .../ABI/testing/configfs-usb-gadget-loopback | 2 +-
+ .../ABI/testing/configfs-usb-gadget-sourcesink | 2 +-
+ Documentation/ABI/testing/sysfs-bus-usb | 14 +
+ .../bindings/phy/phy-lpc18xx-usb-otg.txt | 26 +
+ .../devicetree/bindings/phy/sun4i-usb-phy.txt | 22 +-
+ .../bindings/usb/allwinner,sun4i-a10-musb.txt | 29 +
+ .../devicetree/bindings/usb/ci-hdrc-usb2.txt | 20 +
+ Documentation/devicetree/bindings/usb/generic.txt | 15 +
+ .../devicetree/bindings/usb/msm-hsusb.txt | 4 +
+ .../devicetree/bindings/usb/qcom,usb-8x16-phy.txt | 76 +++
+ Documentation/usb/gadget-testing.txt | 7 +-
+ Documentation/usb/power-management.txt | 15 +-
+ drivers/phy/Kconfig | 13 +
+ drivers/phy/Makefile | 1 +
+ drivers/phy/phy-armada375-usb2.c | 3 +-
+ drivers/phy/phy-bcm-kona-usb2.c | 2 +-
+ drivers/phy/phy-berlin-sata.c | 2 +-
+ drivers/phy/phy-berlin-usb.c | 13 +-
+ drivers/phy/phy-brcmstb-sata.c | 2 +-
+ drivers/phy/phy-dm816x-usb.c | 2 +-
+ drivers/phy/phy-exynos-dp-video.c | 2 +-
+ drivers/phy/phy-exynos-mipi-video.c | 2 +-
+ drivers/phy/phy-exynos5-usbdrd.c | 2 +-
+ drivers/phy/phy-exynos5250-sata.c | 2 +-
+ drivers/phy/phy-hix5hd2-sata.c | 2 +-
+ drivers/phy/phy-lpc18xx-usb-otg.c | 143 ++++
+ drivers/phy/phy-miphy28lp.c | 3 +-
+ drivers/phy/phy-miphy365x.c | 2 +-
+ drivers/phy/phy-mvebu-sata.c | 2 +-
+ drivers/phy/phy-omap-usb2.c | 2 +-
+ drivers/phy/phy-qcom-apq8064-sata.c | 2 +-
+ drivers/phy/phy-qcom-ipq806x-sata.c | 2 +-
+ drivers/phy/phy-qcom-ufs-i.h | 2 +-
+ drivers/phy/phy-qcom-ufs-qmp-14nm.c | 3 +-
+ drivers/phy/phy-qcom-ufs-qmp-20nm.c | 3 +-
+ drivers/phy/phy-qcom-ufs.c | 2 +-
+ drivers/phy/phy-rcar-gen2.c | 2 +-
+ drivers/phy/phy-rockchip-usb.c | 3 +-
+ drivers/phy/phy-samsung-usb2.c | 2 +-
+ drivers/phy/phy-spear1310-miphy.c | 2 +-
+ drivers/phy/phy-spear1340-miphy.c | 2 +-
+ drivers/phy/phy-stih41x-usb.c | 2 +-
+ drivers/phy/phy-sun4i-usb.c | 423 +++++++++++-
+ drivers/phy/phy-sun9i-usb.c | 2 +-
+ drivers/phy/phy-ti-pipe3.c | 2 +-
+ drivers/phy/phy-tusb1210.c | 2 +-
+ drivers/phy/ulpi_phy.h | 2 +-
+ drivers/staging/emxx_udc/emxx_udc.c | 76 ++-
+ drivers/usb/atm/cxacru.c | 7 +-
+ drivers/usb/chipidea/bits.h | 12 +
+ drivers/usb/chipidea/ci.h | 9 +-
+ drivers/usb/chipidea/ci_hdrc_imx.c | 17 +-
+ drivers/usb/chipidea/core.c | 128 +++-
+ drivers/usb/chipidea/debug.c | 7 +
+ drivers/usb/chipidea/host.c | 26 +-
+ drivers/usb/chipidea/otg_fsm.c | 1 -
+ drivers/usb/chipidea/udc.c | 30 +-
+ drivers/usb/chipidea/usbmisc_imx.c | 12 +-
+ drivers/usb/class/usblp.c | 66 +-
+ drivers/usb/common/common.c | 56 ++
+ drivers/usb/core/devio.c | 19 +-
+ drivers/usb/core/driver.c | 1 +
+ drivers/usb/core/endpoint.c | 2 +-
+ drivers/usb/core/hcd.c | 19 +-
+ drivers/usb/core/hub.c | 70 +-
+ drivers/usb/core/otg_whitelist.h | 2 +-
+ drivers/usb/core/sysfs.c | 31 +
+ drivers/usb/dwc2/gadget.c | 15 +-
+ drivers/usb/dwc3/Kconfig | 7 -
+ drivers/usb/dwc3/Makefile | 2 -
+ drivers/usb/dwc3/core.c | 2 -
+ drivers/usb/dwc3/dwc3-exynos.c | 2 +-
+ drivers/usb/dwc3/dwc3-keystone.c | 2 +-
+ drivers/usb/dwc3/dwc3-omap.c | 75 +-
+ drivers/usb/dwc3/dwc3-pci.c | 26 +-
+ drivers/usb/dwc3/dwc3-qcom.c | 4 +-
+ drivers/usb/dwc3/dwc3-st.c | 4 -
+ drivers/usb/dwc3/ep0.c | 92 ++-
+ drivers/usb/dwc3/gadget.c | 57 +-
+ drivers/usb/gadget/composite.c | 37 +-
+ drivers/usb/gadget/config.c | 56 ++
+ drivers/usb/gadget/configfs.c | 29 +-
+ drivers/usb/gadget/epautoconf.c | 282 ++------
+ drivers/usb/gadget/function/f_acm.c | 1 -
+ drivers/usb/gadget/function/f_ecm.c | 4 +-
+ drivers/usb/gadget/function/f_fs.c | 8 +-
+ drivers/usb/gadget/function/f_loopback.c | 5 -
+ drivers/usb/gadget/function/f_mass_storage.c | 164 ++---
+ drivers/usb/gadget/function/f_mass_storage.h | 6 +-
+ drivers/usb/gadget/function/f_midi.c | 4 +
+ drivers/usb/gadget/function/f_ncm.c | 5 +-
+ drivers/usb/gadget/function/f_obex.c | 22 +-
+ drivers/usb/gadget/function/f_printer.c | 7 +-
+ drivers/usb/gadget/function/f_serial.c | 1 -
+ drivers/usb/gadget/function/f_sourcesink.c | 6 -
+ drivers/usb/gadget/function/f_uac2.c | 31 +-
+ drivers/usb/gadget/function/f_uvc.c | 7 +-
+ drivers/usb/gadget/function/storage_common.h | 2 +-
+ drivers/usb/gadget/function/u_ether.h | 4 +-
+ drivers/usb/gadget/function/u_uac1.h | 2 -
+ drivers/usb/gadget/legacy/Kconfig | 2 +
+ drivers/usb/gadget/legacy/acm_ms.c | 41 +-
+ drivers/usb/gadget/legacy/audio.c | 41 +-
+ drivers/usb/gadget/legacy/cdc2.c | 35 +-
+ drivers/usb/gadget/legacy/dbgp.c | 10 +-
+ drivers/usb/gadget/legacy/ether.c | 36 +-
+ drivers/usb/gadget/legacy/g_ffs.c | 32 +-
+ drivers/usb/gadget/legacy/gmidi.c | 8 +-
+ drivers/usb/gadget/legacy/hid.c | 37 +-
+ drivers/usb/gadget/legacy/mass_storage.c | 41 +-
+ drivers/usb/gadget/legacy/multi.c | 43 +-
+ drivers/usb/gadget/legacy/ncm.c | 34 +-
+ drivers/usb/gadget/legacy/nokia.c | 105 ++-
+ drivers/usb/gadget/legacy/printer.c | 51 +-
+ drivers/usb/gadget/legacy/serial.c | 38 +-
+ drivers/usb/gadget/legacy/zero.c | 41 +-
+ drivers/usb/gadget/udc/amd5536udc.c | 88 ++-
+ drivers/usb/gadget/udc/at91_udc.c | 39 +-
+ drivers/usb/gadget/udc/atmel_usba_udc.c | 16 +-
+ drivers/usb/gadget/udc/bcm63xx_udc.c | 29 +-
+ drivers/usb/gadget/udc/bdc/bdc_ep.c | 9 +
+ drivers/usb/gadget/udc/dummy_hcd.c | 95 ++-
+ drivers/usb/gadget/udc/fotg210-udc.c | 29 +-
+ drivers/usb/gadget/udc/fsl_qe_udc.c | 11 +
+ drivers/usb/gadget/udc/fsl_udc_core.c | 13 +
+ drivers/usb/gadget/udc/fusb300_udc.c | 11 +
+ drivers/usb/gadget/udc/gadget_chips.h | 55 --
+ drivers/usb/gadget/udc/goku_udc.c | 38 ++
+ drivers/usb/gadget/udc/gr_udc.c | 11 +
+ drivers/usb/gadget/udc/lpc32xx_udc.c | 32 +
+ drivers/usb/gadget/udc/m66592-udc.c | 13 +-
+ drivers/usb/gadget/udc/mv_u3d_core.c | 9 +
+ drivers/usb/gadget/udc/mv_udc_core.c | 9 +
+ drivers/usb/gadget/udc/net2272.c | 15 +-
+ drivers/usb/gadget/udc/net2280.c | 95 ++-
+ drivers/usb/gadget/udc/omap_udc.c | 22 +
+ drivers/usb/gadget/udc/pch_udc.c | 52 +-
+ drivers/usb/gadget/udc/pxa25x_udc.c | 30 +
+ drivers/usb/gadget/udc/pxa27x_udc.c | 3 +-
+ drivers/usb/gadget/udc/pxa27x_udc.h | 40 +-
+ drivers/usb/gadget/udc/r8a66597-udc.c | 10 +
+ drivers/usb/gadget/udc/s3c-hsudc.c | 15 +
+ drivers/usb/gadget/udc/s3c2410_udc.c | 10 +
+ drivers/usb/gadget/udc/udc-core.c | 90 +++
+ drivers/usb/gadget/udc/udc-xilinx.c | 9 +
+ drivers/usb/host/Kconfig | 17 +-
+ drivers/usb/host/bcma-hcd.c | 128 +++-
+ drivers/usb/host/ehci-fsl.c | 53 +-
+ drivers/usb/host/ehci-fsl.h | 1 +
+ drivers/usb/host/ehci-hub.c | 7 +
+ drivers/usb/host/ehci-platform.c | 13 +-
+ drivers/usb/host/ehci-st.c | 7 +-
+ drivers/usb/host/ehci-sysfs.c | 8 +-
+ drivers/usb/host/ehci.h | 12 +
+ drivers/usb/host/fsl-mph-dr-of.c | 29 +-
+ drivers/usb/host/ohci-at91.c | 179 +++--
+ drivers/usb/host/oxu210hp-hcd.c | 7 +-
+ drivers/usb/host/u132-hcd.c | 35 +-
+ drivers/usb/host/xhci-dbg.c | 4 +
+ drivers/usb/host/xhci-ring.c | 301 +++++++-
+ drivers/usb/host/xhci.c | 13 +-
+ drivers/usb/host/xhci.h | 13 +-
+ drivers/usb/isp1760/isp1760-udc.c | 15 +-
+ drivers/usb/misc/ftdi-elan.c | 12 +-
+ drivers/usb/misc/usbtest.c | 7 +-
+ drivers/usb/musb/Kconfig | 51 +-
+ drivers/usb/musb/Makefile | 1 +
+ drivers/usb/musb/musb_cppi41.c | 6 +-
+ drivers/usb/musb/musb_dsps.c | 6 +-
+ drivers/usb/musb/musb_gadget.c | 87 ++-
+ drivers/usb/musb/sunxi.c | 756 +++++++++++++++++++++
+ drivers/usb/phy/Kconfig | 14 +
+ drivers/usb/phy/Makefile | 1 +
+ drivers/usb/phy/phy-generic.c | 6 +-
+ drivers/usb/phy/phy-keystone.c | 6 +-
+ drivers/usb/phy/phy-msm-usb.c | 67 +-
+ drivers/usb/phy/phy-mxs-usb.c | 6 +-
+ drivers/usb/phy/phy-omap-otg.c | 22 +-
+ drivers/usb/phy/phy-qcom-8x16-usb.c | 436 ++++++++++++
+ drivers/usb/phy/phy-tahvo.c | 27 +-
+ drivers/usb/renesas_usbhs/common.c | 2 +-
+ drivers/usb/renesas_usbhs/mod_gadget.c | 68 ++
+ drivers/usb/serial/ftdi_sio_ids.h | 2 +-
+ drivers/usb/serial/io_ti.c | 279 ++++++--
+ drivers/usb/serial/mxuport.c | 10 +-
+ drivers/usb/serial/option.c | 2 +-
+ drivers/usb/serial/pl2303.c | 35 +-
+ drivers/usb/serial/symbolserial.c | 24 +-
+ drivers/usb/serial/usb_wwan.c | 2 +-
+ drivers/usb/storage/transport.c | 2 +-
+ include/linux/fsl_devices.h | 20 +-
+ include/linux/platform_data/atmel.h | 12 -
+ include/linux/usb/chipidea.h | 15 +-
+ include/linux/usb/composite.h | 2 +
+ include/linux/usb/gadget.h | 198 +++++-
+ include/linux/usb/hcd.h | 6 +-
+ include/linux/usb/msm_hsusb.h | 9 +-
+ include/linux/usb/of.h | 7 +
+ include/linux/usb/otg.h | 15 +
+ include/uapi/linux/usb/ch9.h | 12 +
+ 200 files changed, 5393 insertions(+), 1627 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/phy/phy-lpc18xx-usb-otg.txt
+ create mode 100644 Documentation/devicetree/bindings/usb/allwinner,sun4i-a10-musb.txt
+ create mode 100644 Documentation/devicetree/bindings/usb/qcom,usb-8x16-phy.txt
+ create mode 100644 drivers/phy/phy-lpc18xx-usb-otg.c
+ delete mode 100644 drivers/usb/gadget/udc/gadget_chips.h
+ create mode 100644 drivers/usb/musb/sunxi.c
+ create mode 100644 drivers/usb/phy/phy-qcom-8x16-usb.c
+Merging usb-gadget/next (2f3cc24f07b8 usb: musb: gadget: fix build break by adding missing 'break')
+$ git merge usb-gadget/next
+Already up-to-date.
+Merging usb-serial/usb-next (26c78daade0f USB: io_ti: Add heartbeat to keep idle EP/416 ports from disconnecting)
+$ git merge usb-serial/usb-next
+Already up-to-date.
+Merging staging/staging-next (415bcb5c6eff staging/lustre/o2iblnd: remove references to ib_reg_phsy_mr())
+$ git merge staging/staging-next
+Resolved 'drivers/staging/Kconfig' using previous resolution.
+Resolved 'drivers/staging/Makefile' using previous resolution.
+Resolved 'drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h' using previous resolution.
+Resolved 'drivers/staging/lustre/lustre/include/linux/lustre_compat25.h' using previous resolution.
+Auto-merging drivers/video/fbdev/sm712fb.c
+Auto-merging drivers/video/fbdev/sm712.h
+Auto-merging drivers/video/fbdev/Kconfig
+Removing drivers/staging/xgifb/vb_util.c
+Removing drivers/staging/wilc1000/wilc_wfi_netdevice.c
+Removing drivers/staging/wilc1000/wilc_type.h
+Removing drivers/staging/wilc1000/wilc_timer.h
+Removing drivers/staging/wilc1000/wilc_timer.c
+Removing drivers/staging/wilc1000/wilc_strutils.h
+Removing drivers/staging/wilc1000/wilc_strutils.c
+Removing drivers/staging/wilc1000/wilc_sleep.h
+Removing drivers/staging/wilc1000/wilc_sleep.c
+Removing drivers/staging/wilc1000/wilc_osconfig.h
+Removing drivers/staging/wilc1000/wilc_log.h
+Auto-merging drivers/staging/wilc1000/linux_mon.c
+Removing drivers/staging/wilc1000/fifo_buffer.h
+Removing drivers/staging/wilc1000/fifo_buffer.c
+Removing drivers/staging/wilc1000/coreconfigsimulator.h
+Removing drivers/staging/sm7xxfb/TODO
+Removing drivers/staging/sm7xxfb/Makefile
+Removing drivers/staging/sm7xxfb/Kconfig
+Removing drivers/staging/ozwpan/ozusbsvc1.c
+Removing drivers/staging/ozwpan/ozusbsvc.h
+Removing drivers/staging/ozwpan/ozusbsvc.c
+Removing drivers/staging/ozwpan/ozusbif.h
+Removing drivers/staging/ozwpan/ozurbparanoia.h
+Removing drivers/staging/ozwpan/ozurbparanoia.c
+Removing drivers/staging/ozwpan/ozprotocol.h
+Removing drivers/staging/ozwpan/ozproto.h
+CONFLICT (modify/delete): drivers/staging/ozwpan/ozproto.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/ozwpan/ozproto.c left in tree.
+Removing drivers/staging/ozwpan/ozpd.h
+Removing drivers/staging/ozwpan/ozpd.c
+Removing drivers/staging/ozwpan/ozmain.c
+Removing drivers/staging/ozwpan/ozhcd.h
+Removing drivers/staging/ozwpan/ozhcd.c
+Removing drivers/staging/ozwpan/ozeltbuf.h
+Removing drivers/staging/ozwpan/ozeltbuf.c
+Removing drivers/staging/ozwpan/ozdbg.h
+Removing drivers/staging/ozwpan/ozcdev.h
+Removing drivers/staging/ozwpan/ozcdev.c
+Removing drivers/staging/ozwpan/ozappif.h
+Removing drivers/staging/ozwpan/TODO
+Removing drivers/staging/ozwpan/README
+Removing drivers/staging/ozwpan/Makefile
+Removing drivers/staging/ozwpan/Kconfig
+Auto-merging drivers/staging/octeon/ethernet.c
+Auto-merging drivers/staging/octeon/ethernet-tx.c
+Auto-merging drivers/staging/lustre/lustre/llite/lloop.c
+Auto-merging drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
+CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
+Auto-merging drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
+Auto-merging drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
+CONFLICT (content): Merge conflict in drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
+Auto-merging drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
+Auto-merging drivers/staging/android/ion/ion_chunk_heap.c
+Auto-merging drivers/staging/Makefile
+CONFLICT (content): Merge conflict in drivers/staging/Makefile
+Auto-merging drivers/staging/Kconfig
+CONFLICT (content): Merge conflict in drivers/staging/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/DocBook/Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f drivers/staging/ozwpan/ozproto.c
+drivers/staging/ozwpan/ozproto.c: needs merge
+rm 'drivers/staging/ozwpan/ozproto.c'
+$ git commit -v -a
+[master b55bb6c1ed3e] Merge remote-tracking branch 'staging/staging-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-bus-iio | 18 +-
+ .../ABI/testing/sysfs-bus-iio-trigger-sysfs | 9 +
+ Documentation/DocBook/Makefile | 2 +-
+ Documentation/DocBook/iio.tmpl | 697 ++++++
+ .../devicetree/bindings/iio/adc/mcp320x.txt | 1 +
+ .../devicetree/bindings/iio/adc/vf610-adc.txt | 5 +
+ .../bindings/iio/magnetometer/mmc35240.txt | 13 +
+ .../devicetree/bindings/iio/st-sensors.txt | 2 +
+ .../bindings/staging/iio/adc/mxs-lradc.txt | 2 +-
+ Documentation/fb/sm712fb.txt | 31 +
+ MAINTAINERS | 22 +-
+ drivers/iio/accel/Kconfig | 26 +-
+ drivers/iio/accel/bma180.c | 1 -
+ drivers/iio/accel/bmc150-accel.c | 243 +--
+ drivers/iio/accel/kxcjk-1013.c | 5 +-
+ drivers/iio/accel/mma8452.c | 217 +-
+ drivers/iio/accel/mma9551_core.c | 35 +-
+ drivers/iio/accel/mma9551_core.h | 6 +-
+ drivers/iio/accel/mma9553.c | 83 +-
+ drivers/iio/accel/st_accel.h | 1 +
+ drivers/iio/accel/st_accel_core.c | 6 +
+ drivers/iio/accel/st_accel_i2c.c | 6 +-
+ drivers/iio/accel/st_accel_spi.c | 1 +
+ drivers/iio/accel/stk8312.c | 429 +++-
+ drivers/iio/accel/stk8ba50.c | 369 +++-
+ drivers/iio/adc/Kconfig | 52 +-
+ drivers/iio/adc/berlin2-adc.c | 22 +-
+ drivers/iio/adc/cc10001_adc.c | 26 +-
+ drivers/iio/adc/mcp320x.c | 16 +-
+ drivers/iio/adc/mcp3422.c | 1 -
+ drivers/iio/adc/ti-adc081c.c | 1 -
+ drivers/iio/adc/vf610_adc.c | 79 +-
+ drivers/iio/common/ssp_sensors/ssp_dev.c | 1 -
+ drivers/iio/common/st_sensors/st_sensors_core.c | 52 +-
+ drivers/iio/dac/ad5064.c | 1 -
+ drivers/iio/dac/ad5380.c | 1 -
+ drivers/iio/dac/ad5446.c | 1 -
+ drivers/iio/dac/max5821.c | 1 -
+ drivers/iio/frequency/adf4350.c | 1 -
+ drivers/iio/gyro/Kconfig | 3 +-
+ drivers/iio/gyro/adis16136.c | 6 +
+ drivers/iio/gyro/adis16260.c | 137 +-
+ drivers/iio/gyro/itg3200_core.c | 1 -
+ drivers/iio/gyro/st_gyro_core.c | 3 +
+ drivers/iio/gyro/st_gyro_i2c.c | 1 -
+ drivers/iio/humidity/dht11.c | 65 +-
+ drivers/iio/humidity/si7005.c | 1 -
+ drivers/iio/imu/adis16400_core.c | 46 +-
+ drivers/iio/imu/adis16480.c | 39 +-
+ drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 7 +-
+ drivers/iio/imu/kmx61.c | 8 +-
+ drivers/iio/industrialio-buffer.c | 35 +-
+ drivers/iio/industrialio-core.c | 33 +-
+ drivers/iio/industrialio-event.c | 8 +-
+ drivers/iio/industrialio-trigger.c | 27 +-
+ drivers/iio/industrialio-triggered-buffer.c | 12 +-
+ drivers/iio/light/Kconfig | 34 +-
+ drivers/iio/light/Makefile | 3 +
+ drivers/iio/light/acpi-als.c | 18 +-
+ drivers/iio/light/apds9300.c | 1 -
+ drivers/iio/light/bh1750.c | 1 -
+ drivers/iio/light/cm32181.c | 2 +-
+ drivers/iio/light/cm3232.c | 2 +-
+ drivers/iio/light/cm3323.c | 19 +-
+ drivers/iio/light/cm36651.c | 2 +-
+ drivers/iio/light/gp2ap020a00f.c | 2 +-
+ drivers/iio/light/hid-sensor-prox.c | 3 +-
+ drivers/iio/light/isl29125.c | 13 +-
+ drivers/iio/light/jsa1212.c | 1 -
+ drivers/iio/light/ltr501.c | 1 -
+ drivers/iio/light/opt3001.c | 804 +++++++
+ drivers/iio/light/pa12203001.c | 483 ++++
+ drivers/iio/light/rpr0521.c | 615 ++++++
+ drivers/iio/light/stk3310.c | 1 +
+ drivers/iio/light/tcs3414.c | 1 -
+ drivers/iio/light/tcs3472.c | 1 -
+ drivers/iio/light/tsl4531.c | 1 -
+ drivers/iio/light/vcnl4000.c | 1 -
+ drivers/iio/magnetometer/bmc150_magn.c | 95 +-
+ drivers/iio/magnetometer/mmc35240.c | 33 +-
+ drivers/iio/magnetometer/st_magn.h | 3 +
+ drivers/iio/magnetometer/st_magn_buffer.c | 7 +
+ drivers/iio/magnetometer/st_magn_core.c | 98 +-
+ drivers/iio/magnetometer/st_magn_i2c.c | 6 +-
+ drivers/iio/magnetometer/st_magn_spi.c | 1 +
+ drivers/iio/pressure/Kconfig | 6 +-
+ drivers/iio/pressure/ms5611.h | 16 +-
+ drivers/iio/pressure/ms5611_core.c | 82 +-
+ drivers/iio/pressure/ms5611_i2c.c | 6 +-
+ drivers/iio/pressure/ms5611_spi.c | 6 +-
+ drivers/iio/pressure/st_pressure_core.c | 3 +
+ drivers/iio/pressure/st_pressure_i2c.c | 1 -
+ drivers/iio/temperature/mlx90614.c | 21 +-
+ drivers/iio/temperature/tmp006.c | 5 +-
+ drivers/staging/Kconfig | 6 +-
+ drivers/staging/Makefile | 3 +-
+ drivers/staging/android/Kconfig | 3 +-
+ drivers/staging/android/TODO | 10 +-
+ drivers/staging/android/ashmem.c | 4 +-
+ drivers/staging/android/ion/ion.c | 24 +-
+ drivers/staging/android/ion/ion_chunk_heap.c | 4 +-
+ drivers/staging/android/ion/ion_cma_heap.c | 4 +-
+ drivers/staging/android/ion/ion_page_pool.c | 5 +-
+ drivers/staging/android/ion/ion_system_heap.c | 16 +-
+ drivers/staging/android/sync.h | 10 +-
+ drivers/staging/android/timed_gpio.c | 4 +-
+ drivers/staging/comedi/comedi_compat32.c | 3 +-
+ drivers/staging/comedi/comedi_fops.c | 35 +-
+ drivers/staging/comedi/drivers.c | 2 +-
+ .../comedi/drivers/addi-data/hwdrv_apci1564.c | 93 +-
+ .../comedi/drivers/addi-data/hwdrv_apci3501.c | 154 +-
+ drivers/staging/comedi/drivers/addi_apci_1564.c | 35 +-
+ drivers/staging/comedi/drivers/addi_apci_3501.c | 60 +-
+ drivers/staging/comedi/drivers/addi_tcw.h | 63 +-
+ drivers/staging/comedi/drivers/adl_pci7x3x.c | 16 +-
+ drivers/staging/comedi/drivers/cb_pcimdas.c | 6 +-
+ drivers/staging/comedi/drivers/dac02.c | 6 +-
+ drivers/staging/comedi/drivers/das08_cs.c | 4 +-
+ drivers/staging/comedi/drivers/das16.c | 3 +-
+ drivers/staging/comedi/drivers/das16m1.c | 41 +-
+ drivers/staging/comedi/drivers/dmm32at.c | 6 +-
+ drivers/staging/comedi/drivers/fl512.c | 6 +-
+ drivers/staging/comedi/drivers/me4000.c | 1000 ++++-----
+ drivers/staging/comedi/drivers/ni_daq_dio24.c | 6 +-
+ drivers/staging/comedi/drivers/ni_usb6501.c | 27 +-
+ drivers/staging/comedi/drivers/pcl816.c | 2 +-
+ drivers/staging/comedi/drivers/s626.c | 6 +-
+ drivers/staging/comedi/drivers/serial2002.c | 10 +-
+ drivers/staging/comedi/drivers/usbduxsigma.c | 214 +-
+ drivers/staging/comedi/range.c | 13 +-
+ drivers/staging/dgap/dgap.c | 45 +-
+ drivers/staging/dgnc/dgnc_driver.h | 6 +-
+ drivers/staging/dgnc/dgnc_sysfs.h | 16 +-
+ drivers/staging/fbtft/Kconfig | 9 +-
+ drivers/staging/fbtft/Makefile | 1 +
+ drivers/staging/fbtft/fb_uc1611.c | 350 +++
+ drivers/staging/fbtft/fbtft-core.c | 17 +-
+ drivers/staging/fbtft/fbtft.h | 57 +-
+ drivers/staging/fbtft/fbtft_device.c | 31 +
+ drivers/staging/fbtft/flexfb.c | 258 ++-
+ drivers/staging/fsl-mc/README.txt | 364 ++++
+ drivers/staging/fsl-mc/TODO | 28 +-
+ drivers/staging/ft1000/ft1000-pcmcia/ft1000.h | 19 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 31 +-
+ .../staging/ft1000/ft1000-usb/ft1000_download.c | 24 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 1 -
+ drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 4 +-
+ drivers/staging/gdm72xx/usb_ids.h | 6 +-
+ drivers/staging/iio/adc/mxs-lradc.c | 122 +-
+ drivers/staging/iio/iio_dummy_evgen.c | 1 +
+ drivers/staging/iio/iio_simple_dummy.c | 2 -
+ drivers/staging/iio/iio_simple_dummy.h | 1 +
+ drivers/staging/iio/iio_simple_dummy_buffer.c | 2 +-
+ drivers/staging/iio/iio_simple_dummy_events.c | 4 +-
+ drivers/staging/iio/meter/ade7854.h | 4 +-
+ drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 7 +-
+ .../staging/iio/trigger/iio-trig-periodic-rtc.c | 5 +-
+ .../staging/lustre/include/linux/libcfs/libcfs.h | 15 +-
+ .../lustre/include/linux/libcfs/libcfs_debug.h | 1 -
+ .../lustre/include/linux/libcfs/libcfs_fail.h | 18 +-
+ .../lustre/include/linux/libcfs/libcfs_private.h | 28 +-
+ .../lustre/include/linux/libcfs/libcfs_string.h | 2 -
+ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 14 +-
+ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 114 +-
+ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 3 +-
+ .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 5 -
+ .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 142 +-
+ .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 3 +-
+ drivers/staging/lustre/lnet/lnet/router_proc.c | 11 -
+ drivers/staging/lustre/lnet/selftest/console.h | 90 +-
+ drivers/staging/lustre/lnet/selftest/framework.c | 12 +-
+ drivers/staging/lustre/lustre/fid/fid_request.c | 4 +-
+ drivers/staging/lustre/lustre/fld/fld_cache.c | 2 +-
+ drivers/staging/lustre/lustre/fld/fld_request.c | 2 +-
+ .../lustre/lustre/include/linux/lustre_compat25.h | 119 -
+ .../lustre/include/linux/lustre_patchless_compat.h | 12 -
+ .../staging/lustre/lustre/include/lprocfs_status.h | 313 ++-
+ .../lustre/lustre/include/lustre/lustre_idl.h | 133 +-
+ .../lustre/lustre/include/lustre/lustre_user.h | 2 +-
+ drivers/staging/lustre/lustre/include/lustre_dlm.h | 2 +-
+ .../staging/lustre/lustre/include/lustre_export.h | 4 +-
+ .../staging/lustre/lustre/include/lustre_import.h | 4 +-
+ drivers/staging/lustre/lustre/include/lustre_net.h | 18 +-
+ drivers/staging/lustre/lustre/include/obd.h | 2 +-
+ drivers/staging/lustre/lustre/include/obd_class.h | 17 +-
+ .../staging/lustre/lustre/include/obd_support.h | 22 +-
+ drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 2 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 2 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 3 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 4 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 17 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 8 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 1 +
+ drivers/staging/lustre/lustre/libcfs/debug.c | 149 +-
+ drivers/staging/lustre/lustre/libcfs/fail.c | 2 +-
+ drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c | 2 +-
+ .../staging/lustre/lustre/libcfs/libcfs_string.c | 4 +-
+ .../lustre/lustre/libcfs/linux/linux-crypto.c | 4 +-
+ .../lustre/lustre/libcfs/linux/linux-module.c | 6 +-
+ drivers/staging/lustre/lustre/libcfs/module.c | 357 +--
+ drivers/staging/lustre/lustre/libcfs/tracefile.c | 12 -
+ drivers/staging/lustre/lustre/libcfs/tracefile.h | 33 +-
+ drivers/staging/lustre/lustre/llite/dcache.c | 3 +-
+ drivers/staging/lustre/lustre/llite/dir.c | 4 -
+ drivers/staging/lustre/lustre/llite/file.c | 5 +-
+ drivers/staging/lustre/lustre/llite/llite_capa.c | 40 +-
+ .../staging/lustre/lustre/llite/llite_internal.h | 17 +-
+ drivers/staging/lustre/lustre/llite/llite_lib.c | 23 +-
+ drivers/staging/lustre/lustre/llite/lloop.c | 6 +-
+ drivers/staging/lustre/lustre/llite/namei.c | 12 +-
+ drivers/staging/lustre/lustre/llite/remote_perm.c | 17 +-
+ drivers/staging/lustre/lustre/llite/vvp_io.c | 5 +-
+ drivers/staging/lustre/lustre/llite/vvp_page.c | 27 +-
+ drivers/staging/lustre/lustre/llite/xattr_cache.c | 2 +-
+ drivers/staging/lustre/lustre/lmv/lmv_intent.c | 2 +-
+ drivers/staging/lustre/lustre/lmv/lmv_obd.c | 8 +-
+ drivers/staging/lustre/lustre/lov/lov_dev.c | 2 +-
+ drivers/staging/lustre/lustre/lov/lov_io.c | 2 +-
+ drivers/staging/lustre/lustre/lov/lov_merge.c | 1 +
+ drivers/staging/lustre/lustre/lov/lov_obd.c | 13 +-
+ drivers/staging/lustre/lustre/lov/lov_pool.c | 2 +-
+ drivers/staging/lustre/lustre/lov/lov_request.c | 18 +-
+ drivers/staging/lustre/lustre/mdc/mdc_lib.c | 2 +-
+ drivers/staging/lustre/lustre/mdc/mdc_request.c | 6 +-
+ drivers/staging/lustre/lustre/mgc/mgc_request.c | 6 +-
+ drivers/staging/lustre/lustre/obdclass/acl.c | 6 +-
+ drivers/staging/lustre/lustre/obdclass/cl_page.c | 30 +-
+ drivers/staging/lustre/lustre/obdclass/class_obd.c | 19 +-
+ drivers/staging/lustre/lustre/obdclass/genops.c | 22 +-
+ .../lustre/lustre/obdclass/linux/linux-module.c | 6 +-
+ .../lustre/lustre/obdclass/linux/linux-sysctl.c | 374 +---
+ drivers/staging/lustre/lustre/obdclass/llog.c | 8 +-
+ .../lustre/lustre/obdclass/lprocfs_status.c | 4 +-
+ drivers/staging/lustre/lustre/obdclass/lu_object.c | 8 +-
+ .../staging/lustre/lustre/obdclass/lustre_peer.c | 2 +-
+ .../staging/lustre/lustre/obdclass/obd_config.c | 17 +-
+ drivers/staging/lustre/lustre/obdclass/obd_mount.c | 24 +-
+ drivers/staging/lustre/lustre/obdclass/uuid.c | 34 +-
+ .../staging/lustre/lustre/obdecho/echo_client.c | 14 +-
+ drivers/staging/lustre/lustre/osc/osc_cache.c | 6 -
+ drivers/staging/lustre/lustre/osc/osc_dev.c | 2 +-
+ drivers/staging/lustre/lustre/osc/osc_page.c | 2 +-
+ drivers/staging/lustre/lustre/osc/osc_request.c | 8 +-
+ drivers/staging/lustre/lustre/ptlrpc/client.c | 2 +-
+ drivers/staging/lustre/lustre/ptlrpc/events.c | 4 +-
+ drivers/staging/lustre/lustre/ptlrpc/import.c | 6 +-
+ .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 8 +-
+ drivers/staging/lustre/lustre/ptlrpc/nrs.c | 2 +-
+ .../staging/lustre/lustre/ptlrpc/pack_generic.c | 2 +
+ drivers/staging/lustre/lustre/ptlrpc/pinger.c | 2 -
+ .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c | 2 +-
+ drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 2 +-
+ drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 2 +-
+ drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 2 +-
+ drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 2 +-
+ drivers/staging/lustre/lustre/ptlrpc/service.c | 18 +-
+ drivers/staging/lustre/sysfs-fs-lustre | 103 +
+ .../most/Documentation/ABI/sysfs-class-most.txt | 181 ++
+ .../staging/most/Documentation/driver_usage.txt | 180 ++
+ drivers/staging/most/Kconfig | 30 +
+ drivers/staging/most/Makefile | 8 +
+ drivers/staging/most/TODO | 8 +
+ drivers/staging/most/aim-cdev/Kconfig | 12 +
+ drivers/staging/most/aim-cdev/Makefile | 4 +
+ drivers/staging/most/aim-cdev/cdev.c | 528 +++++
+ drivers/staging/most/aim-network/Kconfig | 13 +
+ drivers/staging/most/aim-network/Makefile | 4 +
+ drivers/staging/most/aim-network/networking.c | 567 +++++
+ drivers/staging/most/aim-network/networking.h | 23 +
+ drivers/staging/most/aim-sound/Kconfig | 13 +
+ drivers/staging/most/aim-sound/Makefile | 4 +
+ drivers/staging/most/aim-sound/sound.c | 758 +++++++
+ drivers/staging/most/aim-v4l2/Kconfig | 12 +
+ drivers/staging/most/aim-v4l2/Makefile | 6 +
+ drivers/staging/most/aim-v4l2/video.c | 635 ++++++
+ drivers/staging/most/hdm-dim2/Kconfig | 16 +
+ drivers/staging/most/hdm-dim2/Makefile | 5 +
+ drivers/staging/most/hdm-dim2/dim2_errors.h | 67 +
+ drivers/staging/most/hdm-dim2/dim2_hal.c | 919 ++++++++
+ drivers/staging/most/hdm-dim2/dim2_hal.h | 124 ++
+ drivers/staging/most/hdm-dim2/dim2_hdm.c | 964 ++++++++
+ drivers/staging/most/hdm-dim2/dim2_hdm.h | 26 +
+ drivers/staging/most/hdm-dim2/dim2_reg.h | 176 ++
+ drivers/staging/most/hdm-dim2/dim2_sysfs.c | 116 +
+ drivers/staging/most/hdm-dim2/dim2_sysfs.h | 39 +
+ drivers/staging/most/hdm-i2c/Kconfig | 12 +
+ drivers/staging/most/hdm-i2c/Makefile | 3 +
+ drivers/staging/most/hdm-i2c/hdm_i2c.c | 451 ++++
+ drivers/staging/most/hdm-usb/Kconfig | 14 +
+ drivers/staging/most/hdm-usb/Makefile | 4 +
+ drivers/staging/most/hdm-usb/hdm_usb.c | 1454 +++++++++++++
+ drivers/staging/most/mostcore/Kconfig | 13 +
+ drivers/staging/most/mostcore/Makefile | 3 +
+ drivers/staging/most/mostcore/core.c | 1932 ++++++++++++++++
+ drivers/staging/most/mostcore/mostcore.h | 316 +++
+ drivers/staging/mt29f_spinand/mt29f_spinand.c | 1 -
+ drivers/staging/mt29f_spinand/mt29f_spinand.h | 4 +-
+ drivers/staging/netlogic/platform_net.c | 2 +-
+ drivers/staging/netlogic/xlr_net.h | 2 +-
+ drivers/staging/nvec/nvec.h | 19 +-
+ drivers/staging/octeon/ethernet-mdio.h | 2 +-
+ drivers/staging/octeon/ethernet-rgmii.c | 7 +-
+ drivers/staging/octeon/ethernet-tx.c | 10 +-
+ drivers/staging/octeon/ethernet.c | 1 +
+ drivers/staging/octeon/octeon-ethernet.h | 22 +-
+ drivers/staging/olpc_dcon/olpc_dcon.h | 2 +-
+ drivers/staging/ozwpan/Kconfig | 9 -
+ drivers/staging/ozwpan/Makefile | 16 -
+ drivers/staging/ozwpan/README | 25 -
+ drivers/staging/ozwpan/TODO | 14 -
+ drivers/staging/ozwpan/ozappif.h | 36 -
+ drivers/staging/ozwpan/ozcdev.c | 554 -----
+ drivers/staging/ozwpan/ozcdev.h | 17 -
+ drivers/staging/ozwpan/ozdbg.h | 54 -
+ drivers/staging/ozwpan/ozeltbuf.c | 252 ---
+ drivers/staging/ozwpan/ozeltbuf.h | 65 -
+ drivers/staging/ozwpan/ozhcd.c | 2301 --------------------
+ drivers/staging/ozwpan/ozhcd.h | 15 -
+ drivers/staging/ozwpan/ozmain.c | 71 -
+ drivers/staging/ozwpan/ozpd.c | 886 --------
+ drivers/staging/ozwpan/ozpd.h | 134 --
+ drivers/staging/ozwpan/ozproto.c | 804 -------
+ drivers/staging/ozwpan/ozproto.h | 62 -
+ drivers/staging/ozwpan/ozprotocol.h | 375 ----
+ drivers/staging/ozwpan/ozurbparanoia.c | 54 -
+ drivers/staging/ozwpan/ozurbparanoia.h | 19 -
+ drivers/staging/ozwpan/ozusbif.h | 43 -
+ drivers/staging/ozwpan/ozusbsvc.c | 263 ---
+ drivers/staging/ozwpan/ozusbsvc.h | 32 -
+ drivers/staging/ozwpan/ozusbsvc1.c | 471 ----
+ drivers/staging/panel/panel.c | 12 +-
+ drivers/staging/rtl8188eu/core/rtw_ap.c | 5 +-
+ drivers/staging/rtl8188eu/core/rtw_debug.c | 6 +-
+ drivers/staging/rtl8188eu/core/rtw_efuse.c | 2 +-
+ drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 4 +-
+ drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 10 +-
+ drivers/staging/rtl8188eu/core/rtw_mlme.c | 43 +-
+ drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 10 +-
+ drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 8 +-
+ drivers/staging/rtl8188eu/core/rtw_recv.c | 44 +-
+ drivers/staging/rtl8188eu/core/rtw_security.c | 2 +-
+ drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 2 +
+ drivers/staging/rtl8188eu/core/rtw_xmit.c | 36 +-
+ .../staging/rtl8188eu/hal/Hal8188ERateAdaptive.c | 8 +-
+ drivers/staging/rtl8188eu/hal/bb_cfg.c | 6 +-
+ drivers/staging/rtl8188eu/hal/hal_com.c | 27 +-
+ drivers/staging/rtl8188eu/hal/hal_intf.c | 32 -
+ drivers/staging/rtl8188eu/hal/odm.c | 11 +-
+ drivers/staging/rtl8188eu/hal/rf.c | 2 +-
+ drivers/staging/rtl8188eu/hal/rf_cfg.c | 2 +-
+ drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 21 -
+ drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 33 +-
+ drivers/staging/rtl8188eu/hal/usb_halinit.c | 99 +-
+ drivers/staging/rtl8188eu/include/HalVerDef.h | 84 -
+ drivers/staging/rtl8188eu/include/hal_intf.h | 16 -
+ drivers/staging/rtl8188eu/include/ieee80211.h | 54 -
+ drivers/staging/rtl8188eu/include/osdep_service.h | 2 +-
+ drivers/staging/rtl8188eu/include/recv_osdep.h | 3 +-
+ drivers/staging/rtl8188eu/include/rtl8188e_cmd.h | 1 -
+ drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 8 -
+ drivers/staging/rtl8188eu/include/rtw_mlme.h | 3 +-
+ drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 8 +-
+ drivers/staging/rtl8188eu/include/rtw_pwrctrl.h | 1 -
+ drivers/staging/rtl8188eu/include/sta_info.h | 19 +-
+ drivers/staging/rtl8188eu/include/wifi.h | 7 -
+ drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 22 +-
+ drivers/staging/rtl8188eu/os_dep/os_intfs.c | 2 +-
+ drivers/staging/rtl8188eu/os_dep/recv_linux.c | 16 +-
+ drivers/staging/rtl8188eu/os_dep/usb_intf.c | 79 +-
+ drivers/staging/rtl8192e/dot11d.c | 39 -
+ drivers/staging/rtl8192e/dot11d.h | 6 -
+ drivers/staging/rtl8192e/rtl8192e/r8190P_def.h | 46 -
+ drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 192 +-
+ drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.h | 11 +-
+ drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 11 +-
+ drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h | 5 +-
+ drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 440 ++--
+ drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h | 58 +-
+ .../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 20 +-
+ .../staging/rtl8192e/rtl8192e/r8192E_firmware.h | 6 +-
+ drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h | 8 +-
+ drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 448 ++--
+ drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 66 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 125 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_cam.h | 16 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 615 ++----
+ drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 112 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 472 ++--
+ drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 44 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c | 130 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.h | 2 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_pci.c | 2 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_pci.h | 2 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_pm.c | 24 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_pm.h | 4 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 53 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_ps.h | 19 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 132 +-
+ drivers/staging/rtl8192e/rtl819x_BA.h | 5 -
+ drivers/staging/rtl8192e/rtl819x_BAProc.c | 5 +-
+ drivers/staging/rtl8192e/rtl819x_HT.h | 2 -
+ drivers/staging/rtl8192e/rtl819x_HTProc.c | 5 +-
+ drivers/staging/rtl8192e/rtl819x_Qos.h | 5 -
+ drivers/staging/rtl8192e/rtl819x_TS.h | 2 -
+ drivers/staging/rtl8192e/rtl819x_TSProc.c | 2 +-
+ drivers/staging/rtl8192e/rtllib.h | 439 ++--
+ drivers/staging/rtl8192e/rtllib_debug.h | 8 -
+ drivers/staging/rtl8192e/rtllib_rx.c | 91 +-
+ drivers/staging/rtl8192e/rtllib_softmac.c | 30 +-
+ drivers/staging/rtl8192e/rtllib_tx.c | 9 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211.h | 345 +--
+ drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 4 +-
+ .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 6 +-
+ .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 2 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 4 +-
+ .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 17 +-
+ .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 16 +-
+ .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 4 +-
+ drivers/staging/rtl8192u/r8190_rtl8256.h | 11 +-
+ drivers/staging/rtl8192u/r8192U.h | 2 +-
+ drivers/staging/rtl8192u/r8192U_core.c | 14 +-
+ drivers/staging/rtl8192u/r8192U_dm.c | 8 +-
+ drivers/staging/rtl8192u/r8192U_dm.h | 36 +-
+ drivers/staging/rtl8192u/r8192U_wx.h | 2 +-
+ drivers/staging/rtl8192u/r819xU_cmdpkt.h | 8 +-
+ drivers/staging/rtl8192u/r819xU_firmware.c | 15 +-
+ drivers/staging/rtl8192u/r819xU_phy.h | 55 +-
+ drivers/staging/rtl8712/ieee80211.c | 25 +-
+ drivers/staging/rtl8712/rtl8712_recv.c | 4 +-
+ drivers/staging/rtl8712/rtl871x_cmd.c | 28 +-
+ drivers/staging/rtl8712/rtl871x_cmd.h | 18 -
+ drivers/staging/rtl8712/rtl871x_event.h | 2 +-
+ drivers/staging/rtl8712/rtl871x_ioctl.h | 28 +-
+ drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 34 +-
+ drivers/staging/rtl8712/rtl871x_mlme.c | 47 +-
+ drivers/staging/rtl8712/rtl871x_mlme.h | 2 +-
+ drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 6 +-
+ drivers/staging/rtl8712/rtl871x_security.c | 35 +-
+ drivers/staging/rtl8712/wlan_bssdef.h | 42 +-
+ drivers/staging/rtl8723au/core/rtw_recv.c | 3 +-
+ drivers/staging/rtl8723au/core/rtw_security.c | 24 +-
+ drivers/staging/rtl8723au/hal/odm.c | 2 +-
+ drivers/staging/rtl8723au/hal/odm_RegConfig8723A.c | 2 +-
+ drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 4 +-
+ drivers/staging/rts5208/ms.c | 5 +-
+ drivers/staging/rts5208/sd.c | 21 +-
+ drivers/staging/slicoss/slicoss.c | 1 +
+ drivers/staging/sm750fb/ddk750_chip.c | 15 +-
+ drivers/staging/sm750fb/ddk750_chip.h | 12 +-
+ drivers/staging/sm750fb/ddk750_display.c | 170 +-
+ drivers/staging/sm750fb/ddk750_display.h | 11 +-
+ drivers/staging/sm750fb/ddk750_dvi.c | 75 +-
+ drivers/staging/sm750fb/ddk750_dvi.h | 3 +-
+ drivers/staging/sm750fb/ddk750_help.c | 8 +-
+ drivers/staging/sm750fb/ddk750_help.h | 4 +-
+ drivers/staging/sm750fb/ddk750_hwi2c.c | 244 +--
+ drivers/staging/sm750fb/ddk750_mode.c | 164 +-
+ drivers/staging/sm750fb/ddk750_mode.h | 52 +-
+ drivers/staging/sm750fb/ddk750_power.c | 261 ++-
+ drivers/staging/sm750fb/ddk750_power.h | 11 +-
+ drivers/staging/sm750fb/ddk750_reg.h | 18 +-
+ drivers/staging/sm750fb/ddk750_sii164.c | 389 ++--
+ drivers/staging/sm750fb/ddk750_sii164.h | 31 +-
+ drivers/staging/sm750fb/sm750.c | 160 +-
+ drivers/staging/sm750fb/sm750.h | 72 +-
+ drivers/staging/sm750fb/sm750_accel.c | 381 ++--
+ drivers/staging/sm750fb/sm750_accel.h | 4 +-
+ drivers/staging/sm750fb/sm750_cursor.c | 55 +-
+ drivers/staging/sm750fb/sm750_cursor.h | 4 +-
+ drivers/staging/sm750fb/sm750_help.h | 28 +-
+ drivers/staging/sm750fb/sm750_hw.c | 414 ++--
+ drivers/staging/sm750fb/sm750_hw.h | 48 +-
+ drivers/staging/sm7xxfb/Kconfig | 13 -
+ drivers/staging/sm7xxfb/Makefile | 1 -
+ drivers/staging/sm7xxfb/TODO | 12 -
+ drivers/staging/speakup/buffers.c | 3 +-
+ drivers/staging/speakup/i18n.c | 3 +-
+ drivers/staging/speakup/i18n.h | 12 +-
+ drivers/staging/speakup/keyhelp.c | 2 +-
+ drivers/staging/speakup/kobjects.c | 3 +-
+ drivers/staging/speakup/main.c | 15 +-
+ drivers/staging/speakup/selection.c | 3 +-
+ drivers/staging/speakup/serialio.c | 10 +-
+ drivers/staging/speakup/speakup.h | 68 +-
+ drivers/staging/speakup/speakup_acnt.h | 8 +-
+ drivers/staging/speakup/speakup_decpc.c | 6 +-
+ drivers/staging/speakup/speakup_dtlk.h | 52 +-
+ drivers/staging/speakup/speakup_soft.c | 1 -
+ drivers/staging/speakup/thread.c | 3 +-
+ drivers/staging/speakup/varhandlers.c | 3 +-
+ drivers/staging/unisys/Kconfig | 2 +-
+ drivers/staging/unisys/include/channel_guid.h | 24 +-
+ drivers/staging/unisys/include/visorbus.h | 5 +-
+ drivers/staging/unisys/visorbus/controlvmchannel.h | 9 +-
+ .../unisys/visorbus/controlvmcompletionstatus.h | 9 +-
+ drivers/staging/unisys/visorbus/iovmcall_gnuc.h | 9 +-
+ drivers/staging/unisys/visorbus/periodic_work.c | 9 +-
+ drivers/staging/unisys/visorbus/vbuschannel.h | 9 +-
+ drivers/staging/unisys/visorbus/vbusdeviceinfo.h | 9 +-
+ drivers/staging/unisys/visorbus/visorbus_main.c | 109 +-
+ drivers/staging/unisys/visorbus/visorbus_private.h | 9 +-
+ drivers/staging/unisys/visorbus/visorchannel.c | 43 +-
+ drivers/staging/unisys/visorbus/visorchipset.c | 22 +-
+ drivers/staging/unisys/visorbus/vmcallinterface.h | 9 +-
+ drivers/staging/unisys/visornic/visornic_main.c | 1132 +++++-----
+ drivers/staging/vme/devices/vme_pio2_core.c | 18 +-
+ drivers/staging/vme/devices/vme_user.c | 168 +-
+ drivers/staging/vt6655/baseband.c | 6 +-
+ drivers/staging/vt6655/card.c | 15 +-
+ drivers/staging/vt6655/desc.h | 146 +-
+ drivers/staging/vt6655/device.h | 13 +-
+ drivers/staging/vt6655/device_cfg.h | 15 -
+ drivers/staging/vt6655/device_main.c | 146 +-
+ drivers/staging/vt6655/dpc.c | 2 +-
+ drivers/staging/vt6655/mac.c | 18 -
+ drivers/staging/vt6655/power.c | 16 +-
+ drivers/staging/vt6655/rf.c | 532 ++---
+ drivers/staging/vt6655/rf.h | 24 +-
+ drivers/staging/vt6655/rxtx.c | 23 +-
+ drivers/staging/vt6655/rxtx.h | 4 +-
+ drivers/staging/vt6655/upc.h | 36 +-
+ drivers/staging/vt6656/rxtx.c | 7 +-
+ drivers/staging/wilc1000/Kconfig | 28 +-
+ drivers/staging/wilc1000/Makefile | 8 +-
+ drivers/staging/wilc1000/coreconfigsimulator.h | 17 -
+ drivers/staging/wilc1000/coreconfigurator.c | 225 +-
+ drivers/staging/wilc1000/coreconfigurator.h | 37 +-
+ drivers/staging/wilc1000/fifo_buffer.c | 133 --
+ drivers/staging/wilc1000/fifo_buffer.h | 26 -
+ drivers/staging/wilc1000/host_interface.c | 1433 ++++++------
+ drivers/staging/wilc1000/host_interface.h | 115 +-
+ drivers/staging/wilc1000/linux_mon.c | 23 +-
+ drivers/staging/wilc1000/linux_wlan.c | 248 +--
+ drivers/staging/wilc1000/linux_wlan_common.h | 4 +-
+ drivers/staging/wilc1000/linux_wlan_sdio.c | 1 -
+ drivers/staging/wilc1000/wilc_debugfs.c | 30 +-
+ drivers/staging/wilc1000/wilc_exported_buf.c | 13 +-
+ drivers/staging/wilc1000/wilc_log.h | 47 -
+ drivers/staging/wilc1000/wilc_memory.c | 46 +-
+ drivers/staging/wilc1000/wilc_memory.h | 173 --
+ drivers/staging/wilc1000/wilc_msgqueue.c | 28 +-
+ drivers/staging/wilc1000/wilc_msgqueue.h | 35 +-
+ drivers/staging/wilc1000/wilc_osconfig.h | 9 -
+ drivers/staging/wilc1000/wilc_oswrapper.h | 12 -
+ drivers/staging/wilc1000/wilc_platform.h | 8 +-
+ drivers/staging/wilc1000/wilc_sdio.c | 288 +--
+ drivers/staging/wilc1000/wilc_sleep.c | 18 -
+ drivers/staging/wilc1000/wilc_sleep.h | 20 -
+ drivers/staging/wilc1000/wilc_spi.c | 15 +-
+ drivers/staging/wilc1000/wilc_strutils.c | 80 -
+ drivers/staging/wilc1000/wilc_strutils.h | 134 --
+ drivers/staging/wilc1000/wilc_timer.c | 45 -
+ drivers/staging/wilc1000/wilc_timer.h | 129 --
+ drivers/staging/wilc1000/wilc_type.h | 34 -
+ drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 321 ++-
+ drivers/staging/wilc1000/wilc_wfi_cfgoperations.h | 2 +-
+ drivers/staging/wilc1000/wilc_wfi_netdevice.c | 951 --------
+ drivers/staging/wilc1000/wilc_wfi_netdevice.h | 16 +-
+ drivers/staging/wilc1000/wilc_wlan.c | 53 +-
+ drivers/staging/wilc1000/wilc_wlan.h | 2 +-
+ drivers/staging/wilc1000/wilc_wlan_cfg.c | 16 +-
+ drivers/staging/wilc1000/wilc_wlan_if.h | 6 +-
+ drivers/staging/xgifb/Makefile | 2 +-
+ drivers/staging/xgifb/XGI_main_26.c | 12 +-
+ drivers/staging/xgifb/vb_init.h | 4 +-
+ drivers/staging/xgifb/vb_setmode.h | 34 +-
+ drivers/staging/xgifb/vb_util.c | 42 -
+ drivers/staging/xgifb/vb_util.h | 44 +-
+ drivers/video/fbdev/Kconfig | 14 +
+ drivers/video/fbdev/Makefile | 1 +
+ .../sm7xxfb/sm7xx.h => video/fbdev/sm712.h} | 39 +-
+ .../sm7xxfb/sm7xxfb.c => video/fbdev/sm712fb.c} | 71 +-
+ include/linux/iio/common/st_sensors.h | 2 +
+ include/linux/iio/consumer.h | 2 +-
+ include/linux/iio/iio.h | 17 +
+ include/linux/iio/sysfs.h | 3 +-
+ include/linux/iio/trigger.h | 3 +
+ include/linux/iio/triggered_buffer.h | 4 +-
+ tools/iio/generic_buffer.c | 115 +-
+ tools/iio/iio_event_monitor.c | 40 +-
+ tools/iio/iio_utils.c | 243 ++-
+ tools/iio/iio_utils.h | 19 +-
+ tools/iio/lsiio.c | 55 +-
+ 583 files changed, 23642 insertions(+), 20350 deletions(-)
+ create mode 100644 Documentation/DocBook/iio.tmpl
+ create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/mmc35240.txt
+ create mode 100644 Documentation/fb/sm712fb.txt
+ create mode 100644 drivers/iio/light/opt3001.c
+ create mode 100644 drivers/iio/light/pa12203001.c
+ create mode 100644 drivers/iio/light/rpr0521.c
+ create mode 100644 drivers/staging/fbtft/fb_uc1611.c
+ create mode 100644 drivers/staging/fsl-mc/README.txt
+ create mode 100644 drivers/staging/most/Documentation/ABI/sysfs-class-most.txt
+ create mode 100644 drivers/staging/most/Documentation/driver_usage.txt
+ create mode 100644 drivers/staging/most/Kconfig
+ create mode 100644 drivers/staging/most/Makefile
+ create mode 100644 drivers/staging/most/TODO
+ create mode 100644 drivers/staging/most/aim-cdev/Kconfig
+ create mode 100644 drivers/staging/most/aim-cdev/Makefile
+ create mode 100644 drivers/staging/most/aim-cdev/cdev.c
+ create mode 100644 drivers/staging/most/aim-network/Kconfig
+ create mode 100644 drivers/staging/most/aim-network/Makefile
+ create mode 100644 drivers/staging/most/aim-network/networking.c
+ create mode 100644 drivers/staging/most/aim-network/networking.h
+ create mode 100644 drivers/staging/most/aim-sound/Kconfig
+ create mode 100644 drivers/staging/most/aim-sound/Makefile
+ create mode 100644 drivers/staging/most/aim-sound/sound.c
+ create mode 100644 drivers/staging/most/aim-v4l2/Kconfig
+ create mode 100644 drivers/staging/most/aim-v4l2/Makefile
+ create mode 100644 drivers/staging/most/aim-v4l2/video.c
+ create mode 100644 drivers/staging/most/hdm-dim2/Kconfig
+ create mode 100644 drivers/staging/most/hdm-dim2/Makefile
+ create mode 100644 drivers/staging/most/hdm-dim2/dim2_errors.h
+ create mode 100644 drivers/staging/most/hdm-dim2/dim2_hal.c
+ create mode 100644 drivers/staging/most/hdm-dim2/dim2_hal.h
+ create mode 100644 drivers/staging/most/hdm-dim2/dim2_hdm.c
+ create mode 100644 drivers/staging/most/hdm-dim2/dim2_hdm.h
+ create mode 100644 drivers/staging/most/hdm-dim2/dim2_reg.h
+ create mode 100644 drivers/staging/most/hdm-dim2/dim2_sysfs.c
+ create mode 100644 drivers/staging/most/hdm-dim2/dim2_sysfs.h
+ create mode 100644 drivers/staging/most/hdm-i2c/Kconfig
+ create mode 100644 drivers/staging/most/hdm-i2c/Makefile
+ create mode 100644 drivers/staging/most/hdm-i2c/hdm_i2c.c
+ create mode 100644 drivers/staging/most/hdm-usb/Kconfig
+ create mode 100644 drivers/staging/most/hdm-usb/Makefile
+ create mode 100644 drivers/staging/most/hdm-usb/hdm_usb.c
+ create mode 100644 drivers/staging/most/mostcore/Kconfig
+ create mode 100644 drivers/staging/most/mostcore/Makefile
+ create mode 100644 drivers/staging/most/mostcore/core.c
+ create mode 100644 drivers/staging/most/mostcore/mostcore.h
+ delete mode 100644 drivers/staging/ozwpan/Kconfig
+ delete mode 100644 drivers/staging/ozwpan/Makefile
+ delete mode 100644 drivers/staging/ozwpan/README
+ delete mode 100644 drivers/staging/ozwpan/TODO
+ delete mode 100644 drivers/staging/ozwpan/ozappif.h
+ delete mode 100644 drivers/staging/ozwpan/ozcdev.c
+ delete mode 100644 drivers/staging/ozwpan/ozcdev.h
+ delete mode 100644 drivers/staging/ozwpan/ozdbg.h
+ delete mode 100644 drivers/staging/ozwpan/ozeltbuf.c
+ delete mode 100644 drivers/staging/ozwpan/ozeltbuf.h
+ delete mode 100644 drivers/staging/ozwpan/ozhcd.c
+ delete mode 100644 drivers/staging/ozwpan/ozhcd.h
+ delete mode 100644 drivers/staging/ozwpan/ozmain.c
+ delete mode 100644 drivers/staging/ozwpan/ozpd.c
+ delete mode 100644 drivers/staging/ozwpan/ozpd.h
+ delete mode 100644 drivers/staging/ozwpan/ozproto.c
+ delete mode 100644 drivers/staging/ozwpan/ozproto.h
+ delete mode 100644 drivers/staging/ozwpan/ozprotocol.h
+ delete mode 100644 drivers/staging/ozwpan/ozurbparanoia.c
+ delete mode 100644 drivers/staging/ozwpan/ozurbparanoia.h
+ delete mode 100644 drivers/staging/ozwpan/ozusbif.h
+ delete mode 100644 drivers/staging/ozwpan/ozusbsvc.c
+ delete mode 100644 drivers/staging/ozwpan/ozusbsvc.h
+ delete mode 100644 drivers/staging/ozwpan/ozusbsvc1.c
+ delete mode 100644 drivers/staging/sm7xxfb/Kconfig
+ delete mode 100644 drivers/staging/sm7xxfb/Makefile
+ delete mode 100644 drivers/staging/sm7xxfb/TODO
+ delete mode 100644 drivers/staging/wilc1000/coreconfigsimulator.h
+ delete mode 100644 drivers/staging/wilc1000/fifo_buffer.c
+ delete mode 100644 drivers/staging/wilc1000/fifo_buffer.h
+ delete mode 100644 drivers/staging/wilc1000/wilc_log.h
+ delete mode 100644 drivers/staging/wilc1000/wilc_osconfig.h
+ delete mode 100644 drivers/staging/wilc1000/wilc_sleep.c
+ delete mode 100644 drivers/staging/wilc1000/wilc_sleep.h
+ delete mode 100644 drivers/staging/wilc1000/wilc_strutils.c
+ delete mode 100644 drivers/staging/wilc1000/wilc_strutils.h
+ delete mode 100644 drivers/staging/wilc1000/wilc_timer.c
+ delete mode 100644 drivers/staging/wilc1000/wilc_timer.h
+ delete mode 100644 drivers/staging/wilc1000/wilc_type.h
+ delete mode 100644 drivers/staging/wilc1000/wilc_wfi_netdevice.c
+ delete mode 100644 drivers/staging/xgifb/vb_util.c
+ rename drivers/{staging/sm7xxfb/sm7xx.h => video/fbdev/sm712.h} (81%)
+ rename drivers/{staging/sm7xxfb/sm7xxfb.c => video/fbdev/sm712fb.c} (97%)
+$ git am -3 ../patches/0001-staging-lustre-fix-for-bio_endio-API-change.patch
+Applying: staging/lustre: fix for bio_endio() API change
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/staging/lustre/lustre/llite/lloop.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 722b53feaa74] Merge remote-tracking branch 'staging/staging-next'
+ Date: Fri Aug 28 14:57:19 2015 +1000
+Merging char-misc/char-misc-next (672cfeeb93e5 Merge tag 'extcon-next-for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-testing)
+$ git merge char-misc/char-misc-next
+Resolved 'arch/x86/kernel/cpu/mshyperv.c' using previous resolution.
+Resolved 'drivers/misc/ti-st/st_kim.c' using previous resolution.
+Auto-merging kernel/cpu.c
+Auto-merging fs/dlm/user.c
+Auto-merging fs/btrfs/super.c
+Auto-merging drivers/w1/masters/matrox_w1.c
+Auto-merging drivers/staging/lustre/lustre/libcfs/module.c
+Auto-merging drivers/staging/android/ashmem.c
+Auto-merging drivers/spmi/spmi-pmic-arb.c
+Auto-merging drivers/misc/ti-st/st_kim.c
+CONFLICT (content): Merge conflict in drivers/misc/ti-st/st_kim.c
+Removing drivers/misc/mei/nfc.c
+Removing drivers/misc/eeprom/sunxi_sid.c
+Auto-merging drivers/misc/eeprom/max6875.c
+Auto-merging drivers/misc/cxl/sysfs.c
+Auto-merging drivers/extcon/extcon-max77843.c
+Auto-merging drivers/Makefile
+Auto-merging drivers/Kconfig
+Auto-merging arch/x86/kernel/cpu/mshyperv.c
+CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mshyperv.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/ioctl/ioctl-number.txt
+Auto-merging Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt
+Removing Documentation/ABI/testing/sysfs-driver-sunxi-sid
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 523f9bec138f] Merge remote-tracking branch 'char-misc/char-misc-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/stable/sysfs-bus-vmbus | 29 +
+ .../ABI/testing/sysfs-bus-coresight-devices-etm3x | 2 +-
+ .../ABI/testing/sysfs-bus-coresight-devices-etm4x | 2 +-
+ Documentation/ABI/testing/sysfs-driver-sunxi-sid | 22 -
+ .../devicetree/bindings/arm/coresight.txt | 1 +
+ .../devicetree/bindings/extcon/extcon-palmas.txt | 5 +-
+ .../{misc => nvmem}/allwinner,sunxi-sid.txt | 4 +
+ Documentation/devicetree/bindings/nvmem/nvmem.txt | 80 ++
+ Documentation/devicetree/bindings/nvmem/qfprom.txt | 35 +
+ .../bindings/power/qcom,coincell-charger.txt | 48 +
+ Documentation/ioctl/ioctl-number.txt | 2 +
+ Documentation/misc-devices/mei/mei.txt | 45 +-
+ Documentation/nvmem/nvmem.txt | 152 +++
+ Documentation/power/suspend-and-cpuhotplug.txt | 6 +-
+ Documentation/trace/coresight.txt | 4 +-
+ MAINTAINERS | 10 +
+ .../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 10 +
+ arch/arm/boot/dts/qcom-pm8941.dtsi | 6 +
+ arch/x86/include/asm/mshyperv.h | 5 +
+ arch/x86/include/uapi/asm/hyperv.h | 2 +
+ arch/x86/kernel/cpu/mshyperv.c | 48 +
+ drivers/Kconfig | 2 +
+ drivers/Makefile | 1 +
+ drivers/auxdisplay/ks0108.c | 97 +-
+ drivers/char/misc.c | 17 +-
+ drivers/char/nvram.c | 2 +-
+ drivers/char/toshiba.c | 2 +-
+ drivers/char/xillybus/xillybus_pcie.c | 10 +-
+ drivers/extcon/extcon-arizona.c | 101 +-
+ drivers/extcon/extcon-gpio.c | 18 -
+ drivers/extcon/extcon-max77843.c | 9 +
+ drivers/extcon/extcon-palmas.c | 134 ++-
+ drivers/extcon/extcon-rt8973a.c | 1 -
+ drivers/extcon/extcon-sm5502.c | 1 -
+ drivers/extcon/extcon-usb-gpio.c | 1 +
+ drivers/extcon/extcon.c | 48 +-
+ drivers/hv/channel.c | 4 +-
+ drivers/hv/channel_mgmt.c | 34 +-
+ drivers/hv/hv.c | 152 ++-
+ drivers/hv/hv_balloon.c | 26 +-
+ drivers/hv/hv_fcopy.c | 21 +-
+ drivers/hv/hv_kvp.c | 3 +
+ drivers/hv/hv_utils_transport.c | 2 +-
+ drivers/hv/hyperv_vmbus.h | 16 +-
+ drivers/hv/ring_buffer.c | 14 +-
+ drivers/hv/vmbus_drv.c | 353 +++++--
+ drivers/hwtracing/coresight/coresight-etm.h | 7 +-
+ drivers/hwtracing/coresight/coresight-etm3x.c | 33 +-
+ drivers/hwtracing/coresight/coresight-etm4x.c | 37 +-
+ drivers/hwtracing/coresight/coresight-etm4x.h | 7 +-
+ drivers/hwtracing/coresight/coresight-replicator.c | 13 +-
+ drivers/md/dm-ioctl.c | 4 +-
+ drivers/misc/Kconfig | 10 +
+ drivers/misc/Makefile | 1 +
+ drivers/misc/cxl/sysfs.c | 7 +-
+ drivers/misc/ds1682.c | 12 -
+ drivers/misc/eeprom/Kconfig | 13 -
+ drivers/misc/eeprom/Makefile | 1 -
+ drivers/misc/eeprom/eeprom.c | 5 -
+ drivers/misc/eeprom/eeprom_93xx46.c | 14 -
+ drivers/misc/eeprom/max6875.c | 6 -
+ drivers/misc/eeprom/sunxi_sid.c | 156 ---
+ drivers/misc/mei/Makefile | 2 +-
+ drivers/misc/mei/bus-fixup.c | 306 ++++++
+ drivers/misc/mei/bus.c | 1008 ++++++++++++------
+ drivers/misc/mei/client.c | 333 +++++-
+ drivers/misc/mei/client.h | 8 +
+ drivers/misc/mei/debugfs.c | 6 +
+ drivers/misc/mei/hbm.c | 330 +++++-
+ drivers/misc/mei/hbm.h | 3 +
+ drivers/misc/mei/hw-me-regs.h | 27 +-
+ drivers/misc/mei/hw-me.c | 499 +++++++--
+ drivers/misc/mei/hw-me.h | 8 +-
+ drivers/misc/mei/hw.h | 134 ++-
+ drivers/misc/mei/init.c | 3 +-
+ drivers/misc/mei/interrupt.c | 27 +-
+ drivers/misc/mei/main.c | 96 ++
+ drivers/misc/mei/mei_dev.h | 47 +-
+ drivers/misc/mei/nfc.c | 415 --------
+ drivers/misc/mei/pci-me.c | 32 +-
+ drivers/misc/qcom-coincell.c | 152 +++
+ drivers/misc/ti-st/st_kim.c | 104 +-
+ drivers/misc/ti-st/st_ll.c | 17 +-
+ drivers/misc/vmw_balloon.c | 170 +--
+ drivers/misc/vmw_vmci/vmci_host.c | 7 +-
+ drivers/nfc/mei_phy.c | 3 +-
+ drivers/nvmem/Kconfig | 39 +
+ drivers/nvmem/Makefile | 12 +
+ drivers/nvmem/core.c | 1083 ++++++++++++++++++++
+ drivers/nvmem/qfprom.c | 85 ++
+ drivers/nvmem/sunxi_sid.c | 171 ++++
+ drivers/rtc/rtc-ds1374.c | 5 +-
+ drivers/spmi/Kconfig | 2 +-
+ drivers/spmi/spmi-pmic-arb.c | 17 +
+ drivers/spmi/spmi.c | 22 +-
+ drivers/staging/android/ashmem.c | 7 +-
+ drivers/staging/android/ion/ion_test.c | 3 +-
+ drivers/staging/lustre/lustre/libcfs/module.c | 4 +-
+ drivers/uio/Kconfig | 2 +-
+ drivers/uio/uio.c | 1 +
+ drivers/uio/uio_fsl_elbc_gpcm.c | 14 +-
+ drivers/vhost/scsi.c | 4 +-
+ drivers/video/fbdev/hyperv_fb.c | 46 +-
+ drivers/w1/masters/ds2482.c | 1 -
+ drivers/w1/masters/matrox_w1.c | 14 +-
+ drivers/watchdog/at91rm9200_wdt.c | 5 +-
+ drivers/watchdog/ks8695_wdt.c | 9 +-
+ drivers/watchdog/ts72xx_wdt.c | 3 +-
+ fs/btrfs/super.c | 3 +-
+ fs/char_dev.c | 2 +-
+ fs/dlm/plock.c | 3 +-
+ fs/dlm/user.c | 9 +-
+ fs/ocfs2/stack_user.c | 9 +-
+ include/linux/coresight.h | 21 +
+ include/linux/extcon.h | 7 -
+ include/linux/hyperv.h | 7 +-
+ include/linux/kexec.h | 1 +
+ include/linux/mei_cl_bus.h | 15 +
+ include/linux/mfd/palmas.h | 7 +
+ include/linux/miscdevice.h | 2 +-
+ include/linux/nvmem-consumer.h | 157 +++
+ include/linux/nvmem-provider.h | 47 +
+ include/linux/ti_wilink_st.h | 1 -
+ include/trace/events/spmi.h | 135 +++
+ include/uapi/linux/mei.h | 19 +
+ kernel/cpu.c | 24 +-
+ scripts/checkkconfigsymbols.py | 52 +-
+ tools/hv/lsvmbus | 101 ++
+ 128 files changed, 6022 insertions(+), 1799 deletions(-)
+ create mode 100644 Documentation/ABI/stable/sysfs-bus-vmbus
+ delete mode 100644 Documentation/ABI/testing/sysfs-driver-sunxi-sid
+ rename Documentation/devicetree/bindings/{misc => nvmem}/allwinner,sunxi-sid.txt (78%)
+ create mode 100644 Documentation/devicetree/bindings/nvmem/nvmem.txt
+ create mode 100644 Documentation/devicetree/bindings/nvmem/qfprom.txt
+ create mode 100644 Documentation/devicetree/bindings/power/qcom,coincell-charger.txt
+ create mode 100644 Documentation/nvmem/nvmem.txt
+ delete mode 100644 drivers/misc/eeprom/sunxi_sid.c
+ create mode 100644 drivers/misc/mei/bus-fixup.c
+ delete mode 100644 drivers/misc/mei/nfc.c
+ create mode 100644 drivers/misc/qcom-coincell.c
+ create mode 100644 drivers/nvmem/Kconfig
+ create mode 100644 drivers/nvmem/Makefile
+ create mode 100644 drivers/nvmem/core.c
+ create mode 100644 drivers/nvmem/qfprom.c
+ create mode 100644 drivers/nvmem/sunxi_sid.c
+ create mode 100644 include/linux/nvmem-consumer.h
+ create mode 100644 include/linux/nvmem-provider.h
+ create mode 100644 include/trace/events/spmi.h
+ create mode 100644 tools/hv/lsvmbus
+$ git am -3 ../patches/0001-Drivers-hv-vmbus-fix-for-the-removal-of-rdtscll.patch
+Applying: Drivers: hv: vmbus: fix for the removal of rdtscll()
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/hv/hv.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 8a6862d5cff9] Merge remote-tracking branch 'char-misc/char-misc-next'
+ Date: Fri Aug 28 14:59:11 2015 +1000
+Merging extcon/extcon-next (ac22a1d3386e extcon: palmas: Fix build break due to devm_gpiod_get_optional API change)
+$ git merge extcon/extcon-next
+Already up-to-date.
+Merging kdbus/kdbus (a36324913ff2 kdbus: selftests: add more name registry tests)
+$ git merge kdbus/kdbus
+Auto-merging tools/testing/selftests/Makefile
+Auto-merging init/Kconfig
+Auto-merging include/uapi/linux/Kbuild
+Auto-merging Makefile
+Auto-merging MAINTAINERS
+Auto-merging Documentation/ioctl/ioctl-number.txt
+Merge made by the 'recursive' strategy.
+ Documentation/Makefile | 2 +-
+ Documentation/ioctl/ioctl-number.txt | 1 +
+ Documentation/kdbus/.gitignore | 2 +
+ Documentation/kdbus/Makefile | 44 +
+ Documentation/kdbus/kdbus.bus.xml | 344 ++++
+ Documentation/kdbus/kdbus.connection.xml | 1244 ++++++++++++
+ Documentation/kdbus/kdbus.endpoint.xml | 429 +++++
+ Documentation/kdbus/kdbus.fs.xml | 124 ++
+ Documentation/kdbus/kdbus.item.xml | 839 ++++++++
+ Documentation/kdbus/kdbus.match.xml | 555 ++++++
+ Documentation/kdbus/kdbus.message.xml | 1276 +++++++++++++
+ Documentation/kdbus/kdbus.name.xml | 711 +++++++
+ Documentation/kdbus/kdbus.policy.xml | 406 ++++
+ Documentation/kdbus/kdbus.pool.xml | 326 ++++
+ Documentation/kdbus/kdbus.xml | 1012 ++++++++++
+ Documentation/kdbus/stylesheet.xsl | 16 +
+ MAINTAINERS | 13 +
+ Makefile | 1 +
+ include/uapi/linux/Kbuild | 1 +
+ include/uapi/linux/kdbus.h | 984 ++++++++++
+ include/uapi/linux/magic.h | 2 +
+ init/Kconfig | 13 +
+ ipc/Makefile | 2 +-
+ ipc/kdbus/Makefile | 33 +
+ ipc/kdbus/bus.c | 514 +++++
+ ipc/kdbus/bus.h | 101 +
+ ipc/kdbus/connection.c | 2227 ++++++++++++++++++++++
+ ipc/kdbus/connection.h | 260 +++
+ ipc/kdbus/domain.c | 296 +++
+ ipc/kdbus/domain.h | 77 +
+ ipc/kdbus/endpoint.c | 303 +++
+ ipc/kdbus/endpoint.h | 70 +
+ ipc/kdbus/fs.c | 508 +++++
+ ipc/kdbus/fs.h | 28 +
+ ipc/kdbus/handle.c | 691 +++++++
+ ipc/kdbus/handle.h | 103 +
+ ipc/kdbus/item.c | 293 +++
+ ipc/kdbus/item.h | 61 +
+ ipc/kdbus/limits.h | 61 +
+ ipc/kdbus/main.c | 114 ++
+ ipc/kdbus/match.c | 546 ++++++
+ ipc/kdbus/match.h | 35 +
+ ipc/kdbus/message.c | 1040 ++++++++++
+ ipc/kdbus/message.h | 120 ++
+ ipc/kdbus/metadata.c | 1347 +++++++++++++
+ ipc/kdbus/metadata.h | 86 +
+ ipc/kdbus/names.c | 854 +++++++++
+ ipc/kdbus/names.h | 105 +
+ ipc/kdbus/node.c | 897 +++++++++
+ ipc/kdbus/node.h | 86 +
+ ipc/kdbus/notify.c | 204 ++
+ ipc/kdbus/notify.h | 30 +
+ ipc/kdbus/policy.c | 489 +++++
+ ipc/kdbus/policy.h | 51 +
+ ipc/kdbus/pool.c | 728 +++++++
+ ipc/kdbus/pool.h | 46 +
+ ipc/kdbus/queue.c | 363 ++++
+ ipc/kdbus/queue.h | 84 +
+ ipc/kdbus/reply.c | 252 +++
+ ipc/kdbus/reply.h | 68 +
+ ipc/kdbus/util.c | 156 ++
+ ipc/kdbus/util.h | 73 +
+ samples/Kconfig | 7 +
+ samples/Makefile | 3 +-
+ samples/kdbus/.gitignore | 1 +
+ samples/kdbus/Makefile | 9 +
+ samples/kdbus/kdbus-api.h | 114 ++
+ samples/kdbus/kdbus-workers.c | 1346 +++++++++++++
+ tools/testing/selftests/Makefile | 1 +
+ tools/testing/selftests/kdbus/.gitignore | 1 +
+ tools/testing/selftests/kdbus/Makefile | 49 +
+ tools/testing/selftests/kdbus/kdbus-enum.c | 94 +
+ tools/testing/selftests/kdbus/kdbus-enum.h | 15 +
+ tools/testing/selftests/kdbus/kdbus-test.c | 905 +++++++++
+ tools/testing/selftests/kdbus/kdbus-test.h | 84 +
+ tools/testing/selftests/kdbus/kdbus-util.c | 1612 ++++++++++++++++
+ tools/testing/selftests/kdbus/kdbus-util.h | 218 +++
+ tools/testing/selftests/kdbus/test-activator.c | 318 +++
+ tools/testing/selftests/kdbus/test-benchmark.c | 451 +++++
+ tools/testing/selftests/kdbus/test-bus.c | 175 ++
+ tools/testing/selftests/kdbus/test-chat.c | 124 ++
+ tools/testing/selftests/kdbus/test-connection.c | 597 ++++++
+ tools/testing/selftests/kdbus/test-daemon.c | 65 +
+ tools/testing/selftests/kdbus/test-endpoint.c | 352 ++++
+ tools/testing/selftests/kdbus/test-fd.c | 789 ++++++++
+ tools/testing/selftests/kdbus/test-free.c | 64 +
+ tools/testing/selftests/kdbus/test-match.c | 441 +++++
+ tools/testing/selftests/kdbus/test-message.c | 734 +++++++
+ tools/testing/selftests/kdbus/test-metadata-ns.c | 500 +++++
+ tools/testing/selftests/kdbus/test-monitor.c | 176 ++
+ tools/testing/selftests/kdbus/test-names.c | 272 +++
+ tools/testing/selftests/kdbus/test-policy-ns.c | 632 ++++++
+ tools/testing/selftests/kdbus/test-policy-priv.c | 1285 +++++++++++++
+ tools/testing/selftests/kdbus/test-policy.c | 80 +
+ tools/testing/selftests/kdbus/test-sync.c | 369 ++++
+ tools/testing/selftests/kdbus/test-timeout.c | 99 +
+ 96 files changed, 33726 insertions(+), 3 deletions(-)
+ create mode 100644 Documentation/kdbus/.gitignore
+ create mode 100644 Documentation/kdbus/Makefile
+ create mode 100644 Documentation/kdbus/kdbus.bus.xml
+ create mode 100644 Documentation/kdbus/kdbus.connection.xml
+ create mode 100644 Documentation/kdbus/kdbus.endpoint.xml
+ create mode 100644 Documentation/kdbus/kdbus.fs.xml
+ create mode 100644 Documentation/kdbus/kdbus.item.xml
+ create mode 100644 Documentation/kdbus/kdbus.match.xml
+ create mode 100644 Documentation/kdbus/kdbus.message.xml
+ create mode 100644 Documentation/kdbus/kdbus.name.xml
+ create mode 100644 Documentation/kdbus/kdbus.policy.xml
+ create mode 100644 Documentation/kdbus/kdbus.pool.xml
+ create mode 100644 Documentation/kdbus/kdbus.xml
+ create mode 100644 Documentation/kdbus/stylesheet.xsl
+ create mode 100644 include/uapi/linux/kdbus.h
+ create mode 100644 ipc/kdbus/Makefile
+ create mode 100644 ipc/kdbus/bus.c
+ create mode 100644 ipc/kdbus/bus.h
+ create mode 100644 ipc/kdbus/connection.c
+ create mode 100644 ipc/kdbus/connection.h
+ create mode 100644 ipc/kdbus/domain.c
+ create mode 100644 ipc/kdbus/domain.h
+ create mode 100644 ipc/kdbus/endpoint.c
+ create mode 100644 ipc/kdbus/endpoint.h
+ create mode 100644 ipc/kdbus/fs.c
+ create mode 100644 ipc/kdbus/fs.h
+ create mode 100644 ipc/kdbus/handle.c
+ create mode 100644 ipc/kdbus/handle.h
+ create mode 100644 ipc/kdbus/item.c
+ create mode 100644 ipc/kdbus/item.h
+ create mode 100644 ipc/kdbus/limits.h
+ create mode 100644 ipc/kdbus/main.c
+ create mode 100644 ipc/kdbus/match.c
+ create mode 100644 ipc/kdbus/match.h
+ create mode 100644 ipc/kdbus/message.c
+ create mode 100644 ipc/kdbus/message.h
+ create mode 100644 ipc/kdbus/metadata.c
+ create mode 100644 ipc/kdbus/metadata.h
+ create mode 100644 ipc/kdbus/names.c
+ create mode 100644 ipc/kdbus/names.h
+ create mode 100644 ipc/kdbus/node.c
+ create mode 100644 ipc/kdbus/node.h
+ create mode 100644 ipc/kdbus/notify.c
+ create mode 100644 ipc/kdbus/notify.h
+ create mode 100644 ipc/kdbus/policy.c
+ create mode 100644 ipc/kdbus/policy.h
+ create mode 100644 ipc/kdbus/pool.c
+ create mode 100644 ipc/kdbus/pool.h
+ create mode 100644 ipc/kdbus/queue.c
+ create mode 100644 ipc/kdbus/queue.h
+ create mode 100644 ipc/kdbus/reply.c
+ create mode 100644 ipc/kdbus/reply.h
+ create mode 100644 ipc/kdbus/util.c
+ create mode 100644 ipc/kdbus/util.h
+ create mode 100644 samples/kdbus/.gitignore
+ create mode 100644 samples/kdbus/Makefile
+ create mode 100644 samples/kdbus/kdbus-api.h
+ create mode 100644 samples/kdbus/kdbus-workers.c
+ create mode 100644 tools/testing/selftests/kdbus/.gitignore
+ create mode 100644 tools/testing/selftests/kdbus/Makefile
+ create mode 100644 tools/testing/selftests/kdbus/kdbus-enum.c
+ create mode 100644 tools/testing/selftests/kdbus/kdbus-enum.h
+ create mode 100644 tools/testing/selftests/kdbus/kdbus-test.c
+ create mode 100644 tools/testing/selftests/kdbus/kdbus-test.h
+ create mode 100644 tools/testing/selftests/kdbus/kdbus-util.c
+ create mode 100644 tools/testing/selftests/kdbus/kdbus-util.h
+ create mode 100644 tools/testing/selftests/kdbus/test-activator.c
+ create mode 100644 tools/testing/selftests/kdbus/test-benchmark.c
+ create mode 100644 tools/testing/selftests/kdbus/test-bus.c
+ create mode 100644 tools/testing/selftests/kdbus/test-chat.c
+ create mode 100644 tools/testing/selftests/kdbus/test-connection.c
+ create mode 100644 tools/testing/selftests/kdbus/test-daemon.c
+ create mode 100644 tools/testing/selftests/kdbus/test-endpoint.c
+ create mode 100644 tools/testing/selftests/kdbus/test-fd.c
+ create mode 100644 tools/testing/selftests/kdbus/test-free.c
+ create mode 100644 tools/testing/selftests/kdbus/test-match.c
+ create mode 100644 tools/testing/selftests/kdbus/test-message.c
+ create mode 100644 tools/testing/selftests/kdbus/test-metadata-ns.c
+ create mode 100644 tools/testing/selftests/kdbus/test-monitor.c
+ create mode 100644 tools/testing/selftests/kdbus/test-names.c
+ create mode 100644 tools/testing/selftests/kdbus/test-policy-ns.c
+ create mode 100644 tools/testing/selftests/kdbus/test-policy-priv.c
+ create mode 100644 tools/testing/selftests/kdbus/test-policy.c
+ create mode 100644 tools/testing/selftests/kdbus/test-sync.c
+ create mode 100644 tools/testing/selftests/kdbus/test-timeout.c
+Merging cgroup/for-next (eacb1e7d4bfa Merge branch 'for-4.3' into for-next)
+$ git merge cgroup/for-next
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/fork.c
+Auto-merging kernel/cgroup.c
+Auto-merging kernel/Makefile
+Auto-merging init/Kconfig
+Auto-merging include/linux/cgroup_subsys.h
+Merge made by the 'recursive' strategy.
+ CREDITS | 5 +
+ Documentation/cgroups/00-INDEX | 2 +
+ Documentation/cgroups/pids.txt | 85 ++++++++++
+ include/linux/cgroup-defs.h | 10 +-
+ include/linux/cgroup.h | 15 +-
+ include/linux/cgroup_subsys.h | 28 ++++
+ init/Kconfig | 16 ++
+ kernel/Makefile | 1 +
+ kernel/cgroup.c | 81 +++++++++-
+ kernel/cgroup_freezer.c | 2 +-
+ kernel/cgroup_pids.c | 355 +++++++++++++++++++++++++++++++++++++++++
+ kernel/fork.c | 17 +-
+ kernel/sched/core.c | 2 +-
+ 13 files changed, 606 insertions(+), 13 deletions(-)
+ create mode 100644 Documentation/cgroups/pids.txt
+ create mode 100644 kernel/cgroup_pids.c
+Merging scsi/for-next (294eb0a61964 Merge branch 'misc' into for-next)
+$ git merge scsi/for-next
+Auto-merging drivers/scsi/scsi_transport_iscsi.c
+Auto-merging drivers/scsi/scsi_error.c
+Auto-merging drivers/scsi/qla2xxx/tcm_qla2xxx.c
+Auto-merging drivers/scsi/qla2xxx/qla_target.c
+Auto-merging drivers/scsi/qla2xxx/qla_sup.c
+Auto-merging drivers/scsi/qla2xxx/qla_os.c
+Auto-merging drivers/scsi/qla2xxx/qla_mbx.c
+Auto-merging drivers/scsi/qla2xxx/qla_iocb.c
+Auto-merging drivers/scsi/qla2xxx/qla_init.c
+Auto-merging drivers/scsi/qla2xxx/qla_def.h
+Auto-merging drivers/scsi/qla2xxx/qla_dbg.c
+Auto-merging drivers/scsi/qla2xxx/qla_attr.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/ioctl/ioctl-number.txt
+Merge made by the 'recursive' strategy.
+ Documentation/ioctl/ioctl-number.txt | 1 +
+ Documentation/powerpc/cxlflash.txt | 318 ++++
+ MAINTAINERS | 2 +-
+ drivers/message/fusion/mptctl.c | 9 +
+ drivers/scsi/Kconfig | 1 +
+ drivers/scsi/Makefile | 1 +
+ drivers/scsi/aic94xx/aic94xx_init.c | 1 +
+ drivers/scsi/bfa/bfad_im.c | 2 +
+ drivers/scsi/cxlflash/Kconfig | 11 +
+ drivers/scsi/cxlflash/Makefile | 2 +
+ drivers/scsi/cxlflash/common.h | 208 +++
+ drivers/scsi/cxlflash/lunmgt.c | 266 +++
+ drivers/scsi/cxlflash/main.c | 2494 +++++++++++++++++++++++++++
+ drivers/scsi/cxlflash/main.h | 108 ++
+ drivers/scsi/cxlflash/sislite.h | 472 +++++
+ drivers/scsi/cxlflash/superpipe.c | 2084 ++++++++++++++++++++++
+ drivers/scsi/cxlflash/superpipe.h | 147 ++
+ drivers/scsi/cxlflash/vlun.c | 1243 +++++++++++++
+ drivers/scsi/cxlflash/vlun.h | 86 +
+ drivers/scsi/hpsa.c | 301 ++--
+ drivers/scsi/hpsa.h | 16 +-
+ drivers/scsi/hpsa_cmd.h | 10 +-
+ drivers/scsi/hptiop.c | 97 +-
+ drivers/scsi/hptiop.h | 6 +-
+ drivers/scsi/ipr.c | 15 +-
+ drivers/scsi/ipr.h | 17 +-
+ drivers/scsi/libfc/fc_fcp.c | 2 +-
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +-
+ drivers/scsi/megaraid.c | 140 +-
+ drivers/scsi/megaraid/megaraid_sas_base.c | 544 +++---
+ drivers/scsi/megaraid/megaraid_sas_fusion.c | 95 +-
+ drivers/scsi/mpt2sas/mpt2sas_base.c | 16 +-
+ drivers/scsi/mpt2sas/mpt2sas_base.h | 22 +-
+ drivers/scsi/mpt2sas/mpt2sas_scsih.c | 592 +++++--
+ drivers/scsi/mpt2sas/mpt2sas_transport.c | 12 +-
+ drivers/scsi/mpt3sas/mpi/mpi2.h | 8 +-
+ drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 52 +-
+ drivers/scsi/mpt3sas/mpi/mpi2_ioc.h | 4 +-
+ drivers/scsi/mpt3sas/mpi/mpi2_tool.h | 4 +-
+ drivers/scsi/mpt3sas/mpt3sas_base.c | 326 +++-
+ drivers/scsi/mpt3sas/mpt3sas_base.h | 57 +-
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 343 +++-
+ drivers/scsi/mpt3sas/mpt3sas_transport.c | 22 +-
+ drivers/scsi/mvsas/mv_init.c | 5 +-
+ drivers/scsi/pm8001/pm8001_defs.h | 4 +-
+ drivers/scsi/pm8001/pm8001_hwi.c | 4 +
+ drivers/scsi/pm8001/pm8001_init.c | 5 +-
+ drivers/scsi/pm8001/pm8001_sas.c | 19 +-
+ drivers/scsi/pm8001/pm8001_sas.h | 12 +-
+ drivers/scsi/pm8001/pm80xx_hwi.c | 111 +-
+ drivers/scsi/pm8001/pm80xx_hwi.h | 5 +-
+ drivers/scsi/qla2xxx/qla_attr.c | 24 +-
+ drivers/scsi/qla2xxx/qla_bsg.c | 7 +-
+ drivers/scsi/qla2xxx/qla_dbg.c | 102 +-
+ drivers/scsi/qla2xxx/qla_def.h | 15 +-
+ drivers/scsi/qla2xxx/qla_gs.c | 52 +-
+ drivers/scsi/qla2xxx/qla_init.c | 162 +-
+ drivers/scsi/qla2xxx/qla_iocb.c | 132 +-
+ drivers/scsi/qla2xxx/qla_isr.c | 70 +-
+ drivers/scsi/qla2xxx/qla_mbx.c | 80 +-
+ drivers/scsi/qla2xxx/qla_mid.c | 3 +-
+ drivers/scsi/qla2xxx/qla_mr.c | 22 +-
+ drivers/scsi/qla2xxx/qla_nx.c | 165 +-
+ drivers/scsi/qla2xxx/qla_nx2.c | 20 +-
+ drivers/scsi/qla2xxx/qla_nx2.h | 6 +-
+ drivers/scsi/qla2xxx/qla_os.c | 41 +-
+ drivers/scsi/qla2xxx/qla_sup.c | 14 +-
+ drivers/scsi/qla2xxx/qla_target.c | 139 +-
+ drivers/scsi/qla2xxx/qla_tmpl.c | 27 +-
+ drivers/scsi/qla2xxx/qla_version.h | 2 +-
+ drivers/scsi/qla2xxx/tcm_qla2xxx.c | 6 +
+ drivers/scsi/scsi_error.c | 9 +
+ drivers/scsi/scsi_lib.c | 11 +-
+ drivers/scsi/scsi_transport_iscsi.c | 11 +-
+ drivers/scsi/st.c | 83 +-
+ drivers/scsi/storvsc_drv.c | 224 ++-
+ include/scsi/scsi_device.h | 3 +-
+ include/scsi/scsi_transport_iscsi.h | 1 +
+ include/uapi/scsi/Kbuild | 1 +
+ include/uapi/scsi/cxlflash_ioctl.h | 174 ++
+ 80 files changed, 10322 insertions(+), 1608 deletions(-)
+ create mode 100644 Documentation/powerpc/cxlflash.txt
+ create mode 100644 drivers/scsi/cxlflash/Kconfig
+ create mode 100644 drivers/scsi/cxlflash/Makefile
+ create mode 100644 drivers/scsi/cxlflash/common.h
+ create mode 100644 drivers/scsi/cxlflash/lunmgt.c
+ create mode 100644 drivers/scsi/cxlflash/main.c
+ create mode 100644 drivers/scsi/cxlflash/main.h
+ create mode 100644 drivers/scsi/cxlflash/sislite.h
+ create mode 100644 drivers/scsi/cxlflash/superpipe.c
+ create mode 100644 drivers/scsi/cxlflash/superpipe.h
+ create mode 100644 drivers/scsi/cxlflash/vlun.c
+ create mode 100644 drivers/scsi/cxlflash/vlun.h
+ create mode 100644 include/uapi/scsi/cxlflash_ioctl.h
+Merging target-updates/for-next (140373b074ba target/qla2xxx: Honor max_data_sg_nents I/O transfer limit)
+$ git merge target-updates/for-next
+Resolved 'drivers/ata/libata-scsi.c' using previous resolution.
+Resolved 'drivers/scsi/scsi_error.c' using previous resolution.
+Resolved 'include/scsi/scsi_eh.h' using previous resolution.
+Auto-merging include/target/iscsi/iscsi_target_core.h
+Auto-merging include/scsi/scsi_eh.h
+CONFLICT (content): Merge conflict in include/scsi/scsi_eh.h
+Auto-merging drivers/target/target_core_spc.c
+Auto-merging drivers/target/target_core_hba.c
+Auto-merging drivers/target/iscsi/iscsi_target_nego.c
+Auto-merging drivers/target/iscsi/iscsi_target_login.h
+Auto-merging drivers/target/iscsi/iscsi_target_login.c
+Auto-merging drivers/target/iscsi/iscsi_target.c
+Auto-merging drivers/scsi/scsi_error.c
+CONFLICT (content): Merge conflict in drivers/scsi/scsi_error.c
+Auto-merging drivers/scsi/qla2xxx/tcm_qla2xxx.c
+Auto-merging drivers/scsi/libiscsi.c
+Auto-merging drivers/infiniband/ulp/isert/ib_isert.c
+Auto-merging drivers/ata/libata-scsi.c
+CONFLICT (content): Merge conflict in drivers/ata/libata-scsi.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 9851a3963062] Merge remote-tracking branch 'target-updates/for-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/infiniband/ulp/isert/ib_isert.c | 29 +-
+ drivers/scsi/libiscsi.c | 9 +-
+ drivers/scsi/qla2xxx/Kconfig | 4 +-
+ drivers/scsi/qla2xxx/tcm_qla2xxx.c | 13 +-
+ drivers/scsi/scsi_common.c | 109 ++++++
+ drivers/scsi/scsi_error.c | 68 +---
+ drivers/target/iscsi/iscsi_target.c | 86 ++---
+ drivers/target/iscsi/iscsi_target.h | 6 +-
+ drivers/target/iscsi/iscsi_target_configfs.c | 34 +-
+ drivers/target/iscsi/iscsi_target_device.c | 7 +-
+ drivers/target/iscsi/iscsi_target_login.c | 78 ++---
+ drivers/target/iscsi/iscsi_target_login.h | 4 +-
+ drivers/target/iscsi/iscsi_target_nego.c | 9 +-
+ drivers/target/iscsi/iscsi_target_stat.c | 2 +-
+ drivers/target/iscsi/iscsi_target_tmr.c | 2 +-
+ drivers/target/iscsi/iscsi_target_tpg.c | 38 +-
+ drivers/target/iscsi/iscsi_target_tpg.h | 3 +-
+ drivers/target/iscsi/iscsi_target_util.c | 39 ++-
+ drivers/target/loopback/tcm_loop.c | 22 +-
+ drivers/target/target_core_device.c | 11 +-
+ drivers/target/target_core_fabric_configfs.c | 2 +-
+ drivers/target/target_core_hba.c | 5 +
+ drivers/target/target_core_sbc.c | 49 ++-
+ drivers/target/target_core_spc.c | 55 ++-
+ drivers/target/target_core_tpg.c | 17 +
+ drivers/target/target_core_transport.c | 504 ++++++++++++---------------
+ drivers/target/tcm_fc/tfc_cmd.c | 2 +-
+ include/scsi/scsi_common.h | 5 +
+ include/scsi/scsi_eh.h | 6 +-
+ include/target/iscsi/iscsi_target_core.h | 15 +-
+ include/target/iscsi/iscsi_target_stat.h | 2 +-
+ include/target/iscsi/iscsi_transport.h | 2 +-
+ include/target/target_core_backend.h | 2 +
+ include/target/target_core_base.h | 27 +-
+ include/target/target_core_fabric.h | 14 +
+ 35 files changed, 665 insertions(+), 615 deletions(-)
+Merging target-merge/for-next-merge (d770e558e219 Linux 4.2-rc1)
+$ git merge target-merge/for-next-merge
+Already up-to-date.
+Merging pinctrl/for-next (3ab897d2113c Merge branch 'devel' into for-next)
+$ git merge pinctrl/for-next
+Auto-merging drivers/clk/rockchip/clk-rk3288.c
+Auto-merging drivers/Makefile
+Auto-merging arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
+Auto-merging arch/arm/boot/dts/ste-dbx5x0.dtsi
+Auto-merging MAINTAINERS
+Auto-merging CREDITS
+Merge made by the 'recursive' strategy.
+ CREDITS | 4 +
+ .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 37 +-
+ .../bindings/pinctrl/cnxt,cx92755-pinctrl.txt | 86 ++
+ .../devicetree/bindings/pinctrl/qcom,pmic-mpp.txt | 36 +-
+ .../bindings/pinctrl/renesas,pfc-pinctrl.txt | 20 +-
+ .../devicetree/bindings/pinctrl/ste,nomadik.txt | 7 +-
+ MAINTAINERS | 1 -
+ arch/arm/boot/dts/ste-dbx5x0.dtsi | 23 +-
+ arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 8 +-
+ drivers/Makefile | 2 +-
+ drivers/clk/rockchip/clk-rk3288.c | 1 +
+ drivers/pinctrl/Kconfig | 7 +
+ drivers/pinctrl/Makefile | 8 +-
+ drivers/pinctrl/bcm/pinctrl-bcm2835.c | 5 +-
+ drivers/pinctrl/core.c | 3 +-
+ drivers/pinctrl/devicetree.c | 8 +-
+ drivers/pinctrl/freescale/Kconfig | 7 +
+ drivers/pinctrl/freescale/Makefile | 1 +
+ drivers/pinctrl/freescale/pinctrl-imx6ul.c | 323 ++++
+ drivers/pinctrl/intel/pinctrl-baytrail.c | 30 +-
+ drivers/pinctrl/intel/pinctrl-cherryview.c | 16 +-
+ drivers/pinctrl/intel/pinctrl-intel.c | 6 +-
+ drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 8 +-
+ drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c | 21 -
+ drivers/pinctrl/nomadik/pinctrl-nomadik-db8540.c | 24 -
+ drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c | 30 +-
+ drivers/pinctrl/nomadik/pinctrl-nomadik.c | 241 +--
+ drivers/pinctrl/nomadik/pinctrl-nomadik.h | 4 -
+ drivers/pinctrl/pinconf.c | 88 +-
+ drivers/pinctrl/pinctrl-adi2-bf60x.c | 8 +-
+ drivers/pinctrl/pinctrl-adi2.c | 4 +-
+ drivers/pinctrl/pinctrl-amd.c | 15 +-
+ drivers/pinctrl/pinctrl-at91.c | 27 +-
+ drivers/pinctrl/pinctrl-coh901.c | 7 +-
+ drivers/pinctrl/pinctrl-digicolor.c | 378 +++++
+ drivers/pinctrl/pinctrl-lpc18xx.c | 54 +-
+ drivers/pinctrl/pinctrl-pistachio.c | 6 +-
+ drivers/pinctrl/pinctrl-rockchip.c | 71 +-
+ drivers/pinctrl/pinctrl-single.c | 14 +-
+ drivers/pinctrl/pinctrl-st.c | 6 +-
+ drivers/pinctrl/pinmux.c | 3 +-
+ drivers/pinctrl/qcom/Kconfig | 20 +
+ drivers/pinctrl/qcom/Makefile | 3 +
+ drivers/pinctrl/qcom/pinctrl-msm.c | 19 +-
+ drivers/pinctrl/qcom/pinctrl-qdf2xxx.c | 122 ++
+ drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 376 +++--
+ drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 791 ++++++++++
+ drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 882 +++++++++++
+ drivers/pinctrl/samsung/pinctrl-exynos.c | 18 +-
+ drivers/pinctrl/samsung/pinctrl-exynos5440.c | 90 +-
+ drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 28 +-
+ drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 34 +-
+ drivers/pinctrl/sh-pfc/core.c | 52 +-
+ drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 4 -
+ drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 21 +-
+ drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 19 +-
+ drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 4 -
+ drivers/pinctrl/sh-pfc/pinctrl.c | 42 +-
+ drivers/pinctrl/sirf/pinctrl-atlas7.c | 525 +++++--
+ drivers/pinctrl/sirf/pinctrl-sirf.c | 5 +-
+ drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | 17 +-
+ drivers/pinctrl/sunxi/pinctrl-sunxi.c | 62 +-
+ drivers/pinctrl/uniphier/Kconfig | 32 +
+ drivers/pinctrl/uniphier/Makefile | 8 +
+ drivers/pinctrl/uniphier/pinctrl-ph1-ld4.c | 886 +++++++++++
+ drivers/pinctrl/uniphier/pinctrl-ph1-ld6b.c | 1274 ++++++++++++++++
+ drivers/pinctrl/uniphier/pinctrl-ph1-pro4.c | 1554 ++++++++++++++++++++
+ drivers/pinctrl/uniphier/pinctrl-ph1-pro5.c | 1351 +++++++++++++++++
+ drivers/pinctrl/uniphier/pinctrl-ph1-sld8.c | 794 ++++++++++
+ drivers/pinctrl/uniphier/pinctrl-proxstream2.c | 1269 ++++++++++++++++
+ drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 684 +++++++++
+ drivers/pinctrl/uniphier/pinctrl-uniphier.h | 217 +++
+ include/dt-bindings/pinctrl/qcom,pmic-mpp.h | 51 +
+ 73 files changed, 12038 insertions(+), 864 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/cnxt,cx92755-pinctrl.txt
+ create mode 100644 drivers/pinctrl/freescale/pinctrl-imx6ul.c
+ create mode 100644 drivers/pinctrl/pinctrl-digicolor.c
+ create mode 100644 drivers/pinctrl/qcom/pinctrl-qdf2xxx.c
+ create mode 100644 drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c
+ create mode 100644 drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c
+ create mode 100644 drivers/pinctrl/uniphier/Kconfig
+ create mode 100644 drivers/pinctrl/uniphier/Makefile
+ create mode 100644 drivers/pinctrl/uniphier/pinctrl-ph1-ld4.c
+ create mode 100644 drivers/pinctrl/uniphier/pinctrl-ph1-ld6b.c
+ create mode 100644 drivers/pinctrl/uniphier/pinctrl-ph1-pro4.c
+ create mode 100644 drivers/pinctrl/uniphier/pinctrl-ph1-pro5.c
+ create mode 100644 drivers/pinctrl/uniphier/pinctrl-ph1-sld8.c
+ create mode 100644 drivers/pinctrl/uniphier/pinctrl-proxstream2.c
+ create mode 100644 drivers/pinctrl/uniphier/pinctrl-uniphier-core.c
+ create mode 100644 drivers/pinctrl/uniphier/pinctrl-uniphier.h
+Merging vhost/linux-next (0c63b715912b PCI/MSI: Make pci_msi_shutdown(), pci_msix_shutdown() static)
+$ git merge vhost/linux-next
+Auto-merging include/linux/pci.h
+Auto-merging drivers/pci/pci-driver.c
+Auto-merging drivers/pci/msi.c
+Auto-merging drivers/net/tun.c
+Merge made by the 'recursive' strategy.
+ drivers/net/macvtap.c | 2 +-
+ drivers/net/tun.c | 2 +-
+ drivers/pci/msi.c | 4 ++--
+ drivers/pci/pci-driver.c | 2 --
+ include/linux/pci.h | 4 ----
+ 5 files changed, 4 insertions(+), 10 deletions(-)
+Merging remoteproc/for-next (8de3dbd0895b remoteproc: fix !CONFIG_OF build breakage)
+$ 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 (929550b9f9f8 gpio: mxc: fix section mismatch warning)
+$ git merge gpio/for-next
+Removing include/linux/platform_data/gpio-em.h
+Auto-merging drivers/phy/phy-tusb1210.c
+Auto-merging drivers/iio/magnetometer/bmc150_magn.c
+Auto-merging drivers/iio/light/stk3310.c
+Auto-merging drivers/gpio/gpiolib.c
+Auto-merging drivers/gpio/Makefile
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-gpio | 3 +-
+ .../devicetree/bindings/gpio/brcm,brcmstb-gpio.txt | 35 ++-
+ .../devicetree/bindings/gpio/gpio-etraxfs.txt | 3 +-
+ .../devicetree/bindings/gpio/gpio-mpc8xxx.txt | 22 ++
+ .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 1 +
+ .../devicetree/bindings/gpio/zx296702-gpio.txt | 24 ++
+ Documentation/gpio/00-INDEX | 3 +
+ Documentation/gpio/drivers-on-gpio.txt | 95 ++++++
+ Documentation/gpio/sysfs.txt | 9 +-
+ drivers/gpio/Kconfig | 10 +-
+ drivers/gpio/Makefile | 1 +
+ drivers/gpio/devres.c | 18 +-
+ drivers/gpio/gpio-74xx-mmio.c | 2 +-
+ drivers/gpio/gpio-adp5588.c | 10 +-
+ drivers/gpio/gpio-altera.c | 4 +-
+ drivers/gpio/gpio-bcm-kona.c | 17 +-
+ drivers/gpio/gpio-brcmstb.c | 306 ++++++++++++++++++-
+ drivers/gpio/gpio-davinci.c | 16 +-
+ drivers/gpio/gpio-dwapb.c | 2 +-
+ drivers/gpio/gpio-em.c | 35 +--
+ drivers/gpio/gpio-ep93xx.c | 8 +-
+ drivers/gpio/gpio-etraxfs.c | 329 ++++++++++++++++++++-
+ drivers/gpio/gpio-generic.c | 41 ++-
+ drivers/gpio/gpio-grgpio.c | 8 -
+ drivers/gpio/gpio-mcp23s08.c | 4 -
+ drivers/gpio/gpio-mpc8xxx.c | 121 +++++---
+ drivers/gpio/gpio-msm-v2.c | 23 +-
+ drivers/gpio/gpio-mvebu.c | 8 +-
+ drivers/gpio/gpio-mxc.c | 9 +-
+ drivers/gpio/gpio-mxs.c | 2 +-
+ drivers/gpio/gpio-omap.c | 88 +++---
+ drivers/gpio/gpio-pcf857x.c | 14 +-
+ drivers/gpio/gpio-pch.c | 4 +-
+ drivers/gpio/gpio-pxa.c | 8 +-
+ drivers/gpio/gpio-rcar.c | 24 +-
+ drivers/gpio/gpio-sa1100.c | 6 +-
+ drivers/gpio/gpio-sta2x11.c | 2 +-
+ drivers/gpio/gpio-tegra.c | 9 +-
+ drivers/gpio/gpio-timberdale.c | 12 +-
+ drivers/gpio/gpio-tz1090.c | 4 +-
+ drivers/gpio/gpio-vf610.c | 2 +-
+ drivers/gpio/gpio-zx.c | 324 ++++++++++++++++++++
+ drivers/gpio/gpio-zynq.c | 12 +-
+ drivers/gpio/gpiolib-of.c | 34 ++-
+ drivers/gpio/gpiolib.c | 57 ++--
+ drivers/gpu/drm/tilcdc/tilcdc_panel.c | 22 +-
+ drivers/iio/light/stk3310.c | 6 +-
+ drivers/iio/magnetometer/bmc150_magn.c | 6 +-
+ drivers/media/i2c/adp1653.c | 2 +-
+ drivers/nfc/nxp-nci/i2c.c | 10 +-
+ drivers/phy/phy-tusb1210.c | 30 +-
+ include/linux/basic_mmio_gpio.h | 1 +
+ include/linux/gpio/consumer.h | 82 ++---
+ include/linux/of_gpio.h | 4 +-
+ include/linux/platform_data/gpio-em.h | 11 -
+ 55 files changed, 1505 insertions(+), 438 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/gpio/gpio-mpc8xxx.txt
+ create mode 100644 Documentation/devicetree/bindings/gpio/zx296702-gpio.txt
+ create mode 100644 Documentation/gpio/drivers-on-gpio.txt
+ create mode 100644 drivers/gpio/gpio-zx.c
+ delete mode 100644 include/linux/platform_data/gpio-em.h
+$ git am -3 ../patches/0001-media-tc358743-fix-for-devm_gpiod_get-API-change.patch
+Applying: tc358743: fix for devm_gpiod_get API change
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/media/i2c/tc358743.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 44bf11e43d90] Merge remote-tracking branch 'gpio/for-next'
+ Date: Fri Aug 28 15:48:11 2015 +1000
+Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
+$ git merge dma-mapping/dma-mapping-next
+Already up-to-date.
+Merging pwm/for-next (01ec8472009c pwm-pca9685: Support changing the output frequency)
+$ git merge pwm/for-next
+Auto-merging Documentation/DocBook/device-drivers.tmpl
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/device-drivers.tmpl | 27 +++++++++
+ drivers/pwm/core.c | 49 ++++++++++++---
+ drivers/pwm/pwm-atmel-tcb.c | 2 +-
+ drivers/pwm/pwm-atmel.c | 6 +-
+ drivers/pwm/pwm-bcm-kona.c | 54 +++++++++++++----
+ drivers/pwm/pwm-ep93xx.c | 4 +-
+ drivers/pwm/pwm-imx.c | 5 +-
+ drivers/pwm/pwm-mxs.c | 4 +-
+ drivers/pwm/pwm-pca9685.c | 90 +++++++++++++++++++++++++++-
+ drivers/pwm/pwm-renesas-tpu.c | 2 +-
+ drivers/pwm/pwm-rockchip.c | 2 +-
+ drivers/pwm/pwm-tegra.c | 6 +-
+ drivers/pwm/pwm-tiecap.c | 10 ++--
+ drivers/pwm/pwm-tiehrpwm.c | 6 +-
+ drivers/pwm/sysfs.c | 29 ++++++---
+ include/linux/pwm.h | 99 ++++++++++++++++++-------------
+ 16 files changed, 299 insertions(+), 96 deletions(-)
+Merging dma-buf/for-next (86ea07ca846a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
+$ git merge dma-buf/for-next
+Already up-to-date.
+Merging userns/for-next (4b75de861505 fs: Set the size of empty dirs to 0.)
+$ git merge userns/for-next
+Auto-merging security/security.c
+Auto-merging mm/nommu.c
+Auto-merging kernel/fork.c
+Auto-merging include/linux/fs.h
+Auto-merging fs/namespace.c
+Merge made by the 'recursive' strategy.
+ fs/exec.c | 10 ++++++++--
+ fs/libfs.c | 2 +-
+ fs/namespace.c | 33 +++++++++++++++++++++++++--------
+ fs/nsfs.c | 10 ++++++++++
+ fs/open.c | 2 +-
+ fs/proc/root.c | 2 ++
+ fs/sysfs/mount.c | 4 ++++
+ include/linux/fs.h | 3 +++
+ kernel/fork.c | 36 ++++++++++++++++++++++--------------
+ kernel/sys.c | 3 +--
+ kernel/user_namespace.c | 4 ++--
+ mm/mmap.c | 4 ++--
+ mm/nommu.c | 2 +-
+ security/security.c | 2 +-
+ 14 files changed, 83 insertions(+), 34 deletions(-)
+Merging ktest/for-next (b953c0d234bc Linux 4.1)
+$ git merge ktest/for-next
+Already up-to-date.
+Merging clk/clk-next (ba3001157733 clk: s5pv210: add missing call to samsung_clk_of_add_provider())
+$ git merge clk/clk-next
+Resolved 'drivers/clk/ti/Makefile' using previous resolution.
+Resolved 'drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c' using previous resolution.
+Auto-merging include/linux/clk/ti.h
+Auto-merging drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c
+Auto-merging drivers/clocksource/cadence_ttc_timer.c
+Auto-merging drivers/clk/zte/clk.c
+Removing drivers/clk/ux500/u8500_clk.c
+Auto-merging drivers/clk/ti/dpll44xx.c
+Auto-merging drivers/clk/ti/dpll3xxx.c
+Auto-merging drivers/clk/ti/clkt_dpll.c
+Auto-merging drivers/clk/ti/clk-816x.c
+Auto-merging drivers/clk/ti/clk-43xx.c
+Auto-merging drivers/clk/ti/Makefile
+CONFLICT (content): Merge conflict in drivers/clk/ti/Makefile
+Auto-merging drivers/clk/sunxi/clk-sunxi.c
+Auto-merging drivers/clk/spear/spear6xx_clock.c
+Auto-merging drivers/clk/spear/spear1340_clock.c
+Auto-merging drivers/clk/spear/spear1310_clock.c
+Auto-merging drivers/clk/spear/clk-vco-pll.c
+Auto-merging drivers/clk/shmobile/clk-rcar-gen2.c
+Auto-merging drivers/clk/shmobile/clk-r8a7779.c
+Auto-merging drivers/clk/shmobile/clk-r8a7778.c
+Auto-merging drivers/clk/samsung/clk-exynos4.c
+Auto-merging drivers/clk/rockchip/clk-rk3288.c
+Auto-merging drivers/clk/pxa/clk-pxa3xx.c
+Auto-merging drivers/clk/h8300/clk-h8s2678.c
+Removing drivers/clk/clk-gpio-gate.c
+Auto-merging drivers/acpi/acpi_lpss.c
+Auto-merging arch/arm64/kernel/setup.c
+Auto-merging arch/arm/mach-ux500/cpu.c
+Auto-merging arch/arm/mach-s3c64xx/common.c
+Auto-merging arch/arm/mach-omap2/omap_hwmod.c
+Auto-merging arch/arm/mach-omap2/io.c
+Removing arch/arm/mach-omap2/clock_common_data.c
+Removing arch/arm/mach-omap2/clock44xx.h
+Removing arch/arm/mach-omap2/clock3xxx.c
+Removing arch/arm/mach-omap2/clock36xx.h
+Removing arch/arm/mach-omap2/clock36xx.c
+Removing arch/arm/mach-omap2/clock3517.h
+Removing arch/arm/mach-omap2/clock3517.c
+Removing arch/arm/mach-omap2/clock34xx.h
+Removing arch/arm/mach-omap2/clock34xx.c
+Removing arch/arm/mach-omap2/clock2xxx.c
+Removing arch/arm/mach-omap2/clock2430.c
+Removing arch/arm/mach-omap2/clkt_iclk.c
+Removing arch/arm/mach-omap2/clkt_clksel.c
+Auto-merging arch/arm/mach-omap2/Makefile
+Auto-merging arch/arm/mach-at91/at91rm9200.c
+Auto-merging arch/arm/boot/dts/sun8i-a23-a33.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.dtsi
+Auto-merging arch/arm/boot/dts/sun4i-a10.dtsi
+Auto-merging arch/arm/boot/dts/ste-dbx5x0.dtsi
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master bd7210e5abf5] Merge remote-tracking branch 'clk/clk-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/clk.txt | 8 +-
+ .../bindings/arm/hisilicon/hisilicon.txt | 18 +
+ Documentation/devicetree/bindings/arm/sp810.txt | 46 ++
+ .../devicetree/bindings/clock/gpio-mux-clock.txt | 19 +
+ .../devicetree/bindings/clock/hi6220-clock.txt | 19 +-
+ Documentation/devicetree/bindings/clock/ux500.txt | 64 ++
+ arch/arm/boot/dts/ste-dbx5x0.dtsi | 7 +
+ arch/arm/boot/dts/sun4i-a10.dtsi | 69 ++-
+ arch/arm/boot/dts/sun5i-a10s.dtsi | 23 +-
+ arch/arm/boot/dts/sun5i-a13.dtsi | 18 +-
+ arch/arm/boot/dts/sun5i.dtsi | 1 +
+ arch/arm/boot/dts/sun6i-a31.dtsi | 24 +
+ arch/arm/boot/dts/sun7i-a20.dtsi | 23 +
+ arch/arm/boot/dts/sun8i-a23-a33.dtsi | 15 +
+ arch/arm/boot/dts/sun9i-a80.dtsi | 32 +-
+ arch/arm/mach-at91/at91rm9200.c | 1 -
+ arch/arm/mach-hisi/hisilicon.c | 1 -
+ arch/arm/mach-keystone/pm_domain.c | 1 -
+ arch/arm/mach-mvebu/board-v7.c | 1 -
+ arch/arm/mach-omap2/Makefile | 22 +-
+ arch/arm/mach-omap2/clkt34xx_dpll3m2.c | 13 +-
+ arch/arm/mach-omap2/clkt_clksel.c | 466 --------------
+ arch/arm/mach-omap2/clkt_iclk.c | 68 ---
+ arch/arm/mach-omap2/clock.c | 676 +--------------------
+ arch/arm/mach-omap2/clock.h | 205 +------
+ arch/arm/mach-omap2/clock2430.c | 57 --
+ arch/arm/mach-omap2/clock2xxx.c | 57 --
+ arch/arm/mach-omap2/clock34xx.c | 138 -----
+ arch/arm/mach-omap2/clock34xx.h | 18 -
+ arch/arm/mach-omap2/clock3517.c | 118 ----
+ arch/arm/mach-omap2/clock3517.h | 14 -
+ arch/arm/mach-omap2/clock36xx.c | 69 ---
+ arch/arm/mach-omap2/clock36xx.h | 13 -
+ arch/arm/mach-omap2/clock3xxx.c | 135 ----
+ arch/arm/mach-omap2/clock44xx.h | 20 -
+ arch/arm/mach-omap2/clock_common_data.c | 115 ----
+ arch/arm/mach-omap2/io.c | 3 +-
+ arch/arm/mach-omap2/omap_hwmod.c | 1 +
+ arch/arm/mach-omap2/pm24xx.c | 1 +
+ arch/arm/mach-orion5x/board-dt.c | 1 -
+ arch/arm/mach-s3c64xx/common.c | 1 -
+ arch/arm/mach-ux500/cpu.c | 21 +-
+ arch/arm64/kernel/setup.c | 1 -
+ arch/mips/alchemy/common/clock.c | 76 ++-
+ arch/powerpc/platforms/512x/clock-commonclk.c | 1 +
+ drivers/acpi/acpi_apd.c | 1 -
+ drivers/acpi/acpi_lpss.c | 1 -
+ drivers/clk/Makefile | 2 +-
+ drivers/clk/at91/clk-main.c | 7 +-
+ drivers/clk/at91/clk-master.c | 7 +-
+ drivers/clk/at91/clk-peripheral.c | 6 +-
+ drivers/clk/at91/clk-programmable.c | 40 +-
+ drivers/clk/at91/clk-slow.c | 16 +-
+ drivers/clk/at91/clk-smd.c | 7 +-
+ drivers/clk/at91/clk-usb.c | 47 +-
+ drivers/clk/at91/pmc.c | 1 -
+ drivers/clk/at91/pmc.h | 124 ++--
+ drivers/clk/bcm/clk-kona.c | 53 +-
+ drivers/clk/berlin/berlin2-pll.c | 4 +-
+ drivers/clk/clk-axi-clkgen.c | 1 -
+ drivers/clk/clk-bcm2835.c | 5 -
+ drivers/clk/clk-cdce706.c | 3 +-
+ drivers/clk/clk-cdce925.c | 1 +
+ drivers/clk/clk-clps711x.c | 1 -
+ drivers/clk/clk-composite.c | 61 +-
+ drivers/clk/clk-divider.c | 28 +-
+ drivers/clk/clk-efm32gg.c | 1 -
+ drivers/clk/clk-fixed-factor.c | 5 +-
+ drivers/clk/clk-fractional-divider.c | 8 +
+ drivers/clk/clk-gate.c | 4 +
+ drivers/clk/clk-gpio-gate.c | 207 -------
+ drivers/clk/clk-gpio.c | 325 ++++++++++
+ drivers/clk/clk-highbank.c | 1 +
+ drivers/clk/clk-moxart.c | 1 +
+ drivers/clk/clk-mux.c | 7 +-
+ drivers/clk/clk-nomadik.c | 3 +-
+ drivers/clk/clk-palmas.c | 1 -
+ drivers/clk/clk-rk808.c | 1 -
+ drivers/clk/clk-s2mps11.c | 32 +-
+ drivers/clk/clk-si5351.c | 22 +-
+ drivers/clk/clk-si570.c | 1 +
+ drivers/clk/clk-stm32f4.c | 5 +-
+ drivers/clk/clk-twl6040.c | 13 +-
+ drivers/clk/clk-u300.c | 2 +-
+ drivers/clk/clk-wm831x.c | 1 -
+ drivers/clk/clk-xgene.c | 28 +-
+ drivers/clk/clk.c | 346 ++++++-----
+ drivers/clk/h8300/clk-div.c | 4 +-
+ drivers/clk/h8300/clk-h8s2678.c | 20 +-
+ drivers/clk/hisilicon/Kconfig | 2 +-
+ drivers/clk/hisilicon/Makefile | 2 +-
+ drivers/clk/hisilicon/clk-hi3620.c | 41 +-
+ drivers/clk/hisilicon/clk-hi6220-stub.c | 276 +++++++++
+ drivers/clk/hisilicon/clk-hip04.c | 2 -
+ drivers/clk/hisilicon/clk.c | 14 +-
+ drivers/clk/hisilicon/clkgate-separated.c | 2 -
+ drivers/clk/imx/clk-imx1.c | 1 -
+ drivers/clk/imx/clk-imx21.c | 1 -
+ drivers/clk/imx/clk-pfd.c | 1 -
+ drivers/clk/imx/clk-pllv1.c | 1 -
+ drivers/clk/imx/clk-pllv3.c | 1 -
+ drivers/clk/ingenic/cgu.c | 1 +
+ drivers/clk/keystone/gate.c | 1 -
+ drivers/clk/keystone/pll.c | 4 +-
+ drivers/clk/mediatek/clk-gate.h | 3 +-
+ drivers/clk/mediatek/clk-mt8135.c | 1 +
+ drivers/clk/mediatek/clk-mt8173.c | 25 +-
+ drivers/clk/mediatek/clk-mtk.h | 9 +-
+ drivers/clk/mediatek/clk-pll.c | 39 +-
+ drivers/clk/meson/clk-cpu.c | 1 +
+ drivers/clk/meson/clkc.c | 1 -
+ drivers/clk/mmp/clk-apbc.c | 1 -
+ drivers/clk/mmp/clk-apmu.c | 1 -
+ drivers/clk/mmp/clk-gate.c | 3 +-
+ drivers/clk/mmp/clk-mix.c | 71 ++-
+ drivers/clk/mmp/clk.c | 3 +-
+ drivers/clk/mvebu/clk-cpu.c | 9 +-
+ drivers/clk/mvebu/common.c | 2 +-
+ drivers/clk/mxs/clk-div.c | 1 -
+ drivers/clk/mxs/clk-frac.c | 1 -
+ drivers/clk/mxs/clk-imx23.c | 3 +-
+ drivers/clk/mxs/clk-imx28.c | 2 +-
+ drivers/clk/mxs/clk-pll.c | 1 -
+ drivers/clk/mxs/clk-ref.c | 1 -
+ drivers/clk/mxs/clk.h | 3 +-
+ drivers/clk/nxp/clk-lpc18xx-cgu.c | 1 -
+ drivers/clk/pistachio/clk-pistachio.c | 19 +-
+ drivers/clk/pistachio/clk-pll.c | 81 ++-
+ drivers/clk/pistachio/clk.c | 1 +
+ drivers/clk/pistachio/clk.h | 14 +-
+ drivers/clk/pxa/clk-pxa25x.c | 2 +-
+ drivers/clk/pxa/clk-pxa27x.c | 2 +-
+ drivers/clk/pxa/clk-pxa3xx.c | 2 +-
+ drivers/clk/qcom/clk-branch.c | 2 +-
+ drivers/clk/qcom/clk-pll.c | 93 ++-
+ drivers/clk/qcom/clk-pll.h | 1 +
+ drivers/clk/qcom/clk-rcg.c | 63 +-
+ drivers/clk/qcom/clk-rcg2.c | 97 ++-
+ drivers/clk/qcom/common.c | 5 +-
+ drivers/clk/qcom/gcc-apq8084.c | 13 +-
+ drivers/clk/qcom/gcc-ipq806x.c | 10 +-
+ drivers/clk/qcom/gcc-msm8660.c | 8 +-
+ drivers/clk/qcom/gcc-msm8916.c | 26 +-
+ drivers/clk/qcom/gcc-msm8960.c | 12 +-
+ drivers/clk/qcom/gcc-msm8974.c | 5 +-
+ drivers/clk/qcom/lcc-ipq806x.c | 6 +-
+ drivers/clk/qcom/lcc-msm8960.c | 8 +-
+ drivers/clk/qcom/mmcc-apq8084.c | 20 +-
+ drivers/clk/qcom/mmcc-msm8960.c | 27 +-
+ drivers/clk/qcom/mmcc-msm8974.c | 16 +-
+ drivers/clk/rockchip/clk-cpu.c | 1 +
+ drivers/clk/rockchip/clk-inverter.c | 2 +-
+ drivers/clk/rockchip/clk-mmc-phase.c | 3 +-
+ drivers/clk/rockchip/clk-pll.c | 100 +--
+ drivers/clk/rockchip/clk-rk3188.c | 9 +-
+ drivers/clk/rockchip/clk-rk3288.c | 2 +-
+ drivers/clk/rockchip/clk.h | 12 +-
+ drivers/clk/samsung/clk-cpu.c | 7 +-
+ drivers/clk/samsung/clk-exynos-audss.c | 3 +-
+ drivers/clk/samsung/clk-exynos-clkout.c | 2 +-
+ drivers/clk/samsung/clk-exynos3250.c | 2 -
+ drivers/clk/samsung/clk-exynos4.c | 4 +-
+ drivers/clk/samsung/clk-exynos4415.c | 2 -
+ drivers/clk/samsung/clk-exynos5250.c | 2 -
+ drivers/clk/samsung/clk-exynos5260.c | 2 -
+ drivers/clk/samsung/clk-exynos5410.c | 2 -
+ drivers/clk/samsung/clk-exynos5420.c | 3 +-
+ drivers/clk/samsung/clk-exynos5433.c | 2 -
+ drivers/clk/samsung/clk-exynos5440.c | 2 -
+ drivers/clk/samsung/clk-exynos7.c | 2 -
+ drivers/clk/samsung/clk-pll.c | 20 +-
+ drivers/clk/samsung/clk-s3c2410-dclk.c | 6 +-
+ drivers/clk/samsung/clk-s3c2410.c | 2 -
+ drivers/clk/samsung/clk-s3c2412.c | 2 -
+ drivers/clk/samsung/clk-s3c2443.c | 2 -
+ drivers/clk/samsung/clk-s3c64xx.c | 3 +-
+ drivers/clk/samsung/clk-s5pv210-audss.c | 2 +-
+ drivers/clk/samsung/clk-s5pv210.c | 4 +-
+ drivers/clk/samsung/clk.c | 4 +
+ drivers/clk/samsung/clk.h | 3 +-
+ drivers/clk/shmobile/clk-div6.c | 8 +-
+ drivers/clk/shmobile/clk-r8a73a4.c | 2 +-
+ drivers/clk/shmobile/clk-r8a7740.c | 2 +-
+ drivers/clk/shmobile/clk-r8a7778.c | 2 +-
+ drivers/clk/shmobile/clk-r8a7779.c | 2 +-
+ drivers/clk/shmobile/clk-rcar-gen2.c | 2 +-
+ drivers/clk/shmobile/clk-sh73a0.c | 2 +-
+ drivers/clk/sirf/clk-atlas6.c | 1 -
+ drivers/clk/sirf/clk-atlas7.c | 25 +-
+ drivers/clk/sirf/clk-common.c | 14 +-
+ drivers/clk/sirf/clk-prima2.c | 1 -
+ drivers/clk/socfpga/clk-gate-a10.c | 3 +-
+ drivers/clk/socfpga/clk-gate.c | 5 +-
+ drivers/clk/socfpga/clk-periph-a10.c | 3 +-
+ drivers/clk/socfpga/clk-periph.c | 23 +-
+ drivers/clk/socfpga/clk-pll-a10.c | 1 +
+ drivers/clk/socfpga/clk-pll.c | 3 +-
+ drivers/clk/socfpga/clk.h | 3 +-
+ drivers/clk/spear/clk-vco-pll.c | 2 +-
+ drivers/clk/spear/spear1310_clock.c | 1 -
+ drivers/clk/spear/spear1340_clock.c | 1 -
+ drivers/clk/spear/spear6xx_clock.c | 1 -
+ drivers/clk/st/clk-flexgen.c | 13 +-
+ drivers/clk/st/clkgen-fsyn.c | 19 +-
+ drivers/clk/st/clkgen-mux.c | 93 +--
+ drivers/clk/st/clkgen-pll.c | 9 +-
+ drivers/clk/sunxi/Makefile | 1 +
+ drivers/clk/sunxi/clk-a20-gmac.c | 4 +-
+ drivers/clk/sunxi/clk-factors.c | 39 +-
+ drivers/clk/sunxi/clk-mod0.c | 3 +-
+ drivers/clk/sunxi/clk-simple-gates.c | 158 +++++
+ drivers/clk/sunxi/clk-sun6i-ar100.c | 36 +-
+ drivers/clk/sunxi/clk-sun8i-mbus.c | 2 +-
+ drivers/clk/sunxi/clk-sun9i-core.c | 2 +-
+ drivers/clk/sunxi/clk-sun9i-mmc.c | 3 +-
+ drivers/clk/sunxi/clk-sunxi.c | 227 +------
+ drivers/clk/sunxi/clk-usb.c | 3 +-
+ drivers/clk/tegra/clk-dfll.c | 8 +-
+ drivers/clk/tegra/clk-divider.c | 1 -
+ drivers/clk/tegra/clk-emc.c | 36 +-
+ drivers/clk/tegra/clk-periph-gate.c | 1 -
+ drivers/clk/tegra/clk-periph.c | 1 -
+ drivers/clk/tegra/clk-pll-out.c | 1 -
+ drivers/clk/tegra/clk-pll.c | 20 +-
+ drivers/clk/tegra/clk-super.c | 1 -
+ drivers/clk/tegra/clk-tegra-audio.c | 1 -
+ drivers/clk/tegra/clk-tegra-fixed.c | 1 -
+ drivers/clk/tegra/clk-tegra-periph.c | 1 -
+ drivers/clk/tegra/clk-tegra-pmc.c | 1 -
+ drivers/clk/tegra/clk-tegra-super-gen4.c | 1 -
+ drivers/clk/tegra/clk-tegra114.c | 2 -
+ drivers/clk/tegra/clk-tegra124.c | 9 +-
+ drivers/clk/tegra/clk-tegra20.c | 1 -
+ drivers/clk/tegra/clk-tegra30.c | 1 -
+ drivers/clk/tegra/clk.c | 1 +
+ drivers/clk/ti/Makefile | 17 +-
+ drivers/clk/ti/apll.c | 11 +-
+ drivers/clk/ti/autoidle.c | 115 +++-
+ drivers/clk/ti/clk-2xxx.c | 4 +-
+ drivers/clk/ti/clk-33xx.c | 3 +
+ drivers/clk/ti/clk-3xxx-legacy.c | 1 +
+ drivers/clk/ti/clk-3xxx.c | 235 +++++++
+ drivers/clk/ti/clk-43xx.c | 3 +
+ drivers/clk/ti/clk-44xx.c | 2 +
+ drivers/clk/ti/clk-54xx.c | 2 +
+ drivers/clk/ti/clk-7xx.c | 3 +-
+ drivers/clk/ti/clk-816x.c | 2 +
+ drivers/clk/ti/clk-dra7-atl.c | 1 +
+ drivers/clk/ti/clk.c | 154 ++++-
+ drivers/clk/ti/clkt_dflt.c | 316 ++++++++++
+ .../arm/mach-omap2 => drivers/clk/ti}/clkt_dpll.c | 36 +-
+ drivers/clk/ti/clkt_iclk.c | 101 +++
+ drivers/clk/ti/clock.h | 105 ++++
+ drivers/clk/ti/clockdomain.c | 83 ++-
+ drivers/clk/ti/composite.c | 4 +-
+ drivers/clk/ti/divider.c | 8 +-
+ drivers/clk/ti/dpll.c | 9 +-
+ {arch/arm/mach-omap2 => drivers/clk/ti}/dpll3xxx.c | 217 ++++---
+ {arch/arm/mach-omap2 => drivers/clk/ti}/dpll44xx.c | 55 +-
+ drivers/clk/ti/fapll.c | 4 +-
+ drivers/clk/ti/fixed-factor.c | 2 +
+ drivers/clk/ti/gate.c | 6 +-
+ drivers/clk/ti/interface.c | 2 +-
+ drivers/clk/ti/mux.c | 6 +-
+ drivers/clk/ux500/Makefile | 1 -
+ drivers/clk/ux500/abx500-clk.c | 1 -
+ drivers/clk/ux500/clk-prcmu.c | 16 +-
+ drivers/clk/ux500/clk-sysctrl.c | 2 +-
+ drivers/clk/ux500/clk.h | 3 +-
+ drivers/clk/ux500/u8500_clk.c | 526 ----------------
+ drivers/clk/ux500/u8500_of_clk.c | 165 ++---
+ drivers/clk/ux500/u8540_clk.c | 198 +++---
+ drivers/clk/ux500/u9540_clk.c | 5 +-
+ drivers/clk/versatile/clk-icst.c | 5 +-
+ drivers/clk/versatile/clk-impd1.c | 1 -
+ drivers/clk/versatile/clk-realview.c | 5 +-
+ drivers/clk/versatile/clk-sp810.c | 83 +--
+ drivers/clk/versatile/clk-versatile.c | 4 +-
+ drivers/clk/zte/Makefile | 2 +-
+ drivers/clk/zte/clk-zx296702.c | 126 +++-
+ drivers/clk/zte/{clk-pll.c => clk.c} | 141 ++++-
+ drivers/clk/zte/clk.h | 9 +
+ drivers/clk/zynq/clkc.c | 1 +
+ drivers/clocksource/cadence_ttc_timer.c | 1 -
+ drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c | 2 +-
+ .../clocking-wizard/clk-xlnx-clock-wizard.c | 1 +
+ drivers/video/fbdev/simplefb.c | 1 +
+ include/dt-bindings/clock/zx296702-clock.h | 17 +-
+ include/linux/clk-provider.h | 89 ++-
+ include/linux/clk/clk-conf.h | 2 +
+ include/linux/clk/tegra.h | 3 +-
+ include/linux/clk/ti.h | 157 ++---
+ include/linux/platform_data/clk-ux500.h | 12 +-
+ lib/vsprintf.c | 1 +
+ 294 files changed, 4406 insertions(+), 4919 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/sp810.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/gpio-mux-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/ux500.txt
+ delete mode 100644 arch/arm/mach-omap2/clkt_clksel.c
+ delete mode 100644 arch/arm/mach-omap2/clkt_iclk.c
+ delete mode 100644 arch/arm/mach-omap2/clock2430.c
+ delete mode 100644 arch/arm/mach-omap2/clock2xxx.c
+ delete mode 100644 arch/arm/mach-omap2/clock34xx.c
+ delete mode 100644 arch/arm/mach-omap2/clock34xx.h
+ delete mode 100644 arch/arm/mach-omap2/clock3517.c
+ delete mode 100644 arch/arm/mach-omap2/clock3517.h
+ delete mode 100644 arch/arm/mach-omap2/clock36xx.c
+ delete mode 100644 arch/arm/mach-omap2/clock36xx.h
+ delete mode 100644 arch/arm/mach-omap2/clock3xxx.c
+ delete mode 100644 arch/arm/mach-omap2/clock44xx.h
+ delete mode 100644 arch/arm/mach-omap2/clock_common_data.c
+ delete mode 100644 drivers/clk/clk-gpio-gate.c
+ create mode 100644 drivers/clk/clk-gpio.c
+ create mode 100644 drivers/clk/hisilicon/clk-hi6220-stub.c
+ create mode 100644 drivers/clk/sunxi/clk-simple-gates.c
+ create mode 100644 drivers/clk/ti/clkt_dflt.c
+ rename {arch/arm/mach-omap2 => drivers/clk/ti}/clkt_dpll.c (92%)
+ create mode 100644 drivers/clk/ti/clkt_iclk.c
+ rename {arch/arm/mach-omap2 => drivers/clk/ti}/dpll3xxx.c (79%)
+ rename {arch/arm/mach-omap2 => drivers/clk/ti}/dpll44xx.c (79%)
+ delete mode 100644 drivers/clk/ux500/u8500_clk.c
+ rename drivers/clk/zte/{clk-pll.c => clk.c} (55%)
+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 (5f785de58873 aio: Skip timer for io_getevents if timeout=0)
+$ git merge aio/master
+Already up-to-date.
+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 (9fae100cbd10 selftests: breakpoints: fix installing error on the architecture except x86)
+$ git merge kselftest/next
+Auto-merging tools/testing/selftests/Makefile
+Merge made by the 'recursive' strategy.
+ tools/testing/selftests/Makefile | 2 +-
+ tools/testing/selftests/breakpoints/Makefile | 16 +-
+ tools/testing/selftests/lib.mk | 13 +-
+ tools/testing/selftests/zram/Makefile | 12 ++
+ tools/testing/selftests/zram/README | 40 +++++
+ tools/testing/selftests/zram/zram.sh | 23 +++
+ tools/testing/selftests/zram/zram01.sh | 98 ++++++++++++
+ tools/testing/selftests/zram/zram02.sh | 53 +++++++
+ tools/testing/selftests/zram/zram_lib.sh | 222 +++++++++++++++++++++++++++
+ 9 files changed, 460 insertions(+), 19 deletions(-)
+ create mode 100644 tools/testing/selftests/zram/Makefile
+ create mode 100644 tools/testing/selftests/zram/README
+ create mode 100755 tools/testing/selftests/zram/zram.sh
+ create mode 100755 tools/testing/selftests/zram/zram01.sh
+ create mode 100755 tools/testing/selftests/zram/zram02.sh
+ create mode 100755 tools/testing/selftests/zram/zram_lib.sh
+Merging y2038/y2038 (ed8c2241c1ae coredump: Use 64bit time for unix time of coredump)
+$ git merge y2038/y2038
+Resolved 'drivers/staging/media/lirc/lirc_parallel.c' using previous resolution.
+Auto-merging kernel/cpuset.c
+Auto-merging fs/coredump.c
+Auto-merging drivers/staging/media/lirc/lirc_serial.c
+Auto-merging drivers/staging/media/lirc/lirc_sasem.c
+Auto-merging drivers/staging/media/lirc/lirc_parallel.c
+CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_parallel.c
+Auto-merging drivers/staging/gdm72xx/gdm_sdio.c
+Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
+Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
+Auto-merging drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 375a0df79104] Merge remote-tracking branch 'y2038/y2038'
+$ git diff -M --stat --summary HEAD^..
+ 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 (a6c5170d1ede Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux)
+$ git merge luto-misc/next
+Already up-to-date.
+Merging access_once/linux-next (c231afa3ccf1 compiler.h: cast away attributes in WRITE_ONCE magic)
+$ git merge access_once/linux-next
+Merge made by the 'recursive' strategy.
+Merging livepatching/for-next (07d42d41dfc4 Merge branch 'for-4.3/upstream' into for-next)
+$ git merge livepatching/for-next
+Merge made by the 'recursive' strategy.
+ kernel/livepatch/core.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+Merging coresight/next (395855d956ed coresight: Fix implicit inclusion of linux/sched.h)
+$ git merge coresight/next
+Merge made by the 'recursive' strategy.
+Merging rtc/rtc-next (c53d791e8e50 rtc: omap: Add external clock enabling support)
+$ git merge rtc/rtc-next
+Resolved 'arch/arm/boot/dts/am437x-gp-evm.dts' using previous resolution.
+Auto-merging drivers/rtc/rtc-ds1374.c
+Auto-merging drivers/rtc/Kconfig
+Auto-merging arch/arm/mach-pxa/pxa3xx.c
+Auto-merging arch/arm/mach-pxa/pxa27x.c
+Auto-merging arch/arm/mach-pxa/devices.c
+Removing arch/arm/mach-mmp/include/mach/regs-rtc.h
+Auto-merging arch/arm/boot/dts/am437x-sk-evm.dts
+Auto-merging arch/arm/boot/dts/am437x-gp-evm.dts
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/am437x-gp-evm.dts
+Auto-merging arch/arm/boot/dts/am4372.dtsi
+Auto-merging Documentation/devicetree/bindings/rtc/rtc-omap.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 27cb523bd585] Merge remote-tracking branch 'rtc/rtc-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/rtc/nxp,lpc1788-rtc.txt | 21 ++
+ Documentation/devicetree/bindings/rtc/rtc-omap.txt | 4 +
+ Documentation/devicetree/bindings/rtc/xlnx-rtc.txt | 25 ++
+ arch/arm/boot/dts/am4372.dtsi | 2 +
+ arch/arm/boot/dts/am437x-gp-evm.dts | 13 +
+ arch/arm/boot/dts/am437x-idk-evm.dts | 9 +
+ arch/arm/boot/dts/am437x-sk-evm.dts | 9 +
+ arch/arm/configs/cm_x2xx_defconfig | 2 +-
+ arch/arm/configs/em_x270_defconfig | 2 +-
+ arch/arm/configs/magician_defconfig | 2 +-
+ arch/arm/configs/palmz72_defconfig | 2 +-
+ arch/arm/configs/pcm027_defconfig | 2 +-
+ arch/arm/configs/trizeps4_defconfig | 2 +-
+ arch/arm/mach-mmp/include/mach/regs-rtc.h | 23 --
+ arch/arm/mach-pxa/devices.c | 18 +-
+ arch/arm/mach-pxa/pxa27x.c | 1 -
+ arch/arm/mach-pxa/pxa3xx.c | 1 -
+ arch/arm/mach-sa1100/include/mach/SA-1100.h | 34 --
+ drivers/rtc/Kconfig | 37 +-
+ drivers/rtc/Makefile | 2 +
+ drivers/rtc/class.c | 33 +-
+ drivers/rtc/interface.c | 2 +-
+ drivers/rtc/rtc-88pm80x.c | 28 +-
+ drivers/rtc/rtc-ab-b5ze-s3.c | 2 +-
+ drivers/rtc/rtc-armada38x.c | 32 +-
+ drivers/rtc/rtc-as3722.c | 4 +-
+ drivers/rtc/rtc-at91rm9200.c | 43 ++-
+ drivers/rtc/rtc-at91sam9.c | 45 ++-
+ drivers/rtc/rtc-bfin.c | 2 +-
+ drivers/rtc/rtc-bq32k.c | 3 +-
+ drivers/rtc/rtc-cmos.c | 125 ++++---
+ drivers/rtc/rtc-core.h | 19 +-
+ drivers/rtc/rtc-da9063.c | 391 +++++++++++++++------
+ drivers/rtc/rtc-dev.c | 1 +
+ drivers/rtc/rtc-ds1305.c | 18 -
+ drivers/rtc/rtc-ds1307.c | 120 +++----
+ drivers/rtc/rtc-ds1343.c | 12 -
+ drivers/rtc/rtc-ds1374.c | 5 +-
+ drivers/rtc/rtc-ds1511.c | 42 +--
+ drivers/rtc/rtc-ds1553.c | 4 +-
+ drivers/rtc/rtc-ds1685.c | 22 +-
+ drivers/rtc/rtc-ds1742.c | 4 +-
+ drivers/rtc/rtc-ds3232.c | 8 +-
+ drivers/rtc/rtc-fm3130.c | 1 -
+ drivers/rtc/rtc-gemini.c | 5 +-
+ drivers/rtc/rtc-hym8563.c | 1 -
+ drivers/rtc/rtc-isl12022.c | 8 +-
+ drivers/rtc/rtc-isl12057.c | 2 +-
+ drivers/rtc/rtc-lpc24xx.c | 310 ++++++++++++++++
+ drivers/rtc/rtc-m48t59.c | 18 +-
+ drivers/rtc/rtc-mt6397.c | 26 ++
+ drivers/rtc/rtc-omap.c | 33 ++
+ drivers/rtc/rtc-opal.c | 10 +-
+ drivers/rtc/rtc-pcf2123.c | 8 +-
+ drivers/rtc/rtc-pcf2127.c | 35 +-
+ drivers/rtc/rtc-pcf85063.c | 1 -
+ drivers/rtc/rtc-pcf8523.c | 1 -
+ drivers/rtc/rtc-pcf8563.c | 1 -
+ drivers/rtc/rtc-pcf8583.c | 1 -
+ drivers/rtc/rtc-pl031.c | 2 +-
+ drivers/rtc/rtc-pxa.c | 55 +--
+ drivers/rtc/rtc-rp5c01.c | 4 +-
+ drivers/rtc/rtc-rx8025.c | 277 ++++++---------
+ drivers/rtc/rtc-rx8581.c | 1 -
+ drivers/rtc/rtc-s3c.c | 28 +-
+ drivers/rtc/rtc-s5m.c | 10 +
+ drivers/rtc/rtc-sa1100.c | 139 +++++---
+ drivers/rtc/rtc-sa1100.h | 23 ++
+ drivers/rtc/rtc-sirfsoc.c | 107 +++---
+ drivers/rtc/rtc-stk17ta8.c | 4 +-
+ drivers/rtc/rtc-sysfs.c | 72 ++--
+ drivers/rtc/rtc-tx4939.c | 6 +-
+ drivers/rtc/rtc-zynqmp.c | 279 +++++++++++++++
+ include/asm-generic/rtc.h | 29 ++
+ 74 files changed, 1743 insertions(+), 930 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/rtc/nxp,lpc1788-rtc.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/xlnx-rtc.txt
+ delete mode 100644 arch/arm/mach-mmp/include/mach/regs-rtc.h
+ create mode 100644 drivers/rtc/rtc-lpc24xx.c
+ create mode 100644 drivers/rtc/rtc-sa1100.h
+ create mode 100644 drivers/rtc/rtc-zynqmp.c
+Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
+$ git merge hwspinlock/for-next
+Already up-to-date.
+Merging nvdimm/libnvdimm-for-next (f96d05f6b198 libnvdimm, pmem: direct map legacy pmem by default)
+$ git merge nvdimm/libnvdimm-for-next
+Recorded preimage for 'drivers/acpi/nfit.c'
+Recorded preimage for 'mm/Kconfig'
+Auto-merging mm/page_alloc.c
+Auto-merging mm/memory_hotplug.c
+Auto-merging mm/Kconfig
+CONFLICT (content): Merge conflict in mm/Kconfig
+Auto-merging lib/pci_iomap.c
+Auto-merging lib/Kconfig
+Auto-merging kernel/Makefile
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/blkdev.h
+Auto-merging fs/dax.c
+Auto-merging fs/block_dev.c
+Auto-merging drivers/tty/serial/8250/8250_core.c
+Auto-merging drivers/staging/unisys/visorbus/visorchipset.c
+Auto-merging drivers/staging/unisys/visorbus/visorchannel.c
+Auto-merging drivers/scsi/mvsas/mv_init.c
+Auto-merging drivers/scsi/arcmsr/arcmsr_hba.c
+Auto-merging drivers/scsi/aic94xx/aic94xx_init.c
+Auto-merging drivers/s390/block/dcssblk.c
+Auto-merging drivers/pci/probe.c
+Auto-merging drivers/nvdimm/pmem.c
+Auto-merging drivers/nvdimm/btt.c
+Auto-merging drivers/block/brd.c
+Auto-merging drivers/acpi/nfit.c
+CONFLICT (content): Merge conflict in drivers/acpi/nfit.c
+Auto-merging drivers/acpi/Kconfig
+Auto-merging arch/x86/mm/init_32.c
+Auto-merging arch/x86/kernel/Makefile
+Auto-merging arch/x86/include/asm/io.h
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/sparc/kernel/pci.c
+Auto-merging arch/sh/include/asm/io.h
+Auto-merging arch/s390/mm/init.c
+Auto-merging arch/powerpc/sysdev/axonram.c
+Auto-merging arch/powerpc/mm/mem.c
+Auto-merging arch/powerpc/kernel/pci_of_scan.c
+Auto-merging arch/arm64/include/asm/memory.h
+Auto-merging arch/arm/mach-shmobile/pm-rcar.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/acpi/nfit.c'.
+Recorded resolution for 'mm/Kconfig'.
+[master cd86a67f08c1] Merge remote-tracking branch 'nvdimm/libnvdimm-for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/filesystems/Locking | 3 +-
+ MAINTAINERS | 1 +
+ arch/arm/include/asm/memory.h | 6 -
+ arch/arm/mach-clps711x/board-cdb89712.c | 2 +-
+ arch/arm/mach-shmobile/pm-rcar.c | 2 +-
+ arch/arm64/include/asm/memory.h | 6 -
+ arch/ia64/include/asm/io.h | 1 +
+ arch/ia64/kernel/cyclone.c | 2 +-
+ arch/ia64/mm/init.c | 4 +-
+ arch/powerpc/kernel/pci_of_scan.c | 2 +-
+ arch/powerpc/mm/mem.c | 4 +-
+ arch/powerpc/sysdev/axonram.c | 7 +-
+ arch/s390/mm/init.c | 2 +-
+ arch/sh/include/asm/io.h | 1 +
+ arch/sh/mm/init.c | 5 +-
+ arch/sparc/kernel/pci.c | 3 +-
+ arch/tile/mm/init.c | 2 +-
+ arch/unicore32/include/asm/memory.h | 6 -
+ arch/x86/Kconfig | 9 +-
+ arch/x86/include/asm/cacheflush.h | 73 +-----
+ arch/x86/include/asm/io.h | 6 -
+ arch/x86/include/asm/pmem.h | 156 ++++++++++++
+ arch/x86/include/uapi/asm/e820.h | 2 +-
+ arch/x86/kernel/Makefile | 2 +-
+ arch/x86/kernel/pmem.c | 79 +-----
+ arch/x86/mm/init_32.c | 4 +-
+ arch/x86/mm/init_64.c | 4 +-
+ arch/xtensa/include/asm/io.h | 1 +
+ drivers/acpi/Kconfig | 1 +
+ drivers/acpi/nfit.c | 78 +++---
+ drivers/acpi/nfit.h | 17 +-
+ drivers/block/brd.c | 8 +-
+ drivers/isdn/icn/icn.h | 2 +-
+ drivers/mtd/devices/slram.c | 2 +-
+ drivers/mtd/nand/diskonchip.c | 2 +-
+ drivers/mtd/onenand/generic.c | 2 +-
+ drivers/nvdimm/Kconfig | 23 ++
+ drivers/nvdimm/Makefile | 5 +
+ drivers/nvdimm/btt.c | 50 +---
+ drivers/nvdimm/btt.h | 3 +
+ drivers/nvdimm/btt_devs.c | 215 ++++------------
+ drivers/nvdimm/claim.c | 201 +++++++++++++++
+ drivers/nvdimm/dimm_devs.c | 5 +-
+ drivers/nvdimm/e820.c | 87 +++++++
+ drivers/nvdimm/namespace_devs.c | 82 +++++-
+ drivers/nvdimm/nd-core.h | 9 +
+ drivers/nvdimm/nd.h | 62 ++++-
+ drivers/nvdimm/pfn.h | 35 +++
+ drivers/nvdimm/pfn_devs.c | 337 +++++++++++++++++++++++++
+ drivers/nvdimm/pmem.c | 245 +++++++++++++++---
+ drivers/nvdimm/region.c | 2 +
+ drivers/nvdimm/region_devs.c | 20 ++
+ drivers/pci/probe.c | 3 +-
+ drivers/pnp/manager.c | 2 -
+ drivers/s390/block/dcssblk.c | 10 +-
+ drivers/scsi/aic94xx/aic94xx_init.c | 7 +-
+ drivers/scsi/arcmsr/arcmsr_hba.c | 5 +-
+ drivers/scsi/mvsas/mv_init.c | 15 +-
+ drivers/scsi/sun3x_esp.c | 2 +-
+ drivers/staging/comedi/drivers/ii_pci20kc.c | 1 +
+ drivers/staging/unisys/visorbus/visorchannel.c | 16 +-
+ drivers/staging/unisys/visorbus/visorchipset.c | 17 +-
+ drivers/tty/serial/8250/8250_core.c | 2 +-
+ drivers/video/fbdev/ocfb.c | 1 -
+ drivers/video/fbdev/s1d13xxxfb.c | 3 +-
+ drivers/video/fbdev/stifb.c | 1 +
+ fs/block_dev.c | 4 +-
+ fs/dax.c | 62 +++--
+ include/asm-generic/memory_model.h | 6 +
+ include/linux/blkdev.h | 8 +-
+ include/linux/io-mapping.h | 2 +-
+ include/linux/io.h | 33 +++
+ include/linux/libnvdimm.h | 4 +
+ include/linux/memory_hotplug.h | 5 +-
+ include/linux/mm.h | 9 +-
+ include/linux/mmzone.h | 23 ++
+ include/linux/mtd/map.h | 2 +-
+ include/linux/pmem.h | 118 ++++++---
+ include/uapi/linux/ndctl.h | 12 +-
+ include/video/vga.h | 2 +-
+ kernel/Makefile | 2 +
+ kernel/memremap.c | 190 ++++++++++++++
+ kernel/resource.c | 61 +++--
+ lib/Kconfig | 3 +
+ lib/devres.c | 13 +-
+ lib/pci_iomap.c | 7 +-
+ mm/Kconfig | 17 ++
+ mm/memory_hotplug.c | 14 +-
+ mm/page_alloc.c | 3 +
+ tools/testing/nvdimm/Kbuild | 13 +-
+ tools/testing/nvdimm/test/iomap.c | 85 ++++++-
+ tools/testing/nvdimm/test/nfit.c | 209 ++++++++++-----
+ 92 files changed, 2138 insertions(+), 742 deletions(-)
+ create mode 100644 arch/x86/include/asm/pmem.h
+ create mode 100644 drivers/nvdimm/claim.c
+ create mode 100644 drivers/nvdimm/e820.c
+ create mode 100644 drivers/nvdimm/pfn.h
+ create mode 100644 drivers/nvdimm/pfn_devs.c
+ create mode 100644 kernel/memremap.c
+Merging akpm-current/current (0931fbddc5f2 lib: scatterlist: add sg splitting function)
+$ git merge --no-ff akpm-current/current
+Recorded preimage for 'mm/Kconfig'
+Resolved 'arch/x86/entry/syscalls/syscall_32.tbl' using previous resolution.
+Resolved 'drivers/video/console/Kconfig' using previous resolution.
+Resolved 'include/linux/kexec.h' using previous resolution.
+Resolved 'kernel/cgroup.c' using previous resolution.
+Resolved 'mm/Makefile' using previous resolution.
+Resolved 'mm/early_ioremap.c' using previous resolution.
+Auto-merging virt/kvm/kvm_main.c
+Removing tools/testing/selftests/vm/hugetlbfstest.c
+Auto-merging sound/soc/soc-core.c
+Auto-merging security/selinux/hooks.c
+Auto-merging scripts/kernel-doc
+Auto-merging scripts/checkpatch.pl
+Auto-merging mm/swapfile.c
+Auto-merging mm/page_alloc.c
+Auto-merging mm/mmap.c
+Auto-merging mm/memory_hotplug.c
+Auto-merging mm/early_ioremap.c
+CONFLICT (content): Merge conflict in mm/early_ioremap.c
+Auto-merging mm/Makefile
+CONFLICT (content): Merge conflict in mm/Makefile
+Auto-merging mm/Kconfig
+CONFLICT (content): Merge conflict in mm/Kconfig
+Auto-merging lib/vsprintf.c
+Auto-merging lib/Makefile
+Auto-merging lib/Kconfig.debug
+Auto-merging lib/Kconfig
+Auto-merging kernel/user_namespace.c
+Auto-merging kernel/sys_ni.c
+Auto-merging kernel/kthread.c
+Auto-merging kernel/fork.c
+Auto-merging kernel/events/core.c
+Auto-merging kernel/cgroup.c
+CONFLICT (content): Merge conflict in kernel/cgroup.c
+Auto-merging kernel/Makefile
+Auto-merging init/Kconfig
+Auto-merging include/uapi/linux/Kbuild
+Auto-merging include/net/sock.h
+Auto-merging include/linux/swap.h
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/pci.h
+Auto-merging include/linux/nmi.h
+Auto-merging include/linux/mmzone.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/kthread.h
+Auto-merging include/linux/kexec.h
+CONFLICT (content): Merge conflict in include/linux/kexec.h
+Auto-merging include/linux/fsnotify_backend.h
+Auto-merging include/linux/fs.h
+Auto-merging include/asm-generic/early_ioremap.h
+Auto-merging fs/xfs/xfs_trace.h
+Auto-merging fs/xfs/xfs_super.c
+Auto-merging fs/xfs/xfs_file.c
+Auto-merging fs/super.c
+Auto-merging fs/ocfs2/stack_user.c
+Auto-merging fs/ocfs2/refcounttree.c
+Auto-merging fs/ocfs2/quota_local.c
+Auto-merging fs/ocfs2/namei.c
+Auto-merging fs/ocfs2/file.c
+Auto-merging fs/ocfs2/cluster/heartbeat.c
+Auto-merging fs/ntfs/super.c
+Auto-merging fs/notify/inode_mark.c
+Auto-merging fs/namespace.c
+Auto-merging fs/mpage.c
+Auto-merging fs/libfs.c
+Auto-merging fs/inode.c
+Auto-merging fs/ext4/super.c
+Auto-merging fs/ext4/inode.c
+Auto-merging fs/ext4/ext4.h
+CONFLICT (modify/delete): fs/ext3/super.c deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of fs/ext3/super.c left in tree.
+Auto-merging fs/ext2/inode.c
+Auto-merging fs/dcache.c
+Auto-merging fs/dax.c
+Auto-merging fs/coredump.c
+Auto-merging fs/block_dev.c
+Auto-merging fs/Makefile
+Auto-merging fs/9p/vfs_file.c
+Auto-merging fs/9p/v9fs.c
+Auto-merging drivers/video/console/Kconfig
+CONFLICT (content): Merge conflict in drivers/video/console/Kconfig
+Auto-merging drivers/pci/pci-driver.c
+Auto-merging drivers/net/wireless/ath/wil6210/debugfs.c
+Auto-merging drivers/media/platform/coda/coda-common.c
+Auto-merging drivers/clk/tegra/clk.c
+Auto-merging drivers/clk/tegra/clk-tegra-pmc.c
+Auto-merging drivers/clk/samsung/clk.c
+Auto-merging drivers/clk/samsung/clk-pll.c
+Auto-merging drivers/clk/clk-moxart.c
+Auto-merging drivers/block/zram/zram_drv.c
+Auto-merging drivers/acpi/acpi_lpss.c
+Auto-merging drivers/acpi/acpi_apd.c
+Auto-merging block/genhd.c
+Auto-merging arch/x86/kvm/vmx.c
+Auto-merging arch/x86/kernel/setup.c
+Auto-merging arch/x86/kernel/cpu/perf_event_intel.c
+Auto-merging arch/x86/kernel/Makefile
+Auto-merging arch/x86/entry/syscalls/syscall_32.tbl
+CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl
+Auto-merging arch/x86/boot/compressed/misc.c
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/tile/Kconfig
+Auto-merging arch/sh/mm/init.c
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/powerpc/platforms/512x/clock-commonclk.c
+Auto-merging arch/powerpc/include/asm/pgtable-ppc64.h
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/arm64/kernel/setup.c
+Auto-merging arch/arm64/include/asm/pgtable.h
+Auto-merging arch/arm/mach-at91/pm.c
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/sysrq.txt
+Auto-merging Documentation/ioctl/ioctl-number.txt
+Auto-merging CREDITS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f fs/ext3/super.c
+fs/ext3/super.c: needs merge
+rm 'fs/ext3/super.c'
+$ git commit -v -a
+Recorded resolution for 'mm/Kconfig'.
+[master ca243d2b9bb8] Merge branch 'akpm-current/current'
+$ git diff -M --stat --summary HEAD^..
+ CREDITS | 4 +
+ Documentation/DMA-API.txt | 7 +
+ Documentation/blockdev/zram.txt | 3 +-
+ Documentation/devicetree/bindings/w1/omap-hdq.txt | 7 +-
+ Documentation/features/vm/TLB/arch-support.txt | 40 +
+ Documentation/filesystems/dax.txt | 7 +-
+ .../filesystems/ocfs2-online-filecheck.txt | 95 +
+ Documentation/filesystems/proc.txt | 47 +-
+ Documentation/filesystems/vfat.txt | 10 +
+ Documentation/ioctl/ioctl-number.txt | 1 +
+ Documentation/printk-formats.txt | 8 +
+ Documentation/sysrq.txt | 3 +-
+ Documentation/vm/00-INDEX | 2 +
+ Documentation/vm/hugetlbpage.txt | 15 +-
+ Documentation/vm/idle_page_tracking.txt | 98 +
+ Documentation/vm/pagemap.txt | 28 +-
+ Documentation/vm/userfaultfd.txt | 144 +
+ Documentation/vm/zswap.txt | 36 +-
+ Documentation/w1/masters/omap-hdq | 6 +
+ MAINTAINERS | 3 +-
+ arch/Kconfig | 3 +
+ arch/alpha/include/uapi/asm/mman.h | 4 +
+ arch/arm/Kconfig | 1 +
+ arch/arm/boot/compressed/decompress.c | 2 +-
+ arch/arm/include/asm/pgtable-3level.h | 1 +
+ arch/arm/mach-at91/pm.c | 2 +-
+ arch/arm/mach-imx/pm-imx5.c | 2 +-
+ arch/arm/mach-imx/pm-imx6.c | 2 +-
+ arch/arm/mach-socfpga/pm.c | 2 +-
+ arch/arm/mach-vexpress/spc.c | 2 +-
+ arch/arm64/include/asm/pgtable.h | 2 +
+ arch/arm64/kernel/setup.c | 62 +
+ arch/h8300/boot/compressed/misc.c | 2 +-
+ arch/ia64/Kconfig | 1 +
+ arch/ia64/hp/common/sba_iommu.c | 6 +-
+ arch/ia64/kernel/uncached.c | 2 +-
+ arch/ia64/sn/pci/pci_dma.c | 2 +-
+ arch/m32r/boot/compressed/misc.c | 3 +-
+ arch/m68k/Kconfig | 1 +
+ arch/mips/Kconfig | 1 +
+ arch/mips/boot/compressed/decompress.c | 4 +-
+ arch/mips/include/uapi/asm/mman.h | 7 +
+ arch/mips/include/uapi/asm/unistd.h | 15 +-
+ arch/mips/kernel/scall32-o32.S | 1 +
+ arch/mips/kernel/scall64-64.S | 1 +
+ arch/mips/kernel/scall64-n32.S | 1 +
+ arch/mips/kernel/scall64-o32.S | 1 +
+ arch/parisc/include/uapi/asm/mman.h | 4 +
+ arch/powerpc/Kconfig | 1 +
+ arch/powerpc/include/asm/pgtable-ppc64.h | 2 +
+ arch/powerpc/include/asm/systbl.h | 1 +
+ arch/powerpc/include/asm/unistd.h | 2 +-
+ arch/powerpc/include/uapi/asm/mman.h | 1 +
+ arch/powerpc/include/uapi/asm/unistd.h | 1 +
+ arch/powerpc/platforms/512x/clock-commonclk.c | 4 +-
+ arch/powerpc/platforms/cell/ras.c | 2 +-
+ arch/s390/Kconfig | 1 +
+ arch/s390/boot/compressed/misc.c | 2 +-
+ arch/sh/Kconfig | 1 +
+ arch/sh/boot/compressed/misc.c | 2 +-
+ arch/sh/mm/init.c | 4 +-
+ arch/sh/mm/numa.c | 4 +-
+ arch/sparc/include/asm/pgtable_32.h | 2 +-
+ arch/sparc/include/asm/pgtable_64.h | 9 +
+ arch/sparc/include/uapi/asm/mman.h | 1 +
+ arch/tile/Kconfig | 1 +
+ arch/tile/include/uapi/asm/mman.h | 1 +
+ arch/unicore32/boot/compressed/misc.c | 4 +-
+ arch/x86/Kconfig | 4 +-
+ arch/x86/boot/compressed/misc.c | 3 +-
+ arch/x86/boot/header.S | 2 +-
+ arch/x86/entry/syscalls/syscall_32.tbl | 2 +
+ arch/x86/entry/syscalls/syscall_64.tbl | 2 +
+ arch/x86/include/asm/kdebug.h | 2 +-
+ arch/x86/include/asm/pgtable.h | 5 +
+ arch/x86/include/asm/tlbflush.h | 6 +
+ arch/x86/kernel/Makefile | 4 +-
+ arch/x86/kernel/cpu/perf_event_intel.c | 9 +-
+ arch/x86/kernel/kvmclock.c | 4 +-
+ arch/x86/kernel/machine_kexec_64.c | 1 +
+ arch/x86/kernel/reboot.c | 4 +-
+ arch/x86/kernel/setup.c | 24 +-
+ arch/x86/kernel/vmlinux.lds.S | 2 +-
+ arch/x86/kvm/vmx.c | 10 +-
+ arch/x86/mm/numa.c | 6 +-
+ arch/x86/mm/tlb.c | 1 +
+ arch/x86/platform/efi/efi.c | 4 +-
+ arch/x86/platform/uv/uv_nmi.c | 6 +-
+ arch/xtensa/include/uapi/asm/mman.h | 7 +
+ block/genhd.c | 2 +-
+ drivers/acpi/acpi_apd.c | 3 +-
+ drivers/acpi/acpi_lpss.c | 2 +-
+ drivers/block/zram/zram_drv.c | 30 +-
+ drivers/block/zram/zram_drv.h | 1 -
+ drivers/clk/clk-mb86s7x.c | 2 +-
+ drivers/clk/clk-moxart.c | 4 +-
+ drivers/clk/samsung/clk-pll.c | 2 +-
+ drivers/clk/samsung/clk.c | 9 +-
+ drivers/clk/tegra/clk-tegra-pmc.c | 2 +-
+ drivers/clk/tegra/clk.c | 2 +-
+ .../crypto/qat/qat_common/adf_transport_debug.c | 16 +-
+ drivers/firmware/efi/Kconfig | 2 +-
+ drivers/gpu/drm/drm_vm.c | 8 +-
+ drivers/media/platform/coda/coda-common.c | 2 +-
+ drivers/misc/sgi-xp/xpc_uv.c | 2 +-
+ drivers/misc/sram.c | 8 +-
+ drivers/net/wireless/ath/wil6210/debugfs.c | 35 +-
+ drivers/parisc/ccio-dma.c | 13 +-
+ drivers/parisc/sba_iommu.c | 9 +-
+ drivers/pci/pci-driver.c | 2 +-
+ drivers/s390/crypto/zcrypt_api.c | 10 +-
+ drivers/tty/sysrq.c | 11 +-
+ drivers/video/console/Kconfig | 2 +-
+ drivers/w1/masters/omap_hdq.c | 224 +-
+ fs/9p/v9fs.c | 8 +-
+ fs/9p/vfs_file.c | 3 +-
+ fs/Makefile | 1 +
+ fs/affs/super.c | 8 +-
+ fs/aio.c | 27 +-
+ fs/binfmt_misc.c | 12 +-
+ fs/block_dev.c | 1 +
+ fs/cachefiles/daemon.c | 84 +-
+ fs/ceph/super.c | 2 +-
+ fs/cifs/cifsfs.c | 6 +-
+ fs/cifs/file.c | 8 +-
+ fs/coda/upcall.c | 6 +-
+ fs/coredump.c | 46 +-
+ fs/dax.c | 197 +-
+ fs/dcache.c | 2 +-
+ fs/exofs/super.c | 8 +-
+ fs/ext2/file.c | 10 +-
+ fs/ext2/inode.c | 1 +
+ fs/ext2/super.c | 6 +-
+ fs/ext4/ext4.h | 2 +
+ fs/ext4/file.c | 68 +-
+ fs/ext4/fsync.c | 5 +-
+ fs/ext4/indirect.c | 1 +
+ fs/ext4/inode.c | 12 +
+ fs/ext4/super.c | 19 +-
+ fs/fat/cache.c | 79 +-
+ fs/fat/dir.c | 2 +-
+ fs/fat/fat.h | 6 +-
+ fs/fat/file.c | 61 +
+ fs/fat/inode.c | 75 +-
+ fs/gfs2/super.c | 6 +-
+ fs/hfs/bnode.c | 9 +-
+ fs/hfs/brec.c | 20 +-
+ fs/hfs/super.c | 4 +-
+ fs/hfsplus/bnode.c | 3 -
+ fs/hfsplus/options.c | 4 +-
+ fs/hostfs/hostfs_kern.c | 2 +-
+ fs/hugetlbfs/inode.c | 314 ++-
+ fs/inode.c | 2 +-
+ fs/libfs.c | 26 +-
+ fs/mpage.c | 23 +-
+ fs/namespace.c | 4 +-
+ fs/notify/dnotify/dnotify.c | 14 +-
+ fs/notify/fanotify/fanotify_user.c | 8 +-
+ fs/notify/fdinfo.c | 3 +-
+ fs/notify/fsnotify.c | 11 +-
+ fs/notify/fsnotify.h | 21 +-
+ fs/notify/inode_mark.c | 20 -
+ fs/notify/mark.c | 113 +-
+ fs/notify/vfsmount_mark.c | 19 -
+ fs/ntfs/super.c | 21 +-
+ fs/ocfs2/Makefile | 3 +-
+ fs/ocfs2/acl.c | 26 +-
+ fs/ocfs2/alloc.c | 245 +-
+ fs/ocfs2/aops.c | 54 +-
+ fs/ocfs2/buffer_head_io.c | 6 +
+ fs/ocfs2/cluster/heartbeat.c | 123 +-
+ fs/ocfs2/cluster/nodemanager.c | 50 +-
+ fs/ocfs2/dir.c | 70 +-
+ fs/ocfs2/dlm/dlmdomain.c | 78 +-
+ fs/ocfs2/dlm/dlmmaster.c | 22 +-
+ fs/ocfs2/dlm/dlmrecovery.c | 6 +-
+ fs/ocfs2/dlm/dlmthread.c | 10 +
+ fs/ocfs2/dlmglue.c | 2 -
+ fs/ocfs2/extent_map.c | 22 +-
+ fs/ocfs2/file.c | 53 +-
+ fs/ocfs2/filecheck.c | 571 ++++
+ fs/ocfs2/filecheck.h | 48 +
+ fs/ocfs2/inode.c | 245 +-
+ fs/ocfs2/inode.h | 5 +-
+ fs/ocfs2/journal.c | 32 +-
+ fs/ocfs2/localalloc.c | 3 +-
+ fs/ocfs2/move_extents.c | 8 +-
+ fs/ocfs2/namei.c | 100 +-
+ fs/ocfs2/ocfs2.h | 2 +
+ fs/ocfs2/ocfs2_trace.h | 2 +
+ fs/ocfs2/quota_local.c | 3 +-
+ fs/ocfs2/refcounttree.c | 81 +-
+ fs/ocfs2/stack_user.c | 50 +-
+ fs/ocfs2/stackglue.c | 3 +-
+ fs/ocfs2/stackglue.h | 2 +
+ fs/ocfs2/suballoc.c | 90 +-
+ fs/ocfs2/super.c | 78 +-
+ fs/ocfs2/super.h | 8 +-
+ fs/ocfs2/xattr.c | 51 +-
+ fs/overlayfs/super.c | 6 +-
+ fs/proc/array.c | 5 +-
+ fs/proc/base.c | 113 +-
+ fs/proc/generic.c | 44 +-
+ fs/proc/page.c | 65 +
+ fs/proc/task_mmu.c | 323 +--
+ fs/reiserfs/super.c | 8 +-
+ fs/seq_file.c | 42 +
+ fs/super.c | 8 +-
+ fs/userfaultfd.c | 1330 ++++++++++
+ fs/xfs/xfs_buf.h | 1 +
+ fs/xfs/xfs_file.c | 30 +-
+ fs/xfs/xfs_super.c | 4 +-
+ fs/xfs/xfs_trace.h | 1 +
+ include/asm-generic/early_ioremap.h | 6 +
+ include/linux/crc64_ecma.h | 56 +
+ include/linux/cred.h | 8 +
+ include/linux/dax.h | 39 +
+ include/linux/dmapool.h | 6 +
+ include/linux/fs.h | 15 -
+ include/linux/fsnotify_backend.h | 55 +-
+ include/linux/genalloc.h | 6 +-
+ include/linux/gfp.h | 31 +-
+ include/linux/huge_mm.h | 24 +-
+ include/linux/hugetlb.h | 53 +-
+ include/linux/kernel.h | 129 +-
+ include/linux/kexec.h | 19 +-
+ include/linux/kmod.h | 2 -
+ include/linux/kthread.h | 2 +-
+ include/linux/memblock.h | 4 +-
+ include/linux/memcontrol.h | 392 ++-
+ include/linux/mm.h | 79 +-
+ include/linux/mm_types.h | 21 +-
+ include/linux/mmu_notifier.h | 46 +
+ include/linux/mmzone.h | 8 -
+ include/linux/nmi.h | 15 +-
+ include/linux/oom.h | 38 +-
+ include/linux/page-flags.h | 248 +-
+ include/linux/page-isolation.h | 5 -
+ include/linux/page_ext.h | 4 +
+ include/linux/page_idle.h | 110 +
+ include/linux/pagemap.h | 25 +-
+ include/linux/parse-integer.h | 188 ++
+ include/linux/pci.h | 2 +
+ include/linux/poison.h | 17 +-
+ include/linux/printk.h | 14 +-
+ include/linux/rmap.h | 12 +-
+ include/linux/sched.h | 23 +
+ include/linux/seq_file.h | 39 +
+ include/linux/slab.h | 10 +
+ include/linux/smpboot.h | 11 +-
+ include/linux/string.h | 1 +
+ include/linux/string_helpers.h | 14 +-
+ include/linux/swap.h | 22 +-
+ include/linux/swapops.h | 37 +
+ include/linux/syscalls.h | 3 +
+ include/linux/userfaultfd_k.h | 85 +
+ include/linux/vm_event_item.h | 1 +
+ include/linux/wait.h | 5 +-
+ include/linux/watchdog.h | 8 -
+ include/linux/zbud.h | 2 +-
+ include/linux/zpool.h | 6 +-
+ include/linux/zsmalloc.h | 6 +
+ include/net/sock.h | 33 -
+ include/trace/events/tlb.h | 3 +-
+ include/uapi/asm-generic/mman-common.h | 6 +
+ include/uapi/asm-generic/mman.h | 1 +
+ include/uapi/asm-generic/unistd.h | 4 +-
+ include/uapi/linux/Kbuild | 1 +
+ include/uapi/linux/kernel-page-flags.h | 1 +
+ include/uapi/linux/prctl.h | 7 +
+ include/uapi/linux/securebits.h | 11 +-
+ include/uapi/linux/userfaultfd.h | 169 ++
+ init/Kconfig | 22 +
+ init/initramfs.c | 4 +-
+ init/main.c | 1 -
+ ipc/msg.c | 5 +-
+ ipc/msgutil.c | 2 +-
+ ipc/shm.c | 4 +-
+ kernel/Makefile | 2 +
+ kernel/cgroup.c | 7 +-
+ kernel/events/core.c | 2 +-
+ kernel/extable.c | 1 -
+ kernel/fork.c | 7 +-
+ kernel/kexec.c | 2767 +-------------------
+ kernel/kexec_core.c | 1534 +++++++++++
+ kernel/kexec_file.c | 1045 ++++++++
+ kernel/kexec_internal.h | 22 +
+ kernel/kmod.c | 100 +-
+ kernel/ksysfs.c | 6 +-
+ kernel/kthread.c | 7 +-
+ kernel/printk/printk.c | 2 +-
+ kernel/profile.c | 8 +-
+ kernel/reboot.c | 2 +-
+ kernel/sched/wait.c | 7 +-
+ kernel/smpboot.c | 27 +-
+ kernel/sys_ni.c | 2 +
+ kernel/sysctl.c | 12 +-
+ kernel/user_namespace.c | 1 +
+ kernel/watchdog.c | 189 +-
+ lib/Kconfig | 7 +
+ lib/Kconfig.debug | 3 +
+ lib/Makefile | 3 +
+ lib/bitmap.c | 43 +-
+ lib/cmdline.c | 44 +-
+ lib/crc64_ecma.c | 341 +++
+ lib/decompress_bunzip2.c | 6 +-
+ lib/decompress_inflate.c | 31 +-
+ lib/decompress_unlz4.c | 6 +-
+ lib/decompress_unlzma.c | 9 +-
+ lib/decompress_unlzo.c | 13 +-
+ lib/decompress_unxz.c | 12 +-
+ lib/genalloc.c | 110 +-
+ lib/kstrtox.c | 254 --
+ lib/kstrtox.h | 1 -
+ lib/parse-integer.c | 222 ++
+ lib/parser.c | 33 +-
+ lib/show_mem.c | 4 +-
+ lib/string_helpers.c | 20 +-
+ lib/swiotlb.c | 2 +-
+ lib/test-kstrtox.c | 6 +-
+ lib/test-parse-integer.c | 563 ++++
+ lib/test_kasan.c | 6 +-
+ lib/vsprintf.c | 101 +-
+ lib/zlib_deflate/deftree.c | 6 +-
+ lib/zlib_deflate/defutil.h | 16 -
+ mm/Kconfig | 12 +
+ mm/Makefile | 2 +
+ mm/bootmem.c | 7 +
+ mm/compaction.c | 175 +-
+ mm/debug.c | 5 +
+ mm/dmapool.c | 14 +-
+ mm/early_ioremap.c | 22 +
+ mm/filemap.c | 51 +-
+ mm/gup.c | 70 +-
+ mm/huge_memory.c | 275 +-
+ mm/hugetlb.c | 498 +++-
+ mm/hwpoison-inject.c | 7 +-
+ mm/internal.h | 16 +
+ mm/kmemleak.c | 24 +-
+ mm/ksm.c | 2 +-
+ mm/list_lru.c | 4 +-
+ mm/madvise.c | 187 +-
+ mm/memblock.c | 32 +-
+ mm/memcontrol.c | 497 +---
+ mm/memory-failure.c | 119 +-
+ mm/memory.c | 76 +-
+ mm/memory_hotplug.c | 23 +-
+ mm/mempolicy.c | 11 +-
+ mm/mempool.c | 3 +
+ mm/memtest.c | 23 +-
+ mm/migrate.c | 39 +-
+ mm/mlock.c | 90 +-
+ mm/mmap.c | 114 +-
+ mm/mmu_notifier.c | 17 +
+ mm/mprotect.c | 3 +-
+ mm/mremap.c | 50 +-
+ mm/oom_kill.c | 142 +-
+ mm/page_alloc.c | 78 +-
+ mm/page_ext.c | 4 +
+ mm/page_idle.c | 232 ++
+ mm/page_isolation.c | 42 +-
+ mm/rmap.c | 180 +-
+ mm/shmem.c | 34 +-
+ mm/slab.c | 17 +-
+ mm/slab.h | 9 +
+ mm/slab_common.c | 28 +-
+ mm/slob.c | 17 +-
+ mm/slub.c | 208 +-
+ mm/swap.c | 47 +
+ mm/swap_state.c | 41 +-
+ mm/swapfile.c | 42 +
+ mm/userfaultfd.c | 308 +++
+ mm/util.c | 40 +-
+ mm/vmscan.c | 197 +-
+ mm/vmstat.c | 1 +
+ mm/zbud.c | 10 +-
+ mm/zpool.c | 51 +-
+ mm/zsmalloc.c | 235 +-
+ mm/zswap.c | 761 ++++--
+ net/ceph/ceph_common.c | 7 +-
+ net/sunrpc/sched.c | 2 +-
+ scripts/Lindent | 3 +
+ scripts/checkpatch.pl | 162 +-
+ .../coccinelle/api/alloc/pool_zalloc-simple.cocci | 84 +
+ scripts/decode_stacktrace.sh | 5 +-
+ scripts/kernel-doc | 38 +-
+ scripts/spelling.txt | 29 +
+ security/commoncap.c | 103 +-
+ security/keys/process_keys.c | 1 +
+ security/selinux/hooks.c | 2 +-
+ sound/core/oss/mixer_oss.c | 7 +-
+ sound/core/oss/pcm_oss.c | 13 +-
+ sound/core/pcm.c | 13 +-
+ sound/core/pcm_memory.c | 11 +-
+ sound/pci/ac97/ac97_codec.c | 9 +-
+ sound/soc/soc-core.c | 9 +-
+ tools/testing/selftests/vm/Makefile | 8 +-
+ tools/testing/selftests/vm/hugetlbfstest.c | 86 -
+ tools/testing/selftests/vm/mlock2-tests.c | 657 +++++
+ tools/testing/selftests/vm/on-fault-limit.c | 47 +
+ tools/testing/selftests/vm/run_vmtests | 30 +-
+ tools/testing/selftests/vm/userfaultfd.c | 638 +++++
+ tools/vm/page-types.c | 35 +-
+ virt/kvm/kvm_main.c | 31 +
+ 404 files changed, 16884 insertions(+), 6979 deletions(-)
+ create mode 100644 Documentation/features/vm/TLB/arch-support.txt
+ create mode 100644 Documentation/filesystems/ocfs2-online-filecheck.txt
+ create mode 100644 Documentation/vm/idle_page_tracking.txt
+ create mode 100644 Documentation/vm/userfaultfd.txt
+ create mode 100644 fs/ocfs2/filecheck.c
+ create mode 100644 fs/ocfs2/filecheck.h
+ create mode 100644 fs/userfaultfd.c
+ create mode 100644 include/linux/crc64_ecma.h
+ create mode 100644 include/linux/dax.h
+ create mode 100644 include/linux/page_idle.h
+ create mode 100644 include/linux/parse-integer.h
+ create mode 100644 include/linux/userfaultfd_k.h
+ create mode 100644 include/uapi/linux/userfaultfd.h
+ create mode 100644 kernel/kexec_core.c
+ create mode 100644 kernel/kexec_file.c
+ create mode 100644 kernel/kexec_internal.h
+ create mode 100644 lib/crc64_ecma.c
+ create mode 100644 lib/parse-integer.c
+ create mode 100644 lib/test-parse-integer.c
+ create mode 100644 mm/page_idle.c
+ create mode 100644 mm/userfaultfd.c
+ create mode 100644 scripts/coccinelle/api/alloc/pool_zalloc-simple.cocci
+ delete mode 100644 tools/testing/selftests/vm/hugetlbfstest.c
+ create mode 100644 tools/testing/selftests/vm/mlock2-tests.c
+ create mode 100644 tools/testing/selftests/vm/on-fault-limit.c
+ create mode 100644 tools/testing/selftests/vm/userfaultfd.c
+$ git am -3 ../patches/userfaultfd--selftest--update-userfaultfd-x86-32bit-syscall-number.patch
+Applying: userfaultfd: selftest: update userfaultfd x86 32bit syscall number
+$ git reset HEAD^
+Unstaged changes after reset:
+M tools/testing/selftests/vm/userfaultfd.c
+$ git add -A .
+$ git commit -v -a --amend
+[master c4ee0c165f29] Merge branch 'akpm-current/current'
+ Date: Fri Aug 28 17:00:28 2015 +1000
+$ 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: namei: fix warning while make xmldocs caused by namei.c
+Applying: fs/seq_file: convert int seq_vprint/seq_printf/etc... returns to void
+Applying: fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void-fix
+Applying: fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void-fix-fix
+Applying: mm: mark most vm_operations_struct const
+Applying: mm, mpx: add "vm_flags_t vm_flags" arg to do_mmap_pgoff()
+Applying: mm-mpx-add-vm_flags_t-vm_flags-arg-to-do_mmap_pgoff-fix
+Applying: mm-mpx-add-vm_flags_t-vm_flags-arg-to-do_mmap_pgoff-fix-checkpatch-fixes
+Applying: mm: make sure all file VMAs have ->vm_ops set
+Applying: mm: use vma_is_anonymous() in create_huge_pmd() and wp_huge_pmd()
+Applying: mm, madvise: use vma_is_anonymous() to check for anon VMA
+Applying: sys_membarrier(): system-wide memory barrier (generic, x86)
+Applying: selftests: add membarrier syscall test
+Applying: selftests: enhance membarrier syscall test
+Applying: dma-mapping: consolidate dma_{alloc,free}_{attrs,coherent}
+Applying: dma-mapping: consolidate dma_{alloc,free}_noncoherent
+Applying: dma-mapping: cosolidate dma_mapping_error
+Applying: dma-mapping: consolidate dma_supported
+Applying: dma-mapping: consolidate dma_set_mask
+Applying: drivers/w1/w1_int.c: call put_device if device_register fails
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + b3e117e68c85...e212aa6d8f14 akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (e212aa6d8f14 drivers/w1/w1_int.c: call put_device if device_register fails)
+$ git merge --no-ff akpm/master
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 8 ++
+ arch/alpha/include/asm/dma-mapping.h | 36 ------
+ arch/alpha/kernel/pci-noop.c | 10 --
+ arch/alpha/kernel/pci_iommu.c | 11 --
+ arch/arm/include/asm/dma-mapping.h | 68 ++----------
+ arch/arm/mm/dma-mapping.c | 12 --
+ arch/arm64/include/asm/dma-mapping.h | 69 ------------
+ arch/h8300/include/asm/dma-mapping.h | 44 --------
+ arch/hexagon/include/asm/dma-mapping.h | 49 +--------
+ arch/hexagon/kernel/dma.c | 11 --
+ arch/ia64/include/asm/dma-mapping.h | 50 ---------
+ arch/microblaze/include/asm/dma-mapping.h | 70 ------------
+ arch/mips/cavium-octeon/dma-octeon.c | 8 --
+ arch/mips/include/asm/dma-mapping.h | 67 ------------
+ arch/mips/loongson64/common/dma-swiotlb.c | 11 +-
+ arch/mips/mm/dma-default.c | 21 ++--
+ arch/mips/netlogic/common/nlm-dma.c | 8 --
+ arch/openrisc/include/asm/dma-mapping.h | 67 +-----------
+ arch/powerpc/include/asm/dma-mapping.h | 68 +-----------
+ arch/s390/include/asm/dma-mapping.h | 55 ----------
+ arch/s390/pci/pci_dma.c | 10 --
+ arch/sh/include/asm/dma-mapping.h | 77 +------------
+ arch/sparc/include/asm/dma-mapping.h | 40 +------
+ arch/tile/include/asm/dma-mapping.h | 45 +-------
+ arch/unicore32/include/asm/dma-mapping.h | 57 ----------
+ arch/x86/entry/syscalls/syscall_32.tbl | 1 +
+ arch/x86/entry/syscalls/syscall_64.tbl | 1 +
+ arch/x86/entry/vsyscall/vsyscall_64.c | 2 +-
+ arch/x86/include/asm/dma-mapping.h | 34 +-----
+ arch/x86/kernel/pci-dma.c | 60 ++--------
+ arch/x86/mm/mpx.c | 51 ++-------
+ drivers/android/binder.c | 2 +-
+ drivers/gpu/drm/vgem/vgem_drv.c | 2 +-
+ drivers/hsi/clients/cmt_speech.c | 2 +-
+ drivers/infiniband/hw/qib/qib_file_ops.c | 2 +-
+ drivers/infiniband/hw/qib/qib_mmap.c | 2 +-
+ drivers/iommu/omap-iommu-debug.c | 3 +-
+ drivers/media/platform/omap/omap_vout.c | 2 +-
+ drivers/misc/genwqe/card_dev.c | 2 +-
+ drivers/staging/android/ion/ion.c | 2 +-
+ drivers/staging/comedi/comedi_fops.c | 2 +-
+ drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 2 +-
+ drivers/w1/w1_int.c | 3 +-
+ drivers/xen/gntalloc.c | 2 +-
+ drivers/xen/gntdev.c | 2 +-
+ drivers/xen/privcmd.c | 4 +-
+ drivers/xen/swiotlb-xen.c | 6 -
+ fs/ceph/addr.c | 2 +-
+ fs/cifs/file.c | 2 +-
+ fs/namei.c | 2 +-
+ fs/nsfs.c | 3 +-
+ fs/seq_file.c | 70 ++++++------
+ include/asm-generic/dma-mapping-common.h | 118 ++++++++++++++++++++
+ include/linux/mm.h | 12 +-
+ include/linux/seq_file.h | 19 ++--
+ include/linux/syscalls.h | 2 +
+ include/uapi/asm-generic/unistd.h | 4 +-
+ include/uapi/linux/Kbuild | 1 +
+ include/uapi/linux/membarrier.h | 53 +++++++++
+ init/Kconfig | 12 ++
+ kernel/Makefile | 1 +
+ kernel/membarrier.c | 66 +++++++++++
+ kernel/sys_ni.c | 3 +
+ mm/madvise.c | 2 +-
+ mm/memory.c | 4 +-
+ mm/mmap.c | 18 ++-
+ mm/nommu.c | 19 ++--
+ security/selinux/selinuxfs.c | 2 +-
+ tools/testing/selftests/Makefile | 1 +
+ tools/testing/selftests/membarrier/.gitignore | 1 +
+ tools/testing/selftests/membarrier/Makefile | 11 ++
+ .../testing/selftests/membarrier/membarrier_test.c | 121 +++++++++++++++++++++
+ 72 files changed, 564 insertions(+), 1146 deletions(-)
+ create mode 100644 include/uapi/linux/membarrier.h
+ create mode 100644 kernel/membarrier.c
+ create mode 100644 tools/testing/selftests/membarrier/.gitignore
+ create mode 100644 tools/testing/selftests/membarrier/Makefile
+ create mode 100644 tools/testing/selftests/membarrier/membarrier_test.c
OSDN Git Service
