--- /dev/null
+$ date -R
+Thu, 11 Feb 2016 09:44:55 +1100
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 7cf91adc0d38 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
+Merging origin/master (74c7b2af37ad Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
+$ git merge origin/master
+Updating 7cf91adc0d38..74c7b2af37ad
+Fast-forward
+ Documentation/cgroup-v2.txt | 2 +-
+ Documentation/kernel-parameters.txt | 11 +++
+ drivers/ata/ahci.c | 20 +++++
+ drivers/ata/ahci.h | 1 +
+ drivers/ata/ahci_brcmstb.c | 1 +
+ drivers/ata/libahci.c | 27 ++++++-
+ drivers/ata/libata-core.c | 1 +
+ drivers/ata/libata-sff.c | 35 +++-----
+ drivers/input/joystick/xpad.c | 1 -
+ drivers/input/keyboard/adp5589-keys.c | 7 +-
+ drivers/input/keyboard/cap11xx.c | 8 +-
+ drivers/input/misc/Kconfig | 2 +-
+ drivers/input/misc/sirfsoc-onkey.c | 2 +-
+ drivers/input/mouse/vmmouse.c | 13 +--
+ drivers/input/serio/serio.c | 2 +-
+ drivers/input/touchscreen/colibri-vf50-ts.c | 1 +
+ drivers/input/touchscreen/edt-ft5x06.c | 18 +++--
+ include/linux/cgroup-defs.h | 6 ++
+ include/linux/cpuset.h | 6 ++
+ include/linux/libata.h | 1 +
+ include/linux/module.h | 19 ++---
+ include/linux/workqueue.h | 9 ++-
+ kernel/cgroup.c | 31 +++++--
+ kernel/cpuset.c | 71 +++++++++++-----
+ kernel/module.c | 120 +++++++++++++++++-----------
+ kernel/workqueue.c | 74 +++++++++++++++--
+ lib/Kconfig.debug | 15 ++++
+ 27 files changed, 362 insertions(+), 142 deletions(-)
+Merging fixes/master (36f90b0a2ddd Linux 4.5-rc2)
+$ 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 (74bf8efb5fa6 Linux 4.4-rc7)
+$ git merge arc-current/for-curr
+Already up-to-date.
+Merging arm-current/fixes (5070fb14a015 ARM: 8517/1: ICST: avoid arithmetic overflow in icst_hz())
+$ git merge arm-current/fixes
+Merge made by the 'recursive' strategy.
+ arch/arm/common/icst.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+Merging m68k-current/for-linus (daf670bc9d36 m68k/defconfig: Update defconfigs for v4.5-rc1)
+$ git merge m68k-current/for-linus
+Merge made by the 'recursive' strategy.
+ arch/m68k/configs/amiga_defconfig | 9 +++++++++
+ arch/m68k/configs/apollo_defconfig | 9 +++++++++
+ arch/m68k/configs/atari_defconfig | 9 +++++++++
+ arch/m68k/configs/bvme6000_defconfig | 9 +++++++++
+ arch/m68k/configs/hp300_defconfig | 9 +++++++++
+ arch/m68k/configs/mac_defconfig | 9 +++++++++
+ arch/m68k/configs/multi_defconfig | 9 +++++++++
+ arch/m68k/configs/mvme147_defconfig | 9 +++++++++
+ arch/m68k/configs/mvme16x_defconfig | 9 +++++++++
+ arch/m68k/configs/q40_defconfig | 9 +++++++++
+ arch/m68k/configs/sun3_defconfig | 9 +++++++++
+ arch/m68k/configs/sun3x_defconfig | 9 +++++++++
+ arch/m68k/include/asm/unistd.h | 2 +-
+ arch/m68k/include/uapi/asm/unistd.h | 1 +
+ arch/m68k/kernel/syscalltable.S | 1 +
+ 15 files changed, 111 insertions(+), 1 deletion(-)
+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 (0fe53e8d335b powerpc/powernv: Fix stale PE primary bus)
+$ git merge powerpc-fixes/fixes
+Auto-merging mm/huge_memory.c
+Auto-merging arch/powerpc/kernel/eeh_driver.c
+Auto-merging arch/powerpc/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/powerpc/Kconfig | 4 ++--
+ arch/powerpc/include/asm/book3s/64/pgtable.h | 4 ++++
+ arch/powerpc/include/asm/eeh.h | 1 +
+ arch/powerpc/include/asm/trace.h | 8 +++++--
+ arch/powerpc/kernel/eeh_driver.c | 3 +++
+ arch/powerpc/kernel/eeh_pe.c | 2 +-
+ arch/powerpc/kernel/module_64.c | 2 +-
+ arch/powerpc/mm/pgtable_64.c | 33 +++++++++++++++++++++++++++-
+ arch/powerpc/platforms/powernv/eeh-powernv.c | 5 ++++-
+ arch/powerpc/platforms/powernv/pci-ioda.c | 1 +
+ arch/powerpc/platforms/powernv/pci.c | 20 +++++++++++++++++
+ arch/powerpc/platforms/powernv/pci.h | 1 +
+ include/asm-generic/pgtable.h | 8 +++++++
+ mm/huge_memory.c | 1 +
+ 14 files changed, 85 insertions(+), 8 deletions(-)
+Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
+$ git merge powerpc-merge-mpe/fixes
+Already up-to-date.
+Merging sparc/master (ca0bb0798022 Add sun4v_wdt watchdog driver)
+$ git merge sparc/master
+Auto-merging drivers/watchdog/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/watchdog/watchdog-parameters.txt | 4 +
+ arch/sparc/include/uapi/asm/unistd.h | 3 +-
+ arch/sparc/kernel/entry.S | 17 +++
+ arch/sparc/kernel/hvcalls.S | 3 +-
+ arch/sparc/kernel/sparc_ksyms_64.c | 1 +
+ arch/sparc/kernel/syscalls.S | 36 +++++
+ arch/sparc/kernel/systbls_32.S | 2 +-
+ arch/sparc/kernel/systbls_64.S | 4 +-
+ drivers/watchdog/Kconfig | 11 ++
+ drivers/watchdog/Makefile | 1 +
+ drivers/watchdog/sun4v_wdt.c | 191 +++++++++++++++++++++++++
+ 11 files changed, 268 insertions(+), 5 deletions(-)
+ create mode 100644 drivers/watchdog/sun4v_wdt.c
+Merging net/master (a1b14d27ed09 bpf: fix branch offset adjustment on backjumps after patching ctx expansion)
+$ git merge net/master
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 9 +++---
+ drivers/net/ethernet/broadcom/tg3.c | 25 +++++++++++----
+ drivers/net/ethernet/cisco/enic/enic.h | 2 +-
+ drivers/net/ethernet/cisco/enic/vnic_dev.c | 19 +++++++-----
+ drivers/net/ethernet/synopsys/dwc_eth_qos.c | 2 +-
+ drivers/net/geneve.c | 31 ++++++++++++++++---
+ drivers/net/vxlan.c | 47 ++++++++++++++++++++---------
+ drivers/of/of_mdio.c | 1 +
+ include/linux/skbuff.h | 1 +
+ include/net/af_unix.h | 4 +--
+ include/net/ip_tunnels.h | 1 +
+ include/net/scm.h | 1 +
+ include/net/tcp.h | 2 +-
+ kernel/bpf/verifier.c | 2 +-
+ net/core/flow_dissector.c | 9 ++++--
+ net/core/scm.c | 7 +++++
+ net/core/skbuff.c | 2 ++
+ net/core/sysctl_net_core.c | 10 ++++++
+ net/ipv4/ip_gre.c | 8 +++++
+ net/ipv4/ip_tunnel.c | 20 ++++++++++--
+ net/ipv4/tcp.c | 4 +--
+ net/ipv4/tcp_ipv4.c | 11 +++++--
+ net/ipv6/addrconf.c | 5 ++-
+ net/ipv6/ip6_flowlabel.c | 5 +--
+ net/ipv6/tcp_ipv6.c | 5 +--
+ net/openvswitch/vport-vxlan.c | 2 ++
+ net/sctp/socket.c | 9 ++++--
+ net/unix/af_unix.c | 4 +--
+ net/unix/garbage.c | 8 ++---
+ security/selinux/nlmsgtab.c | 1 +
+ 30 files changed, 191 insertions(+), 66 deletions(-)
+Merging ipsec/master (a8a572a6b5f2 xfrm: dst_entries_init() per-net dst_ops)
+$ git merge ipsec/master
+Already up-to-date.
+Merging ipvs/master (b16c29191dc8 netfilter: nf_conntrack: use safer way to lock all buckets)
+$ git merge ipvs/master
+Already up-to-date.
+Merging wireless-drivers/master (d76d65fd2695 rtlwifi: fix broken VHT support)
+$ git merge wireless-drivers/master
+Merge made by the 'recursive' strategy.
+ drivers/net/wireless/realtek/rtlwifi/rc.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+Merging mac80211/master (212c5a5e6ba6 mac80211: minstrel: Change expected throughput unit back to Kbps)
+$ git merge mac80211/master
+Merge made by the 'recursive' strategy.
+ include/net/iw_handler.h | 6 +++++
+ net/mac80211/agg-rx.c | 2 +-
+ net/mac80211/rc80211_minstrel.c | 2 +-
+ net/mac80211/rc80211_minstrel_ht.c | 12 +++++----
+ net/wireless/core.c | 2 ++
+ net/wireless/wext-core.c | 52 ++++++++++++++++++++++++++++++--------
+ 6 files changed, 58 insertions(+), 18 deletions(-)
+Merging sound-current/for-linus (397da2d0ab0d Merge branch 'topic/core-fixes' into for-linus)
+$ git merge sound-current/for-linus
+Merge made by the 'recursive' strategy.
+ sound/core/timer.c | 40 +++++++++++++++---------------
+ sound/drivers/dummy.c | 37 +++++++++++++--------------
+ sound/firewire/digi00x/amdtp-dot.c | 2 +-
+ sound/firewire/tascam/tascam-transaction.c | 6 +++++
+ sound/firewire/tascam/tascam.c | 12 ++++++---
+ sound/firewire/tascam/tascam.h | 4 ---
+ sound/pci/hda/hda_generic.c | 4 +--
+ sound/pci/hda/hda_jack.c | 2 +-
+ sound/pci/hda/hda_jack.h | 2 +-
+ sound/pci/hda/patch_ca0132.c | 5 +++-
+ sound/pci/hda/patch_hdmi.c | 5 ++--
+ sound/pci/hda/patch_realtek.c | 11 ++------
+ sound/pci/hda/patch_sigmatel.c | 6 ++---
+ 13 files changed, 71 insertions(+), 65 deletions(-)
+Merging pci-current/for-linus (0cf1337e0b83 PCI: rcar: Add device tree support for r8a7793)
+$ git merge pci-current/for-linus
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/pci/pci-rcar-gen2.txt | 1 +
+ Documentation/devicetree/bindings/pci/rcar-pci.txt | 1 +
+ drivers/pci/host/pcie-iproc.c | 29 ++++++++--------------
+ drivers/pci/pcie/aer/aerdrv.c | 4 +--
+ drivers/pci/pcie/aer/aerdrv.h | 1 -
+ drivers/pci/pcie/aer/aerdrv_core.c | 2 --
+ 6 files changed, 14 insertions(+), 24 deletions(-)
+Merging driver-core.current/driver-core-linus (00cd29b799e3 klist: fix starting point removed bug in klist iterators)
+$ git merge driver-core.current/driver-core-linus
+Merge made by the 'recursive' strategy.
+ lib/klist.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+Merging tty.current/tty-linus (c8053b587627 Revert "8250: uniphier: allow modular build with 8250 console")
+$ git merge tty.current/tty-linus
+Merge made by the 'recursive' strategy.
+ drivers/tty/pty.c | 21 ++++++++++++++++++++-
+ drivers/tty/serial/8250/8250_pci.c | 21 +++++++++++++++++++++
+ drivers/tty/serial/omap-serial.c | 10 +++++++---
+ drivers/tty/tty_io.c | 3 +--
+ drivers/tty/tty_mutex.c | 7 ++++++-
+ fs/devpts/inode.c | 20 ++++++++++++++++++++
+ include/linux/devpts_fs.h | 4 ++++
+ 7 files changed, 79 insertions(+), 7 deletions(-)
+Merging usb.current/usb-linus (89140fdaf11a xhci: harden xhci_find_next_ext_cap against device removal)
+$ git merge usb.current/usb-linus
+Already up-to-date.
+Merging usb-gadget-fixes/fixes (6a4290cc28be usb: dwc3: gadget: set the OTG flag in dwc3 gadget driver.)
+$ git merge usb-gadget-fixes/fixes
+Already up-to-date.
+Merging usb-serial-fixes/usb-linus (4152b387da81 USB: option: fix Cinterion AHxx enumeration)
+$ git merge usb-serial-fixes/usb-linus
+Already up-to-date.
+Merging usb-chipidea-fixes/ci-for-usb-stable (6f51bc340d2a usb: chipidea: imx: fix a possible NULL dereference)
+$ git merge usb-chipidea-fixes/ci-for-usb-stable
+Already up-to-date.
+Merging staging.current/staging-linus (388f7b1d6e8c Linux 4.5-rc3)
+$ git merge staging.current/staging-linus
+Already up-to-date.
+Merging char-misc.current/char-misc-linus (3b2b9ead3214 nvmem: qfprom: Specify LE device endianness)
+$ git merge char-misc.current/char-misc-linus
+Merge made by the 'recursive' strategy.
+ drivers/misc/mei/main.c | 6 +++++-
+ drivers/nvmem/core.c | 6 ++++++
+ drivers/nvmem/qfprom.c | 1 +
+ 3 files changed, 12 insertions(+), 1 deletion(-)
+Merging input-current/for-linus (ff84dabe3c6e Input: colibri-vf50-ts - add missing #include <linux/of.h>)
+$ git merge input-current/for-linus
+Already up-to-date.
+Merging crypto-current/master (8a3978ad55fb crypto: marvell/cesa - fix test in mv_cesa_dev_dma_init())
+$ git merge crypto-current/master
+Already up-to-date.
+Merging ide/master (e04a2bd6d8c9 drivers/ide: make ide-scan-pci.c driver explicitly non-modular)
+$ 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 (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
+$ git merge rr-fixes/fixes
+Already up-to-date.
+Merging vfio-fixes/for-linus (16ab8a5cbea4 vfio/noiommu: Don't use iommu_present() to track fake groups)
+$ git merge vfio-fixes/for-linus
+Already up-to-date.
+Merging kselftest-fixes/fixes (92e963f50fc7 Linux 4.5-rc1)
+$ 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 (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
+$ git merge mfd-fixes/for-mfd-fixes
+Already up-to-date.
+Merging drm-intel-fixes/for-linux-next-fixes (ed3f9fd1e865 drm/i915: fix error path in intel_setup_gmbus())
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/i915/i915_drv.h | 4 +++
+ drivers/gpu/drm/i915/i915_gem.c | 3 +-
+ drivers/gpu/drm/i915/i915_gem_userptr.c | 3 +-
+ drivers/gpu/drm/i915/i915_reg.h | 2 +-
+ drivers/gpu/drm/i915/i915_suspend.c | 4 +--
+ drivers/gpu/drm/i915/intel_ddi.c | 3 +-
+ drivers/gpu/drm/i915/intel_dp_link_training.c | 45 +++++++++++++++++++--------
+ drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 21 ++++++++++++-
+ drivers/gpu/drm/i915/intel_i2c.c | 2 +-
+ drivers/gpu/drm/i915/intel_pm.c | 14 ++++++---
+ 10 files changed, 75 insertions(+), 26 deletions(-)
+Merging asm-generic/master (040b323b5012 ARM: asm/div64.h: adjust to generic codde)
+$ git merge asm-generic/master
+Already up-to-date.
+Merging arc/for-next (dec2b2849cfc ARCv2: intc: Allow interruption by lowest priority interrupt)
+$ git merge arc/for-next
+Auto-merging arch/arc/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/arc/Kconfig | 2 +-
+ arch/arc/configs/vdk_hs38_smp_defconfig | 2 +-
+ arch/arc/include/asm/arcregs.h | 3 +--
+ arch/arc/include/asm/irqflags-arcv2.h | 7 ++++--
+ arch/arc/include/asm/mcip.h | 4 ++--
+ arch/arc/kernel/entry-arcv2.S | 19 ++++++++++++++-
+ arch/arc/kernel/intc-arcv2.c | 41 +++++++++++++++++++--------------
+ arch/arc/kernel/mcip.c | 10 ++++----
+ arch/arc/kernel/setup.c | 20 ++++++++++------
+ arch/arc/kernel/time.c | 8 +++----
+ 10 files changed, 74 insertions(+), 42 deletions(-)
+Merging arm/for-next (f2c5e7deee7f Merge branches 'component', 'fixes', 'misc' and 'tauros2' into for-next)
+$ git merge arm/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/Kconfig | 4 +-
+ arch/arm/include/asm/div64.h | 14 +-
+ arch/arm/include/asm/memory.h | 6 +-
+ arch/arm/kernel/entry-armv.S | 5 +-
+ arch/arm/kernel/hibernate.c | 4 +-
+ arch/arm/kernel/irq.c | 2 +-
+ arch/arm/kernel/machine_kexec.c | 16 +-
+ arch/arm/kernel/reboot.c | 2 +-
+ arch/arm/kernel/topology.c | 4 +-
+ arch/arm/kernel/vmlinux-xip.lds.S | 322 ++++++++++++++++++++++++++++++++++++++
+ arch/arm/kernel/vmlinux.lds.S | 45 ++----
+ arch/arm/mach-keystone/keystone.c | 2 +-
+ arch/arm/mm/Kconfig | 34 ++--
+ arch/arm/mm/cache-tauros2.c | 32 ++--
+ arch/arm/mm/idmap.c | 2 +-
+ arch/arm/mm/init.c | 19 +--
+ arch/arm/plat-orion/time.c | 13 ++
+ arch/arm64/kernel/psci.c | 99 +-----------
+ drivers/base/component.c | 47 +++---
+ drivers/firmware/psci.c | 120 ++++++++++++++
+ include/linux/psci.h | 3 +
+ 21 files changed, 573 insertions(+), 222 deletions(-)
+ create mode 100644 arch/arm/kernel/vmlinux-xip.lds.S
+Merging arm-perf/for-next/perf (92e963f50fc7 Linux 4.5-rc1)
+$ git merge arm-perf/for-next/perf
+Already up-to-date.
+Merging arm-soc/for-next (ce4785b58783 ARM: SoC: document merges)
+$ git merge arm-soc/for-next
+Removing arch/arm/mach-zynq/Makefile.boot
+Removing arch/arm/mach-ux500/Makefile.boot
+Removing arch/arm/mach-u300/Makefile.boot
+Removing arch/arm/mach-spear/Makefile.boot
+Removing arch/arm/mach-s3c64xx/Makefile.boot
+Removing arch/arm/mach-realview/Makefile.boot
+Removing arch/arm/mach-prima2/Makefile.boot
+Removing arch/arm/mach-orion5x/Makefile.boot
+Removing arch/arm/mach-omap2/Makefile.boot
+Removing arch/arm/mach-nspire/Makefile.boot
+Removing arch/arm/mach-mv78xx0/Makefile.boot
+Removing arch/arm/mach-mmp/Makefile.boot
+Removing arch/arm/mach-keystone/Makefile.boot
+Removing arch/arm/mach-integrator/Makefile.boot
+Removing arch/arm/mach-exynos/Makefile.boot
+Removing arch/arm/mach-cns3xxx/Makefile.boot
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 8 +
+ arch/arm/Kconfig.debug | 9 +
+ arch/arm/arm-soc-for-next-contents.txt | 51 +++++
+ arch/arm/configs/multi_v7_defconfig | 1 +
+ arch/arm/configs/mvebu_v5_defconfig | 1 +
+ arch/arm/configs/mvebu_v7_defconfig | 1 +
+ arch/arm/configs/shmobile_defconfig | 3 +-
+ arch/arm/include/debug/palmchip.S | 11 +
+ arch/arm/mach-cns3xxx/Makefile.boot | 3 -
+ arch/arm/mach-exynos/Makefile.boot | 2 -
+ arch/arm/mach-integrator/Kconfig | 6 -
+ arch/arm/mach-integrator/Makefile.boot | 4 -
+ arch/arm/mach-keystone/Makefile.boot | 1 -
+ arch/arm/mach-mmp/Makefile.boot | 1 -
+ arch/arm/mach-mv78xx0/Kconfig | 3 +-
+ arch/arm/mach-mv78xx0/Makefile.boot | 3 -
+ arch/arm/mach-netx/Kconfig | 3 -
+ arch/arm/mach-nspire/Makefile.boot | 0
+ arch/arm/mach-omap2/Makefile.boot | 3 -
+ arch/arm/mach-orion5x/Makefile.boot | 3 -
+ arch/arm/mach-prima2/Makefile.boot | 3 -
+ arch/arm/mach-realview/Makefile.boot | 9 -
+ arch/arm/mach-s3c64xx/Makefile.boot | 2 -
+ arch/arm/mach-shmobile/cpufreq.c | 2 +
+ arch/arm/mach-shmobile/headsmp-scu.S | 2 +-
+ arch/arm/mach-shmobile/setup-rcar-gen2.c | 7 +-
+ arch/arm/mach-shmobile/smp-r8a7779.c | 2 -
+ arch/arm/mach-shmobile/suspend.c | 2 +
+ arch/arm/mach-shmobile/timer.c | 2 +
+ arch/arm/mach-spear/Makefile.boot | 3 -
+ arch/arm/mach-u300/Makefile.boot | 4 -
+ arch/arm/mach-ux500/Makefile.boot | 3 -
+ arch/arm/mach-zynq/Makefile.boot | 3 -
+ arch/arm64/boot/dts/amd/Makefile | 4 +-
+ arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts | 87 +++++++
+ arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts | 91 ++++++++
+ arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi | 105 +++++++--
+ arch/arm64/boot/dts/amd/amd-seattle-xgbe-b.dtsi | 117 ++++++++++
+ arch/arm64/boot/dts/amd/husky.dts | 83 +++++++
+ arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 16 ++
+ arch/arm64/boot/dts/renesas/r8a7795.dtsi | 249 ++++++++++++++++++---
+ arch/arm64/configs/defconfig | 13 ++
+ 42 files changed, 812 insertions(+), 114 deletions(-)
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ create mode 100644 arch/arm/include/debug/palmchip.S
+ delete mode 100644 arch/arm/mach-cns3xxx/Makefile.boot
+ delete mode 100644 arch/arm/mach-exynos/Makefile.boot
+ delete mode 100644 arch/arm/mach-integrator/Makefile.boot
+ delete mode 100644 arch/arm/mach-keystone/Makefile.boot
+ delete mode 100644 arch/arm/mach-mmp/Makefile.boot
+ delete mode 100644 arch/arm/mach-mv78xx0/Makefile.boot
+ delete mode 100644 arch/arm/mach-nspire/Makefile.boot
+ delete mode 100644 arch/arm/mach-omap2/Makefile.boot
+ delete mode 100644 arch/arm/mach-orion5x/Makefile.boot
+ delete mode 100644 arch/arm/mach-prima2/Makefile.boot
+ delete mode 100644 arch/arm/mach-realview/Makefile.boot
+ delete mode 100644 arch/arm/mach-s3c64xx/Makefile.boot
+ delete mode 100644 arch/arm/mach-spear/Makefile.boot
+ delete mode 100644 arch/arm/mach-u300/Makefile.boot
+ delete mode 100644 arch/arm/mach-ux500/Makefile.boot
+ delete mode 100644 arch/arm/mach-zynq/Makefile.boot
+ create mode 100644 arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts
+ create mode 100644 arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts
+ create mode 100644 arch/arm64/boot/dts/amd/amd-seattle-xgbe-b.dtsi
+ create mode 100644 arch/arm64/boot/dts/amd/husky.dts
+Merging at91/at91-next (8129febb508f ARM: dts: at91: at91sam9n12ek: fix panel compatible string)
+$ git merge at91/at91-next
+Merge made by the 'recursive' strategy.
+Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
+$ git merge bcm2835/for-next
+Already up-to-date.
+Merging bcm2835-dt/bcm2835-dt-next (5ec6f2cd8ec4 ARM: bcm2835: Add the Raspberry Pi power domain driver to the DT.)
+$ git merge bcm2835-dt/bcm2835-dt-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/bcm2835-rpi-a.dts | 24 ++++++++++++++++++++++++
+ arch/arm/boot/dts/bcm2835-rpi.dtsi | 16 ++++++++++++++++
+ arch/arm/boot/dts/bcm283x.dtsi | 35 +++++++++++++++++++++++++++++++++--
+ 4 files changed, 74 insertions(+), 2 deletions(-)
+ create mode 100644 arch/arm/boot/dts/bcm2835-rpi-a.dts
+Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1)
+$ git merge bcm2835-soc/bcm2835-soc-next
+Already up-to-date.
+Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1)
+$ git merge bcm2835-drivers/bcm2835-drivers-next
+Already up-to-date.
+Merging bcm2835-defconfig/bcm2835-defconfig-next (92e963f50fc7 Linux 4.5-rc1)
+$ git merge bcm2835-defconfig/bcm2835-defconfig-next
+Already up-to-date.
+Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next)
+$ git merge berlin/berlin/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
+$ git merge cortex-m/for-next
+Already up-to-date.
+Merging imx-mxs/for-next (5a2565fb7d09 Merge branch 'imx/defconfig' into for-next)
+$ git merge imx-mxs/for-next
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/Makefile | 1 +
+ .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 2 +-
+ arch/arm/boot/dts/imx28-apf28dev.dts | 2 +-
+ arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi | 4 +-
+ arch/arm/boot/dts/imx28-tx28.dts | 4 +-
+ .../boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts | 2 +-
+ arch/arm/boot/dts/imx51-babbage.dts | 2 +-
+ arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 2 +-
+ .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 2 +-
+ arch/arm/boot/dts/imx53-ard.dts | 6 +-
+ arch/arm/boot/dts/imx53-qsb-common.dtsi | 4 +-
+ arch/arm/boot/dts/imx53-tx53-x03x.dts | 2 +-
+ arch/arm/boot/dts/imx53-tx53-x13x.dts | 42 ++-
+ arch/arm/boot/dts/imx53-tx53.dtsi | 4 +-
+ arch/arm/boot/dts/imx6dl-tx6u-811x.dts | 2 +-
+ arch/arm/boot/dts/imx6q-gk802.dts | 2 +-
+ arch/arm/boot/dts/imx6q-icore-rqs.dts | 78 ++++
+ arch/arm/boot/dts/imx6q-tx6q-1110.dts | 2 +-
+ arch/arm/boot/dts/imx6qdl-apf6dev.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 4 +-
+ arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 15 +-
+ arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 8 +-
+ arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi | 411 +++++++++++++++++++++
+ arch/arm/boot/dts/imx6qdl-microsom.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 6 +-
+ arch/arm/boot/dts/imx6qdl-tx6.dtsi | 13 +-
+ arch/arm/boot/dts/imx6qdl-udoo.dtsi | 57 +++
+ arch/arm/boot/dts/imx6qdl.dtsi | 1 -
+ arch/arm/boot/dts/imx6sl-warp.dts | 2 +-
+ arch/arm/boot/dts/imx6sx-sabreauto.dts | 2 +-
+ arch/arm/boot/dts/imx6sx-sdb.dtsi | 18 +-
+ arch/arm/boot/dts/imx6ul-14x14-evk.dts | 4 +-
+ arch/arm/boot/dts/imx7d-sbc-imx7.dts | 2 +-
+ arch/arm/boot/dts/imx7d-sdb.dts | 2 +-
+ arch/arm/boot/dts/imx7d.dtsi | 9 +
+ arch/arm/boot/dts/vf-colibri.dtsi | 9 +
+ arch/arm/boot/dts/vfxxx.dtsi | 44 +++
+ arch/arm/configs/imx_v6_v7_defconfig | 3 +
+ arch/arm/configs/mxs_defconfig | 2 +
+ arch/arm/include/debug/imx.S | 3 +
+ arch/arm/mach-imx/3ds_debugboard.c | 30 +-
+ arch/arm/mach-imx/Kconfig | 2 +
+ arch/arm/mach-imx/anatop.c | 9 +-
+ arch/arm/mach-imx/avic.c | 30 +-
+ arch/arm/mach-imx/cpu-imx27.c | 3 +-
+ arch/arm/mach-imx/cpu-imx31.c | 2 +-
+ arch/arm/mach-imx/cpu-imx35.c | 2 +-
+ arch/arm/mach-imx/cpu.c | 16 +-
+ arch/arm/mach-imx/epit.c | 22 +-
+ arch/arm/mach-imx/headsmp.S | 2 +
+ arch/arm/mach-imx/iomux-imx31.c | 12 +-
+ arch/arm/mach-imx/iomux-v1.c | 4 +-
+ arch/arm/mach-imx/iomux-v3.c | 6 +-
+ arch/arm/mach-imx/mach-armadillo5x0.c | 4 +-
+ arch/arm/mach-imx/mach-imx51.c | 5 +-
+ arch/arm/mach-imx/mach-mx27ads.c | 6 +-
+ arch/arm/mach-imx/mach-mx31ads.c | 16 +-
+ arch/arm/mach-imx/mach-mx31moboard.c | 2 +-
+ arch/arm/mach-imx/mach-qong.c | 6 +-
+ arch/arm/mach-imx/mxc.h | 5 +
+ arch/arm/mach-imx/pm-imx27.c | 4 +-
+ arch/arm/mach-imx/pm-imx3.c | 4 +-
+ arch/arm/mach-imx/pm-imx5.c | 26 +-
+ arch/arm/mach-imx/pm-imx6.c | 8 +-
+ arch/arm/mach-imx/system.c | 6 +-
+ arch/arm/mach-imx/tzic.c | 34 +-
+ 72 files changed, 868 insertions(+), 191 deletions(-)
+ create mode 100644 arch/arm/boot/dts/imx6q-icore-rqs.dts
+ create mode 100644 arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi
+Merging keystone/next (8fdbbde4a16c Merge branch 'for_4.6/keystone_dts' into next)
+$ git merge keystone/next
+Auto-merging arch/arm/mach-keystone/keystone.c
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/keystone/keystone.txt | 5 ++
+ arch/arm/boot/dts/Makefile | 3 +-
+ arch/arm/boot/dts/k2g-evm.dts | 32 ++++++++
+ arch/arm/boot/dts/k2g.dtsi | 89 ++++++++++++++++++++++
+ arch/arm/mach-keystone/keystone.c | 1 +
+ 5 files changed, 129 insertions(+), 1 deletion(-)
+ create mode 100644 arch/arm/boot/dts/k2g-evm.dts
+ create mode 100644 arch/arm/boot/dts/k2g.dtsi
+Merging mvebu/for-next (84127e66ef4a Merge branch 'mvebu/defconfig' into mvebu/for-next)
+$ git merge mvebu/for-next
+Removing arch/arm/boot/dts/kirkwood-lswxl.dts
+Removing arch/arm/boot/dts/kirkwood-lswvl.dts
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/marvell,kirkwood.txt | 7 +-
+ .../pinctrl/marvell,armada-370-pinctrl.txt | 5 +-
+ arch/arm/boot/dts/Makefile | 8 +-
+ arch/arm/boot/dts/armada-370-mirabox.dts | 2 +-
+ arch/arm/boot/dts/armada-370-netgear-rn104.dts | 2 +-
+ arch/arm/boot/dts/armada-370-synology-ds213j.dts | 2 +-
+ arch/arm/boot/dts/armada-385-db-ap.dts | 3 +
+ arch/arm/boot/dts/armada-388-gp.dts | 36 +--
+ arch/arm/boot/dts/armada-38x.dtsi | 30 +-
+ arch/arm/boot/dts/kirkwood-ds112.dts | 2 +-
+ arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi | 192 +++++++++++++
+ .../boot/dts/kirkwood-linkstation-duo-6281.dtsi | 186 +++++++++++++
+ arch/arm/boot/dts/kirkwood-linkstation-lsqvl.dts | 135 +++++++++
+ arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts | 57 ++++
+ arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts | 57 ++++
+ arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts | 112 ++++++++
+ arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts | 116 ++++++++
+ arch/arm/boot/dts/kirkwood-linkstation.dtsi | 202 ++++++++++++++
+ arch/arm/boot/dts/kirkwood-lswvl.dts | 302 ---------------------
+ arch/arm/boot/dts/kirkwood-lswxl.dts | 302 ---------------------
+ arch/arm/boot/dts/kirkwood-openrd-client.dts | 6 +-
+ arch/arm/boot/dts/kirkwood-openrd.dtsi | 41 ++-
+ arch/arm/boot/dts/kirkwood.dtsi | 2 +-
+ arch/arm/boot/dts/mvebu-linkstation-fan.dtsi | 72 +++++
+ .../boot/dts/mvebu-linkstation-gpio-simple.dtsi | 105 +++++++
+ arch/arm/boot/dts/orion5x-linkstation-lsgl.dts | 87 ++++++
+ arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts | 214 ++++-----------
+ arch/arm/boot/dts/orion5x-linkstation.dtsi | 180 ++++++++++++
+ arch/arm/mach-mvebu/platsmp.c | 1 +
+ 29 files changed, 1654 insertions(+), 812 deletions(-)
+ create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi
+ create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi
+ create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lsqvl.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-linkstation.dtsi
+ delete mode 100644 arch/arm/boot/dts/kirkwood-lswvl.dts
+ delete mode 100644 arch/arm/boot/dts/kirkwood-lswxl.dts
+ create mode 100644 arch/arm/boot/dts/mvebu-linkstation-fan.dtsi
+ create mode 100644 arch/arm/boot/dts/mvebu-linkstation-gpio-simple.dtsi
+ create mode 100644 arch/arm/boot/dts/orion5x-linkstation-lsgl.dts
+ create mode 100644 arch/arm/boot/dts/orion5x-linkstation.dtsi
+Merging omap/for-next (d56817ce2533 Merge branch 'omap-for-v4.6/dt' into for-next)
+$ git merge omap/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/am335x-cm-t335.dts | 171 +++++++++++++++++++++++++++++++++++
+ arch/arm/boot/dts/omap3-n900.dts | 15 +++
+ arch/arm/boot/dts/omap3-n950-n9.dtsi | 15 +++
+ arch/arm/boot/dts/omap3-n950.dts | 29 ++++++
+ arch/arm/boot/dts/omap34xx.dtsi | 6 ++
+ arch/arm/boot/dts/omap36xx.dtsi | 6 ++
+ 6 files changed, 242 insertions(+)
+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 d9485ee2e4c2] Merge remote-tracking branch 'omap-pending/for-next'
+$ git diff -M --stat --summary HEAD^..
+Merging qcom/for-next (2ccea21d797f ARM: qcom: Drop ARCH_MSM* configs)
+$ git merge qcom/for-next
+Resolved 'MAINTAINERS' using previous resolution.
+Auto-merging MAINTAINERS
+CONFLICT (content): Merge conflict in MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master af27b6031a7d] Merge remote-tracking branch 'qcom/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/arm/cpus.txt | 1 +
+ .../devicetree/bindings/firmware/qcom,scm.txt | 25 ++
+ .../devicetree/bindings/mtd/qcom_nandc.txt | 86 +++++++
+ MAINTAINERS | 2 +
+ arch/arm/Makefile | 3 +-
+ arch/arm/boot/dts/qcom-apq8064.dtsi | 5 +
+ arch/arm/boot/dts/qcom-apq8084.dtsi | 14 ++
+ arch/arm/boot/dts/qcom-ipq8064.dtsi | 12 +
+ arch/arm/boot/dts/qcom-msm8660.dtsi | 20 ++
+ arch/arm/boot/dts/qcom-msm8974.dtsi | 132 ++++++++++
+ arch/arm/mach-qcom/Kconfig | 17 +-
+ arch/arm64/boot/dts/qcom/Makefile | 1 +
+ arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 132 +++++++++-
+ arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 24 +-
+ arch/arm64/boot/dts/qcom/msm8916.dtsi | 19 +-
+ arch/arm64/boot/dts/qcom/msm8996-mtp.dts | 21 ++
+ arch/arm64/boot/dts/qcom/msm8996-mtp.dtsi | 30 +++
+ arch/arm64/boot/dts/qcom/msm8996.dtsi | 267 ++++++++++++++++++++
+ arch/arm64/boot/dts/qcom/pm8004.dtsi | 19 ++
+ arch/arm64/boot/dts/qcom/pm8994.dtsi | 62 +++++
+ arch/arm64/boot/dts/qcom/pmi8994.dtsi | 19 ++
+ drivers/firmware/qcom_scm-32.c | 82 +++++++
+ drivers/firmware/qcom_scm-64.c | 25 ++
+ drivers/firmware/qcom_scm.c | 271 ++++++++++++++++++++-
+ drivers/firmware/qcom_scm.h | 12 +
+ drivers/soc/qcom/smd.c | 228 ++++++++++++-----
+ drivers/soc/qcom/spm.c | 8 +-
+ drivers/spmi/spmi-pmic-arb.c | 153 ++++++++----
+ include/linux/qcom_scm.h | 6 +
+ include/linux/soc/qcom/smd.h | 8 +-
+ include/linux/soc/qcom/smem_state.h | 35 +++
+ 31 files changed, 1597 insertions(+), 142 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt
+ create mode 100644 Documentation/devicetree/bindings/mtd/qcom_nandc.txt
+ create mode 100644 arch/arm64/boot/dts/qcom/msm8996-mtp.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/msm8996-mtp.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/msm8996.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/pm8004.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/pm8994.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/pmi8994.dtsi
+Merging renesas/next (74eb2716fe71 Merge branches 'heads/arm64-dt-for-v4.6', 'heads/defconfig-for-v4.6', 'heads/dt-for-v4.6' and 'heads/soc-for-v4.6' into next)
+$ git merge renesas/next
+Auto-merging arch/arm/mach-shmobile/smp-r8a7779.c
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/emev2.dtsi | 39 +-
+ arch/arm/boot/dts/r7s72100.dtsi | 177 +++----
+ arch/arm/boot/dts/r8a73a4.dtsi | 224 ++++-----
+ arch/arm/boot/dts/r8a7740.dtsi | 161 +++----
+ arch/arm/boot/dts/r8a7778-bockw.dts | 13 +
+ arch/arm/boot/dts/r8a7778.dtsi | 144 +++---
+ arch/arm/boot/dts/r8a7779-marzen.dts | 13 +
+ arch/arm/boot/dts/r8a7779.dtsi | 135 +++---
+ arch/arm/boot/dts/r8a7790-lager.dts | 13 +
+ arch/arm/boot/dts/r8a7790.dtsi | 441 +++++++++--------
+ arch/arm/boot/dts/r8a7791-koelsch.dts | 13 +
+ arch/arm/boot/dts/r8a7791-porter.dts | 165 +++++++
+ arch/arm/boot/dts/r8a7791.dtsi | 514 ++++++++++----------
+ arch/arm/boot/dts/r8a7793-gose.dts | 304 ++++++++++++
+ arch/arm/boot/dts/r8a7793.dtsi | 758 ++++++++++++++++++++++++------
+ arch/arm/boot/dts/r8a7794-alt.dts | 59 +++
+ arch/arm/boot/dts/r8a7794-silk.dts | 122 +++++
+ arch/arm/boot/dts/r8a7794.dtsi | 362 +++++++-------
+ arch/arm/boot/dts/sh73a0.dtsi | 186 ++++----
+ arch/arm/mach-shmobile/common.h | 5 +-
+ arch/arm/mach-shmobile/emev2.h | 6 +
+ arch/arm/mach-shmobile/headsmp-scu.S | 6 -
+ arch/arm/mach-shmobile/platsmp-scu.c | 11 +-
+ arch/arm/mach-shmobile/setup-emev2.c | 22 +-
+ arch/arm/mach-shmobile/setup-r8a7740.c | 39 +-
+ arch/arm/mach-shmobile/smp-emev2.c | 5 +-
+ arch/arm/mach-shmobile/smp-r8a7779.c | 3 +-
+ arch/arm/mach-shmobile/smp-sh73a0.c | 3 +-
+ arch/arm64/boot/dts/renesas/r8a7795.dtsi | 12 +-
+ include/dt-bindings/clock/r8a7793-clock.h | 2 +
+ 30 files changed, 2605 insertions(+), 1352 deletions(-)
+ create mode 100644 arch/arm/mach-shmobile/emev2.h
+Merging rockchip/for-next (b24b8204ad7d Merge branch 'v4.6-armsoc/dts64' into for-next)
+$ git merge rockchip/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mmc/rockchip-dw-mshc.txt | 2 +
+ .../bindings/soc/rockchip/power_domain.txt | 21 +++++
+ arch/arm/boot/dts/rk3036-kylin.dts | 104 +++++++++++++++++++++
+ arch/arm/boot/dts/rk3036.dtsi | 69 +++++++++++---
+ arch/arm/boot/dts/rk3066a-bqcurie2.dts | 19 +++-
+ arch/arm/boot/dts/rk3066a-marsboard.dts | 16 ++++
+ arch/arm/boot/dts/rk3066a-rayeager.dts | 18 +++-
+ arch/arm/boot/dts/rk3066a.dtsi | 24 ++++-
+ arch/arm/boot/dts/rk3188-radxarock.dts | 2 +-
+ arch/arm/boot/dts/rk3188.dtsi | 2 +
+ arch/arm/boot/dts/rk3288-evb.dtsi | 2 +-
+ arch/arm/boot/dts/rk3288-firefly.dtsi | 26 +++++-
+ arch/arm/boot/dts/rk3288-popmetal.dts | 2 +-
+ arch/arm/boot/dts/rk3288-r89.dts | 2 +-
+ arch/arm/boot/dts/rk3288-rock2-som.dtsi | 26 ++++++
+ arch/arm/boot/dts/rk3288-rock2-square.dts | 48 +++++++++-
+ arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 2 +-
+ arch/arm/boot/dts/rk3288-veyron.dtsi | 9 +-
+ arch/arm/boot/dts/rk3288.dtsi | 48 ++++++++++
+ arch/arm/boot/dts/rk3xxx.dtsi | 3 +
+ arch/arm64/Kconfig.platforms | 1 +
+ arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3368.dtsi | 10 +-
+ drivers/clk/rockchip/clk-rk3036.c | 33 ++-----
+ drivers/clk/rockchip/clk-rk3188.c | 27 ++----
+ drivers/clk/rockchip/clk-rk3228.c | 38 ++------
+ drivers/clk/rockchip/clk-rk3288.c | 38 ++------
+ drivers/clk/rockchip/clk-rk3368.c | 82 +++++++---------
+ drivers/clk/rockchip/clk.c | 64 ++++++++++++-
+ drivers/clk/rockchip/clk.h | 28 ++++++
+ drivers/soc/rockchip/pm_domains.c | 34 +++++++
+ include/dt-bindings/clock/rk3188-cru-common.h | 1 +
+ include/dt-bindings/power/rk3368-power.h | 28 ++++++
+ 34 files changed, 638 insertions(+), 195 deletions(-)
+ create mode 100644 include/dt-bindings/power/rk3368-power.h
+Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
+$ git merge rpi/for-rpi-next
+Already up-to-date.
+Merging samsung/for-next (8005c49d9aea Linux 4.4-rc1)
+$ git merge samsung/for-next
+Already up-to-date.
+Merging samsung-krzk/for-next (3a9cb5f4a9a7 Merge branch 'next/defconfig' into for-next)
+$ git merge samsung-krzk/for-next
+Auto-merging include/linux/soc/samsung/exynos-regs-pmu.h
+Auto-merging include/linux/soc/samsung/exynos-pmu.h
+Removing drivers/rtc/rtc-max77802.c
+Removing arch/arm/mach-exynos/regs-srom.h
+Removing arch/arm/mach-exynos/pmu.c
+Auto-merging arch/arm/configs/multi_v7_defconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../bindings/arm/samsung/exynos-srom.txt | 81 ++
+ MAINTAINERS | 1 +
+ arch/arm/boot/dts/exynos3250-monk.dts | 6 +-
+ arch/arm/boot/dts/exynos3250-rinato.dts | 6 +-
+ arch/arm/boot/dts/exynos4.dtsi | 5 +
+ arch/arm/boot/dts/exynos4210-origen.dts | 10 +-
+ arch/arm/boot/dts/exynos4210-smdkv310.dts | 2 +-
+ arch/arm/boot/dts/exynos4210-trats.dts | 2 +-
+ arch/arm/boot/dts/exynos4210-universal_c210.dts | 4 +-
+ arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 2 +-
+ arch/arm/boot/dts/exynos4412-odroidx.dts | 2 +-
+ arch/arm/boot/dts/exynos4412-origen.dts | 2 +-
+ arch/arm/boot/dts/exynos4412-smdk4412.dts | 2 +-
+ arch/arm/boot/dts/exynos4412-trats2.dts | 4 +-
+ arch/arm/boot/dts/exynos5.dtsi | 5 +
+ arch/arm/boot/dts/exynos5250-arndale.dts | 12 +-
+ arch/arm/boot/dts/exynos5250-snow-common.dtsi | 4 +-
+ arch/arm/boot/dts/exynos5250-spring.dts | 4 +-
+ arch/arm/boot/dts/exynos5250.dtsi | 2 +-
+ arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 406 +++++++++
+ arch/arm/boot/dts/exynos5410-smdk5410.dts | 41 +
+ arch/arm/boot/dts/exynos5410.dtsi | 47 +
+ arch/arm/boot/dts/exynos5420-arndale-octa.dts | 11 +-
+ arch/arm/boot/dts/exynos5420-cpus.dtsi | 102 +++
+ arch/arm/boot/dts/exynos5420-peach-pit.dts | 13 +-
+ arch/arm/boot/dts/exynos5420-smdk5420.dts | 9 +
+ arch/arm/boot/dts/exynos5420.dtsi | 170 ++--
+ arch/arm/boot/dts/exynos5422-cpus.dtsi | 140 +--
+ arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 8 +
+ arch/arm/boot/dts/exynos5800-peach-pi.dts | 13 +-
+ arch/arm/boot/dts/exynos5800.dtsi | 108 +++
+ arch/arm/boot/dts/s5pv210-aquila.dts | 4 +-
+ arch/arm/boot/dts/s5pv210-goni.dts | 4 +-
+ arch/arm/boot/dts/s5pv210-smdkv210.dts | 2 +-
+ arch/arm/configs/exynos_defconfig | 10 +-
+ arch/arm/configs/multi_v7_defconfig | 1 -
+ arch/arm/mach-exynos/Kconfig | 3 +
+ arch/arm/mach-exynos/Makefile | 2 +-
+ arch/arm/mach-exynos/exynos.c | 30 +-
+ arch/arm/mach-exynos/include/mach/map.h | 8 -
+ arch/arm/mach-exynos/mcpm-exynos.c | 2 +-
+ arch/arm/mach-exynos/platsmp.c | 2 +-
+ arch/arm/mach-exynos/pm.c | 4 +-
+ arch/arm/mach-exynos/pmu.c | 967 ---------------------
+ arch/arm/mach-exynos/regs-srom.h | 53 --
+ arch/arm/mach-exynos/suspend.c | 24 +-
+ arch/arm/mach-s3c64xx/Kconfig | 3 +-
+ arch/arm/plat-samsung/adc.c | 6 +-
+ arch/arm/plat-samsung/include/plat/map-s5p.h | 1 -
+ drivers/cpufreq/s5pv210-cpufreq.c | 2 -
+ drivers/rtc/Kconfig | 10 -
+ drivers/rtc/Makefile | 1 -
+ drivers/rtc/rtc-max77686.c | 362 ++++++--
+ drivers/rtc/rtc-max77802.c | 502 -----------
+ drivers/soc/Kconfig | 1 +
+ drivers/soc/Makefile | 1 +
+ drivers/soc/samsung/Kconfig | 17 +
+ drivers/soc/samsung/Makefile | 3 +
+ drivers/soc/samsung/exynos-pmu.c | 141 +++
+ drivers/soc/samsung/exynos-pmu.h | 44 +
+ drivers/soc/samsung/exynos-srom.c | 232 +++++
+ drivers/soc/samsung/exynos-srom.h | 51 ++
+ drivers/soc/samsung/exynos3250-pmu.c | 175 ++++
+ drivers/soc/samsung/exynos4-pmu.c | 222 +++++
+ drivers/soc/samsung/exynos5250-pmu.c | 195 +++++
+ drivers/soc/samsung/exynos5420-pmu.c | 280 ++++++
+ .../linux/soc/samsung}/exynos-pmu.h | 6 +-
+ .../linux/soc/samsung/exynos-regs-pmu.h | 6 +-
+ 68 files changed, 2745 insertions(+), 1856 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/samsung/exynos-srom.txt
+ create mode 100644 arch/arm/boot/dts/exynos5410-pinctrl.dtsi
+ create mode 100644 arch/arm/boot/dts/exynos5420-cpus.dtsi
+ delete mode 100644 arch/arm/mach-exynos/pmu.c
+ delete mode 100644 arch/arm/mach-exynos/regs-srom.h
+ delete mode 100644 drivers/rtc/rtc-max77802.c
+ create mode 100644 drivers/soc/samsung/Kconfig
+ create mode 100644 drivers/soc/samsung/Makefile
+ create mode 100644 drivers/soc/samsung/exynos-pmu.c
+ create mode 100644 drivers/soc/samsung/exynos-pmu.h
+ create mode 100644 drivers/soc/samsung/exynos-srom.c
+ create mode 100644 drivers/soc/samsung/exynos-srom.h
+ create mode 100644 drivers/soc/samsung/exynos3250-pmu.c
+ create mode 100644 drivers/soc/samsung/exynos4-pmu.c
+ create mode 100644 drivers/soc/samsung/exynos5250-pmu.c
+ create mode 100644 drivers/soc/samsung/exynos5420-pmu.c
+ rename {arch/arm/mach-exynos => include/linux/soc/samsung}/exynos-pmu.h (81%)
+ rename arch/arm/mach-exynos/regs-pmu.h => include/linux/soc/samsung/exynos-regs-pmu.h (99%)
+Merging sunxi/sunxi/for-next (06902a8895d5 Merge branches 'sunxi/clocks-for-4.6', 'sunxi/core-for-4.6', 'sunxi/drivers-for-4.6' and 'sunxi/dt-for-4.6' into sunxi/for-next)
+$ git merge sunxi/sunxi/for-next
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ Documentation/arm/sunxi/README | 1 -
+ Documentation/devicetree/bindings/arm/sunxi.txt | 1 +
+ Documentation/devicetree/bindings/clock/sunxi.txt | 4 +-
+ arch/arm/boot/dts/Makefile | 3 +
+ arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 10 +
+ arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 10 +
+ arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 9 +
+ .../boot/dts/sun4i-a10-itead-iteaduino-plus.dts | 86 +--
+ arch/arm/boot/dts/sun5i-r8-chip.dts | 4 +
+ arch/arm/boot/dts/sun6i-a31.dtsi | 46 +-
+ arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi | 6 +-
+ arch/arm/boot/dts/sun7i-a20-itead-ibox.dts | 125 +++
+ arch/arm/boot/dts/sun8i-a23-a33.dtsi | 27 +-
+ arch/arm/boot/dts/sun8i-a23.dtsi | 2 +-
+ arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 3 +
+ arch/arm/boot/dts/sun8i-a33.dtsi | 4 +-
+ .../boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts | 64 ++
+ arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 65 ++
+ arch/arm/boot/dts/sun8i-a83t.dtsi | 228 ++++++
+ arch/arm/boot/dts/sun8i-h3.dtsi | 37 +-
+ arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 6 +
+ arch/arm/boot/dts/sun9i-a80-optimus.dts | 28 +-
+ arch/arm/boot/dts/sun9i-a80.dtsi | 11 +-
+ arch/arm/boot/dts/sunxi-itead-core-common.dtsi | 136 ++++
+ arch/arm/mach-sunxi/sunxi.c | 1 +
+ drivers/bus/sunxi-rsb.c | 4 +-
+ drivers/clk/sunxi/clk-a10-hosc.c | 3 +-
+ drivers/clk/sunxi/clk-a20-gmac.c | 2 -
+ drivers/clk/sunxi/clk-factors.c | 123 ++-
+ drivers/clk/sunxi/clk-factors.h | 26 +-
+ drivers/clk/sunxi/clk-mod0.c | 23 +-
+ drivers/clk/sunxi/clk-simple-gates.c | 2 +
+ drivers/clk/sunxi/clk-sun6i-apb0-gates.c | 2 -
+ drivers/clk/sunxi/clk-sun6i-ar100.c | 235 ++----
+ drivers/clk/sunxi/clk-sun8i-bus-gates.c | 3 +-
+ drivers/clk/sunxi/clk-sun8i-mbus.c | 127 ++--
+ drivers/clk/sunxi/clk-sun9i-core.c | 86 +--
+ drivers/clk/sunxi/clk-sunxi.c | 835 +++++++++------------
+ drivers/clk/sunxi/clk-usb.c | 24 +-
+ drivers/soc/sunxi/sunxi_sram.c | 5 +-
+ 40 files changed, 1408 insertions(+), 1009 deletions(-)
+ create mode 100644 arch/arm/boot/dts/sun7i-a20-itead-ibox.dts
+ create mode 100644 arch/arm/boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts
+ create mode 100644 arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts
+ create mode 100644 arch/arm/boot/dts/sun8i-a83t.dtsi
+ create mode 100644 arch/arm/boot/dts/sunxi-itead-core-common.dtsi
+Merging tegra/for-next (025e08f78501 Merge branch for-4.6/arm64 into for-next)
+$ git merge tegra/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/tegra114.dtsi | 2 +-
+ arch/arm/boot/dts/tegra124-jetson-tk1.dts | 26 ++++++
+ arch/arm/boot/dts/tegra124.dtsi | 2 +-
+ arch/arm/boot/dts/tegra20.dtsi | 2 +-
+ arch/arm/boot/dts/tegra30.dtsi | 2 +-
+ arch/arm64/boot/dts/nvidia/tegra132.dtsi | 2 +-
+ arch/arm64/boot/dts/nvidia/tegra210.dtsi | 2 +-
+ drivers/clk/tegra/clk-emc.c | 6 +-
+ drivers/clk/tegra/clk-id.h | 1 +
+ drivers/clk/tegra/clk-pll.c | 50 +++++++----
+ drivers/clk/tegra/clk-tegra-periph.c | 5 +-
+ drivers/clk/tegra/clk-tegra-super-gen4.c | 6 +-
+ drivers/clk/tegra/clk-tegra210.c | 132 ++++++++++++++----------------
+ drivers/soc/tegra/Kconfig | 2 -
+ drivers/soc/tegra/pmc.c | 19 ++---
+ include/dt-bindings/clock/tegra210-car.h | 2 +-
+ 16 files changed, 145 insertions(+), 116 deletions(-)
+Merging arm64/for-next/core (f4d92287583b arm64: Fix build with CONFIG_DEBUG_PAGEALLOC=n)
+$ git merge arm64/for-next/core
+Merge made by the 'recursive' strategy.
+ Documentation/arm64/booting.txt | 20 +-
+ .../features/vm/huge-vmap/arch-support.txt | 2 +-
+ arch/arm/include/asm/kvm_asm.h | 2 +
+ arch/arm/kvm/arm.c | 8 +-
+ arch/arm64/Kconfig | 14 +
+ arch/arm64/include/asm/acpi.h | 19 +-
+ arch/arm64/include/asm/boot.h | 6 +
+ arch/arm64/include/asm/cpufeature.h | 3 +-
+ arch/arm64/include/asm/cputype.h | 17 +-
+ arch/arm64/include/asm/fixmap.h | 10 +
+ arch/arm64/include/asm/hardirq.h | 2 +-
+ arch/arm64/include/asm/kasan.h | 5 +-
+ arch/arm64/include/asm/kernel-pgtable.h | 12 +
+ arch/arm64/include/asm/kvm_asm.h | 2 +
+ arch/arm64/include/asm/kvm_host.h | 8 +-
+ arch/arm64/include/asm/memory.h | 44 +-
+ arch/arm64/include/asm/mmu_context.h | 62 ++-
+ arch/arm64/include/asm/pgalloc.h | 26 +-
+ arch/arm64/include/asm/pgtable.h | 110 +++--
+ arch/arm64/include/asm/processor.h | 8 +-
+ arch/arm64/include/asm/smp.h | 9 +
+ arch/arm64/kernel/Makefile | 1 +
+ arch/arm64/kernel/acpi_parking_protocol.c | 153 +++++++
+ arch/arm64/kernel/cpu_errata.c | 18 +-
+ arch/arm64/kernel/cpu_ops.c | 27 +-
+ arch/arm64/kernel/cpufeature.c | 17 +
+ arch/arm64/kernel/debug-monitors.c | 21 +-
+ arch/arm64/kernel/head.S | 9 +-
+ arch/arm64/kernel/image.h | 13 +-
+ arch/arm64/kernel/setup.c | 7 +
+ arch/arm64/kernel/smp.c | 32 +-
+ arch/arm64/kernel/suspend.c | 20 +-
+ arch/arm64/kernel/vmlinux.lds.S | 9 +-
+ arch/arm64/kvm/hyp.S | 6 +-
+ arch/arm64/lib/copy_page.S | 63 ++-
+ arch/arm64/mm/dump.c | 17 +-
+ arch/arm64/mm/init.c | 78 +++-
+ arch/arm64/mm/kasan_init.c | 63 ++-
+ arch/arm64/mm/mmu.c | 483 +++++++++++++--------
+ arch/arm64/mm/pageattr.c | 46 +-
+ arch/arm64/mm/proc.S | 28 ++
+ drivers/of/fdt.c | 5 +-
+ include/asm-generic/fixmap.h | 12 +-
+ 43 files changed, 1136 insertions(+), 381 deletions(-)
+ create mode 100644 arch/arm64/kernel/acpi_parking_protocol.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 (ca3060d39ae7 c6x: Use generic clkdev.h header)
+$ git merge c6x/for-linux-next
+Already up-to-date.
+Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
+$ git merge cris/for-next
+Already up-to-date.
+Merging h8300/h8300-next (11943fdd17d2 h8300: dts: Rename the serial port clock to fck)
+$ git merge h8300/h8300-next
+Merge made by the 'recursive' strategy.
+ arch/h8300/boot/dts/edosk2674.dts | 6 +++---
+ arch/h8300/boot/dts/h8300h_sim.dts | 4 ++--
+ arch/h8300/boot/dts/h8s_sim.dts | 4 ++--
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
+$ git merge hexagon/linux-next
+Already up-to-date.
+Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
+$ git merge ia64/next
+Already up-to-date.
+Merging m68k/for-next (a9c9d9aca4e7 zorro: Use kobj_to_dev())
+$ git merge m68k/for-next
+Merge made by the 'recursive' strategy.
+ drivers/zorro/zorro-sysfs.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+Merging m68knommu/for-next (9d4c9e5064d7 m68knommu: fix FEC platform device registration when driver is modular)
+$ git merge m68knommu/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/coldfire/device.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init)
+$ git merge metag/for-next
+Auto-merging arch/metag/kernel/ftrace.c
+Merge made by the 'recursive' strategy.
+ arch/metag/kernel/ftrace.c | 1 -
+ 1 file changed, 1 deletion(-)
+Merging microblaze/next (c937adb7ec91 microblaze: Wire up userfaultfd, membarrier, mlock2 syscalls)
+$ git merge microblaze/next
+Merge made by the 'recursive' strategy.
+ arch/microblaze/include/asm/unistd.h | 2 +-
+ arch/microblaze/include/uapi/asm/unistd.h | 3 +++
+ arch/microblaze/kernel/syscall_table.S | 3 +++
+ 3 files changed, 7 insertions(+), 1 deletion(-)
+Merging mips/mips-for-linux-next (a13d2abd8e61 MIPS: highmem: Turn flush_cache_kmaps into a no-op.)
+$ git merge mips/mips-for-linux-next
+Merge made by the 'recursive' strategy.
+ arch/mips/Kconfig | 2 +-
+ arch/mips/ath79/Kconfig | 12 ------------
+ arch/mips/ath79/setup.c | 13 ++++++-------
+ arch/mips/boot/compressed/Makefile | 12 +++++++++---
+ arch/mips/boot/dts/qca/Makefile | 3 ---
+ arch/mips/cavium-octeon/smp.c | 2 +-
+ arch/mips/include/asm/highmem.h | 4 +++-
+ arch/mips/loongson64/loongson-3/smp.c | 1 -
+ arch/mips/pmcs-msp71xx/msp_setup.c | 2 +-
+ arch/mips/vr41xx/common/pmu.c | 2 +-
+ 10 files changed, 22 insertions(+), 31 deletions(-)
+Merging nios2/for-next (8e3d7c834ba0 nios2: fix cache coherency)
+$ git merge nios2/for-next
+Already up-to-date.
+Merging parisc-hd/for-next (afd2ff9b7e1b Linux 4.4)
+$ git merge parisc-hd/for-next
+Already up-to-date.
+Merging powerpc/next (388f7b1d6e8c Linux 4.5-rc3)
+$ git merge powerpc/next
+Already up-to-date.
+Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
+$ git merge powerpc-mpe/next
+Already up-to-date.
+Merging fsl/next (44451d4d8f0e MAINTAINERS: Update Scott Wood's e-mail address)
+$ git merge fsl/next
+Already up-to-date.
+Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
+$ git merge mpc5xxx/next
+Already up-to-date.
+Merging s390/features (232f5dd78586 s390/oprofile: fix address range for asynchronous stack)
+$ git merge s390/features
+Merge made by the 'recursive' strategy.
+ arch/s390/kernel/perf_event.c | 8 ++++---
+ arch/s390/kernel/stacktrace.c | 47 ++++++++++++++++++++++++++++++------------
+ arch/s390/oprofile/backtrace.c | 8 ++++---
+ 3 files changed, 44 insertions(+), 19 deletions(-)
+Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
+$ git merge sparc-next/master
+Already up-to-date.
+Merging tile/master (f1c3418ed4e6 tile kgdb: fix bug in copy to gdb regs, and optimize memset)
+$ git merge tile/master
+Merge made by the 'recursive' strategy.
+ arch/tile/kernel/kgdb.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+Merging uml/linux-next (288b31a382d2 um: use %lx format specifiers for unsigned longs)
+$ git merge uml/linux-next
+Merge made by the 'recursive' strategy.
+ arch/x86/um/os-Linux/task_size.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
+$ git merge unicore32/unicore32
+Already up-to-date.
+Merging xtensa/for_next (bb2f3486041a Merge tag 'xtensa-for-next-20160111' of git://github.com/jcmvbkbc/linux-xtensa)
+$ git merge xtensa/for_next
+Auto-merging arch/xtensa/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/xtensa/Kconfig | 16 +++++++++
+ arch/xtensa/include/asm/io.h | 16 +++++++--
+ arch/xtensa/include/asm/processor.h | 12 +++----
+ arch/xtensa/include/asm/timex.h | 9 ++---
+ arch/xtensa/kernel/traps.c | 27 +++++++++++++++
+ arch/xtensa/mm/Makefile | 2 +-
+ arch/xtensa/mm/ioremap.c | 68 +++++++++++++++++++++++++++++++++++++
+ 7 files changed, 133 insertions(+), 17 deletions(-)
+ create mode 100644 arch/xtensa/mm/ioremap.c
+Merging btrfs/next (988f1f576d4f Merge branch 'for-chris-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.5)
+$ git merge btrfs/next
+Already up-to-date.
+Merging btrfs-kdave/for-next (4c9aeec066dd Merge branch 'for-next-4.6-20160203' into for-next-20160203)
+$ git merge btrfs-kdave/for-next
+Resolved 'fs/btrfs/file.c' using previous resolution.
+Auto-merging fs/btrfs/scrub.c
+Auto-merging fs/btrfs/ioctl.c
+Auto-merging fs/btrfs/inode.c
+Auto-merging fs/btrfs/file.c
+CONFLICT (content): Merge conflict in fs/btrfs/file.c
+Auto-merging fs/btrfs/ctree.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 109808b2be9c] Merge remote-tracking branch 'btrfs-kdave/for-next'
+$ git diff -M --stat --summary HEAD^..
+ fs/btrfs/ctree.c | 34 +++----
+ fs/btrfs/ctree.h | 5 +-
+ fs/btrfs/extent_io.c | 3 +-
+ fs/btrfs/file-item.c | 92 ++++++++++++-------
+ fs/btrfs/file.c | 99 ++++++++++++--------
+ fs/btrfs/inode.c | 248 ++++++++++++++++++++++++++++++++++++---------------
+ fs/btrfs/ioctl.c | 5 +-
+ fs/btrfs/reada.c | 10 +--
+ fs/btrfs/scrub.c | 24 ++---
+ fs/btrfs/send.c | 36 ++++----
+ 10 files changed, 357 insertions(+), 199 deletions(-)
+Merging ceph/master (bbadd4529b09 libceph: MOSDOpReply v7 encoding)
+$ git merge ceph/master
+Merge made by the 'recursive' strategy.
+Merging cifs/for-next (74c7b2af37ad Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
+$ git merge cifs/for-next
+Already up-to-date.
+Merging configfs/for-next (1609bac8af31 configfs: add myself as co-maintainer, updated git tree)
+$ git merge configfs/for-next
+Already up-to-date.
+Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
+$ git merge ecryptfs/next
+Auto-merging fs/ecryptfs/main.c
+Merge made by the 'recursive' strategy.
+ fs/ecryptfs/main.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+Merging ext3/for_next (5a9530e498ed ocfs2: Implement get_next_id())
+$ git merge ext3/for_next
+Merge made by the 'recursive' strategy.
+ fs/ext4/super.c | 1 +
+ fs/ocfs2/ocfs2_trace.h | 2 +
+ fs/ocfs2/quota_global.c | 25 ++
+ fs/quota/dquot.c | 39 +++
+ fs/quota/quota.c | 67 ++++-
+ fs/quota/quota_tree.c | 67 ++++-
+ fs/quota/quota_v2.c | 6 +
+ fs/reiserfs/super.c | 1 +
+ fs/udf/dir.c | 13 +-
+ fs/udf/namei.c | 29 +-
+ fs/udf/super.c | 38 +--
+ fs/udf/udfdecl.h | 21 +-
+ fs/udf/unicode.c | 630 ++++++++++++++++-------------------------
+ fs/xfs/libxfs/xfs_quota_defs.h | 3 +-
+ fs/xfs/xfs_dquot.c | 129 ++++++++-
+ fs/xfs/xfs_file.c | 82 ++++--
+ fs/xfs/xfs_inode.h | 2 +
+ fs/xfs/xfs_qm.c | 55 +++-
+ fs/xfs/xfs_qm.h | 48 +++-
+ fs/xfs/xfs_qm_syscalls.c | 27 +-
+ fs/xfs/xfs_quotaops.c | 36 ++-
+ fs/xfs/xfs_trans_dquot.c | 15 +-
+ include/linux/dqblk_qtree.h | 2 +
+ include/linux/quota.h | 5 +
+ include/linux/quotaops.h | 3 +
+ include/uapi/linux/dqblk_xfs.h | 1 +
+ include/uapi/linux/quota.h | 14 +
+ 27 files changed, 844 insertions(+), 517 deletions(-)
+Merging ext4/dev (6df2762f3f76 ext4 crypto: move context consistency check to ext4_file_open())
+$ git merge ext4/dev
+Merge made by the 'recursive' strategy.
+ fs/ext4/crypto.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
+ fs/ext4/dir.c | 6 ++++++
+ fs/ext4/ext4.h | 1 +
+ fs/ext4/file.c | 9 +++++++++
+ fs/ext4/namei.c | 26 ++++++++++++++++++++++++--
+ 5 files changed, 84 insertions(+), 2 deletions(-)
+Merging f2fs/dev (108daea1bd02 f2fs: increase i_size to avoid missing data)
+$ git merge f2fs/dev
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-fs-f2fs | 14 ++
+ fs/f2fs/checkpoint.c | 29 ++-
+ fs/f2fs/data.c | 373 +++++++++++++++++---------------
+ fs/f2fs/dir.c | 8 +-
+ fs/f2fs/extent_cache.c | 167 ++++++--------
+ fs/f2fs/f2fs.h | 38 +++-
+ fs/f2fs/file.c | 43 ++--
+ fs/f2fs/gc.c | 201 +++++++++--------
+ fs/f2fs/inline.c | 19 +-
+ fs/f2fs/inode.c | 8 +-
+ fs/f2fs/node.c | 120 ++++++++--
+ fs/f2fs/node.h | 26 ++-
+ fs/f2fs/recovery.c | 12 +-
+ fs/f2fs/segment.c | 64 ++----
+ fs/f2fs/segment.h | 2 +-
+ fs/f2fs/super.c | 48 +++-
+ fs/f2fs/xattr.c | 6 +-
+ include/linux/f2fs_fs.h | 24 +-
+ 18 files changed, 712 insertions(+), 490 deletions(-)
+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.
+Merging fuse/for-next (0b5da8db145b fuse: add support for SEEK_HOLE and SEEK_DATA in lseek)
+$ git merge fuse/for-next
+Already up-to-date.
+Merging gfs2/for-next (00bf5636b147 GFS2: Prevent delete work from occurring on glocks used for create)
+$ git merge gfs2/for-next
+Auto-merging fs/gfs2/inode.c
+Merge made by the 'recursive' strategy.
+ fs/gfs2/aops.c | 2 +-
+ fs/gfs2/dir.c | 4 ++--
+ fs/gfs2/glock.c | 8 ++++++++
+ fs/gfs2/incore.h | 1 +
+ fs/gfs2/inode.c | 7 ++++++-
+ fs/gfs2/super.c | 26 ++++++++++++++++----------
+ 6 files changed, 34 insertions(+), 14 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 (50ab8ec74a15 nfs: fix nfs_size_to_loff_t)
+$ git merge nfs/linux-next
+Merge made by the 'recursive' strategy.
+ include/linux/nfs_fs.h | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+Merging nfsd/nfsd-next (ee2bf98bbe90 NFSv4: fix getacl ERANGE for some ACL buffer sizes)
+$ git merge nfsd/nfsd-next
+Auto-merging fs/nfs/nfs4proc.c
+Merge made by the 'recursive' strategy.
+ fs/nfs/nfs4proc.c | 40 +++++++++++++++-------------------------
+ 1 file changed, 15 insertions(+), 25 deletions(-)
+Merging orangefs/for-next (6ebcc3fcdac1 Orangefs: added a couple of WARN_ONs, perhaps just temporarily.)
+$ git merge orangefs/for-next
+Auto-merging fs/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/stable/sysfs-fs-orangefs | 87 ++
+ Documentation/filesystems/orangefs.txt | 353 ++++++
+ MAINTAINERS | 8 +
+ fs/Kconfig | 1 +
+ fs/Makefile | 1 +
+ fs/orangefs/Kconfig | 6 +
+ fs/orangefs/Makefile | 10 +
+ fs/orangefs/acl.c | 175 +++
+ fs/orangefs/dcache.c | 145 +++
+ fs/orangefs/devorangefs-req.c | 933 +++++++++++++++
+ fs/orangefs/dir.c | 446 +++++++
+ fs/orangefs/downcall.h | 133 +++
+ fs/orangefs/file.c | 738 ++++++++++++
+ fs/orangefs/inode.c | 487 ++++++++
+ fs/orangefs/namei.c | 447 +++++++
+ fs/orangefs/orangefs-bufmap.c | 577 +++++++++
+ fs/orangefs/orangefs-bufmap.h | 47 +
+ fs/orangefs/orangefs-cache.c | 161 +++
+ fs/orangefs/orangefs-debug.h | 92 ++
+ fs/orangefs/orangefs-debugfs.c | 457 +++++++
+ fs/orangefs/orangefs-debugfs.h | 3 +
+ fs/orangefs/orangefs-dev-proto.h | 63 +
+ fs/orangefs/orangefs-kernel.h | 689 +++++++++++
+ fs/orangefs/orangefs-mod.c | 277 +++++
+ fs/orangefs/orangefs-sysfs.c | 1773 ++++++++++++++++++++++++++++
+ fs/orangefs/orangefs-sysfs.h | 2 +
+ fs/orangefs/orangefs-utils.c | 1263 ++++++++++++++++++++
+ fs/orangefs/protocol.h | 453 +++++++
+ fs/orangefs/super.c | 544 +++++++++
+ fs/orangefs/symlink.c | 32 +
+ fs/orangefs/upcall.h | 246 ++++
+ fs/orangefs/waitqueue.c | 506 ++++++++
+ fs/orangefs/xattr.c | 540 +++++++++
+ 33 files changed, 11695 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/devorangefs-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/orangefs-bufmap.c
+ create mode 100644 fs/orangefs/orangefs-bufmap.h
+ create mode 100644 fs/orangefs/orangefs-cache.c
+ create mode 100644 fs/orangefs/orangefs-debug.h
+ create mode 100644 fs/orangefs/orangefs-debugfs.c
+ create mode 100644 fs/orangefs/orangefs-debugfs.h
+ create mode 100644 fs/orangefs/orangefs-dev-proto.h
+ create mode 100644 fs/orangefs/orangefs-kernel.h
+ create mode 100644 fs/orangefs/orangefs-mod.c
+ create mode 100644 fs/orangefs/orangefs-sysfs.c
+ create mode 100644 fs/orangefs/orangefs-sysfs.h
+ create mode 100644 fs/orangefs/orangefs-utils.c
+ create mode 100644 fs/orangefs/protocol.h
+ 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
+$ git am -3 ../patches/0001-orangfs-update-for-follow_link-to-get_link-change.patch
+Applying: orangfs: update for follow_link to get_link change
+$ git reset HEAD^
+Unstaged changes after reset:
+M fs/orangefs/symlink.c
+$ git add -A .
+$ git commit -v -a --amend
+[master c017d5afa8f7] Merge remote-tracking branch 'orangefs/for-next'
+ Date: Thu Feb 11 11:12:33 2016 +1100
+Merging overlayfs/overlayfs-next (84889d493356 ovl: check dentry positiveness in ovl_cleanup_whiteouts())
+$ 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 (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
+$ git merge v9fs/for-next
+Already up-to-date.
+Merging ubifs/linux-next (4fdd1d51ad5d ubifs: Use XATTR_*_PREFIX_LEN)
+$ git merge ubifs/linux-next
+Already up-to-date.
+Merging xfs/for-next (63a1962bea7d Merge branch 'xfs-buf-macro-cleanup-4.6' into for-next)
+$ git merge xfs/for-next
+Auto-merging include/linux/fs.h
+Auto-merging fs/dax.c
+Merge made by the 'recursive' strategy.
+ fs/dax.c | 9 +-
+ fs/direct-io.c | 9 +-
+ fs/ext4/inode.c | 9 +-
+ fs/ocfs2/aops.c | 7 +-
+ fs/xfs/libxfs/xfs_alloc_btree.c | 2 -
+ fs/xfs/libxfs/xfs_attr_sf.h | 16 ---
+ fs/xfs/libxfs/xfs_bmap.c | 6 +-
+ fs/xfs/libxfs/xfs_bmap_btree.c | 1 -
+ fs/xfs/libxfs/xfs_btree.c | 32 +++--
+ fs/xfs/libxfs/xfs_da_format.h | 16 +++
+ fs/xfs/libxfs/xfs_dir2.c | 12 +-
+ fs/xfs/libxfs/xfs_ialloc_btree.c | 12 +-
+ fs/xfs/libxfs/xfs_inode_buf.c | 170 +++++++++++++++---------
+ fs/xfs/libxfs/xfs_inode_buf.h | 38 +++++-
+ fs/xfs/libxfs/xfs_inode_fork.c | 3 +-
+ fs/xfs/libxfs/xfs_log_format.h | 19 +--
+ fs/xfs/libxfs/xfs_rtbitmap.c | 32 ++++-
+ fs/xfs/libxfs/xfs_sb.h | 1 -
+ fs/xfs/libxfs/xfs_shared.h | 1 +
+ fs/xfs/xfs_aops.c | 274 +++++++++++++++------------------------
+ fs/xfs/xfs_bmap_util.c | 8 +-
+ fs/xfs/xfs_buf.c | 2 +-
+ fs/xfs/xfs_buf.h | 26 +---
+ fs/xfs/xfs_buf_item.c | 10 +-
+ fs/xfs/xfs_dir2_readdir.c | 2 +-
+ fs/xfs/xfs_export.c | 2 +-
+ fs/xfs/xfs_file.c | 6 +-
+ fs/xfs/xfs_filestream.c | 4 +-
+ fs/xfs/xfs_fsops.h | 1 -
+ fs/xfs/xfs_icache.c | 43 +++++-
+ fs/xfs/xfs_inode.c | 174 ++++++++++---------------
+ fs/xfs/xfs_inode.h | 8 +-
+ fs/xfs/xfs_inode_item.c | 82 +++++++++++-
+ fs/xfs/xfs_ioctl.c | 16 +--
+ fs/xfs/xfs_iops.c | 53 ++------
+ fs/xfs/xfs_itable.c | 22 ++--
+ fs/xfs/xfs_log.c | 20 ++-
+ fs/xfs/xfs_log_recover.c | 79 +++++------
+ fs/xfs/xfs_mount.c | 4 +-
+ fs/xfs/xfs_mount.h | 1 -
+ fs/xfs/xfs_rtalloc.c | 2 +-
+ fs/xfs/xfs_trace.h | 9 +-
+ fs/xfs/xfs_trans_ail.c | 5 +-
+ fs/xfs/xfs_trans_buf.c | 10 +-
+ fs/xfs/xfs_trans_inode.c | 14 +-
+ include/linux/fs.h | 2 +-
+ 46 files changed, 678 insertions(+), 596 deletions(-)
+Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
+$ git merge file-locks/linux-next
+Already up-to-date.
+Merging vfs/for-next (6f3925248b75 Merge branches 'work.iov_iter', 'work.copy_file_range', 'work.xattr' and 'work.symlinks' into for-next)
+$ git merge vfs/for-next
+Merge made by the 'recursive' strategy.
+Merging pci/next (a314966fad61 Merge branches 'pci/host-designware', 'pci/host-imx6', 'pci/host-layerscape' and 'pci/host-rcar' into next)
+$ git merge pci/next
+Removing include/asm-generic/pci-bridge.h
+Merge made by the 'recursive' strategy.
+ arch/alpha/include/asm/pci.h | 1 -
+ arch/arm/include/asm/pci.h | 3 -
+ arch/arm64/include/asm/Kbuild | 3 -
+ arch/arm64/include/asm/pci.h | 1 -
+ arch/arm64/kernel/pci.c | 2 -
+ arch/mips/include/asm/pci.h | 1 -
+ arch/powerpc/include/asm/pci-bridge.h | 1 -
+ arch/unicore32/include/asm/pci.h | 2 -
+ arch/x86/pci/common.c | 1 -
+ drivers/ata/pata_macio.c | 2 +-
+ drivers/char/agp/uninorth-agp.c | 1 -
+ drivers/gpu/drm/radeon/radeon_combios.c | 1 -
+ drivers/ide/pdc202xx_new.c | 1 -
+ drivers/ide/pmac.c | 1 -
+ drivers/macintosh/macio_asic.c | 1 -
+ drivers/misc/cxl/pci.c | 1 -
+ drivers/net/ethernet/sun/sungem.c | 1 -
+ drivers/net/ethernet/toshiba/spider_net.c | 1 -
+ drivers/of/of_pci.c | 1 -
+ drivers/pci/bus.c | 7 +-
+ drivers/pci/host/pci-imx6.c | 137 ++++++++++++-----------------
+ drivers/pci/host/pci-layerscape.c | 1 +
+ drivers/pci/host/pcie-designware.c | 15 ++--
+ drivers/pci/host/pcie-rcar.c | 14 ++-
+ drivers/pci/pci.c | 1 -
+ drivers/pci/pcie/aer/aer_inject.c | 61 +++++++++----
+ drivers/pci/pcie/pme.c | 11 +--
+ drivers/pci/probe.c | 8 +-
+ drivers/pci/quirks.c | 15 ++++
+ drivers/pci/setup-bus.c | 1 -
+ drivers/scsi/mac53c94.c | 2 +-
+ drivers/scsi/mesh.c | 2 +-
+ drivers/usb/core/hcd-pci.c | 1 -
+ drivers/video/fbdev/aty/aty128fb.c | 1 -
+ drivers/video/fbdev/aty/radeon_base.c | 1 -
+ drivers/video/fbdev/imsttfb.c | 1 -
+ drivers/video/fbdev/matrox/matroxfb_base.h | 1 -
+ drivers/video/fbdev/offb.c | 4 -
+ include/asm-generic/pci-bridge.h | 74 ----------------
+ include/linux/pci.h | 22 +++++
+ sound/ppc/pmac.c | 1 -
+ 41 files changed, 170 insertions(+), 237 deletions(-)
+ delete mode 100644 include/asm-generic/pci-bridge.h
+Merging hid/for-next (bc1db4af59b2 Merge branches 'for-4.6/sony' and 'for-4.6/upstream' into for-next)
+$ git merge hid/for-next
+Merge made by the 'recursive' strategy.
+ drivers/hid/hid-core.c | 94 ++++--
+ drivers/hid/hid-dr.c | 4 +-
+ drivers/hid/hid-ids.h | 9 +-
+ drivers/hid/hid-lg.c | 10 +-
+ drivers/hid/hid-logitech-hidpp.c | 701 +++++++++++++++++++++++++++++++++------
+ drivers/hid/hid-multitouch.c | 3 +
+ drivers/hid/hid-rmi.c | 11 +
+ drivers/hid/hid-sony.c | 182 +++++-----
+ drivers/hid/usbhid/hid-quirks.c | 2 +
+ drivers/hid/wacom_wac.c | 87 ++---
+ 10 files changed, 842 insertions(+), 261 deletions(-)
+Merging i2c/i2c/for-next (36f90b0a2ddd Linux 4.5-rc2)
+$ git merge i2c/i2c/for-next
+Already up-to-date.
+Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440)
+$ git merge jdelvare-hwmon/master
+Merge made by the 'recursive' strategy.
+ Documentation/hwmon/max34440 | 6 +++---
+ drivers/hwmon/emc2103.c | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
+$ git merge dmi/master
+Merge made by the 'recursive' strategy.
+Merging hwmon-staging/hwmon-next (972d7d17b6bb hwmon: Add LTC2990 sensor driver)
+$ git merge hwmon-staging/hwmon-next
+Merge made by the 'recursive' strategy.
+ Documentation/hwmon/ltc2990 | 43 +++++++
+ drivers/hwmon/Kconfig | 14 +++
+ drivers/hwmon/Makefile | 3 +-
+ drivers/hwmon/ltc2990.c | 161 +++++++++++++++++++++++++
+ drivers/hwmon/{vexpress.c => vexpress-hwmon.c} | 0
+ 5 files changed, 220 insertions(+), 1 deletion(-)
+ create mode 100644 Documentation/hwmon/ltc2990
+ create mode 100644 drivers/hwmon/ltc2990.c
+ rename drivers/hwmon/{vexpress.c => vexpress-hwmon.c} (100%)
+Merging v4l-dvb/master (0d8f3357897d Merge branch 'v4l_for_linus' into to_next)
+$ git merge v4l-dvb/master
+Auto-merging MAINTAINERS
+Removing Documentation/DocBook/media/v4l/pixfmt-yvu420m.xml
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/device-drivers.tmpl | 1 +
+ .../DocBook/media/v4l/media-ioc-g-topology.xml | 3 -
+ Documentation/DocBook/media/v4l/media-types.xml | 29 +-
+ Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml | 26 +-
+ Documentation/DocBook/media/v4l/pixfmt-yvu420m.xml | 154 --
+ Documentation/DocBook/media/v4l/pixfmt.xml | 1 -
+ .../DocBook/media/v4l/vidioc-query-dv-timings.xml | 14 +-
+ .../DocBook/media/v4l/vidioc-querystd.xml | 10 +
+ .../devicetree/bindings/media/i2c/mt9v032.txt | 2 +
+ .../devicetree/bindings/media/i2c/tvp5150.txt | 45 +
+ .../devicetree/bindings/media/rcar_vin.txt | 1 +
+ .../devicetree/bindings/media/renesas,jpu.txt | 13 +-
+ Documentation/devicetree/bindings/media/ti-cal.txt | 72 +
+ Documentation/dvb/README.dvb-usb | 2 +-
+ MAINTAINERS | 8 +
+ drivers/media/common/b2c2/flexcop-fe-tuner.c | 4 +-
+ drivers/media/common/b2c2/flexcop.c | 4 +-
+ drivers/media/common/cypress_firmware.c | 2 +-
+ drivers/media/common/cypress_firmware.h | 2 +-
+ drivers/media/dvb-core/dvb-usb-ids.h | 8 +-
+ drivers/media/dvb-core/dvb_frontend.c | 28 +-
+ drivers/media/dvb-core/dvbdev.c | 13 +-
+ drivers/media/dvb-frontends/af9013.c | 4 +
+ drivers/media/dvb-frontends/af9033.c | 3 +
+ drivers/media/dvb-frontends/bcm3510.c | 4 +-
+ drivers/media/dvb-frontends/bcm3510.h | 2 +-
+ drivers/media/dvb-frontends/bcm3510_priv.h | 2 +-
+ drivers/media/dvb-frontends/cxd2820r_core.c | 11 +-
+ drivers/media/dvb-frontends/dib0070.c | 2 +-
+ drivers/media/dvb-frontends/dib0090.c | 4 +-
+ drivers/media/dvb-frontends/dib3000.h | 6 +-
+ drivers/media/dvb-frontends/dib3000mb.c | 8 +-
+ drivers/media/dvb-frontends/dib3000mb_priv.h | 2 +-
+ drivers/media/dvb-frontends/dib3000mc.c | 4 +-
+ drivers/media/dvb-frontends/dib3000mc.h | 2 +-
+ drivers/media/dvb-frontends/dib7000m.c | 2 +-
+ drivers/media/dvb-frontends/dib7000p.c | 4 +-
+ drivers/media/dvb-frontends/dib8000.c | 2 +-
+ drivers/media/dvb-frontends/dib9000.c | 4 +-
+ drivers/media/dvb-frontends/dibx000_common.c | 2 +-
+ drivers/media/dvb-frontends/rtl2830.c | 3 +
+ drivers/media/dvb-frontends/si2165.c | 28 +-
+ drivers/media/dvb-frontends/stv0299.c | 4 +-
+ drivers/media/dvb-frontends/stv6110x.c | 4 +-
+ drivers/media/dvb-frontends/stv6110x.h | 4 +-
+ drivers/media/dvb-frontends/stv6110x_priv.h | 2 +-
+ drivers/media/dvb-frontends/ts2020.c | 4 +
+ drivers/media/i2c/adv7604.c | 28 +-
+ drivers/media/i2c/msp3400-driver.c | 14 +
+ drivers/media/i2c/msp3400-driver.h | 5 +
+ drivers/media/i2c/mt9v011.c | 15 +
+ drivers/media/i2c/mt9v032.c | 28 +
+ drivers/media/i2c/ov2659.c | 8 +-
+ drivers/media/i2c/s5c73m3/s5c73m3-core.c | 4 +-
+ drivers/media/i2c/s5c73m3/s5c73m3-spi.c | 1 -
+ drivers/media/i2c/s5k5baf.c | 5 +-
+ drivers/media/i2c/saa7115.c | 19 +
+ drivers/media/i2c/soc_camera/mt9m001.c | 2 +-
+ drivers/media/i2c/soc_camera/mt9t031.c | 2 +-
+ drivers/media/i2c/soc_camera/mt9v022.c | 2 +-
+ drivers/media/i2c/tc358743.c | 25 +-
+ drivers/media/i2c/tvp514x.c | 6 +-
+ drivers/media/i2c/tvp5150.c | 274 ++-
+ drivers/media/i2c/tvp7002.c | 6 +-
+ drivers/media/i2c/vpx3220.c | 2 +-
+ drivers/media/media-device.c | 7 +-
+ drivers/media/media-devnode.c | 1 +
+ drivers/media/media-entity.c | 18 +-
+ drivers/media/pci/b2c2/flexcop-pci.c | 2 +-
+ drivers/media/pci/bt8xx/bttv-driver.c | 27 +-
+ drivers/media/pci/bt8xx/dvb-bt8xx.c | 4 +-
+ drivers/media/pci/ddbridge/ddbridge-core.c | 2 +-
+ drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 3 +-
+ drivers/media/pci/ngene/ngene-cards.c | 2 +-
+ drivers/media/pci/saa7134/saa7134-empress.c | 3 +-
+ drivers/media/pci/saa7134/saa7134-go7007.c | 2 +-
+ drivers/media/pci/saa7134/saa7134-video.c | 3 +-
+ drivers/media/pci/ttpci/av7110.c | 2 +-
+ drivers/media/pci/ttpci/budget.c | 4 +-
+ drivers/media/platform/Kconfig | 12 +
+ drivers/media/platform/Makefile | 2 +
+ drivers/media/platform/coda/coda-bit.c | 2 +-
+ drivers/media/platform/davinci/dm644x_ccdc.c | 2 +-
+ drivers/media/platform/exynos-gsc/gsc-m2m.c | 2 +-
+ drivers/media/platform/exynos4-is/media-dev.c | 20 +-
+ drivers/media/platform/exynos4-is/mipi-csis.c | 10 +-
+ drivers/media/platform/omap3isp/isp.c | 13 +-
+ drivers/media/platform/omap3isp/ispccdc.c | 2 +-
+ drivers/media/platform/omap3isp/isppreview.c | 14 +-
+ drivers/media/platform/omap3isp/ispvideo.c | 103 +-
+ drivers/media/platform/omap3isp/omap3isp.h | 8 +-
+ drivers/media/platform/rcar_jpu.c | 1 +
+ drivers/media/platform/soc_camera/rcar_vin.c | 2 +
+ .../platform/soc_camera/sh_mobile_ceu_camera.c | 14 +-
+ .../media/platform/sti/c8sectpfe/c8sectpfe-dvb.c | 2 +-
+ drivers/media/platform/ti-vpe/Makefile | 4 +
+ drivers/media/platform/ti-vpe/cal.c | 1970 ++++++++++++++++++++
+ drivers/media/platform/ti-vpe/cal_regs.h | 479 +++++
+ drivers/media/platform/vim2m.c | 2 +-
+ drivers/media/platform/vivid/vivid-tpg.h | 2 +
+ drivers/media/radio/radio-si476x.c | 4 +-
+ drivers/media/radio/wl128x/fmdrv_common.c | 2 +-
+ drivers/media/rc/nuvoton-cir.c | 252 +--
+ drivers/media/rc/nuvoton-cir.h | 12 +-
+ drivers/media/rc/rc-core-priv.h | 6 +-
+ drivers/media/rc/rc-ir-raw.c | 23 +-
+ drivers/media/tuners/m88rs6000t.c | 11 +-
+ drivers/media/tuners/r820t.c | 2 +-
+ drivers/media/tuners/si2157.c | 7 +-
+ drivers/media/tuners/tuner-xc2028.c | 3 +-
+ drivers/media/usb/as102/as102_drv.h | 2 +-
+ drivers/media/usb/as102/as102_usb_drv.c | 2 +-
+ drivers/media/usb/au0828/au0828-core.c | 2 +-
+ drivers/media/usb/au0828/au0828-dvb.c | 12 +-
+ drivers/media/usb/b2c2/flexcop-usb.c | 2 +-
+ drivers/media/usb/cx231xx/cx231xx-417.c | 2 +
+ drivers/media/usb/cx231xx/cx231xx-audio.c | 5 +
+ drivers/media/usb/cx231xx/cx231xx-cards.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/af9035.c | 4 +-
+ drivers/media/usb/dvb-usb-v2/af9035.h | 3 +-
+ drivers/media/usb/dvb-usb-v2/dvb_usb.h | 2 +-
+ drivers/media/usb/dvb-usb-v2/dvb_usb_common.h | 2 +-
+ drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 4 +-
+ drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/dvbsky.c | 7 +
+ drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c | 6 +-
+ drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h | 8 +-
+ drivers/media/usb/dvb-usb-v2/mxl111sf.c | 4 +-
+ drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 8 +
+ drivers/media/usb/dvb-usb-v2/usb_urb.c | 2 +-
+ drivers/media/usb/dvb-usb/a800.c | 4 +-
+ drivers/media/usb/dvb-usb/cxusb.c | 4 +-
+ drivers/media/usb/dvb-usb/dib0700_core.c | 2 +-
+ drivers/media/usb/dvb-usb/dib0700_devices.c | 77 +-
+ drivers/media/usb/dvb-usb/dibusb-common.c | 2 +-
+ drivers/media/usb/dvb-usb/dibusb-mb.c | 6 +-
+ drivers/media/usb/dvb-usb/dibusb-mc.c | 6 +-
+ drivers/media/usb/dvb-usb/dibusb.h | 2 +-
+ drivers/media/usb/dvb-usb/digitv.c | 4 +-
+ drivers/media/usb/dvb-usb/dtt200u-fe.c | 2 +-
+ drivers/media/usb/dvb-usb/dtt200u.c | 4 +-
+ drivers/media/usb/dvb-usb/dtt200u.h | 2 +-
+ drivers/media/usb/dvb-usb/dvb-usb-common.h | 2 +-
+ drivers/media/usb/dvb-usb/dvb-usb-dvb.c | 2 +-
+ drivers/media/usb/dvb-usb/dvb-usb-firmware.c | 2 +-
+ drivers/media/usb/dvb-usb/dvb-usb-i2c.c | 2 +-
+ drivers/media/usb/dvb-usb/dvb-usb-init.c | 4 +-
+ drivers/media/usb/dvb-usb/dvb-usb-remote.c | 2 +-
+ drivers/media/usb/dvb-usb/dvb-usb-urb.c | 2 +-
+ drivers/media/usb/dvb-usb/dvb-usb.h | 2 +-
+ drivers/media/usb/dvb-usb/dw2102.c | 12 +-
+ drivers/media/usb/dvb-usb/nova-t-usb2.c | 4 +-
+ drivers/media/usb/dvb-usb/technisat-usb2.c | 2 +-
+ drivers/media/usb/dvb-usb/ttusb2.c | 2 +-
+ drivers/media/usb/dvb-usb/umt-010.c | 4 +-
+ drivers/media/usb/dvb-usb/usb-urb.c | 2 +-
+ drivers/media/usb/dvb-usb/vp702x-fe.c | 2 +-
+ drivers/media/usb/dvb-usb/vp702x.c | 4 +-
+ drivers/media/usb/dvb-usb/vp7045-fe.c | 2 +-
+ drivers/media/usb/dvb-usb/vp7045.c | 4 +-
+ drivers/media/usb/dvb-usb/vp7045.h | 2 +-
+ drivers/media/usb/em28xx/em28xx-camera.c | 4 +
+ drivers/media/usb/em28xx/em28xx-cards.c | 201 +-
+ drivers/media/usb/em28xx/em28xx-dvb.c | 10 +
+ drivers/media/usb/em28xx/em28xx-video.c | 339 +++-
+ drivers/media/usb/em28xx/em28xx.h | 21 +-
+ drivers/media/usb/go7007/go7007-priv.h | 2 +-
+ drivers/media/usb/go7007/go7007-usb.c | 4 +-
+ drivers/media/usb/hdpvr/hdpvr-core.c | 2 +
+ drivers/media/usb/hdpvr/hdpvr-video.c | 6 +-
+ drivers/media/usb/msi2500/msi2500.c | 2 -
+ drivers/media/usb/pwc/pwc-if.c | 6 +
+ drivers/media/usb/stk1160/stk1160-video.c | 1 -
+ drivers/media/usb/usbtv/usbtv-video.c | 37 +-
+ drivers/media/usb/usbtv/usbtv.h | 1 +
+ drivers/media/usb/usbvision/usbvision-video.c | 29 +-
+ drivers/media/v4l2-core/Kconfig | 1 -
+ drivers/media/v4l2-core/tuner-core.c | 26 +-
+ drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 21 +-
+ drivers/media/v4l2-core/v4l2-dv-timings.c | 3 +-
+ drivers/media/v4l2-core/v4l2-of.c | 2 +-
+ drivers/media/v4l2-core/videobuf2-core.c | 1 +
+ .../staging/media/davinci_vpfe/davinci_vpfe_user.h | 2 +-
+ drivers/staging/media/lirc/lirc_parallel.c | 24 +-
+ include/media/tuner.h | 9 +-
+ include/media/v4l2-mc.h | 91 +
+ include/uapi/linux/media.h | 23 +-
+ include/uapi/linux/v4l2-common.h | 46 +-
+ 188 files changed, 4374 insertions(+), 867 deletions(-)
+ delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-yvu420m.xml
+ create mode 100644 Documentation/devicetree/bindings/media/i2c/tvp5150.txt
+ create mode 100644 Documentation/devicetree/bindings/media/ti-cal.txt
+ create mode 100644 drivers/media/platform/ti-vpe/cal.c
+ create mode 100644 drivers/media/platform/ti-vpe/cal_regs.h
+ create mode 100644 include/media/v4l2-mc.h
+Merging kbuild/for-next (f6f756ddd65f Merge branch 'kbuild/kbuild' into kbuild/for-next)
+$ git merge kbuild/for-next
+Merge made by the 'recursive' strategy.
+ include/linux/compiler-clang.h | 5 +++++
+ scripts/Makefile.dtbinst | 2 --
+ scripts/kconfig/Makefile | 4 +++-
+ scripts/kconfig/confdata.c | 12 +++++++-----
+ scripts/link-vmlinux.sh | 7 ++++---
+ 5 files changed, 19 insertions(+), 11 deletions(-)
+Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
+$ git merge kconfig/for-next
+Already up-to-date.
+Merging libata/for-next (3d3cafda9a56 Merge branch 'for-4.6' into for-next)
+$ git merge libata/for-next
+Merge made by the 'recursive' strategy.
+ drivers/ata/ahci.h | 5 +--
+ drivers/ata/ahci_xgene.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++-
+ drivers/ata/libahci.c | 60 +++++++++-------------------------
+ 3 files changed, 103 insertions(+), 47 deletions(-)
+Merging pm/linux-next (45bb976de29f Merge branch 'pm-cpufreq' into linux-next)
+$ git merge pm/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/base/power/opp/core.c | 420 +++++++++++++++++++++++++++++++++
+ drivers/base/power/opp/opp.h | 13 +
+ drivers/cpufreq/cpufreq.c | 37 +--
+ drivers/cpufreq/cpufreq_conservative.c | 10 +-
+ drivers/cpufreq/cpufreq_ondemand.c | 36 +--
+ drivers/cpufreq/cpufreq_performance.c | 18 +-
+ drivers/cpufreq/cpufreq_powersave.c | 10 +-
+ drivers/cpufreq/cpufreq_userspace.c | 10 +-
+ drivers/cpufreq/powernv-cpufreq.c | 116 +++++----
+ include/linux/cpufreq.h | 25 +-
+ include/linux/pm_opp.h | 27 +++
+ include/trace/events/power.h | 22 ++
+ kernel/trace/power-traces.c | 1 +
+ 13 files changed, 622 insertions(+), 123 deletions(-)
+Merging idle/next (31ade3b83e18 Linux 4.4-rc3)
+$ git merge idle/next
+Already up-to-date.
+Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
+$ git merge apm/for-next
+Already up-to-date.
+Merging thermal/next (98d94507e10c Merge branches 'thermal-intel', 'thermal-suspend-fix' and 'thermal-soc' into next)
+$ git merge thermal/next
+Already up-to-date.
+Merging thermal-soc/next (26716ce124fc thermal: allow u8500-thermal driver to be a module)
+$ git merge thermal-soc/next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/thermal/rcar-thermal.txt | 37 +++++++++++++++++-
+ drivers/mfd/db8500-prcmu.c | 3 ++
+ drivers/thermal/Kconfig | 6 +--
+ drivers/thermal/of-thermal.c | 18 ++-------
+ drivers/thermal/rcar_thermal.c | 45 +++++++++++++++++++---
+ drivers/thermal/spear_thermal.c | 6 +--
+ 6 files changed, 86 insertions(+), 29 deletions(-)
+Merging ieee1394/for-next (100ceb66d5c4 firewire: ohci: fix JMicron JMB38x IT context discovery)
+$ git merge ieee1394/for-next
+Already up-to-date.
+Merging dlm/next (a6b1533e9a57 dlm: make posix locks interruptible)
+$ git merge dlm/next
+Already up-to-date.
+Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
+$ git merge swiotlb/linux-next
+Already up-to-date.
+Merging slave-dma/next (64509b4ad81c Merge branch 'topic/pl330' into next)
+$ git merge slave-dma/next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/dma/arm-pl330.txt | 1 +
+ drivers/dma/dmaengine.c | 1 +
+ drivers/dma/dw/pci.c | 4 +
+ drivers/dma/dw/regs.h | 2 +-
+ drivers/dma/edma.c | 41 +++++++-
+ drivers/dma/ep93xx_dma.c | 28 +++---
+ drivers/dma/ioat/dma.c | 34 ++++---
+ drivers/dma/ioat/prep.c | 2 +-
+ drivers/dma/pl330.c | 106 +++++++++++++++------
+ drivers/dma/sh/Kconfig | 6 +-
+ drivers/spi/spi-rockchip.c | 12 ++-
+ include/linux/dmaengine.h | 4 +
+ 12 files changed, 178 insertions(+), 63 deletions(-)
+Merging net-next/master (aaa5672052cb sxgbe: remove unused code)
+$ git merge net-next/master
+Recorded preimage for 'drivers/net/vxlan.c'
+Auto-merging net/unix/af_unix.c
+Auto-merging net/ipv4/tcp_ipv4.c
+Auto-merging net/ipv4/tcp.c
+Auto-merging include/net/tcp.h
+Auto-merging drivers/net/vxlan.c
+CONFLICT (content): Merge conflict in drivers/net/vxlan.c
+Removing drivers/net/ethernet/samsung/sxgbe/sxgbe_xpcs.h
+Removing drivers/net/ethernet/samsung/sxgbe/sxgbe_xpcs.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/net/vxlan.c'.
+[master 6213ab36ad22] Merge remote-tracking branch 'net-next/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/networking/batman-adv.txt | 2 +-
+ MAINTAINERS | 2 +-
+ drivers/net/bonding/bond_3ad.c | 40 +-
+ drivers/net/bonding/bond_main.c | 15 +-
+ drivers/net/bonding/bond_options.c | 4 +
+ drivers/net/ethernet/broadcom/bgmac.c | 30 +-
+ drivers/net/ethernet/emulex/benet/be.h | 9 +
+ drivers/net/ethernet/emulex/benet/be_cmds.c | 32 +-
+ drivers/net/ethernet/emulex/benet/be_cmds.h | 3 +-
+ drivers/net/ethernet/emulex/benet/be_ethtool.c | 23 +-
+ drivers/net/ethernet/emulex/benet/be_main.c | 93 +++--
+ drivers/net/ethernet/intel/i40e/i40e.h | 2 +
+ drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 26 +-
+ drivers/net/ethernet/intel/i40e/i40e_common.c | 87 ++--
+ drivers/net/ethernet/intel/i40e/i40e_dcb.c | 12 +-
+ drivers/net/ethernet/intel/i40e/i40e_devids.h | 2 +
+ drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 38 +-
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 97 ++++-
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 12 +
+ .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 26 +-
+ drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 16 +
+ drivers/net/ethernet/intel/i40evf/i40evf.h | 1 +
+ drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 57 ++-
+ drivers/net/ethernet/intel/i40evf/i40evf_main.c | 34 +-
+ .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 2 +
+ drivers/net/ethernet/renesas/ravb.h | 4 +-
+ drivers/net/ethernet/renesas/ravb_main.c | 68 ++--
+ drivers/net/ethernet/renesas/ravb_ptp.c | 25 +-
+ drivers/net/ethernet/renesas/sh_eth.c | 53 ++-
+ drivers/net/ethernet/samsung/sxgbe/Makefile | 2 +-
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_xpcs.c | 91 -----
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_xpcs.h | 38 --
+ drivers/net/ethernet/sun/sunvnet.c | 24 +-
+ drivers/net/ipvlan/ipvlan_main.c | 1 +
+ drivers/net/team/team.c | 10 +-
+ drivers/net/virtio_net.c | 60 +++
+ drivers/net/vrf.c | 21 +
+ drivers/net/vxlan.c | 231 ++++-------
+ drivers/net/xen-netback/common.h | 1 +
+ drivers/net/xen-netback/xenbus.c | 89 ++++-
+ include/linux/bpf.h | 24 ++
+ include/linux/if_team.h | 1 +
+ include/linux/netdevice.h | 5 +-
+ include/linux/tcp.h | 1 +
+ include/net/bond_3ad.h | 1 +
+ include/net/netns/ipv4.h | 10 +
+ include/net/tcp.h | 19 +-
+ include/net/vxlan.h | 115 +++---
+ include/trace/events/sunvnet.h | 139 +++++++
+ include/uapi/linux/bpf.h | 2 +
+ include/uapi/linux/ethtool.h | 34 ++
+ include/uapi/linux/if_bridge.h | 2 +
+ include/uapi/linux/if_link.h | 12 +
+ kernel/bpf/arraymap.c | 166 +++++++-
+ kernel/bpf/hashtab.c | 340 +++++++++++++---
+ kernel/bpf/syscall.c | 57 ++-
+ net/batman-adv/Kconfig | 2 +-
+ net/batman-adv/Makefile | 2 +-
+ net/batman-adv/bat_algo.h | 2 +-
+ net/batman-adv/bat_iv_ogm.c | 29 +-
+ net/batman-adv/bitarray.c | 14 +-
+ net/batman-adv/bitarray.h | 14 +-
+ net/batman-adv/bridge_loop_avoidance.c | 231 ++++++++---
+ net/batman-adv/bridge_loop_avoidance.h | 2 +-
+ net/batman-adv/debugfs.c | 8 +-
+ net/batman-adv/debugfs.h | 2 +-
+ net/batman-adv/distributed-arp-table.c | 43 +-
+ net/batman-adv/distributed-arp-table.h | 2 +-
+ net/batman-adv/fragmentation.c | 20 +-
+ net/batman-adv/fragmentation.h | 4 +-
+ net/batman-adv/gateway_client.c | 16 +-
+ net/batman-adv/gateway_client.h | 2 +-
+ net/batman-adv/gateway_common.c | 4 +-
+ net/batman-adv/gateway_common.h | 2 +-
+ net/batman-adv/hard-interface.c | 9 +-
+ net/batman-adv/hard-interface.h | 2 +-
+ net/batman-adv/hash.c | 2 +-
+ net/batman-adv/hash.h | 24 +-
+ net/batman-adv/icmp_socket.c | 2 +-
+ net/batman-adv/icmp_socket.h | 2 +-
+ net/batman-adv/main.c | 30 +-
+ net/batman-adv/main.h | 19 +-
+ net/batman-adv/multicast.c | 37 +-
+ net/batman-adv/multicast.h | 4 +-
+ net/batman-adv/network-coding.c | 57 +--
+ net/batman-adv/network-coding.h | 2 +-
+ net/batman-adv/originator.c | 56 +--
+ net/batman-adv/originator.h | 2 +-
+ net/batman-adv/packet.h | 19 +-
+ net/batman-adv/routing.c | 38 +-
+ net/batman-adv/routing.h | 2 +-
+ net/batman-adv/send.c | 31 +-
+ net/batman-adv/send.h | 6 +-
+ net/batman-adv/soft-interface.c | 20 +-
+ net/batman-adv/soft-interface.h | 2 +-
+ net/batman-adv/sysfs.c | 17 +-
+ net/batman-adv/sysfs.h | 2 +-
+ net/batman-adv/translation-table.c | 119 +++---
+ net/batman-adv/translation-table.h | 2 +-
+ net/batman-adv/types.h | 30 +-
+ net/bridge/br_mdb.c | 63 +--
+ net/bridge/br_multicast.c | 18 +-
+ net/bridge/br_private.h | 11 +-
+ net/core/dev.c | 25 +-
+ net/core/ethtool.c | 2 +-
+ net/core/net-sysfs.c | 2 +
+ net/core/rtnetlink.c | 2 +
+ net/ipv4/inet_connection_sock.c | 7 +-
+ net/ipv4/syncookies.c | 4 +-
+ net/ipv4/sysctl_net_ipv4.c | 136 +++----
+ net/ipv4/tcp.c | 20 +-
+ net/ipv4/tcp_fastopen.c | 70 ++--
+ net/ipv4/tcp_input.c | 176 ++++++---
+ net/ipv4/tcp_ipv4.c | 11 +-
+ net/ipv4/tcp_metrics.c | 3 +-
+ net/ipv4/tcp_minisocks.c | 3 -
+ net/ipv4/tcp_output.c | 6 +-
+ net/ipv4/tcp_timer.c | 23 +-
+ net/ipv6/syncookies.c | 2 +-
+ net/packet/af_packet.c | 440 ++++++++++++---------
+ net/tipc/link.c | 37 +-
+ net/tipc/link.h | 6 +-
+ net/tipc/name_table.c | 14 +-
+ net/tipc/node.c | 9 +-
+ net/tipc/server.c | 4 +-
+ net/tipc/subscr.c | 130 +++---
+ net/tipc/subscr.h | 11 +-
+ net/unix/af_unix.c | 5 +-
+ samples/bpf/test_maps.c | 188 +++++++++
+ samples/bpf/tracex2_kern.c | 2 +-
+ samples/bpf/tracex2_user.c | 7 +-
+ samples/bpf/tracex3_kern.c | 8 +-
+ samples/bpf/tracex3_user.c | 21 +-
+ 133 files changed, 3093 insertions(+), 1619 deletions(-)
+ delete mode 100644 drivers/net/ethernet/samsung/sxgbe/sxgbe_xpcs.c
+ delete mode 100644 drivers/net/ethernet/samsung/sxgbe/sxgbe_xpcs.h
+ create mode 100644 include/trace/events/sunvnet.h
+Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
+$ git merge ipsec-next/master
+Already up-to-date.
+Merging ipvs-next/master (6709d1f4ece5 netfilter: ipvs/SIP: handle ip_vs_fill_iph_skb_off failure)
+$ git merge ipvs-next/master
+Merge made by the 'recursive' strategy.
+ net/netfilter/ipvs/ip_vs_app.c | 8 ++------
+ net/netfilter/ipvs/ip_vs_ctl.c | 17 ++++++-----------
+ net/netfilter/ipvs/ip_vs_pe_sip.c | 4 ++--
+ 3 files changed, 10 insertions(+), 19 deletions(-)
+Merging wireless-drivers-next/master (11e70824e75f mwifiex: firmware dump support for w8997 chipset)
+$ git merge wireless-drivers-next/master
+Auto-merging drivers/net/wireless/ralink/rt2x00/rt2x00.h
+Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/tx.c
+Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/rs.c
+Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+Auto-merging drivers/bcma/driver_gpio.c
+Merge made by the 'recursive' strategy.
+ .../bindings/net/wireless/ti,wlcore,spi.txt | 36 ++
+ drivers/bcma/bcma_private.h | 1 -
+ drivers/bcma/driver_chipcommon.c | 16 +-
+ drivers/bcma/driver_chipcommon_pmu.c | 94 ++--
+ drivers/bcma/driver_chipcommon_sflash.c | 1 +
+ drivers/bcma/driver_gpio.c | 1 +
+ drivers/bcma/driver_mips.c | 3 -
+ drivers/bcma/host_pci.c | 2 +-
+ drivers/bcma/scan.c | 5 +
+ drivers/net/wireless/broadcom/b43/main.c | 8 +-
+ .../broadcom/brcm80211/brcmfmac/cfg80211.c | 23 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 45 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/chip.h | 3 +
+ .../broadcom/brcm80211/brcmfmac/firmware.c | 2 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 4 +
+ .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 13 +-
+ drivers/net/wireless/intel/iwlwifi/Kconfig | 12 +
+ drivers/net/wireless/intel/iwlwifi/dvm/led.c | 5 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 4 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-9000.c | 3 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-config.h | 2 +
+ drivers/net/wireless/intel/iwlwifi/iwl-fh.h | 77 +++
+ .../net/wireless/intel/iwlwifi/iwl-fw-error-dump.h | 3 +
+ drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h | 21 +
+ drivers/net/wireless/intel/iwlwifi/iwl-modparams.h | 2 +
+ drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 7 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 2 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 20 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/constants.h | 8 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 73 ++-
+ .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 75 ++-
+ drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 58 ++-
+ drivers/net/wireless/intel/iwlwifi/mvm/fw-api-d3.h | 1 +
+ drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h | 42 +-
+ .../net/wireless/intel/iwlwifi/mvm/fw-api-sta.h | 69 ++-
+ drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h | 31 ++
+ drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c | 6 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 29 ++
+ drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 43 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 4 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 36 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 8 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 28 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/power.c | 131 +++--
+ drivers/net/wireless/intel/iwlwifi/mvm/quota.c | 16 +
+ drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 3 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 13 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 9 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 50 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 2 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 17 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 33 ++
+ drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 6 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 134 +++++-
+ drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 42 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 536 ++++++++++++++-------
+ drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 155 ++++--
+ drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 87 +++-
+ drivers/net/wireless/intersil/hostap/hostap_hw.c | 15 +-
+ drivers/net/wireless/marvell/libertas/cfg.c | 38 ++
+ drivers/net/wireless/marvell/libertas/cmd.c | 40 +-
+ drivers/net/wireless/marvell/libertas/cmdresp.c | 9 +-
+ drivers/net/wireless/marvell/libertas/dev.h | 1 +
+ drivers/net/wireless/marvell/libertas/if_sdio.c | 2 +-
+ drivers/net/wireless/marvell/libertas/if_usb.c | 1 +
+ drivers/net/wireless/marvell/libertas/main.c | 7 +-
+ drivers/net/wireless/marvell/mwifiex/README | 10 +
+ drivers/net/wireless/marvell/mwifiex/cfg80211.c | 248 +++++++++-
+ drivers/net/wireless/marvell/mwifiex/cmdevt.c | 13 +
+ drivers/net/wireless/marvell/mwifiex/debugfs.c | 51 +-
+ drivers/net/wireless/marvell/mwifiex/decl.h | 24 +
+ drivers/net/wireless/marvell/mwifiex/fw.h | 90 +++-
+ drivers/net/wireless/marvell/mwifiex/init.c | 16 +-
+ drivers/net/wireless/marvell/mwifiex/ioctl.h | 5 +
+ drivers/net/wireless/marvell/mwifiex/join.c | 15 +
+ drivers/net/wireless/marvell/mwifiex/main.c | 14 +
+ drivers/net/wireless/marvell/mwifiex/main.h | 44 +-
+ drivers/net/wireless/marvell/mwifiex/pcie.c | 321 ++++++++----
+ drivers/net/wireless/marvell/mwifiex/pcie.h | 50 +-
+ drivers/net/wireless/marvell/mwifiex/scan.c | 310 ++++++++++++
+ drivers/net/wireless/marvell/mwifiex/sdio.c | 35 +-
+ drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 23 +
+ drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 6 +
+ drivers/net/wireless/marvell/mwifiex/sta_event.c | 20 +-
+ drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 33 +-
+ drivers/net/wireless/marvell/mwifiex/wmm.c | 7 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00.h | 18 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00debug.c | 4 +-
+ drivers/net/wireless/ralink/rt2x00/rt61pci.h | 20 +-
+ drivers/net/wireless/ti/wlcore/Kconfig | 2 +-
+ drivers/net/wireless/ti/wlcore/event.c | 2 +-
+ drivers/net/wireless/ti/wlcore/spi.c | 86 +++-
+ include/linux/bcma/bcma.h | 3 +
+ include/linux/bcma/bcma_driver_chipcommon.h | 31 +-
+ 94 files changed, 3046 insertions(+), 728 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/net/wireless/ti,wlcore,spi.txt
+Merging bluetooth/master (9a6a1c77e1fc Bluetooth: Use managed version of led_trigger_register in LED trigger)
+$ git merge bluetooth/master
+Merge made by the 'recursive' strategy.
+ drivers/bluetooth/ath3k.c | 1 +
+ include/net/bluetooth/hci_core.h | 3 ++
+ net/bluetooth/Kconfig | 9 +++++
+ net/bluetooth/Makefile | 1 +
+ net/bluetooth/hci_core.c | 6 ++++
+ net/bluetooth/leds.c | 74 ++++++++++++++++++++++++++++++++++++++++
+ net/bluetooth/leds.h | 16 +++++++++
+ 7 files changed, 110 insertions(+)
+ create mode 100644 net/bluetooth/leds.c
+ create mode 100644 net/bluetooth/leds.h
+Merging mac80211-next/master (94106d26c380 mac80211: fix VHT MU-MIMO frame processing)
+$ git merge mac80211-next/master
+Resolved 'net/mac80211/debugfs.c' using previous resolution.
+Auto-merging net/wireless/reg.c
+Auto-merging net/wireless/core.c
+Auto-merging net/rfkill/core.c
+Auto-merging net/mac80211/util.c
+Auto-merging net/mac80211/sta_info.c
+Auto-merging net/mac80211/mlme.c
+Auto-merging net/mac80211/mesh.h
+Auto-merging net/mac80211/mesh.c
+Auto-merging net/mac80211/ibss.c
+Auto-merging net/mac80211/debugfs.c
+CONFLICT (content): Merge conflict in net/mac80211/debugfs.c
+Auto-merging net/mac80211/agg-rx.c
+Auto-merging drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+Auto-merging drivers/net/wireless/mac80211_hwsim.c
+Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+Auto-merging drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master dec7730df6ef] Merge remote-tracking branch 'mac80211-next/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/obsolete/sysfs-class-rfkill | 9 -
+ Documentation/ABI/removed/sysfs-class-rfkill | 13 ++
+ Documentation/networking/mac80211-injection.txt | 17 ++
+ drivers/net/wireless/ath/ath10k/mac.c | 7 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_main.c | 7 +-
+ drivers/net/wireless/ath/ath9k/main.c | 8 +-
+ drivers/net/wireless/ath/carl9170/main.c | 8 +-
+ drivers/net/wireless/ath/wcn36xx/main.c | 8 +-
+ drivers/net/wireless/ath/wil6210/cfg80211.c | 10 +
+ .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 8 +-
+ drivers/net/wireless/intel/iwlegacy/4965-mac.c | 8 +-
+ drivers/net/wireless/intel/iwlegacy/4965.h | 4 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 9 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 9 +-
+ drivers/net/wireless/mac80211_hwsim.c | 12 +-
+ drivers/net/wireless/marvell/mwl8k.c | 10 +-
+ drivers/net/wireless/mediatek/mt7601u/main.c | 8 +-
+ drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 7 +-
+ drivers/net/wireless/ralink/rt2x00/rt2800lib.h | 4 +-
+ drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c | 6 +-
+ drivers/net/wireless/realtek/rtlwifi/core.c | 8 +-
+ drivers/net/wireless/rsi/rsi_91x_mac80211.c | 19 +-
+ drivers/net/wireless/st/cw1200/sta.c | 4 +-
+ drivers/net/wireless/st/cw1200/sta.h | 4 +-
+ drivers/net/wireless/ti/wlcore/main.c | 8 +-
+ include/linux/ieee80211.h | 26 +++
+ include/linux/rfkill.h | 3 +-
+ include/net/cfg80211.h | 8 +
+ include/net/mac80211.h | 138 ++++++++++++--
+ include/uapi/linux/nl80211.h | 6 +
+ include/uapi/linux/rfkill.h | 2 +
+ net/mac80211/agg-rx.c | 50 ++++-
+ net/mac80211/agg-tx.c | 53 ++++--
+ net/mac80211/cfg.c | 29 +++
+ net/mac80211/chan.c | 2 +-
+ net/mac80211/debugfs.c | 1 +
+ net/mac80211/driver-ops.c | 10 +-
+ net/mac80211/driver-ops.h | 4 +-
+ net/mac80211/ht.c | 5 +
+ net/mac80211/ibss.c | 32 ++--
+ net/mac80211/ieee80211_i.h | 35 ++--
+ net/mac80211/iface.c | 14 ++
+ net/mac80211/mesh.c | 9 +-
+ net/mac80211/mesh.h | 3 -
+ net/mac80211/mesh_pathtbl.c | 111 +++++++++--
+ net/mac80211/mesh_plink.c | 10 +-
+ net/mac80211/mlme.c | 68 +++----
+ net/mac80211/rx.c | 139 ++++++++++++--
+ net/mac80211/sta_info.c | 35 ++--
+ net/mac80211/sta_info.h | 24 ++-
+ net/mac80211/trace.h | 43 +++--
+ net/mac80211/tx.c | 85 ++++++++-
+ net/mac80211/util.c | 116 +++++++++---
+ net/mac80211/vht.c | 44 +++++
+ net/rfkill/core.c | 71 ++++---
+ net/wireless/Kconfig | 25 +--
+ net/wireless/core.c | 10 +
+ net/wireless/mlme.c | 3 +-
+ net/wireless/nl80211.c | 11 ++
+ net/wireless/reg.c | 122 ++++---------
+ net/wireless/sme.c | 9 +-
+ net/wireless/util.c | 203 +++++++++++----------
+ 62 files changed, 1189 insertions(+), 585 deletions(-)
+ create mode 100644 Documentation/ABI/removed/sysfs-class-rfkill
+Merging rdma/for-next (34356f64ac0d IB/mlx5: Unify CQ create flags check)
+$ git merge rdma/for-next
+Already up-to-date.
+Merging mtd/master (9146cbd52b11 mtd: jz4780_nand: replace if/else blocks with switch/case)
+$ git merge mtd/master
+Already up-to-date.
+Merging l2-mtd/master (ed4eeba7338b driver/memory: Removal of deprecated NO_IRQ)
+$ git merge l2-mtd/master
+Merge made by the 'recursive' strategy.
+ arch/arm/plat-samsung/devs.c | 9 -
+ arch/mips/include/asm/mach-jz4740/jz4740_nand.h | 2 -
+ drivers/memory/fsl_ifc.c | 2 +-
+ drivers/mtd/bcm47xxpart.c | 42 ++--
+ drivers/mtd/nand/Kconfig | 3 +
+ drivers/mtd/nand/atmel_nand.c | 12 +-
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 73 ++++--
+ drivers/mtd/nand/jz4740_nand.c | 3 -
+ drivers/mtd/nand/lpc32xx_mlc.c | 2 +-
+ drivers/mtd/nand/mpc5121_nfc.c | 7 +-
+ drivers/mtd/nand/nand_bbt.c | 2 -
+ drivers/mtd/nand/nand_ids.c | 4 +-
+ drivers/mtd/nand/nuc900_nand.c | 2 +-
+ drivers/mtd/nand/plat_nand.c | 1 -
+ drivers/mtd/nand/pxa3xx_nand.c | 22 +-
+ drivers/mtd/nand/s3c2410.c | 3 -
+ drivers/mtd/nand/sunxi_nand.c | 287 +++++++++++++++++++++---
+ drivers/mtd/nand/vf610_nfc.c | 2 -
+ drivers/mtd/onenand/onenand_bbt.c | 5 +-
+ drivers/mtd/spi-nor/Kconfig | 1 +
+ drivers/mtd/spi-nor/mtk-quadspi.c | 4 +-
+ drivers/staging/mt29f_spinand/mt29f_spinand.h | 1 -
+ include/linux/mtd/bbm.h | 1 -
+ include/linux/mtd/inftl.h | 1 -
+ include/linux/mtd/nand.h | 8 +-
+ include/linux/mtd/nftl.h | 1 -
+ include/linux/platform_data/mtd-nand-s3c2410.h | 1 -
+ 27 files changed, 387 insertions(+), 114 deletions(-)
+Merging crypto/master (f75516a81548 crypto: keys - Revert "convert public key to akcipher api")
+$ git merge crypto/master
+Auto-merging net/sctp/socket.c
+Auto-merging net/ipv6/tcp_ipv6.c
+Auto-merging net/ipv4/tcp_ipv4.c
+Auto-merging net/ipv4/tcp_fastopen.c
+Auto-merging net/ipv4/tcp.c
+Auto-merging net/bluetooth/smp.c
+Auto-merging include/net/tcp.h
+Auto-merging include/net/sctp/structs.h
+Removing include/crypto/internal/compress.h
+Removing include/crypto/compress.h
+Auto-merging fs/ext4/crypto.c
+Auto-merging fs/ecryptfs/main.c
+Auto-merging drivers/crypto/atmel-sha.c
+Auto-merging drivers/crypto/atmel-aes.c
+Auto-merging drivers/char/hw_random/Kconfig
+Removing crypto/zlib.c
+Auto-merging crypto/shash.c
+Removing crypto/pcompress.c
+Auto-merging crypto/crc32_generic.c
+Auto-merging crypto/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/crypto-API.tmpl | 13 -
+ Documentation/crypto/api-intro.txt | 23 +-
+ .../devicetree/bindings/rng/brcm,bcm6368.txt | 17 +
+ .../devicetree/bindings/sparc_sun_oracle_rng.txt | 30 ++
+ .../devicetree/bindings/vendor-prefixes.txt | 2 +
+ arch/x86/crypto/sha-mb/sha1_mb.c | 35 ++
+ arch/x86/crypto/sha-mb/sha1_mb_mgr_submit_avx2.S | 2 +-
+ crypto/Kconfig | 23 +-
+ crypto/Makefile | 5 +-
+ crypto/ahash.c | 24 +-
+ crypto/algapi.c | 15 +
+ crypto/{crc32.c => crc32_generic.c} | 3 +-
+ crypto/crypto_engine.c | 355 +++++++++++++++++++
+ crypto/drbg.c | 64 ----
+ crypto/internal.h | 3 +
+ crypto/keywrap.c | 4 +-
+ crypto/mcryptd.c | 1 +
+ crypto/pcompress.c | 115 -------
+ crypto/shash.c | 147 --------
+ crypto/skcipher.c | 4 +-
+ crypto/tcrypt.c | 239 +------------
+ crypto/testmgr.c | 369 ++++++++------------
+ crypto/testmgr.h | 144 --------
+ crypto/zlib.c | 381 ---------------------
+ drivers/block/cryptoloop.c | 48 +--
+ drivers/block/drbd/drbd_int.h | 16 +-
+ drivers/block/drbd/drbd_main.c | 16 +-
+ drivers/block/drbd/drbd_nl.c | 59 ++--
+ drivers/block/drbd/drbd_receiver.c | 56 ++-
+ drivers/block/drbd/drbd_worker.c | 43 ++-
+ drivers/char/hw_random/Kconfig | 2 +-
+ drivers/char/hw_random/bcm63xx-rng.c | 9 +-
+ drivers/char/hw_random/n2-drv.c | 10 +
+ drivers/crypto/Kconfig | 3 +-
+ drivers/crypto/atmel-aes.c | 6 -
+ drivers/crypto/atmel-sha-regs.h | 4 +
+ drivers/crypto/atmel-sha.c | 192 +++++++++--
+ drivers/crypto/caam/ctrl.c | 2 +-
+ drivers/crypto/caam/regs.h | 3 +-
+ drivers/crypto/ccp/ccp-crypto-aes-cmac.c | 35 ++
+ drivers/crypto/ccp/ccp-crypto-sha.c | 39 +++
+ drivers/crypto/ccp/ccp-crypto.h | 22 ++
+ drivers/crypto/ixp4xx_crypto.c | 26 +-
+ drivers/crypto/omap-aes.c | 97 +++---
+ drivers/crypto/qat/qat_common/adf_accel_devices.h | 4 +-
+ drivers/crypto/qat/qat_common/adf_aer.c | 1 -
+ drivers/crypto/qat/qat_common/adf_cfg_user.h | 6 +-
+ drivers/crypto/qat/qat_common/qat_algs.c | 6 +-
+ drivers/crypto/s5p-sss.c | 12 +-
+ drivers/crypto/sahara.c | 19 +-
+ drivers/crypto/sunxi-ss/sun4i-ss-cipher.c | 5 +-
+ drivers/md/dm-crypt.c | 93 ++---
+ drivers/net/ppp/ppp_mppe.c | 99 +++---
+ drivers/net/wireless/intersil/orinoco/mic.c | 29 +-
+ drivers/net/wireless/intersil/orinoco/mic.h | 4 +-
+ drivers/net/wireless/intersil/orinoco/orinoco.h | 4 +-
+ drivers/nfc/s3fwrn5/firmware.c | 36 +-
+ drivers/scsi/iscsi_tcp.c | 54 +--
+ drivers/scsi/iscsi_tcp.h | 4 +-
+ drivers/scsi/libiscsi_tcp.c | 29 +-
+ .../lustre/lustre/libcfs/linux/linux-crypto.c | 92 ++---
+ drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 99 +++---
+ drivers/staging/rtl8192e/rtllib_crypt_wep.c | 48 +--
+ .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 92 ++---
+ .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 46 ++-
+ drivers/target/iscsi/iscsi_target.c | 86 ++---
+ drivers/target/iscsi/iscsi_target_auth.c | 98 ++----
+ drivers/target/iscsi/iscsi_target_login.c | 45 ++-
+ drivers/usb/wusbcore/crypto.c | 30 +-
+ fs/cifs/cifsencrypt.c | 32 +-
+ fs/cifs/smbencrypt.c | 26 +-
+ fs/ecryptfs/crypto.c | 107 +++---
+ fs/ecryptfs/ecryptfs_kernel.h | 12 +-
+ fs/ecryptfs/inode.c | 1 -
+ fs/ecryptfs/keystore.c | 218 +++++++-----
+ fs/ecryptfs/main.c | 1 -
+ fs/ecryptfs/mmap.c | 1 -
+ fs/ecryptfs/super.c | 1 -
+ fs/ext4/crypto.c | 24 +-
+ fs/ext4/crypto_fname.c | 32 +-
+ fs/ext4/crypto_key.c | 42 ++-
+ fs/ext4/ext4_crypto.h | 2 +-
+ fs/f2fs/crypto.c | 24 +-
+ fs/f2fs/crypto_fname.c | 32 +-
+ fs/f2fs/crypto_key.c | 40 +--
+ fs/f2fs/f2fs_crypto.h | 2 +-
+ fs/nfsd/nfs4recover.c | 28 +-
+ include/crypto/algapi.h | 92 ++++-
+ include/crypto/compress.h | 145 --------
+ include/crypto/drbg.h | 4 -
+ include/crypto/hash.h | 45 +++
+ include/crypto/internal/aead.h | 6 +
+ include/crypto/internal/compress.h | 28 --
+ include/crypto/internal/hash.h | 3 -
+ include/crypto/skcipher.h | 24 +-
+ include/linux/crypto.h | 252 --------------
+ include/linux/sunrpc/gss_krb5.h | 32 +-
+ include/net/sctp/auth.h | 4 +-
+ include/net/sctp/structs.h | 6 +-
+ include/net/tcp.h | 6 +-
+ include/scsi/libiscsi_tcp.h | 13 +-
+ include/target/iscsi/iscsi_target_core.h | 4 +-
+ net/bluetooth/smp.c | 135 ++++----
+ net/ceph/crypto.c | 101 +++---
+ net/ipv4/tcp.c | 41 ++-
+ net/ipv4/tcp_fastopen.c | 1 +
+ net/ipv4/tcp_ipv4.c | 23 +-
+ net/ipv6/tcp_ipv6.c | 23 +-
+ net/mac802154/llsec.c | 41 ++-
+ net/mac802154/llsec.h | 3 +-
+ net/rxrpc/ar-internal.h | 2 +-
+ net/rxrpc/ar-key.c | 12 +-
+ net/rxrpc/rxkad.c | 172 ++++++----
+ net/sctp/auth.c | 36 +-
+ net/sctp/endpointola.c | 1 -
+ net/sctp/sm_make_chunk.c | 51 +--
+ net/sctp/socket.c | 8 +-
+ net/sunrpc/auth_gss/gss_krb5_crypto.c | 350 +++++++++++--------
+ net/sunrpc/auth_gss/gss_krb5_keys.c | 12 +-
+ net/sunrpc/auth_gss/gss_krb5_mech.c | 89 ++---
+ net/sunrpc/auth_gss/gss_krb5_seqnum.c | 22 +-
+ net/sunrpc/auth_gss/gss_krb5_wrap.c | 24 +-
+ net/wireless/lib80211_crypt_tkip.c | 99 +++---
+ net/wireless/lib80211_crypt_wep.c | 46 ++-
+ net/xfrm/xfrm_algo.c | 7 +-
+ security/keys/encrypted-keys/encrypted.c | 82 +++--
+ 126 files changed, 2975 insertions(+), 3442 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/rng/brcm,bcm6368.txt
+ create mode 100644 Documentation/devicetree/bindings/sparc_sun_oracle_rng.txt
+ rename crypto/{crc32.c => crc32_generic.c} (98%)
+ create mode 100644 crypto/crypto_engine.c
+ delete mode 100644 crypto/pcompress.c
+ delete mode 100644 crypto/zlib.c
+ delete mode 100644 include/crypto/compress.h
+ delete mode 100644 include/crypto/internal/compress.h
+Merging drm/drm-next (5443ce86fa37 drm: virtio-gpu: set atomic flag)
+$ git merge drm/drm-next
+Auto-merging drivers/gpu/drm/i915/intel_pm.c
+Auto-merging drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
+Auto-merging drivers/gpu/drm/i915/intel_ddi.c
+Auto-merging drivers/gpu/drm/i915/i915_reg.h
+Auto-merging drivers/gpu/drm/i915/i915_gem.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.h
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/gpu.tmpl | 54 +-
+ MAINTAINERS | 6 +
+ drivers/gpu/drm/Kconfig | 2 +
+ drivers/gpu/drm/Makefile | 1 +
+ drivers/gpu/drm/arm/Kconfig | 27 +
+ drivers/gpu/drm/arm/Makefile | 2 +
+ drivers/gpu/drm/arm/hdlcd_crtc.c | 327 ++++++++
+ drivers/gpu/drm/arm/hdlcd_drv.c | 550 ++++++++++++
+ drivers/gpu/drm/arm/hdlcd_drv.h | 42 +
+ drivers/gpu/drm/arm/hdlcd_regs.h | 87 ++
+ drivers/gpu/drm/armada/armada_drv.c | 3 -
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 18 -
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 10 -
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 3 -
+ drivers/gpu/drm/drm_atomic.c | 44 +-
+ drivers/gpu/drm/drm_atomic_helper.c | 5 +-
+ drivers/gpu/drm/drm_crtc.c | 36 +-
+ drivers/gpu/drm/drm_crtc_helper.c | 13 +-
+ drivers/gpu/drm/drm_fb_cma_helper.c | 3 +-
+ drivers/gpu/drm/drm_fb_helper.c | 21 +
+ drivers/gpu/drm/drm_fops.c | 305 ++++++-
+ drivers/gpu/drm/drm_irq.c | 18 +-
+ drivers/gpu/drm/exynos/exynos_drm_drv.c | 14 -
+ drivers/gpu/drm/exynos/exynos_drm_g2d.c | 37 +-
+ drivers/gpu/drm/exynos/exynos_drm_ipp.c | 29 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 5 -
+ drivers/gpu/drm/gma500/framebuffer.c | 20 +-
+ drivers/gpu/drm/gma500/mdfld_dsi_output.c | 12 +-
+ drivers/gpu/drm/gma500/psb_drv.c | 9 -
+ drivers/gpu/drm/i915/i915_debugfs.c | 56 +-
+ drivers/gpu/drm/i915/i915_dma.c | 2 -
+ drivers/gpu/drm/i915/i915_drv.c | 15 +-
+ drivers/gpu/drm/i915/i915_drv.h | 108 +--
+ drivers/gpu/drm/i915/i915_gem.c | 95 ++-
+ drivers/gpu/drm/i915/i915_gem_context.c | 29 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 163 ++--
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 8 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.h | 1 -
+ drivers/gpu/drm/i915/i915_gem_shrinker.c | 60 +-
+ drivers/gpu/drm/i915/i915_gem_stolen.c | 3 +
+ drivers/gpu/drm/i915/i915_gpu_error.c | 2 +-
+ drivers/gpu/drm/i915/i915_guc_reg.h | 1 +
+ drivers/gpu/drm/i915/i915_guc_submission.c | 146 +++-
+ drivers/gpu/drm/i915/i915_irq.c | 254 +++---
+ drivers/gpu/drm/i915/i915_params.c | 1 +
+ drivers/gpu/drm/i915/i915_params.h | 68 ++
+ drivers/gpu/drm/i915/i915_reg.h | 5 +
+ drivers/gpu/drm/i915/i915_sysfs.c | 8 +-
+ drivers/gpu/drm/i915/intel_atomic.c | 2 +-
+ drivers/gpu/drm/i915/intel_atomic_plane.c | 14 +-
+ drivers/gpu/drm/i915/intel_bios.c | 412 +++++----
+ drivers/gpu/drm/i915/intel_bios.h | 60 +-
+ drivers/gpu/drm/i915/intel_csr.c | 14 +-
+ drivers/gpu/drm/i915/intel_ddi.c | 291 +++----
+ drivers/gpu/drm/i915/intel_display.c | 1066 +++++++++++++-----------
+ drivers/gpu/drm/i915/intel_dp.c | 30 +-
+ drivers/gpu/drm/i915/intel_dp_mst.c | 4 +-
+ drivers/gpu/drm/i915/intel_drv.h | 52 +-
+ drivers/gpu/drm/i915/intel_dsi.c | 9 +-
+ drivers/gpu/drm/i915/intel_dsi.h | 3 +-
+ drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 153 ++--
+ drivers/gpu/drm/i915/intel_dsi_pll.c | 93 +--
+ drivers/gpu/drm/i915/intel_fbdev.c | 4 +-
+ drivers/gpu/drm/i915/intel_guc.h | 4 +
+ drivers/gpu/drm/i915/intel_guc_fwif.h | 113 ++-
+ drivers/gpu/drm/i915/intel_guc_loader.c | 13 +-
+ drivers/gpu/drm/i915/intel_hdmi.c | 6 +
+ drivers/gpu/drm/i915/intel_lrc.c | 562 +++++++------
+ drivers/gpu/drm/i915/intel_lrc.h | 23 +-
+ drivers/gpu/drm/i915/intel_overlay.c | 24 +-
+ drivers/gpu/drm/i915/intel_pm.c | 93 ++-
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 38 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 19 +-
+ drivers/gpu/drm/i915/intel_runtime_pm.c | 31 +-
+ drivers/gpu/drm/i915/intel_sdvo_regs.h | 76 +-
+ drivers/gpu/drm/i915/intel_sprite.c | 161 ++--
+ drivers/gpu/drm/i915/intel_uncore.c | 139 ++-
+ drivers/gpu/drm/imx/imx-drm-core.c | 13 -
+ drivers/gpu/drm/imx/ipuv3-crtc.c | 4 -
+ drivers/gpu/drm/msm/adreno/adreno_gpu.c | 3 +
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 7 -
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 11 -
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 1 -
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 6 -
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 11 -
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 1 -
+ drivers/gpu/drm/omapdrm/omap_crtc.c | 13 +-
+ drivers/gpu/drm/omapdrm/omap_drv.c | 42 -
+ drivers/gpu/drm/omapdrm/omap_drv.h | 1 -
+ drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 20 -
+ drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 2 -
+ drivers/gpu/drm/rcar-du/rcar_du_drv.c | 10 -
+ drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 20 -
+ drivers/gpu/drm/shmobile/shmob_drm_crtc.h | 2 -
+ drivers/gpu/drm/shmobile/shmob_drm_drv.c | 8 -
+ drivers/gpu/drm/tegra/dc.c | 17 -
+ drivers/gpu/drm/tegra/drm.c | 4 -
+ drivers/gpu/drm/tegra/drm.h | 1 -
+ drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 20 -
+ drivers/gpu/drm/tilcdc/tilcdc_drv.c | 8 -
+ drivers/gpu/drm/tilcdc/tilcdc_drv.h | 1 -
+ drivers/gpu/drm/vc4/vc4_crtc.c | 20 -
+ drivers/gpu/drm/vc4/vc4_drv.c | 10 -
+ drivers/gpu/drm/vc4/vc4_drv.h | 1 -
+ drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +-
+ drivers/gpu/drm/virtio/virtgpu_plane.c | 16 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 11 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 87 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_fence.h | 2 -
+ include/drm/drmP.h | 30 +-
+ include/uapi/drm/i915_drm.h | 33 +-
+ include/uapi/drm/msm_drm.h | 1 +
+ mm/swapfile.c | 6 +
+ 114 files changed, 4162 insertions(+), 2521 deletions(-)
+ create mode 100644 drivers/gpu/drm/arm/Kconfig
+ create mode 100644 drivers/gpu/drm/arm/Makefile
+ create mode 100644 drivers/gpu/drm/arm/hdlcd_crtc.c
+ create mode 100644 drivers/gpu/drm/arm/hdlcd_drv.c
+ create mode 100644 drivers/gpu/drm/arm/hdlcd_drv.h
+ create mode 100644 drivers/gpu/drm/arm/hdlcd_regs.h
+ create mode 100644 drivers/gpu/drm/i915/i915_params.h
+ mode change 100644 => 100755 drivers/gpu/drm/i915/intel_hdmi.c
+Merging drm-panel/drm/panel/for-next (abf08d5efee4 dt-bindings: Move panel bindings to correct location)
+$ git merge drm-panel/drm/panel/for-next
+Merge made by the 'recursive' strategy.
+Merging drm-intel/for-linux-next (2417c8c03f50 drm/i915: fix error path in intel_setup_gmbus())
+$ git merge drm-intel/for-linux-next
+Auto-merging drivers/gpu/drm/i915/intel_pm.c
+Auto-merging drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
+Auto-merging drivers/gpu/drm/i915/intel_drv.h
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+Auto-merging drivers/gpu/drm/i915/intel_ddi.c
+Auto-merging drivers/gpu/drm/i915/i915_suspend.c
+Auto-merging drivers/gpu/drm/i915/i915_reg.h
+Auto-merging drivers/gpu/drm/i915/i915_gem_userptr.c
+Auto-merging drivers/gpu/drm/i915/i915_gem.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.h
+Auto-merging drivers/gpu/drm/i915/i915_dma.c
+Auto-merging drivers/gpu/drm/i915/Kconfig
+Merge made by the 'recursive' strategy.
+ drivers/char/agp/intel-gtt.c | 8 +-
+ drivers/gpu/drm/i915/Kconfig | 2 -
+ drivers/gpu/drm/i915/i915_debugfs.c | 31 +-
+ drivers/gpu/drm/i915/i915_dma.c | 262 ++++----
+ drivers/gpu/drm/i915/i915_drv.h | 75 ++-
+ drivers/gpu/drm/i915/i915_gem.c | 38 +-
+ drivers/gpu/drm/i915/i915_gem_context.c | 34 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 3 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 50 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.h | 4 +-
+ drivers/gpu/drm/i915/i915_gem_shrinker.c | 16 +-
+ drivers/gpu/drm/i915/i915_gem_stolen.c | 3 +
+ drivers/gpu/drm/i915/i915_gem_userptr.c | 181 ++----
+ drivers/gpu/drm/i915/i915_gpu_error.c | 4 +
+ drivers/gpu/drm/i915/i915_guc_submission.c | 65 +-
+ drivers/gpu/drm/i915/i915_params.c | 3 +-
+ drivers/gpu/drm/i915/i915_reg.h | 46 +-
+ drivers/gpu/drm/i915/i915_suspend.c | 2 +-
+ drivers/gpu/drm/i915/intel_csr.c | 3 +-
+ drivers/gpu/drm/i915/intel_ddi.c | 8 +-
+ drivers/gpu/drm/i915/intel_display.c | 164 +++--
+ drivers/gpu/drm/i915/intel_dp.c | 7 +-
+ drivers/gpu/drm/i915/intel_drv.h | 33 +-
+ drivers/gpu/drm/i915/intel_dsi.c | 2 +-
+ drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 5 +-
+ drivers/gpu/drm/i915/intel_fbc.c | 950 +++++++++++++++++------------
+ drivers/gpu/drm/i915/intel_guc.h | 6 +-
+ drivers/gpu/drm/i915/intel_guc_fwif.h | 17 +-
+ drivers/gpu/drm/i915/intel_hdmi.c | 0
+ drivers/gpu/drm/i915/intel_lrc.c | 78 ++-
+ drivers/gpu/drm/i915/intel_lrc.h | 3 +-
+ drivers/gpu/drm/i915/intel_pm.c | 181 ++++--
+ drivers/gpu/drm/i915/intel_psr.c | 54 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 61 ++
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 1 +
+ drivers/gpu/drm/i915/intel_sideband.c | 23 +-
+ drivers/gpu/drm/i915/intel_sprite.c | 40 +-
+ drivers/gpu/drm/i915/intel_tv.c | 1 +
+ drivers/gpu/drm/i915/intel_uncore.c | 2 +
+ include/drm/i915_pciids.h | 6 +-
+ include/uapi/drm/i915_drm.h | 10 +-
+ 41 files changed, 1435 insertions(+), 1047 deletions(-)
+ mode change 100755 => 100644 drivers/gpu/drm/i915/intel_hdmi.c
+Merging drm-tegra/drm/tegra/for-next (d50bbe33efb5 gpu: host1x: Use a signed return type for do_relocs())
+$ git merge drm-tegra/drm/tegra/for-next
+Merge made by the 'recursive' strategy.
+ drivers/gpu/host1x/bus.c | 4 +++-
+ drivers/gpu/host1x/job.c | 2 +-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+Merging drm-misc/topic/drm-misc (e24bfdd5052c apple-gmux: Fix build breakage if !CONFIG_ACPI)
+$ git merge drm-misc/topic/drm-misc
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/gpu.tmpl | 5 +
+ Documentation/dma-buf-sharing.txt | 19 ++--
+ drivers/dma-buf/dma-buf.c | 13 +--
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 3 +-
+ drivers/gpu/drm/drm_atomic_helper.c | 57 +++++++++--
+ drivers/gpu/drm/drm_crtc.c | 65 +++++++++++++
+ drivers/gpu/drm/drm_crtc_helper.c | 10 +-
+ drivers/gpu/drm/drm_edid.c | 26 +++++
+ drivers/gpu/drm/drm_encoder_slave.c | 3 +
+ drivers/gpu/drm/drm_modes.c | 3 +-
+ drivers/gpu/drm/drm_prime.c | 10 +-
+ drivers/gpu/drm/gma500/intel_gmbus.c | 2 +-
+ drivers/gpu/drm/i2c/ch7006_drv.c | 2 +
+ drivers/gpu/drm/i915/i915_drv.c | 12 +++
+ drivers/gpu/drm/i915/i915_gem_dmabuf.c | 42 +++++++-
+ drivers/gpu/drm/i915/intel_display.c | 5 +-
+ drivers/gpu/drm/i915/intel_lvds.c | 8 +-
+ drivers/gpu/drm/msm/msm_fbdev.c | 3 -
+ drivers/gpu/drm/nouveau/nouveau_acpi.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_connector.c | 21 +++-
+ drivers/gpu/drm/nouveau/nouveau_drm.c | 11 +++
+ drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 4 +-
+ drivers/gpu/drm/radeon/radeon_atpx_handler.c | 3 +-
+ drivers/gpu/drm/radeon/radeon_connectors.c | 6 ++
+ drivers/gpu/drm/radeon/radeon_drv.c | 11 +++
+ drivers/gpu/drm/udl/udl_fb.c | 2 -
+ drivers/gpu/vga/vga_switcheroo.c | 119 ++++++++++++++++++++++-
+ drivers/platform/x86/apple-gmux.c | 111 ++++++++++++++++-----
+ drivers/staging/android/ion/ion.c | 6 +-
+ drivers/staging/android/ion/ion_test.c | 4 +-
+ include/drm/drm_crtc.h | 18 ++++
+ include/linux/apple-gmux.h | 50 ++++++++++
+ include/linux/dma-buf.h | 12 +--
+ include/linux/vga_switcheroo.h | 36 ++++++-
+ include/uapi/drm/drm.h | 1 +
+ 35 files changed, 607 insertions(+), 98 deletions(-)
+ create mode 100644 include/linux/apple-gmux.h
+Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
+$ git merge drm-exynos/exynos-drm/for-next
+Already up-to-date.
+Merging drm-msm/msm-next (2abd1c88345e drm/msm/mdp: fix a problematic usage of WARN_ON())
+$ git merge drm-msm/msm-next
+Already up-to-date.
+Merging hdlcd/for-upstream/hdlcd (8bb912e606b7 arm64: Juno: Add HDLCD support to the Juno boards.)
+$ git merge hdlcd/for-upstream/hdlcd
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/display/arm,hdlcd.txt | 79 ++++++++++++++++++++++
+ arch/arm64/boot/dts/arm/juno-base.dtsi | 46 +++++++++++--
+ 2 files changed, 121 insertions(+), 4 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/display/arm,hdlcd.txt
+Merging drm-vc4/drm-vc4-next (5645e785cea2 drm/vc4: fix an error code)
+$ git merge drm-vc4/drm-vc4-next
+Already up-to-date.
+Merging sound/for-next (fa9a435debad Merge branch 'topic/hda-mst' into for-next)
+$ git merge sound/for-next
+Removing sound/mips/au1x00.c
+Merge made by the 'recursive' strategy.
+ Documentation/sound/alsa/ALSA-Configuration.txt | 9 +
+ Documentation/sound/alsa/HD-Audio-DP-MST-audio.txt | 74 +++
+ sound/firewire/dice/dice-midi.c | 23 +-
+ sound/firewire/dice/dice-pcm.c | 199 ++----
+ sound/firewire/dice/dice-stream.c | 69 +-
+ sound/firewire/dice/dice-transaction.c | 54 --
+ sound/firewire/dice/dice.c | 67 +-
+ sound/firewire/dice/dice.h | 8 -
+ sound/mips/Kconfig | 12 -
+ sound/mips/Makefile | 2 -
+ sound/mips/au1x00.c | 734 ---------------------
+ sound/pci/hda/patch_hdmi.c | 548 +++++++++++++--
+ sound/usb/card.c | 56 +-
+ sound/usb/midi.c | 15 +-
+ sound/usb/midi.h | 14 +-
+ sound/usb/quirks.c | 36 +-
+ sound/usb/quirks.h | 3 +-
+ 17 files changed, 778 insertions(+), 1145 deletions(-)
+ create mode 100644 Documentation/sound/alsa/HD-Audio-DP-MST-audio.txt
+ delete mode 100644 sound/mips/au1x00.c
+Merging sound-asoc/for-next (00d2170519d9 Merge remote-tracking branch 'asoc/topic/wm8974' into asoc-next)
+$ git merge sound-asoc/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/sound/fsl-asoc-card.txt | 11 +
+ .../devicetree/bindings/sound/max98926.txt | 32 +
+ .../devicetree/bindings/sound/pcm179x.txt | 11 +-
+ Documentation/devicetree/bindings/sound/rt5514.txt | 25 +
+ Documentation/devicetree/bindings/sound/rt5616.txt | 6 +
+ include/sound/pcm.h | 2 +
+ sound/core/pcm_misc.c | 30 +
+ sound/soc/amd/acp-pcm-dma.c | 1 +
+ sound/soc/bcm/bcm2835-i2s.c | 284 ++----
+ sound/soc/codecs/Kconfig | 31 +-
+ sound/soc/codecs/Makefile | 8 +
+ sound/soc/codecs/ab8500-codec.c | 1 -
+ sound/soc/codecs/adau1761.c | 8 +
+ sound/soc/codecs/arizona.c | 105 ++-
+ sound/soc/codecs/arizona.h | 4 +-
+ sound/soc/codecs/cs42xx8.c | 10 +-
+ sound/soc/codecs/cs47l24.c | 123 ++-
+ sound/soc/codecs/max98926.c | 604 +++++++++++++
+ sound/soc/codecs/max98926.h | 848 ++++++++++++++++++
+ sound/soc/codecs/pcm179x-i2c.c | 73 ++
+ sound/soc/codecs/pcm179x-spi.c | 72 ++
+ sound/soc/codecs/pcm179x.c | 56 +-
+ sound/soc/codecs/pcm179x.h | 9 +-
+ sound/soc/codecs/pcm3168a.c | 5 +
+ sound/soc/codecs/rt286.c | 26 +-
+ sound/soc/codecs/rt5514.c | 982 +++++++++++++++++++++
+ sound/soc/codecs/rt5514.h | 252 ++++++
+ sound/soc/codecs/rt5616.c | 412 +++++----
+ sound/soc/codecs/rt5645.c | 2 +-
+ sound/soc/codecs/rt5659.c | 33 +-
+ sound/soc/codecs/rt5659.h | 1 -
+ sound/soc/codecs/sigmadsp-i2c.c | 5 +-
+ sound/soc/codecs/ssm4567.c | 5 +
+ sound/soc/codecs/wm5102.c | 93 +-
+ sound/soc/codecs/wm5110.c | 76 +-
+ sound/soc/codecs/wm8960.c | 40 +-
+ sound/soc/codecs/wm8974.c | 93 ++
+ sound/soc/codecs/wm8997.c | 2 +-
+ sound/soc/codecs/wm8998.c | 2 +-
+ sound/soc/codecs/wm_adsp.c | 85 +-
+ sound/soc/codecs/wm_adsp.h | 8 +-
+ sound/soc/davinci/davinci-mcasp.c | 2 +
+ sound/soc/dwc/designware_i2s.c | 5 +-
+ sound/soc/fsl/Kconfig | 4 +-
+ sound/soc/fsl/fsl-asoc-card.c | 26 +-
+ sound/soc/fsl/fsl_sai.c | 3 +-
+ sound/soc/fsl/fsl_ssi.c | 42 +-
+ sound/soc/fsl/imx-spdif.c | 2 -
+ sound/soc/fsl/mpc5200_psc_ac97.c | 3 +-
+ sound/soc/generic/simple-card.c | 2 +-
+ sound/soc/intel/Kconfig | 13 +-
+ sound/soc/intel/atom/sst-mfld-platform-pcm.c | 1 +
+ sound/soc/intel/boards/cht_bsw_max98090_ti.c | 17 +-
+ sound/soc/intel/boards/cht_bsw_rt5645.c | 13 +-
+ sound/soc/intel/boards/skl_rt286.c | 5 +-
+ sound/soc/intel/common/Makefile | 9 +-
+ sound/soc/intel/common/sst-acpi.c | 4 +
+ sound/soc/intel/common/sst-match-acpi.c | 19 +-
+ sound/soc/intel/skylake/skl-messages.c | 68 +-
+ sound/soc/intel/skylake/skl-pcm.c | 21 +
+ sound/soc/intel/skylake/skl-topology.c | 268 +++++-
+ sound/soc/intel/skylake/skl-topology.h | 27 +
+ sound/soc/intel/skylake/skl-tplg-interface.h | 3 +-
+ sound/soc/intel/skylake/skl.c | 28 +-
+ sound/soc/mediatek/Kconfig | 4 +-
+ sound/soc/mediatek/mtk-afe-common.h | 1 +
+ sound/soc/mediatek/mtk-afe-pcm.c | 22 +-
+ sound/soc/mxs/mxs-saif.c | 15 +-
+ sound/soc/qcom/lpass-platform.c | 15 +-
+ sound/soc/samsung/s3c-i2s-v2.c | 2 +-
+ sound/soc/samsung/s3c-i2s-v2.h | 2 +-
+ sound/soc/sh/rcar/adg.c | 9 +-
+ sound/soc/sh/rcar/cmd.c | 18 +-
+ sound/soc/sh/rcar/core.c | 84 +-
+ sound/soc/sh/rcar/ctu.c | 72 +-
+ sound/soc/sh/rcar/dma.c | 56 +-
+ sound/soc/sh/rcar/dvc.c | 2 +-
+ sound/soc/sh/rcar/gen.c | 35 +
+ sound/soc/sh/rcar/mix.c | 2 +-
+ sound/soc/sh/rcar/rsnd.h | 80 +-
+ sound/soc/sh/rcar/src.c | 71 +-
+ sound/soc/sh/rcar/ssi.c | 192 ++--
+ sound/soc/sh/rcar/ssiu.c | 3 +-
+ sound/soc/soc-dapm.c | 8 +-
+ sound/soc/soc-pcm.c | 27 +-
+ 85 files changed, 4751 insertions(+), 1030 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/max98926.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/rt5514.txt
+ create mode 100644 sound/soc/codecs/max98926.c
+ create mode 100644 sound/soc/codecs/max98926.h
+ create mode 100644 sound/soc/codecs/pcm179x-i2c.c
+ create mode 100644 sound/soc/codecs/pcm179x-spi.c
+ create mode 100644 sound/soc/codecs/rt5514.c
+ create mode 100644 sound/soc/codecs/rt5514.h
+Merging modules/modules-next (b37a05c083c8 Merge branch 'akpm' (patches from Andrew))
+$ git merge modules/modules-next
+Already up-to-date.
+Merging input/next (1261d013daea Input: Allow compile test of Goodix and Colibri VF50 if !GPIOLIB)
+$ git merge input/next
+Auto-merging drivers/input/touchscreen/Kconfig
+Merge made by the 'recursive' strategy.
+ .../bindings/input/touchscreen/cyttsp.txt | 95 ++++++
+ drivers/input/mouse/Kconfig | 10 +
+ drivers/input/mouse/Makefile | 1 +
+ drivers/input/mouse/byd.c | 337 +++++++++++++++++++++
+ drivers/input/mouse/byd.h | 18 ++
+ drivers/input/mouse/psmouse-base.c | 14 +
+ drivers/input/mouse/psmouse.h | 1 +
+ drivers/input/touchscreen/Kconfig | 5 +-
+ drivers/input/touchscreen/cyttsp_core.c | 194 ++++++++----
+ drivers/input/touchscreen/cyttsp_core.h | 10 +-
+ drivers/input/touchscreen/cyttsp_i2c.c | 10 -
+ drivers/input/touchscreen/cyttsp_spi.c | 10 -
+ include/linux/input/cyttsp.h | 15 -
+ 13 files changed, 614 insertions(+), 106 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/cyttsp.txt
+ create mode 100644 drivers/input/mouse/byd.c
+ create mode 100644 drivers/input/mouse/byd.h
+Merging block/for-next (0124663be268 Merge branch 'for-4.6/drivers' into for-next)
+$ git merge block/for-next
+Merge made by the 'recursive' strategy.
+ block/blk-mq-sysfs.c | 9 +--
+ block/blk-mq.c | 173 +++++++++++++++++++++++++++------------------
+ block/blk-mq.h | 1 +
+ block/cfq-iosched.c | 43 ++++++++---
+ drivers/nvme/host/Kconfig | 6 +-
+ drivers/nvme/host/Makefile | 10 +--
+ drivers/nvme/host/core.c | 84 +++++++++++++++++-----
+ drivers/nvme/host/nvme.h | 3 +-
+ drivers/nvme/host/pci.c | 78 +++++++++-----------
+ include/linux/blk-mq.h | 2 +
+ 10 files changed, 255 insertions(+), 154 deletions(-)
+Merging device-mapper/for-next (aa8c484be790 dm thin metadata: remove needless newline from subtree_dec() DMERR message)
+$ git merge device-mapper/for-next
+Auto-merging drivers/md/dm-crypt.c
+Merge made by the 'recursive' strategy.
+ block/blk-core.c | 2 +-
+ drivers/md/dm-cache-target.c | 2 +-
+ drivers/md/dm-crypt.c | 2 +-
+ drivers/md/dm-delay.c | 2 +-
+ drivers/md/dm-flakey.c | 2 +-
+ drivers/md/dm-ioctl.c | 5 +-
+ drivers/md/dm-log-writes.c | 2 +-
+ drivers/md/dm-mpath.c | 101 ++++++++++++------
+ drivers/md/dm-raid1.c | 2 +-
+ drivers/md/dm-snap.c | 2 +-
+ drivers/md/dm-table.c | 30 +++++-
+ drivers/md/dm-target.c | 3 +-
+ drivers/md/dm-thin-metadata.c | 2 +-
+ drivers/md/dm-thin.c | 2 +-
+ drivers/md/dm-verity-fec.c | 2 +-
+ drivers/md/dm-verity-target.c | 12 +--
+ drivers/md/dm.c | 239 +++++++++++++++++++++++-------------------
+ drivers/md/dm.h | 4 +-
+ include/linux/device-mapper.h | 13 ++-
+ 19 files changed, 263 insertions(+), 166 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 (4e2918512024 Merge branch 'fixes' into next)
+$ git merge mmc-uh/next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mmc/brcm,sdhci-iproc.txt | 5 +-
+ .../bindings/mmc/microchip,sdhci-pic32.txt | 29 +++
+ drivers/mmc/card/block.c | 14 +-
+ drivers/mmc/card/mmc_test.c | 1 +
+ drivers/mmc/core/core.c | 29 ++-
+ drivers/mmc/core/debugfs.c | 2 +-
+ drivers/mmc/core/host.c | 1 +
+ drivers/mmc/core/mmc.c | 4 +-
+ drivers/mmc/core/mmc_ops.c | 19 +-
+ drivers/mmc/core/pwrseq_simple.c | 1 -
+ drivers/mmc/core/sd_ops.c | 7 +-
+ drivers/mmc/core/sdio_ops.c | 3 +-
+ drivers/mmc/host/Kconfig | 19 +-
+ drivers/mmc/host/Makefile | 1 +
+ drivers/mmc/host/atmel-mci.c | 9 +-
+ drivers/mmc/host/bfin_sdh.c | 3 -
+ drivers/mmc/host/davinci_mmc.c | 15 +-
+ drivers/mmc/host/dw_mmc-exynos.c | 31 +--
+ drivers/mmc/host/dw_mmc-pltfm.c | 19 +-
+ drivers/mmc/host/dw_mmc-rockchip.c | 7 -
+ drivers/mmc/host/dw_mmc.c | 101 ++++----
+ drivers/mmc/host/dw_mmc.h | 6 +-
+ drivers/mmc/host/jz4740_mmc.c | 2 -
+ drivers/mmc/host/mmc_spi.c | 15 +-
+ drivers/mmc/host/mxcmmc.c | 3 -
+ drivers/mmc/host/omap_hsmmc.c | 9 +-
+ drivers/mmc/host/pxamci.c | 43 +---
+ drivers/mmc/host/s3cmci.c | 3 +-
+ drivers/mmc/host/sdhci-acpi.c | 2 +
+ drivers/mmc/host/sdhci-iproc.c | 40 +++-
+ drivers/mmc/host/sdhci-of-arasan.c | 5 -
+ drivers/mmc/host/sdhci-of-at91.c | 1 +
+ drivers/mmc/host/sdhci-pic32.c | 257 +++++++++++++++++++++
+ drivers/mmc/host/sdricoh_cs.c | 26 +--
+ drivers/mmc/host/sh_mmcif.c | 4 +-
+ drivers/mmc/host/sh_mobile_sdhi.c | 7 +-
+ drivers/mmc/host/sunxi-mmc.c | 95 ++++++--
+ drivers/mmc/host/tmio_mmc_dma.c | 11 -
+ drivers/mmc/host/tmio_mmc_pio.c | 27 ++-
+ drivers/mmc/host/usdhi6rol0.c | 2 +-
+ include/linux/mfd/tmio.h | 4 +
+ include/linux/mmc/core.h | 1 -
+ include/linux/mmc/dw_mmc.h | 12 +-
+ include/linux/mmc/tmio.h | 5 +
+ 44 files changed, 603 insertions(+), 297 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mmc/microchip,sdhci-pic32.txt
+ create mode 100644 drivers/mmc/host/sdhci-pic32.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 (fc2561ec0afc md-cluster: delete useless code)
+$ git merge md/for-next
+Already up-to-date.
+Merging mfd/for-mfd-next (84a6c45ae136 mfd: syscon: Make syscon_regmap_config const)
+$ git merge mfd/for-mfd-next
+Auto-merging drivers/mfd/db8500-prcmu.c
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mfd/tps65086.txt | 55 ++++++++
+ drivers/mfd/Kconfig | 27 +++-
+ drivers/mfd/Makefile | 1 +
+ drivers/mfd/ab8500-core.c | 106 +++++----------
+ drivers/mfd/db8500-prcmu.c | 7 +-
+ drivers/mfd/intel-lpss-pci.c | 19 ++-
+ drivers/mfd/intel-lpss.c | 1 +
+ drivers/mfd/lpc_ich.c | 5 +-
+ drivers/mfd/syscon.c | 19 ++-
+ drivers/mfd/tps65010.c | 21 +--
+ drivers/mfd/tps65086.c | 149 +++++++++++++++++++++
+ include/linux/mfd/core.h | 26 ++++
+ include/linux/mfd/tps65086.h | 117 ++++++++++++++++
+ 13 files changed, 441 insertions(+), 112 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mfd/tps65086.txt
+ create mode 100644 drivers/mfd/tps65086.c
+ create mode 100644 include/linux/mfd/tps65086.h
+Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
+$ git merge backlight/for-backlight-next
+Already up-to-date.
+Merging battery/master (265b60497a57 power: bq27xxx_battery: Fix bq27541 AveragePower register address)
+$ git merge battery/master
+Already up-to-date.
+Merging omap_dss2/for-next (caf05780f6ed Merge omapdss split between omapdrm and omapfb)
+$ git merge omap_dss2/for-next
+Already up-to-date.
+Merging regulator/for-next (18c4766e2e9f Merge remote-tracking branches 'regulator/topic/mt6397' and 'regulator/topic/qcom-saw' into regulator-next)
+$ git merge regulator/for-next
+Merge made by the 'recursive' strategy.
+ .../bindings/regulator/act8945a-regulator.txt | 80 +++++++
+ .../devicetree/bindings/regulator/lp872x.txt | 1 +
+ .../devicetree/bindings/regulator/max77802.txt | 2 +-
+ .../bindings/regulator/qcom,saw-regulator.txt | 31 +++
+ drivers/regulator/Kconfig | 21 ++
+ drivers/regulator/Makefile | 2 +
+ drivers/regulator/act8945a-regulator.c | 165 +++++++++++++++
+ drivers/regulator/axp20x-regulator.c | 46 ++---
+ drivers/regulator/core.c | 29 ++-
+ drivers/regulator/da9210-regulator.c | 5 +
+ drivers/regulator/fan53555.c | 18 ++
+ drivers/regulator/lp872x.c | 38 +++-
+ drivers/regulator/mt6397-regulator.c | 15 +-
+ drivers/regulator/qcom_saw-regulator.c | 229 +++++++++++++++++++++
+ include/linux/regulator/lp872x.h | 5 +
+ 15 files changed, 639 insertions(+), 48 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/regulator/act8945a-regulator.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/qcom,saw-regulator.txt
+ create mode 100644 drivers/regulator/act8945a-regulator.c
+ create mode 100644 drivers/regulator/qcom_saw-regulator.c
+Merging security/next (388f7b1d6e8c Linux 4.5-rc3)
+$ git merge security/next
+Already up-to-date.
+Merging integrity/next (1d6d167c2efc KEYS: refcount bug fix)
+$ git merge integrity/next
+Already up-to-date.
+Merging selinux/next (9090a2d5e3e6 selinux: use absolute path to include directory)
+$ git merge selinux/next
+Merge made by the 'recursive' strategy.
+ security/selinux/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging lblnet/next (b2776bf7149b Linux 3.18)
+$ git merge lblnet/next
+Already up-to-date.
+Merging watchdog/master (388f7b1d6e8c Linux 4.5-rc3)
+$ git merge watchdog/master
+Already up-to-date.
+Merging iommu/next (fd6b6b40c17e Merge branches 'iommu/fixes' and 'arm/rockchip' into next)
+$ git merge iommu/next
+Merge made by the 'recursive' strategy.
+ drivers/iommu/rockchip-iommu.c | 214 ++++++++++++++++++++++++++---------------
+ 1 file changed, 135 insertions(+), 79 deletions(-)
+Merging dwmw2-iommu/master (fda3bec12d09 iommu/vt-d: Fix 64-bit accesses to 32-bit DMAR_GSTS_REG)
+$ git merge dwmw2-iommu/master
+Auto-merging drivers/iommu/intel_irq_remapping.c
+Auto-merging drivers/iommu/dmar.c
+Merge made by the 'recursive' strategy.
+ drivers/iommu/dmar.c | 2 +-
+ drivers/iommu/intel-svm.c | 33 +++++++++++++++++++++++++++------
+ drivers/iommu/intel_irq_remapping.c | 2 +-
+ 3 files changed, 29 insertions(+), 8 deletions(-)
+Merging vfio/next (d4f50ee2f5b4 vfio/iommu_type1: make use of info.flags)
+$ git merge vfio/next
+Already up-to-date.
+Merging jc_docs/docs-next (5645a717c6ee Documentation: HOWTO: remove obsolete info about regression postings)
+$ git merge jc_docs/docs-next
+Auto-merging Documentation/DocBook/device-drivers.tmpl
+Merge made by the 'recursive' strategy.
+ Documentation/CodingStyle | 2 +-
+ Documentation/DocBook/device-drivers.tmpl | 2 +-
+ Documentation/HOWTO | 7 +------
+ Documentation/SubmittingPatches | 2 +-
+ Documentation/features/list-arch.sh | 2 +-
+ Documentation/i2c/dev-interface | 2 +-
+ Documentation/i2c/slave-eeprom-backend | 4 ++--
+ Documentation/ja_JP/HOWTO | 2 +-
+ README | 14 +++++++-------
+ 9 files changed, 16 insertions(+), 21 deletions(-)
+Merging trivial/for-next (e9bf1d57f0a0 drivers/rtc: broken link fix)
+$ git merge trivial/for-next
+Auto-merging net/openvswitch/vport-geneve.c
+Auto-merging mm/balloon_compaction.c
+Auto-merging lib/842/842_decompress.c
+Auto-merging kernel/time/timekeeping.c
+Auto-merging include/linux/device.h
+Auto-merging drivers/usb/host/uhci-q.c
+Auto-merging drivers/usb/gadget/legacy/Kconfig
+Auto-merging drivers/usb/dwc3/gadget.c
+Auto-merging drivers/usb/dwc3/ep0.c
+Auto-merging drivers/scsi/ufs/ufshcd.c
+Auto-merging drivers/rtc/rtc-rx8025.c
+Auto-merging drivers/phy/phy-core.c
+Auto-merging drivers/media/platform/exynos4-is/mipi-csis.c
+Auto-merging drivers/media/platform/exynos4-is/fimc-is.c
+Auto-merging drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_fence.c
+Auto-merging drivers/dma/ioat/init.c
+Auto-merging drivers/dma/dw/core.c
+Auto-merging drivers/base/core.c
+Merge made by the 'recursive' strategy.
+ REPORTING-BUGS | 2 +-
+ drivers/atm/firestream.c | 2 +-
+ drivers/base/core.c | 2 +-
+ drivers/crypto/nx/nx-842.c | 2 +-
+ drivers/dma/dw/core.c | 6 +-
+ drivers/dma/ioat/init.c | 2 +-
+ drivers/gpu/drm/i915/i915_gem_fence.c | 10 +--
+ drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c | 2 +-
+ drivers/input/touchscreen/wdt87xx_i2c.c | 2 +-
+ drivers/media/platform/exynos4-is/fimc-is.c | 6 +-
+ drivers/media/platform/exynos4-is/mipi-csis.c | 2 +-
+ drivers/net/ethernet/nuvoton/w90p910_ether.c | 2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/dm.c | 2 +-
+ drivers/pci/host/pci-mvebu.c | 6 +-
+ drivers/phy/phy-core.c | 4 +-
+ drivers/regulator/pbias-regulator.c | 2 +-
+ drivers/rtc/rtc-rx8025.c | 2 +-
+ drivers/scsi/ufs/ufshcd.c | 6 +-
+ drivers/thunderbolt/ctl.c | 2 +-
+ drivers/thunderbolt/nhi.c | 74 ++++++++++------------
+ drivers/thunderbolt/path.c | 2 +-
+ drivers/thunderbolt/tb.h | 2 +-
+ drivers/usb/core/urb.c | 8 +--
+ drivers/usb/dwc3/dwc3-omap.c | 4 +-
+ drivers/usb/dwc3/ep0.c | 5 +-
+ drivers/usb/dwc3/gadget.c | 2 +-
+ drivers/usb/gadget/legacy/Kconfig | 3 +-
+ drivers/usb/host/uhci-q.c | 20 +++---
+ include/linux/device.h | 5 +-
+ kernel/time/timekeeping.c | 2 +-
+ lib/842/842_decompress.c | 2 +-
+ lib/flex_proportions.c | 2 +-
+ lib/percpu-refcount.c | 2 +-
+ mm/balloon_compaction.c | 4 +-
+ net/openvswitch/vport-geneve.c | 2 +-
+ .../testing/selftests/timers/alarmtimer-suspend.c | 2 +-
+ 36 files changed, 98 insertions(+), 107 deletions(-)
+$ git am -3 ../patches/kernel-memremapc-add-new-arg-to-dev_warn.patch
+Applying: kernel/memremap.c: add new arg to dev_WARN
+$ git reset HEAD^
+Unstaged changes after reset:
+M kernel/memremap.c
+$ git add -A .
+$ git commit -v -a --amend
+[master ed4704d10ccb] Merge remote-tracking branch 'trivial/for-next'
+ Date: Thu Feb 11 12:47:49 2016 +1100
+Merging audit/next (fd97646b0595 audit: Fix typo in comment)
+$ git merge audit/next
+Auto-merging kernel/audit_watch.c
+Auto-merging kernel/audit.c
+Merge made by the 'recursive' strategy.
+ include/uapi/linux/audit.h | 1 +
+ kernel/audit.c | 20 +++++++++++++++++++-
+ kernel/audit_watch.c | 2 +-
+ kernel/auditfilter.c | 6 +++---
+ 4 files changed, 24 insertions(+), 5 deletions(-)
+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 (b8c15a91f1fe Merge branches 'dt/next' and 'dt/linus' into for-next)
+$ git merge dt-rh/for-next
+Merge made by the 'recursive' strategy.
+ scripts/dtc/dtx_diff | 343 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 343 insertions(+)
+ create mode 100755 scripts/dtc/dtx_diff
+Merging mailbox/mailbox-for-next (bfbcfa770b1c mailbox: constify mbox_chan_ops structure)
+$ git merge mailbox/mailbox-for-next
+Already up-to-date.
+Merging spi/for-next (e908e75fc383 Merge remote-tracking branch 'spi/topic/ti-qspi' into spi-next)
+$ git merge spi/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/spi/adi,axi-spi-engine.txt | 31 ++
+ drivers/spi/Kconfig | 79 +--
+ drivers/spi/Makefile | 4 +-
+ drivers/spi/spi-atmel.c | 1 +
+ drivers/spi/spi-axi-spi-engine.c | 591 +++++++++++++++++++++
+ drivers/spi/spi-bcm2835aux.c | 10 +-
+ drivers/spi/spi-dw-mid.c | 4 +-
+ drivers/spi/spi-dw-mmio.c | 5 -
+ drivers/spi/spi-fsl-espi.c | 4 +-
+ drivers/spi/spi-imx.c | 8 +-
+ drivers/spi/spi-loopback-test.c | 1 +
+ drivers/spi/spi-pxa2xx.c | 143 +++--
+ drivers/spi/spi-pxa2xx.h | 35 --
+ drivers/spi/spi-ti-qspi.c | 139 ++++-
+ drivers/spi/spi.c | 398 +++++++++++++-
+ include/linux/pxa2xx_ssp.h | 1 +
+ include/linux/spi/spi.h | 144 +++++
+ 17 files changed, 1440 insertions(+), 158 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/spi/adi,axi-spi-engine.txt
+ create mode 100644 drivers/spi/spi-axi-spi-engine.c
+Merging tip/auto-latest (f864fe9a9259 Merge branch 'x86/mm')
+$ git merge tip/auto-latest
+Auto-merging kernel/memremap.c
+Auto-merging arch/x86/events/core.c
+Auto-merging arch/x86/events/amd/uncore.c
+Auto-merging arch/x86/events/amd/iommu.c
+Auto-merging arch/x86/events/amd/ibs.c
+Auto-merging arch/x86/events/amd/core.c
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/arm64/kernel/setup.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/efi-stub.txt | 4 +-
+ Documentation/kernel-parameters.txt | 18 +-
+ Documentation/sysctl/kernel.txt | 21 +
+ Documentation/x86/early-microcode.txt | 25 +
+ Documentation/x86/x86_64/mm.txt | 12 +-
+ MAINTAINERS | 1 +
+ arch/arm/kernel/setup.c | 6 +-
+ arch/arm/plat-samsung/pm-check.c | 4 +-
+ arch/arm64/kernel/setup.c | 6 +-
+ arch/avr32/kernel/setup.c | 6 +-
+ arch/c6x/kernel/setup.c | 2 -
+ arch/ia64/kernel/efi.c | 13 +-
+ arch/ia64/kernel/setup.c | 6 +-
+ arch/m32r/kernel/setup.c | 4 +-
+ arch/microblaze/kernel/setup.c | 2 -
+ arch/mips/Kconfig | 1 +
+ arch/mips/bmips/irq.c | 10 +-
+ arch/mips/kernel/setup.c | 10 +-
+ arch/parisc/mm/init.c | 6 +-
+ arch/powerpc/kernel/setup_32.c | 2 -
+ arch/powerpc/kernel/setup_64.c | 3 -
+ arch/powerpc/mm/mem.c | 2 +-
+ arch/s390/kernel/early.c | 1 -
+ arch/s390/kernel/setup.c | 8 +-
+ arch/score/kernel/setup.c | 2 +-
+ arch/sh/kernel/setup.c | 8 +-
+ arch/sparc/kernel/head_64.S | 8 -
+ arch/sparc/mm/init_64.c | 8 +-
+ arch/tile/kernel/setup.c | 11 +-
+ arch/unicore32/kernel/setup.c | 6 +-
+ arch/x86/Kbuild | 3 +-
+ arch/x86/Kconfig | 27 +-
+ arch/x86/Kconfig.debug | 10 -
+ arch/x86/boot/cpuflags.h | 2 +-
+ arch/x86/boot/mkcpustr.c | 2 +-
+ arch/x86/crypto/crc32-pclmul_glue.c | 2 +-
+ arch/x86/crypto/crc32c-intel_glue.c | 2 +-
+ arch/x86/crypto/crct10dif-pclmul_glue.c | 2 +-
+ arch/x86/entry/calling.h | 31 -
+ arch/x86/entry/common.c | 27 +
+ arch/x86/entry/entry_32.S | 2 +-
+ arch/x86/entry/entry_64.S | 276 +++------
+ arch/x86/entry/syscall_32.c | 10 +-
+ arch/x86/entry/syscall_64.c | 13 +-
+ arch/x86/entry/syscalls/syscall_64.tbl | 20 +-
+ arch/x86/entry/syscalls/syscalltbl.sh | 58 +-
+ arch/x86/entry/vdso/vdso2c.h | 7 -
+ arch/x86/entry/vdso/vdso32-setup.c | 1 -
+ arch/x86/entry/vdso/vdso32/system_call.S | 2 +-
+ arch/x86/entry/vdso/vma.c | 127 ++--
+ arch/x86/entry/vsyscall/vsyscall_gtod.c | 9 +-
+ arch/x86/events/Makefile | 7 +
+ .../cpu/perf_event_amd.c => events/amd/core.c} | 2 +-
+ .../cpu/perf_event_amd_ibs.c => events/amd/ibs.c} | 12 +-
+ .../perf_event_amd_iommu.c => events/amd/iommu.c} | 4 +-
+ .../perf_event_amd_iommu.h => events/amd/iommu.h} | 0
+ .../amd/uncore.c} | 4 +-
+ .../x86/{kernel/cpu/perf_event.c => events/core.c} | 11 +-
+ arch/x86/include/asm/alternative.h | 6 -
+ arch/x86/include/asm/apic.h | 1 -
+ arch/x86/include/asm/arch_hweight.h | 2 +
+ arch/x86/include/asm/barrier.h | 15 +-
+ arch/x86/include/asm/bitops.h | 36 +-
+ arch/x86/include/asm/clocksource.h | 9 +-
+ arch/x86/include/asm/cmpxchg.h | 1 +
+ arch/x86/include/asm/cpufeature.h | 445 +-------------
+ arch/x86/include/asm/cpufeatures.h | 288 +++++++++
+ arch/x86/include/asm/dmi.h | 2 +-
+ arch/x86/include/asm/efi.h | 26 +
+ arch/x86/include/asm/elf.h | 2 +-
+ arch/x86/include/asm/fixmap.h | 2 +-
+ arch/x86/include/asm/fpu/internal.h | 18 +-
+ arch/x86/include/asm/frame.h | 59 +-
+ arch/x86/include/asm/irq_work.h | 2 +-
+ arch/x86/include/asm/microcode.h | 26 +
+ arch/x86/include/asm/mmu.h | 3 +-
+ arch/x86/include/asm/msr-index.h | 4 +
+ arch/x86/include/asm/mwait.h | 2 +
+ arch/x86/include/asm/processor.h | 5 +-
+ arch/x86/include/asm/smap.h | 2 +-
+ arch/x86/include/asm/smp.h | 1 -
+ arch/x86/include/asm/thread_info.h | 2 +-
+ arch/x86/include/asm/tlbflush.h | 58 ++
+ arch/x86/include/asm/uaccess_64.h | 2 +-
+ arch/x86/include/asm/vdso.h | 3 -
+ arch/x86/include/asm/vgtod.h | 6 +
+ arch/x86/kernel/apic/apic_numachip.c | 4 +-
+ arch/x86/kernel/asm-offsets_32.c | 2 +-
+ arch/x86/kernel/asm-offsets_64.c | 10 +-
+ arch/x86/kernel/cpu/Makefile | 10 +-
+ arch/x86/kernel/cpu/amd.c | 23 +-
+ arch/x86/kernel/cpu/bugs_64.c | 2 +-
+ arch/x86/kernel/cpu/centaur.c | 12 +-
+ arch/x86/kernel/cpu/common.c | 72 +--
+ arch/x86/kernel/cpu/cyrix.c | 11 +-
+ arch/x86/kernel/cpu/hypervisor.c | 2 +-
+ arch/x86/kernel/cpu/intel.c | 12 +-
+ arch/x86/kernel/cpu/intel_cacheinfo.c | 4 +-
+ arch/x86/kernel/cpu/match.c | 2 +-
+ arch/x86/kernel/cpu/mcheck/mce-inject.c | 15 +-
+ arch/x86/kernel/cpu/mcheck/mce.c | 2 +-
+ arch/x86/kernel/cpu/mcheck/mce_amd.c | 111 +++-
+ arch/x86/kernel/cpu/mcheck/p5.c | 18 +-
+ arch/x86/kernel/cpu/mcheck/therm_throt.c | 15 +-
+ arch/x86/kernel/cpu/mcheck/threshold.c | 4 +-
+ arch/x86/kernel/cpu/mcheck/winchip.c | 5 +-
+ arch/x86/kernel/cpu/microcode/amd.c | 13 +-
+ arch/x86/kernel/cpu/microcode/core.c | 17 +-
+ arch/x86/kernel/cpu/microcode/intel.c | 281 +++++----
+ arch/x86/kernel/cpu/mkcapflags.sh | 6 +-
+ arch/x86/kernel/cpu/mshyperv.c | 8 +-
+ arch/x86/kernel/cpu/mtrr/centaur.c | 2 +-
+ arch/x86/kernel/cpu/mtrr/cleanup.c | 44 +-
+ arch/x86/kernel/cpu/mtrr/generic.c | 23 +-
+ arch/x86/kernel/cpu/mtrr/main.c | 22 +-
+ arch/x86/kernel/cpu/perf_event_intel_ds.c | 6 +-
+ arch/x86/kernel/cpu/rdrand.c | 2 +-
+ arch/x86/kernel/cpu/topology.c | 4 +-
+ arch/x86/kernel/cpu/transmeta.c | 10 +-
+ arch/x86/kernel/cpu/vmware.c | 5 +-
+ arch/x86/kernel/crash.c | 41 +-
+ arch/x86/kernel/e820.c | 39 +-
+ arch/x86/kernel/fpu/core.c | 52 +-
+ arch/x86/kernel/fpu/init.c | 13 +-
+ arch/x86/kernel/head64.c | 14 +-
+ arch/x86/kernel/head_32.S | 8 +-
+ arch/x86/kernel/head_64.S | 5 +-
+ arch/x86/kernel/hpet.c | 1 +
+ arch/x86/kernel/mpparse.c | 2 +-
+ arch/x86/kernel/msr.c | 2 +-
+ arch/x86/kernel/pmem.c | 4 +-
+ arch/x86/kernel/process.c | 4 +-
+ arch/x86/kernel/setup.c | 6 +-
+ arch/x86/kernel/signal.c | 13 +-
+ arch/x86/kernel/traps.c | 50 +-
+ arch/x86/kernel/verify_cpu.S | 2 +-
+ arch/x86/kernel/vm86_32.c | 2 +-
+ arch/x86/kernel/vmlinux.lds.S | 12 +
+ arch/x86/lguest/boot.c | 8 +-
+ arch/x86/lib/clear_page_64.S | 2 +-
+ arch/x86/lib/cmdline.c | 60 +-
+ arch/x86/lib/copy_page_64.S | 2 +-
+ arch/x86/lib/copy_user_64.S | 2 +-
+ arch/x86/lib/memcpy_64.S | 2 +-
+ arch/x86/lib/memmove_64.S | 2 +-
+ arch/x86/lib/memset_64.S | 2 +-
+ arch/x86/mm/init_32.c | 3 -
+ arch/x86/mm/init_64.c | 24 +-
+ arch/x86/mm/kasan_init_64.c | 17 +-
+ arch/x86/mm/numa.c | 67 +-
+ arch/x86/mm/pageattr.c | 17 +-
+ arch/x86/mm/pat.c | 4 +-
+ arch/x86/mm/setup_nx.c | 6 +-
+ arch/x86/oprofile/op_model_amd.c | 1 -
+ arch/x86/platform/efi/efi-bgrt.c | 52 +-
+ arch/x86/platform/efi/efi.c | 58 +-
+ arch/x86/platform/efi/efi_32.c | 5 +
+ arch/x86/platform/efi/efi_64.c | 159 +++--
+ arch/x86/platform/efi/efi_stub_64.S | 43 --
+ arch/x86/platform/efi/quirks.c | 37 +-
+ arch/x86/um/asm/barrier.h | 2 +-
+ arch/x86/um/sys_call_table_32.c | 4 +-
+ arch/x86/um/sys_call_table_64.c | 7 +-
+ arch/x86/um/user-offsets.c | 6 +-
+ arch/x86/xen/enlighten.c | 2 +-
+ drivers/acpi/acpi_platform.c | 2 +-
+ drivers/acpi/apei/einj.c | 15 +-
+ drivers/cpufreq/intel_pstate.c | 2 +-
+ drivers/firmware/efi/efi.c | 41 +-
+ drivers/firmware/efi/efivars.c | 2 +-
+ drivers/firmware/efi/esrt.c | 5 +-
+ drivers/firmware/efi/runtime-wrappers.c | 80 +--
+ drivers/firmware/efi/vars.c | 16 +-
+ drivers/irqchip/Kconfig | 5 +
+ drivers/irqchip/Makefile | 1 +
+ drivers/irqchip/irq-atmel-aic-common.c | 14 +-
+ drivers/irqchip/irq-atmel-aic-common.h | 7 +-
+ drivers/irqchip/irq-atmel-aic.c | 9 +-
+ drivers/irqchip/irq-atmel-aic5.c | 9 +-
+ drivers/irqchip/irq-bcm6345-l1.c | 364 +++++++++++
+ drivers/irqchip/irq-gic-v3-its.c | 17 +-
+ drivers/irqchip/irq-sun4i.c | 1 -
+ drivers/nvdimm/e820.c | 2 +-
+ drivers/parisc/eisa_enumerator.c | 4 +-
+ drivers/rapidio/rio.c | 8 +-
+ drivers/sh/superhyway/superhyway.c | 2 +-
+ drivers/xen/balloon.c | 2 +-
+ fs/btrfs/disk-io.c | 2 +-
+ include/asm-generic/cputime_nsecs.h | 5 +-
+ include/linux/clockchips.h | 4 +-
+ include/linux/compiler.h | 5 +-
+ include/linux/efi.h | 22 +-
+ include/linux/hrtimer.h | 1 +
+ include/linux/ioport.h | 33 +-
+ include/linux/latencytop.h | 3 +
+ include/linux/lockdep.h | 6 +-
+ include/linux/mm.h | 5 +-
+ include/linux/mm_types.h | 22 +-
+ include/linux/sched.h | 4 +
+ include/linux/sched/sysctl.h | 4 +
+ init/main.c | 5 -
+ kernel/irq/irqdesc.c | 21 +-
+ kernel/kexec_core.c | 8 +-
+ kernel/kexec_file.c | 8 +-
+ kernel/latencytop.c | 14 +-
+ kernel/locking/lockdep.c | 113 +---
+ kernel/memremap.c | 13 +-
+ kernel/profile.c | 1 +
+ kernel/resource.c | 93 +--
+ kernel/sched/core.c | 79 ++-
+ kernel/sched/debug.c | 102 ++--
+ kernel/sched/fair.c | 200 +++---
+ kernel/sched/sched.h | 1 +
+ kernel/sched/stats.h | 8 +-
+ kernel/sysctl.c | 13 +-
+ kernel/time/clocksource.c | 52 +-
+ kernel/time/hrtimer.c | 18 +-
+ kernel/trace/trace_kprobe.c | 19 +-
+ lib/atomic64_test.c | 2 +-
+ lib/test_static_keys.c | 62 +-
+ mm/memory.c | 25 +-
+ mm/memory_hotplug.c | 2 +-
+ mm/mmap.c | 13 +-
+ tools/build/Makefile.feature | 31 +-
+ tools/build/feature/Makefile | 4 +
+ tools/build/feature/test-all.c | 5 +
+ tools/build/feature/test-compile.c | 2 +
+ tools/build/feature/test-libcrypto.c | 17 +
+ tools/lib/bpf/libbpf.c | 34 +-
+ tools/lib/lockdep/common.c | 5 -
+ tools/lib/lockdep/include/liblockdep/common.h | 1 -
+ tools/lib/lockdep/preload.c | 2 -
+ tools/perf/Documentation/perf-config.txt | 343 ++++++++++-
+ tools/perf/Documentation/perf-inject.txt | 7 +
+ tools/perf/Documentation/perf-report.txt | 37 +-
+ tools/perf/Documentation/perfconfig.example | 2 +-
+ tools/perf/Makefile | 25 +-
+ tools/perf/Makefile.perf | 14 +-
+ tools/perf/arch/powerpc/Makefile | 2 +
+ tools/perf/arch/powerpc/util/Build | 1 +
+ tools/perf/arch/powerpc/util/book3s_hcalls.h | 123 ++++
+ tools/perf/arch/powerpc/util/book3s_hv_exits.h | 33 +
+ tools/perf/arch/powerpc/util/kvm-stat.c | 170 ++++++
+ tools/perf/arch/s390/util/kvm-stat.c | 10 +-
+ tools/perf/arch/x86/util/intel-bts.c | 4 +-
+ tools/perf/arch/x86/util/intel-pt.c | 4 +-
+ tools/perf/arch/x86/util/kvm-stat.c | 16 +-
+ tools/perf/builtin-annotate.c | 2 +-
+ tools/perf/builtin-buildid-cache.c | 14 +-
+ tools/perf/builtin-inject.c | 107 +++-
+ tools/perf/builtin-kvm.c | 38 +-
+ tools/perf/builtin-record.c | 12 +-
+ tools/perf/builtin-report.c | 29 +-
+ tools/perf/builtin-top.c | 24 +-
+ tools/perf/config/Makefile | 112 ++--
+ tools/perf/jvmti/Makefile | 76 +++
+ tools/perf/jvmti/jvmti_agent.c | 465 ++++++++++++++
+ tools/perf/jvmti/jvmti_agent.h | 36 ++
+ tools/perf/jvmti/libjvmti.c | 304 ++++++++++
+ tools/perf/tests/.gitignore | 1 +
+ tools/perf/tests/Build | 9 +-
+ tools/perf/tests/bp_signal.c | 140 ++++-
+ tools/perf/tests/bpf-script-test-relocation.c | 50 ++
+ tools/perf/tests/bpf.c | 63 +-
+ tools/perf/tests/hists_cumulate.c | 2 +-
+ tools/perf/tests/hists_filter.c | 2 +-
+ tools/perf/tests/hists_output.c | 10 +-
+ tools/perf/tests/llvm.c | 17 +-
+ tools/perf/tests/llvm.h | 5 +-
+ tools/perf/tests/make | 50 +-
+ tools/perf/tests/vmlinux-kallsyms.c | 24 +-
+ tools/perf/ui/browser.c | 4 +-
+ tools/perf/ui/browser.h | 2 +-
+ tools/perf/ui/browsers/annotate.c | 2 +-
+ tools/perf/ui/browsers/hists.c | 214 +++++--
+ tools/perf/ui/gtk/hists.c | 6 +-
+ tools/perf/ui/hist.c | 170 +++---
+ tools/perf/ui/stdio/hist.c | 85 +--
+ tools/perf/util/Build | 6 +
+ tools/perf/util/auxtrace.c | 7 +-
+ tools/perf/util/auxtrace.h | 6 +-
+ tools/perf/util/build-id.c | 6 +-
+ tools/perf/util/cpumap.c | 30 +
+ tools/perf/util/cpumap.h | 32 +-
+ tools/perf/util/demangle-java.c | 199 ++++++
+ tools/perf/util/demangle-java.h | 10 +
+ tools/perf/util/dso.c | 5 +
+ tools/perf/util/event.c | 2 +-
+ tools/perf/util/evsel.c | 15 +-
+ tools/perf/util/genelf.c | 449 ++++++++++++++
+ tools/perf/util/genelf.h | 67 ++
+ tools/perf/util/genelf_debug.c | 610 +++++++++++++++++++
+ tools/perf/util/hist.c | 163 ++---
+ tools/perf/util/hist.h | 65 +-
+ tools/perf/util/intel-pt.c | 9 +
+ tools/perf/util/jit.h | 15 +
+ tools/perf/util/jitdump.c | 672 +++++++++++++++++++++
+ tools/perf/util/jitdump.h | 124 ++++
+ tools/perf/util/kvm-stat.h | 8 +-
+ tools/perf/util/machine.h | 10 +
+ tools/perf/util/parse-events.c | 3 +
+ tools/perf/util/pmu.c | 2 +-
+ tools/perf/util/probe-finder.c | 62 +-
+ tools/perf/util/probe-finder.h | 5 +-
+ tools/perf/util/sort.c | 208 +++++--
+ tools/perf/util/sort.h | 2 +
+ tools/perf/util/stat.c | 24 +-
+ tools/perf/util/stat.h | 10 -
+ tools/perf/util/symbol-elf.c | 3 +
+ tools/perf/util/symbol.c | 6 +-
+ tools/perf/util/util.c | 27 +
+ tools/perf/util/util.h | 2 +
+ tools/testing/selftests/x86/Makefile | 14 +-
+ .../selftests/x86/check_initial_reg_state.c | 109 ++++
+ virt/kvm/arm/arch_timer.c | 4 +-
+ 315 files changed, 8281 insertions(+), 2833 deletions(-)
+ create mode 100644 arch/x86/events/Makefile
+ rename arch/x86/{kernel/cpu/perf_event_amd.c => events/amd/core.c} (99%)
+ rename arch/x86/{kernel/cpu/perf_event_amd_ibs.c => events/amd/ibs.c} (98%)
+ rename arch/x86/{kernel/cpu/perf_event_amd_iommu.c => events/amd/iommu.c} (99%)
+ rename arch/x86/{kernel/cpu/perf_event_amd_iommu.h => events/amd/iommu.h} (100%)
+ rename arch/x86/{kernel/cpu/perf_event_amd_uncore.c => events/amd/uncore.c} (99%)
+ rename arch/x86/{kernel/cpu/perf_event.c => events/core.c} (99%)
+ create mode 100644 arch/x86/include/asm/cpufeatures.h
+ create mode 100644 drivers/irqchip/irq-bcm6345-l1.c
+ create mode 100644 tools/build/feature/test-libcrypto.c
+ create mode 100644 tools/perf/arch/powerpc/util/book3s_hcalls.h
+ create mode 100644 tools/perf/arch/powerpc/util/book3s_hv_exits.h
+ create mode 100644 tools/perf/arch/powerpc/util/kvm-stat.c
+ create mode 100644 tools/perf/jvmti/Makefile
+ create mode 100644 tools/perf/jvmti/jvmti_agent.c
+ create mode 100644 tools/perf/jvmti/jvmti_agent.h
+ create mode 100644 tools/perf/jvmti/libjvmti.c
+ create mode 100644 tools/perf/tests/bpf-script-test-relocation.c
+ create mode 100644 tools/perf/util/demangle-java.c
+ create mode 100644 tools/perf/util/demangle-java.h
+ create mode 100644 tools/perf/util/genelf.c
+ create mode 100644 tools/perf/util/genelf.h
+ create mode 100644 tools/perf/util/genelf_debug.c
+ create mode 100644 tools/perf/util/jit.h
+ create mode 100644 tools/perf/util/jitdump.c
+ create mode 100644 tools/perf/util/jitdump.h
+ create mode 100644 tools/testing/selftests/x86/check_initial_reg_state.c
+Merging clockevents/clockevents/next (1ddca16cc5b3 clocksource/drivers/h8300: Use ioread / iowrite)
+$ git merge clockevents/clockevents/next
+Resolved 'drivers/clocksource/h8300_timer16.c' using previous resolution.
+Auto-merging drivers/clocksource/h8300_timer16.c
+CONFLICT (content): Merge conflict in drivers/clocksource/h8300_timer16.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master ef50ea502803] Merge remote-tracking branch 'clockevents/clockevents/next'
+$ git diff -M --stat --summary HEAD^..
+Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
+$ git merge edac/linux_next
+Already up-to-date.
+Merging edac-amd/for-next (9bf4f0056720 EDAC: Use edac_debugfs_remove_recursive() in edac_debugfs_exit())
+$ git merge edac-amd/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/edac/apm-xgene-edac.txt | 10 ++++
+ arch/arm64/boot/dts/apm/apm-storm.dtsi | 6 ++
+ drivers/edac/amd64_edac.c | 2 +-
+ drivers/edac/debugfs.c | 2 +-
+ drivers/edac/edac_mc.c | 64 ++++----------------
+ drivers/edac/edac_pci.c | 67 ++++++---------------
+ drivers/edac/mpc85xx_edac.c | 2 +-
+ drivers/edac/xgene_edac.c | 70 +++++++++++++++++++++-
+ 8 files changed, 120 insertions(+), 103 deletions(-)
+Merging irqchip/irqchip/for-next (f290917dc209 Merge branch 'irqchip/sunxi' 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 (7fd13615992a tracing/dma-buf/fence: Fix timeline str value on fence_annotate_wait_on)
+$ git merge ftrace/for-next
+Already up-to-date.
+Merging rcu/rcu/next (0dd1befbc663 rcu: Remove expedited GP funnel-lock bypass)
+$ git merge rcu/rcu/next
+Auto-merging lib/Kconfig.debug
+Auto-merging include/linux/compiler.h
+Auto-merging Documentation/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ .../Design/Data-Structures/BigTreeClassicRCU.svg | 474 +++++++
+ .../Design/Data-Structures/BigTreeClassicRCUBH.svg | 499 +++++++
+ .../Data-Structures/BigTreeClassicRCUBHdyntick.svg | 695 ++++++++++
+ .../Data-Structures/BigTreePreemptRCUBHdyntick.svg | 741 +++++++++++
+ .../BigTreePreemptRCUBHdyntickCB.svg | 858 ++++++++++++
+ .../Design/Data-Structures/Data-Structures.html | 1372 ++++++++++++++++++++
+ .../Design/Data-Structures/Data-Structures.htmlx | 1272 ++++++++++++++++++
+ .../Design/Data-Structures/HugeTreeClassicRCU.svg | 939 ++++++++++++++
+ .../RCU/Design/Data-Structures/TreeLevel.svg | 828 ++++++++++++
+ .../RCU/Design/Data-Structures/TreeMapping.svg | 305 +++++
+ .../Design/Data-Structures/TreeMappingLevel.svg | 380 ++++++
+ .../RCU/Design/Data-Structures/blkd_task.svg | 843 ++++++++++++
+ .../RCU/Design/Data-Structures/nxtlist.svg | 396 ++++++
+ .../RCU/Design/Requirements/Requirements.html | 102 +-
+ .../RCU/Design/Requirements/Requirements.htmlx | 90 ++
+ Documentation/RCU/trace.txt | 10 +-
+ Documentation/kernel-parameters.txt | 32 +
+ Documentation/memory-barriers.txt | 135 +-
+ include/linux/compiler.h | 12 +-
+ include/linux/irq.h | 6 +-
+ include/linux/rcutiny.h | 16 +
+ include/linux/rcutree.h | 2 +
+ include/linux/srcu.h | 19 +-
+ include/trace/events/rcu.h | 78 +-
+ kernel/irq/internals.h | 4 +
+ kernel/locking/mutex.c | 11 +-
+ kernel/rcu/Makefile | 1 +
+ kernel/rcu/rcuperf.c | 642 +++++++++
+ kernel/rcu/rcutorture.c | 16 +-
+ kernel/rcu/tiny_plugin.h | 15 +-
+ kernel/rcu/tree.c | 306 +++--
+ kernel/rcu/tree.h | 45 +-
+ kernel/rcu/tree_plugin.h | 53 +-
+ kernel/rcu/tree_trace.c | 7 +-
+ kernel/rcu/update.c | 1 +
+ lib/Kconfig.debug | 33 +
+ scripts/checkpatch.pl | 3 +-
+ .../rcutorture/bin/kvm-recheck-rcuperf-ftrace.sh | 121 ++
+ .../rcutorture/bin/kvm-recheck-rcuperf.sh | 96 ++
+ .../selftests/rcutorture/bin/kvm-recheck.sh | 5 +-
+ tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +-
+ .../selftests/rcutorture/bin/parse-console.sh | 6 +-
+ .../selftests/rcutorture/configs/rcuperf/CFLIST | 1 +
+ .../selftests/rcutorture/configs/rcuperf/CFcommon | 2 +
+ .../selftests/rcutorture/configs/rcuperf/TREE | 20 +
+ .../rcutorture/configs/rcuperf/ver_functions.sh | 52 +
+ 46 files changed, 11334 insertions(+), 212 deletions(-)
+ create mode 100644 Documentation/RCU/Design/Data-Structures/BigTreeClassicRCU.svg
+ create mode 100644 Documentation/RCU/Design/Data-Structures/BigTreeClassicRCUBH.svg
+ create mode 100644 Documentation/RCU/Design/Data-Structures/BigTreeClassicRCUBHdyntick.svg
+ create mode 100644 Documentation/RCU/Design/Data-Structures/BigTreePreemptRCUBHdyntick.svg
+ create mode 100644 Documentation/RCU/Design/Data-Structures/BigTreePreemptRCUBHdyntickCB.svg
+ create mode 100644 Documentation/RCU/Design/Data-Structures/Data-Structures.html
+ create mode 100644 Documentation/RCU/Design/Data-Structures/Data-Structures.htmlx
+ create mode 100644 Documentation/RCU/Design/Data-Structures/HugeTreeClassicRCU.svg
+ create mode 100644 Documentation/RCU/Design/Data-Structures/TreeLevel.svg
+ create mode 100644 Documentation/RCU/Design/Data-Structures/TreeMapping.svg
+ create mode 100644 Documentation/RCU/Design/Data-Structures/TreeMappingLevel.svg
+ create mode 100644 Documentation/RCU/Design/Data-Structures/blkd_task.svg
+ create mode 100644 Documentation/RCU/Design/Data-Structures/nxtlist.svg
+ create mode 100644 kernel/rcu/rcuperf.c
+ create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-rcuperf-ftrace.sh
+ create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-rcuperf.sh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcuperf/CFLIST
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcuperf/CFcommon
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcuperf/TREE
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcuperf/ver_functions.sh
+Merging kvm/linux-next (bce87cce88c7 KVM: x86: consolidate different ways to test for in-kernel LAPIC)
+$ git merge kvm/linux-next
+Merge made by the 'recursive' strategy.
+ arch/x86/include/asm/kvm_host.h | 2 +
+ arch/x86/kvm/irq.c | 9 ++-
+ arch/x86/kvm/irq.h | 8 ---
+ arch/x86/kvm/irq_comm.c | 25 +++++--
+ arch/x86/kvm/lapic.c | 147 +++++++++++++++++++++++++++++-----------
+ arch/x86/kvm/lapic.h | 10 +--
+ arch/x86/kvm/pmu.c | 2 +-
+ arch/x86/kvm/trace.h | 12 ++--
+ arch/x86/kvm/vmx.c | 17 ++++-
+ arch/x86/kvm/x86.c | 36 +++++-----
+ arch/x86/kvm/x86.h | 16 +++++
+ 11 files changed, 203 insertions(+), 81 deletions(-)
+Merging kvm-arm/next (c7da6fa43cb1 arm/arm64: KVM: Detect vGIC presence at runtime)
+$ git merge kvm-arm/next
+Already up-to-date.
+Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
+$ git merge kvm-ppc/kvm-ppc-next
+Already up-to-date.
+Merging kvm-ppc-paulus/kvm-ppc-next (b4d7f161feb3 KVM: PPC: Fix ONE_REG AltiVec support)
+$ git merge kvm-ppc-paulus/kvm-ppc-next
+Already up-to-date.
+Merging kvms390/next (1763f8d09d52 KVM: s390: bail out early on fatal signal in dirty logging)
+$ git merge kvms390/next
+Merge made by the 'recursive' strategy.
+ Documentation/virtual/kvm/devices/s390_flic.txt | 2 +
+ Documentation/virtual/kvm/devices/vm.txt | 52 +++++++++++++++++
+ arch/s390/include/asm/kvm_host.h | 8 +--
+ arch/s390/include/uapi/asm/kvm.h | 8 ++-
+ arch/s390/kvm/gaccess.c | 57 +++++++++---------
+ arch/s390/kvm/gaccess.h | 38 ++++++++++--
+ arch/s390/kvm/intercept.c | 78 +++++++++++++++----------
+ arch/s390/kvm/interrupt.c | 40 ++++++-------
+ arch/s390/kvm/kvm-s390.c | 55 +++++++++++------
+ arch/s390/kvm/kvm-s390.h | 17 +++++-
+ arch/s390/kvm/priv.c | 13 +++--
+ include/uapi/linux/kvm.h | 8 ++-
+ 12 files changed, 254 insertions(+), 122 deletions(-)
+Merging xen-tip/linux-next (a4cdb556cae0 xen/gntdev: add ioctl for grant copy)
+$ git merge xen-tip/linux-next
+Already up-to-date.
+Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
+$ git merge percpu/for-next
+Already up-to-date.
+Merging workqueues/for-next (d6e022f1d207 workqueue: handle NUMA_NO_NODE for unbound pool_workqueue lookup)
+$ git merge workqueues/for-next
+Already up-to-date.
+Merging drivers-x86/for-next (9df7fc9a9657 toshiba_acpi: Add a module parameter to disable hotkeys registration)
+$ git merge drivers-x86/for-next
+Merge made by the 'recursive' strategy.
+ .../ABI/testing/sysfs-driver-toshiba_acpi | 16 ++
+ drivers/platform/x86/alienware-wmi.c | 286 ++++++++++++++++++---
+ drivers/platform/x86/thinkpad_acpi.c | 4 +-
+ drivers/platform/x86/toshiba_acpi.c | 115 +++++++++
+ 4 files changed, 378 insertions(+), 43 deletions(-)
+Merging chrome-platform/for-next (ebaf31c46cce platform/chrome: Fix i2c-designware adapter name)
+$ git merge chrome-platform/for-next
+Already up-to-date.
+Merging regmap/for-next (02ce716f8000 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/irq' into regmap-next)
+$ git merge regmap/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/regmap/regmap.txt | 11 +-
+ arch/mips/boot/dts/brcm/bcm6328.dtsi | 2 +-
+ arch/mips/boot/dts/brcm/bcm6368.dtsi | 2 +-
+ arch/mips/boot/dts/brcm/bcm7125.dtsi | 2 +-
+ arch/mips/boot/dts/brcm/bcm7346.dtsi | 2 +-
+ arch/mips/boot/dts/brcm/bcm7358.dtsi | 2 +-
+ arch/mips/boot/dts/brcm/bcm7360.dtsi | 2 +-
+ arch/mips/boot/dts/brcm/bcm7362.dtsi | 2 +-
+ arch/mips/boot/dts/brcm/bcm7420.dtsi | 2 +-
+ arch/mips/boot/dts/brcm/bcm7425.dtsi | 2 +-
+ arch/mips/boot/dts/brcm/bcm7435.dtsi | 2 +-
+ drivers/base/regmap/regcache.c | 45 ++--
+ drivers/base/regmap/regmap-irq.c | 21 ++
+ drivers/base/regmap/regmap-mmio.c | 259 +++++++++++----------
+ drivers/base/regmap/regmap.c | 5 +
+ include/linux/regmap.h | 2 +-
+ 16 files changed, 215 insertions(+), 148 deletions(-)
+Merging hsi/for-next (87d99063be01 HSI: ssi-protocol: Use handshake logic from n950)
+$ git merge hsi/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/hsi/nokia-modem.txt | 12 +++++++-----
+ drivers/hsi/clients/nokia-modem.c | 2 ++
+ drivers/hsi/clients/ssi_protocol.c | 16 +++++-----------
+ 3 files changed, 14 insertions(+), 16 deletions(-)
+Merging leds/for-next (ee2e1c2d18a4 leds: leds-gpio: Fix return value check in create_gpio_led())
+$ git merge leds/for-next
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/leds/leds-sn3218.txt | 41 +++
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ drivers/leds/Kconfig | 12 +
+ drivers/leds/Makefile | 1 +
+ drivers/leds/led-class.c | 2 +
+ drivers/leds/led-core.c | 5 +-
+ drivers/leds/leds-gpio.c | 4 +-
+ drivers/leds/leds-lp3944.c | 7 +-
+ drivers/leds/leds-sn3218.c | 306 +++++++++++++++++++++
+ include/linux/leds.h | 8 +-
+ 10 files changed, 380 insertions(+), 7 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/leds/leds-sn3218.txt
+ create mode 100644 drivers/leds/leds-sn3218.c
+Merging ipmi/for-next (7f8df84ecba8 ipmi_si: Avoid a wrong long timeout on transaction done)
+$ git merge ipmi/for-next
+Merge made by the 'recursive' strategy.
+ drivers/char/ipmi/ipmi_si_intf.c | 8 ++++----
+ drivers/char/ipmi/ipmi_ssif.c | 13 ++++---------
+ 2 files changed, 8 insertions(+), 13 deletions(-)
+Merging driver-core/driver-core-next (67d02a1bbb33 driver-core: platform: probe of-devices only using list of compatibles)
+$ git merge driver-core/driver-core-next
+Auto-merging drivers/base/component.c
+Merge made by the 'recursive' strategy.
+ .../ABI/testing/sysfs-firmware-qemu_fw_cfg | 100 +++
+ Documentation/devicetree/bindings/arm/fw-cfg.txt | 38 +-
+ Documentation/driver-model/platform.txt | 2 +-
+ drivers/base/bus.c | 15 +-
+ drivers/base/component.c | 2 +-
+ drivers/base/dma-coherent.c | 28 +-
+ drivers/base/platform.c | 4 +-
+ drivers/firmware/Kconfig | 19 +
+ drivers/firmware/Makefile | 1 +
+ drivers/firmware/qemu_fw_cfg.c | 751 +++++++++++++++++++++
+ fs/kernfs/dir.c | 19 +-
+ include/linux/debugfs.h | 8 +
+ lib/kobject.c | 1 +
+ 13 files changed, 916 insertions(+), 72 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-firmware-qemu_fw_cfg
+ create mode 100644 drivers/firmware/qemu_fw_cfg.c
+Merging tty/tty-next (54573c4a073f xen/hvc: constify hv_ops structures)
+$ git merge tty/tty-next
+Resolved 'drivers/tty/tty_io.c' using previous resolution.
+Auto-merging kernel/audit.c
+Auto-merging include/linux/sched.h
+Auto-merging drivers/tty/tty_mutex.c
+Auto-merging drivers/tty/tty_io.c
+CONFLICT (content): Merge conflict in drivers/tty/tty_io.c
+Auto-merging drivers/tty/serial/omap-serial.c
+Removing drivers/tty/serial/m32r_sio.h
+Auto-merging drivers/tty/serial/8250/8250_pci.c
+Removing drivers/tty/serial/68328serial.c
+Auto-merging drivers/tty/pty.c
+Auto-merging drivers/of/fdt.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 2292705bd6c2] Merge remote-tracking branch 'tty/tty-next'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/serial/brcm,bcm2835-aux-uart.txt | 18 +
+ .../bindings/serial/renesas,sci-serial.txt | 2 +
+ Documentation/serial/tty.txt | 3 -
+ arch/alpha/include/asm/serial.h | 8 +-
+ arch/arm/mach-omap2/serial.c | 2 +-
+ arch/frv/include/asm/serial.h | 2 +-
+ arch/ia64/kernel/unaligned.c | 7 +-
+ arch/m68k/include/asm/serial.h | 8 +-
+ arch/mips/pmcs-msp71xx/msp_serial.c | 2 +-
+ arch/mn10300/include/asm/serial.h | 10 +-
+ arch/xtensa/platforms/iss/console.c | 4 -
+ arch/xtensa/platforms/xt2000/setup.c | 2 +-
+ drivers/char/pcmcia/synclink_cs.c | 21 +-
+ drivers/char/ttyprintk.c | 2 +-
+ drivers/isdn/i4l/isdn_tty.c | 12 +-
+ drivers/mmc/card/sdio_uart.c | 14 +-
+ drivers/net/irda/irtty-sir.c | 10 -
+ drivers/of/fdt.c | 32 +-
+ drivers/of/fdt_address.c | 11 +-
+ drivers/s390/char/con3215.c | 3 +-
+ drivers/staging/dgap/dgap.c | 36 +-
+ drivers/staging/dgnc/dgnc_tty.c | 20 +-
+ drivers/tty/Kconfig | 2 +-
+ drivers/tty/amiserial.c | 28 +-
+ drivers/tty/cyclades.c | 22 +-
+ drivers/tty/ehv_bytechan.c | 40 +-
+ drivers/tty/goldfish.c | 2 +-
+ drivers/tty/hvc/hvc_vio.c | 29 +-
+ drivers/tty/hvc/hvc_xen.c | 6 +-
+ drivers/tty/isicom.c | 3 +-
+ drivers/tty/mxser.c | 21 +-
+ drivers/tty/n_gsm.c | 22 +-
+ drivers/tty/n_hdlc.c | 19 +-
+ drivers/tty/n_tty.c | 117 +-
+ drivers/tty/nozomi.c | 2 +-
+ drivers/tty/pty.c | 30 +-
+ drivers/tty/rocket.c | 18 +-
+ drivers/tty/rocket_int.h | 1 -
+ drivers/tty/serial/68328serial.c | 1322 --------------------
+ drivers/tty/serial/8250/8250.h | 14 +
+ drivers/tty/serial/8250/8250_accent.c | 13 +-
+ drivers/tty/serial/8250/8250_acorn.c | 2 +-
+ drivers/tty/serial/8250/8250_bcm2835aux.c | 146 +++
+ drivers/tty/serial/8250/8250_boca.c | 41 +-
+ drivers/tty/serial/8250/8250_core.c | 21 +-
+ drivers/tty/serial/8250/8250_dw.c | 126 +-
+ drivers/tty/serial/8250/8250_early.c | 37 +-
+ drivers/tty/serial/8250/8250_exar_st16c554.c | 17 +-
+ drivers/tty/serial/8250/8250_fourport.c | 28 +-
+ drivers/tty/serial/8250/8250_gsc.c | 7 +-
+ drivers/tty/serial/8250/8250_hp300.c | 27 +-
+ drivers/tty/serial/8250/8250_hub6.c | 2 +-
+ drivers/tty/serial/8250/8250_ingenic.c | 40 +-
+ drivers/tty/serial/8250/8250_of.c | 1 +
+ drivers/tty/serial/8250/8250_omap.c | 31 +
+ drivers/tty/serial/8250/8250_pci.c | 96 +-
+ drivers/tty/serial/8250/8250_pnp.c | 48 +-
+ drivers/tty/serial/8250/8250_port.c | 453 +++++--
+ drivers/tty/serial/8250/Kconfig | 24 +
+ drivers/tty/serial/8250/Makefile | 1 +
+ drivers/tty/serial/8250/serial_cs.c | 90 +-
+ drivers/tty/serial/Kconfig | 18 +-
+ drivers/tty/serial/Makefile | 1 -
+ drivers/tty/serial/amba-pl011.c | 20 +-
+ drivers/tty/serial/arc_uart.c | 1 -
+ drivers/tty/serial/atmel_serial.c | 134 +-
+ drivers/tty/serial/crisv10.c | 33 +-
+ drivers/tty/serial/earlycon.c | 118 +-
+ drivers/tty/serial/imx.c | 5 +-
+ drivers/tty/serial/jsm/jsm_tty.c | 13 +-
+ drivers/tty/serial/m32r_sio.c | 134 +-
+ drivers/tty/serial/m32r_sio.h | 49 -
+ drivers/tty/serial/mpc52xx_uart.c | 8 +-
+ drivers/tty/serial/mpsc.c | 178 ++-
+ drivers/tty/serial/msm_serial.c | 2 -
+ drivers/tty/serial/omap-serial.c | 2 +-
+ drivers/tty/serial/samsung.c | 6 -
+ drivers/tty/serial/sc16is7xx.c | 12 +-
+ drivers/tty/serial/serial_core.c | 125 +-
+ drivers/tty/serial/serial_ks8695.c | 2 +-
+ drivers/tty/serial/sh-sci.c | 183 ++-
+ drivers/tty/serial/sh-sci.h | 15 +
+ drivers/tty/serial/sprd_serial.c | 2 -
+ drivers/tty/serial/uartlite.c | 45 +
+ drivers/tty/serial/xilinx_uartps.c | 539 ++++----
+ drivers/tty/serial/zs.c | 4 +
+ drivers/tty/synclink.c | 23 +-
+ drivers/tty/synclink_gt.c | 19 +-
+ drivers/tty/synclinkmp.c | 63 +-
+ drivers/tty/tty_audit.c | 231 +---
+ drivers/tty/tty_buffer.c | 39 +-
+ drivers/tty/tty_io.c | 266 ++--
+ drivers/tty/tty_ioctl.c | 12 +-
+ drivers/tty/tty_ldisc.c | 198 +--
+ drivers/tty/tty_mutex.c | 8 +-
+ drivers/tty/tty_port.c | 11 +-
+ drivers/tty/vt/keyboard.c | 14 +-
+ drivers/tty/vt/selection.c | 2 +
+ drivers/tty/vt/vt.c | 2 +-
+ drivers/usb/serial/console.c | 6 +-
+ drivers/usb/serial/cypress_m8.c | 3 +-
+ drivers/usb/serial/digi_acceleport.c | 8 +-
+ drivers/usb/serial/io_edgeport.c | 4 +-
+ drivers/usb/serial/mct_u232.c | 2 +-
+ drivers/usb/serial/mos7720.c | 4 +-
+ drivers/usb/serial/mos7840.c | 4 +-
+ include/asm-generic/vmlinux.lds.h | 6 +-
+ include/linux/audit.h | 4 +
+ include/linux/isdn.h | 1 +
+ include/linux/of_fdt.h | 2 +-
+ include/linux/platform_data/serial-omap.h | 2 +-
+ include/linux/sched.h | 1 -
+ include/linux/serial_8250.h | 8 +
+ include/linux/serial_core.h | 25 +-
+ include/linux/tty.h | 58 +-
+ include/linux/tty_ldisc.h | 13 -
+ kernel/audit.c | 27 +-
+ net/irda/ircomm/ircomm_tty.c | 15 +-
+ net/irda/ircomm/ircomm_tty_ioctl.c | 13 +-
+ net/nfc/nci/uart.c | 9 +-
+ security/selinux/hooks.c | 4 +-
+ 121 files changed, 2338 insertions(+), 3596 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/serial/brcm,bcm2835-aux-uart.txt
+ delete mode 100644 drivers/tty/serial/68328serial.c
+ create mode 100644 drivers/tty/serial/8250/8250_bcm2835aux.c
+ delete mode 100644 drivers/tty/serial/m32r_sio.h
+Merging usb/usb-next (a44007a42dfd drivers: usb: removed assignment of 0 to static variables)
+$ git merge usb/usb-next
+Auto-merging include/linux/device.h
+Auto-merging drivers/usb/host/xhci.h
+Auto-merging drivers/usb/host/xhci.c
+Auto-merging drivers/usb/host/xhci-ring.c
+Auto-merging drivers/usb/core/urb.c
+Auto-merging drivers/usb/core/hcd-pci.c
+Merge made by the 'recursive' strategy.
+ drivers/usb/atm/cxacru.c | 2 +
+ drivers/usb/chipidea/debug.c | 5 +-
+ drivers/usb/class/usbtmc.c | 330 ++++++++
+ drivers/usb/common/common.c | 1 +
+ drivers/usb/core/config.c | 3 +-
+ drivers/usb/core/devices.c | 26 +-
+ drivers/usb/core/devio.c | 13 +-
+ drivers/usb/core/file.c | 9 +-
+ drivers/usb/core/hcd-pci.c | 2 +-
+ drivers/usb/core/hcd.c | 98 ++-
+ drivers/usb/core/hub.c | 106 ++-
+ drivers/usb/core/hub.h | 7 +
+ drivers/usb/core/sysfs.c | 68 +-
+ drivers/usb/core/urb.c | 3 +-
+ drivers/usb/core/usb.c | 5 +-
+ drivers/usb/core/usb.h | 2 +-
+ drivers/usb/gadget/function/rndis.c | 20 +-
+ drivers/usb/host/bcma-hcd.c | 83 +-
+ drivers/usb/host/ehci-dbg.c | 477 ++++++-----
+ drivers/usb/host/ehci-fsl.c | 24 +-
+ drivers/usb/host/ehci-hcd.c | 22 +-
+ drivers/usb/host/ehci-hub.c | 6 +-
+ drivers/usb/host/ehci-msm.c | 66 +-
+ drivers/usb/host/ehci-pci.c | 8 +-
+ drivers/usb/host/ehci-platform.c | 6 +-
+ drivers/usb/host/ehci-q.c | 104 ++-
+ drivers/usb/host/ehci-sched.c | 524 ++++++------
+ drivers/usb/host/ehci-st.c | 6 +-
+ drivers/usb/host/ehci-timer.c | 5 +-
+ drivers/usb/host/ehci.h | 97 +--
+ drivers/usb/host/fotg210-hcd.c | 15 +-
+ drivers/usb/host/fsl-mph-dr-of.c | 7 +-
+ drivers/usb/host/max3421-hcd.c | 16 +-
+ drivers/usb/host/ohci-nxp.c | 7 -
+ drivers/usb/host/ohci-platform.c | 6 +-
+ drivers/usb/host/ohci-st.c | 6 +-
+ drivers/usb/host/oxu210hp-hcd.c | 15 +-
+ drivers/usb/host/r8a66597-hcd.c | 11 +-
+ drivers/usb/host/u132-hcd.c | 18 +-
+ drivers/usb/host/xhci-hub.c | 27 +-
+ drivers/usb/host/xhci-mem.c | 12 +-
+ drivers/usb/host/xhci-ring.c | 3 +-
+ drivers/usb/host/xhci.c | 8 +-
+ drivers/usb/host/xhci.h | 1 +
+ drivers/usb/misc/sisusbvga/sisusb.c | 1543 +++++++++++++++++------------------
+ drivers/usb/mon/mon_main.c | 9 +-
+ drivers/usb/renesas_usbhs/fifo.c | 20 +-
+ drivers/usb/renesas_usbhs/fifo.h | 20 +-
+ drivers/usb/renesas_usbhs/pipe.h | 2 +-
+ drivers/usb/storage/ene_ub6250.c | 4 +-
+ drivers/usb/storage/uas.c | 36 +-
+ drivers/usb/usbip/usbip_event.c | 5 +-
+ drivers/usb/usbip/vhci_hcd.c | 88 +-
+ drivers/usb/usbip/vhci_rx.c | 30 +-
+ drivers/usb/usbip/vhci_sysfs.c | 19 +-
+ drivers/usb/usbip/vhci_tx.c | 14 +-
+ drivers/usb/wusbcore/wusbhc.h | 2 +-
+ include/linux/device.h | 5 +
+ include/linux/usb.h | 8 +-
+ include/linux/usb/hcd.h | 5 +-
+ include/linux/usb/msm_hsusb_hw.h | 1 +
+ include/linux/usb/storage.h | 12 +-
+ include/uapi/linux/usb/ch11.h | 21 +
+ include/uapi/linux/usb/ch9.h | 1 +
+ include/uapi/linux/usb/tmc.h | 29 +-
+ 65 files changed, 2396 insertions(+), 1758 deletions(-)
+Merging usb-gadget/next (36f90b0a2ddd Linux 4.5-rc2)
+$ git merge usb-gadget/next
+Already up-to-date.
+Merging usb-serial/usb-next (92e963f50fc7 Linux 4.5-rc1)
+$ git merge usb-serial/usb-next
+Already up-to-date.
+Merging usb-chipidea-next/ci-for-usb-next (6b8bc9c6fb26 usb: chipidea: udc: remove unused value assignment)
+$ git merge usb-chipidea-next/ci-for-usb-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt | 7 +++++++
+ drivers/usb/chipidea/ci_hdrc_imx.c | 6 ++++++
+ drivers/usb/chipidea/udc.c | 1 -
+ 3 files changed, 13 insertions(+), 1 deletion(-)
+Merging staging/staging-next (8c79c49c803d staging: iio: Remove parantheses around right hand side of assignment)
+$ git merge staging/staging-next
+Removing drivers/staging/staging.c
+Removing drivers/staging/panel/TODO
+Removing drivers/staging/panel/Makefile
+Removing drivers/staging/panel/Kconfig
+Removing drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c
+Removing drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
+Removing drivers/staging/olpc_dcon/olpc_dcon.h
+Removing drivers/staging/olpc_dcon/olpc_dcon.c
+Removing drivers/staging/olpc_dcon/TODO
+Removing drivers/staging/olpc_dcon/Makefile
+Removing drivers/staging/olpc_dcon/Kconfig
+Auto-merging drivers/staging/lustre/lustre/obdclass/kernelcomm.c
+Auto-merging drivers/staging/lustre/lustre/include/uapi_kernelcomm.h
+Removing drivers/staging/dgap/dgap.h
+CONFLICT (modify/delete): drivers/staging/dgap/dgap.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/dgap/dgap.c left in tree.
+Removing drivers/staging/dgap/Makefile
+Removing drivers/staging/dgap/Kconfig
+Auto-merging drivers/staging/android/ion/ion.c
+Auto-merging drivers/misc/panel.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f drivers/staging/dgap/dgap.c
+drivers/staging/dgap/dgap.c: needs merge
+rm 'drivers/staging/dgap/dgap.c'
+$ git commit -v -a
+[master b53df41716d2] Merge remote-tracking branch 'staging/staging-next'
+$ git diff -M --stat --summary HEAD^..
+ CREDITS | 1 +
+ Documentation/ABI/testing/sysfs-bus-iio | 9 +
+ .../devicetree/bindings/iio/accel/mma8452.txt | 4 +-
+ .../bindings/iio/adc/at91-sama5d2_adc.txt | 28 +
+ .../devicetree/bindings/iio/adc/mcp3422.txt | 1 +
+ .../bindings/iio/chemical/atlas,ph-sm.txt | 22 +
+ .../devicetree/bindings/iio/health/max30100.txt | 8 +
+ .../devicetree/bindings/iio/light/opt3001.txt | 26 +
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ .../misc-devices}/lcd-panel-cgram.txt | 0
+ MAINTAINERS | 33 +-
+ drivers/android/binder.c | 5 +
+ drivers/iio/accel/Kconfig | 2 +-
+ drivers/iio/accel/mma8452.c | 206 +-
+ drivers/iio/accel/st_accel_core.c | 16 +
+ drivers/iio/adc/Kconfig | 16 +-
+ drivers/iio/adc/Makefile | 1 +
+ drivers/iio/adc/at91-sama5d2_adc.c | 508 ++
+ drivers/iio/adc/axp288_adc.c | 2 +-
+ drivers/iio/adc/mcp320x.c | 31 +-
+ drivers/iio/adc/mcp3422.c | 7 +-
+ drivers/iio/chemical/Kconfig | 13 +
+ drivers/iio/chemical/Makefile | 1 +
+ drivers/iio/chemical/atlas-ph-sensor.c | 511 ++
+ drivers/iio/common/st_sensors/st_sensors_core.c | 6 +-
+ drivers/iio/common/st_sensors/st_sensors_core.h | 8 +
+ drivers/iio/common/st_sensors/st_sensors_trigger.c | 52 +-
+ drivers/iio/dac/Kconfig | 14 +-
+ drivers/iio/dac/Makefile | 1 +
+ drivers/iio/dac/ad5761.c | 430 ++
+ drivers/iio/dac/mcp4725.c | 87 +-
+ drivers/iio/gyro/st_gyro_core.c | 15 +
+ drivers/iio/health/max30100.c | 81 +-
+ drivers/iio/humidity/Kconfig | 6 +-
+ drivers/iio/humidity/dht11.c | 77 +-
+ drivers/iio/humidity/si7005.c | 1 +
+ drivers/iio/humidity/si7020.c | 1 +
+ drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 5 +-
+ drivers/iio/industrialio-core.c | 1 +
+ drivers/iio/light/opt3001.c | 156 +-
+ drivers/iio/magnetometer/ak8975.c | 4 +-
+ drivers/iio/magnetometer/st_magn_core.c | 4 +
+ drivers/iio/pressure/Kconfig | 41 +-
+ drivers/iio/pressure/Makefile | 2 +
+ drivers/iio/pressure/mpl115.c | 66 +-
+ drivers/iio/pressure/mpl115.h | 24 +
+ drivers/iio/pressure/mpl115_i2c.c | 67 +
+ drivers/iio/pressure/mpl115_spi.c | 106 +
+ drivers/iio/pressure/st_pressure_core.c | 8 +
+ drivers/misc/Kconfig | 278 +
+ drivers/misc/Makefile | 1 +
+ drivers/{staging/panel => misc}/panel.c | 49 +-
+ drivers/staging/Kconfig | 6 -
+ drivers/staging/Makefile | 6 -
+ drivers/staging/android/Kconfig | 9 -
+ drivers/staging/android/ashmem.c | 4 +-
+ drivers/staging/android/ion/ion.c | 74 +-
+ drivers/staging/android/ion/ion.h | 20 +-
+ drivers/staging/android/ion/ion_carveout_heap.c | 2 +-
+ drivers/staging/android/ion/ion_page_pool.c | 4 +-
+ drivers/staging/android/ion/ion_system_heap.c | 2 +-
+ drivers/staging/android/lowmemorykiller.c | 24 +-
+ drivers/staging/android/sw_sync.c | 191 +-
+ drivers/staging/android/sw_sync.h | 8 +-
+ drivers/staging/android/sync.c | 467 +-
+ drivers/staging/android/sync.h | 241 +-
+ drivers/staging/android/sync_debug.c | 229 +-
+ drivers/staging/android/trace/sync.h | 44 -
+ drivers/staging/android/uapi/ashmem.h | 1 +
+ drivers/staging/android/uapi/sync.h | 37 +-
+ drivers/staging/board/armadillo800eva.c | 1 -
+ drivers/staging/board/board.c | 1 -
+ .../clocking-wizard/clk-xlnx-clock-wizard.c | 9 +-
+ drivers/staging/comedi/comedi.h | 2 +-
+ drivers/staging/comedi/comedi_pcmcia.h | 3 +-
+ drivers/staging/comedi/drivers/dt2801.c | 18 +-
+ drivers/staging/comedi/drivers/mite.c | 72 +-
+ drivers/staging/comedi/drivers/mite.h | 3 +
+ drivers/staging/comedi/drivers/ni_mio_common.c | 576 +-
+ drivers/staging/comedi/drivers/ni_pcimio.c | 20 +-
+ drivers/staging/comedi/drivers/ni_tiocmd.c | 2 +-
+ drivers/staging/dgap/Kconfig | 6 -
+ drivers/staging/dgap/Makefile | 1 -
+ drivers/staging/dgap/dgap.c | 7057 --------------------
+ drivers/staging/dgap/dgap.h | 1229 ----
+ drivers/staging/emxx_udc/emxx_udc.c | 38 +-
+ drivers/staging/fbtft/Kconfig | 12 +
+ drivers/staging/fbtft/Makefile | 2 +
+ drivers/staging/fbtft/fb_hx8340bn.c | 25 +-
+ drivers/staging/fbtft/fb_hx8353d.c | 21 +-
+ drivers/staging/fbtft/fb_hx8357d.c | 38 +-
+ drivers/staging/fbtft/fb_hx8357d.h | 32 -
+ drivers/staging/fbtft/fb_ili9163.c | 86 +-
+ drivers/staging/fbtft/fb_ili9340.c | 26 +-
+ drivers/staging/fbtft/fb_ili9341.c | 50 +-
+ drivers/staging/fbtft/fb_ili9481.c | 30 +-
+ drivers/staging/fbtft/fb_ili9486.c | 35 +-
+ drivers/staging/fbtft/fb_s6d02a1.c | 42 +-
+ drivers/staging/fbtft/fb_ssd1305.c | 216 +
+ drivers/staging/fbtft/fb_ssd1325.c | 205 +
+ drivers/staging/fbtft/fb_st7735r.c | 42 +-
+ drivers/staging/fbtft/fb_tinylcd.c | 28 +-
+ drivers/staging/fbtft/fb_uc1701.c | 27 +-
+ drivers/staging/fbtft/fbtft-core.c | 18 +-
+ drivers/staging/fbtft/fbtft.h | 8 -
+ drivers/staging/fbtft/fbtft_device.c | 75 +-
+ drivers/staging/fsl-mc/bus/Kconfig | 1 +
+ drivers/staging/fsl-mc/bus/Makefile | 2 +
+ drivers/staging/fsl-mc/bus/dprc-driver.c | 331 +-
+ .../staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c | 127 +
+ drivers/staging/fsl-mc/bus/mc-allocator.c | 199 +
+ drivers/staging/fsl-mc/bus/mc-bus.c | 15 +-
+ drivers/staging/fsl-mc/bus/mc-msi.c | 276 +
+ drivers/staging/fsl-mc/include/dprc.h | 2 +-
+ drivers/staging/fsl-mc/include/mc-private.h | 39 +-
+ drivers/staging/fsl-mc/include/mc.h | 26 +
+ drivers/staging/fwserial/dma_fifo.c | 10 +-
+ drivers/staging/fwserial/fwserial.c | 17 +-
+ drivers/staging/fwserial/fwserial.h | 1 -
+ drivers/staging/gdm72xx/gdm_qos.c | 2 +-
+ drivers/staging/gdm72xx/gdm_qos.h | 2 +-
+ drivers/staging/gdm72xx/gdm_sdio.h | 4 +-
+ drivers/staging/gdm72xx/gdm_usb.c | 1 -
+ drivers/staging/gdm72xx/gdm_usb.h | 8 +-
+ drivers/staging/gdm72xx/gdm_wimax.c | 2 +-
+ drivers/staging/gdm72xx/hci.h | 9 +-
+ drivers/staging/gdm72xx/netlink_k.c | 2 +-
+ drivers/staging/gdm72xx/usb_ids.h | 64 +-
+ drivers/staging/goldfish/goldfish_audio.c | 6 +-
+ drivers/staging/gs_fpgaboot/gs_fpgaboot.c | 6 +-
+ .../staging/iio/Documentation/sysfs-bus-iio-light | 28 -
+ drivers/staging/iio/adc/ad7192.c | 2 +-
+ drivers/staging/iio/adc/ad7280a.c | 4 +-
+ drivers/staging/iio/cdc/ad7150.c | 34 +-
+ drivers/staging/iio/light/tsl2x7x_core.c | 6 +-
+ .../staging/lustre/include/linux/libcfs/libcfs.h | 4 +-
+ .../lustre/include/linux/libcfs/libcfs_debug.h | 2 +-
+ .../lustre/include/linux/libcfs/libcfs_ioctl.h | 13 +-
+ .../lustre/include/linux/libcfs/libcfs_private.h | 5 -
+ .../lustre/include/linux/libcfs/libcfs_string.h | 2 -
+ drivers/staging/lustre/include/linux/lnet/api.h | 1 +
+ .../staging/lustre/include/linux/lnet/lib-lnet.h | 2 -
+ drivers/staging/lustre/include/linux/lnet/lnetst.h | 104 +-
+ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 3 +-
+ .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 1 +
+ drivers/staging/lustre/lnet/lnet/api-ni.c | 53 +-
+ drivers/staging/lustre/lnet/lnet/config.c | 18 +-
+ drivers/staging/lustre/lnet/lnet/lib-eq.c | 3 +-
+ drivers/staging/lustre/lnet/selftest/conrpc.c | 4 +-
+ drivers/staging/lustre/lnet/selftest/conrpc.h | 5 +-
+ drivers/staging/lustre/lnet/selftest/console.c | 96 +-
+ drivers/staging/lustre/lnet/selftest/console.h | 56 +-
+ drivers/staging/lustre/lustre/fid/lproc_fid.c | 2 +
+ .../staging/lustre/lustre/include/lprocfs_status.h | 2 +-
+ drivers/staging/lustre/lustre/include/lu_object.h | 4 +-
+ drivers/staging/lustre/lustre/include/lustre_cfg.h | 4 -
+ .../staging/lustre/lustre/include/lustre_export.h | 7 +
+ .../lustre/lustre/include/lustre_kernelcomm.h | 55 +
+ drivers/staging/lustre/lustre/include/lustre_lib.h | 16 +-
+ drivers/staging/lustre/lustre/include/obd.h | 3 +-
+ drivers/staging/lustre/lustre/include/obd_class.h | 2 +-
+ .../include/uapi_kernelcomm.h} | 72 +-
+ drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 11 -
+ drivers/staging/lustre/lustre/libcfs/Makefile | 5 +-
+ drivers/staging/lustre/lustre/libcfs/debug.c | 2 +
+ drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c | 8 +
+ drivers/staging/lustre/lustre/libcfs/libcfs_lock.c | 2 +
+ .../lustre/lustre/libcfs/linux/linux-module.c | 22 +-
+ drivers/staging/lustre/lustre/libcfs/module.c | 185 +-
+ drivers/staging/lustre/lustre/llite/dcache.c | 10 +-
+ drivers/staging/lustre/lustre/llite/dir.c | 86 +-
+ drivers/staging/lustre/lustre/llite/file.c | 78 +-
+ .../staging/lustre/lustre/llite/llite_internal.h | 4 +-
+ drivers/staging/lustre/lustre/llite/llite_lib.c | 14 +-
+ drivers/staging/lustre/lustre/llite/llite_nfs.c | 2 +-
+ drivers/staging/lustre/lustre/llite/lloop.c | 4 +-
+ drivers/staging/lustre/lustre/llite/rw.c | 1 -
+ drivers/staging/lustre/lustre/lmv/lmv_obd.c | 40 +-
+ drivers/staging/lustre/lustre/lov/lov_dev.c | 2 +-
+ drivers/staging/lustre/lustre/lov/lov_internal.h | 2 +-
+ drivers/staging/lustre/lustre/lov/lov_obd.c | 6 +-
+ drivers/staging/lustre/lustre/lov/lov_pack.c | 2 +-
+ drivers/staging/lustre/lustre/mdc/mdc_request.c | 23 +-
+ drivers/staging/lustre/lustre/obdclass/Makefile | 10 +-
+ drivers/staging/lustre/lustre/obdclass/class_obd.c | 14 +-
+ drivers/staging/lustre/lustre/obdclass/genops.c | 1 +
+ .../kernel_user_comm.c => obdclass/kernelcomm.c} | 80 +-
+ .../lustre/lustre/obdclass/linux/linux-module.c | 20 +-
+ drivers/staging/lustre/lustre/obdclass/llog_swab.c | 3 -
+ .../lustre/lustre/obdclass/lprocfs_status.c | 22 +-
+ .../staging/lustre/lustre/obdecho/echo_client.c | 349 +-
+ drivers/staging/lustre/lustre/osc/lproc_osc.c | 25 +-
+ drivers/staging/lustre/lustre/osc/osc_cache.c | 3 +
+ drivers/staging/lustre/lustre/osc/osc_page.c | 4 +-
+ drivers/staging/lustre/lustre/osc/osc_request.c | 5 +-
+ drivers/staging/lustre/lustre/ptlrpc/client.c | 3 +-
+ drivers/staging/lustre/lustre/ptlrpc/events.c | 11 -
+ drivers/staging/lustre/lustre/ptlrpc/nrs.c | 14 +-
+ drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 1 -
+ drivers/staging/most/aim-cdev/cdev.c | 372 +-
+ drivers/staging/most/aim-network/networking.c | 11 +-
+ drivers/staging/most/hdm-dim2/dim2_hal.c | 4 +-
+ drivers/staging/most/hdm-dim2/dim2_hal.h | 7 +-
+ drivers/staging/most/hdm-dim2/dim2_hdm.c | 10 +-
+ drivers/staging/most/hdm-dim2/dim2_hdm.h | 2 +-
+ drivers/staging/most/mostcore/core.c | 168 +-
+ drivers/staging/most/mostcore/mostcore.h | 3 +-
+ drivers/staging/mt29f_spinand/mt29f_spinand.c | 77 +-
+ drivers/staging/nvec/nvec.c | 8 +-
+ drivers/staging/nvec/nvec_paz00.c | 12 +-
+ drivers/staging/nvec/nvec_power.c | 14 +-
+ drivers/staging/octeon-usb/octeon-hcd.c | 3 +-
+ drivers/staging/octeon/ethernet-rgmii.c | 4 -
+ drivers/staging/octeon/ethernet-tx.c | 4 +-
+ drivers/staging/olpc_dcon/Kconfig | 35 -
+ drivers/staging/olpc_dcon/Makefile | 6 -
+ drivers/staging/olpc_dcon/TODO | 9 -
+ drivers/staging/olpc_dcon/olpc_dcon.c | 813 ---
+ drivers/staging/olpc_dcon/olpc_dcon.h | 111 -
+ drivers/staging/olpc_dcon/olpc_dcon_xo_1.c | 205 -
+ drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 161 -
+ drivers/staging/panel/Kconfig | 278 -
+ drivers/staging/panel/Makefile | 1 -
+ drivers/staging/panel/TODO | 8 -
+ drivers/staging/rdma/hfi1/chip.c | 1 -
+ drivers/staging/rdma/hfi1/chip_registers.h | 11 +
+ drivers/staging/rdma/hfi1/diag.c | 2 +-
+ drivers/staging/rdma/hfi1/driver.c | 2 +-
+ drivers/staging/rdma/hfi1/efivar.c | 3 +-
+ drivers/staging/rdma/hfi1/hfi.h | 8 +-
+ drivers/staging/rdma/hfi1/mad.c | 33 +-
+ drivers/staging/rdma/hfi1/pcie.c | 84 +-
+ drivers/staging/rdma/hfi1/ud.c | 2 +-
+ drivers/staging/rtl8188eu/Makefile | 2 +-
+ drivers/staging/rtl8188eu/core/rtw_ap.c | 4 +-
+ drivers/staging/rtl8188eu/core/rtw_cmd.c | 12 +-
+ drivers/staging/rtl8188eu/core/rtw_debug.c | 14 +-
+ drivers/staging/rtl8188eu/core/rtw_efuse.c | 8 +-
+ drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 4 +-
+ drivers/staging/rtl8188eu/core/rtw_mlme.c | 19 +-
+ drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 11 +-
+ drivers/staging/rtl8188eu/core/rtw_recv.c | 54 +-
+ drivers/staging/rtl8188eu/core/rtw_security.c | 28 +-
+ drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 23 +-
+ drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 5 +-
+ drivers/staging/rtl8188eu/core/rtw_xmit.c | 84 +-
+ drivers/staging/rtl8188eu/include/drv_types.h | 2 +-
+ drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 2 +-
+ drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 2 +-
+ drivers/staging/rtl8188eu/os_dep/os_intfs.c | 4 +-
+ drivers/staging/rtl8192e/dot11d.h | 3 -
+ drivers/staging/rtl8192e/rtllib.h | 2 +-
+ drivers/staging/rtl8192e/rtllib_module.c | 5 -
+ drivers/staging/rtl8192e/rtllib_softmac.c | 2 +-
+ drivers/staging/rtl8192e/rtllib_wx.c | 2 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 13 +-
+ .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 6 +-
+ drivers/staging/rtl8192u/r8190_rtl8256.c | 24 +-
+ drivers/staging/rtl8192u/r8192U_core.c | 30 +-
+ drivers/staging/rtl8192u/r8192U_dm.c | 4 +-
+ drivers/staging/rtl8192u/r8192U_wx.c | 38 +-
+ drivers/staging/rtl8192u/r819xU_phy.c | 3 +-
+ drivers/staging/rtl8712/drv_types.h | 1 +
+ drivers/staging/rtl8712/ieee80211.h | 112 +-
+ drivers/staging/rtl8712/rtl8712_cmd.c | 2 +-
+ drivers/staging/rtl8712/rtl8712_io.c | 77 +-
+ drivers/staging/rtl8712/rtl871x_cmd.c | 13 +-
+ drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 5 +-
+ drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 45 +-
+ drivers/staging/rtl8712/rtl871x_mlme.c | 15 +-
+ drivers/staging/rtl8712/rtl871x_recv.c | 16 +-
+ drivers/staging/rtl8712/rtl871x_sta_mgt.c | 25 +-
+ drivers/staging/rtl8712/rtl871x_xmit.c | 33 +-
+ drivers/staging/rtl8712/usb_intf.c | 12 +
+ drivers/staging/rtl8712/usb_ops_linux.c | 5 +-
+ drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 20 -
+ drivers/staging/rtl8723au/core/rtw_recv.c | 32 +-
+ drivers/staging/rtl8723au/hal/odm.c | 2 +-
+ .../staging/rtl8723au/hal/rtl8723a_bt-coexist.c | 24 +-
+ drivers/staging/rtl8723au/hal/rtl8723a_cmd.c | 6 +-
+ drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 8 +-
+ drivers/staging/rtl8723au/hal/usb_halinit.c | 6 +-
+ drivers/staging/rtl8723au/include/rtl8723a_cmd.h | 2 +-
+ drivers/staging/rts5208/rtsx.c | 2 -
+ drivers/staging/rts5208/rtsx_transport.c | 4 +-
+ drivers/staging/rts5208/spi.c | 2 -
+ drivers/staging/slicoss/slic.h | 2 +
+ drivers/staging/slicoss/slicoss.c | 41 +-
+ drivers/staging/sm750fb/ddk750_chip.c | 83 +-
+ drivers/staging/sm750fb/ddk750_display.c | 24 +-
+ drivers/staging/sm750fb/ddk750_hwi2c.c | 11 +-
+ drivers/staging/sm750fb/ddk750_mode.c | 30 +-
+ drivers/staging/sm750fb/ddk750_power.c | 43 +-
+ drivers/staging/sm750fb/ddk750_power.h | 11 +-
+ drivers/staging/sm750fb/ddk750_reg.h | 503 +-
+ drivers/staging/sm750fb/ddk750_sii164.c | 4 +-
+ drivers/staging/sm750fb/ddk750_sii164.h | 5 +-
+ drivers/staging/sm750fb/sm750.c | 185 +-
+ drivers/staging/sm750fb/sm750.h | 4 +-
+ drivers/staging/sm750fb/sm750_accel.c | 4 +-
+ drivers/staging/sm750fb/sm750_accel.h | 2 +-
+ drivers/staging/sm750fb/sm750_cursor.c | 3 +-
+ drivers/staging/sm750fb/sm750_hw.c | 59 +-
+ drivers/staging/speakup/buffers.c | 4 +-
+ drivers/staging/speakup/devsynth.c | 4 +-
+ drivers/staging/speakup/fakekey.c | 6 +-
+ drivers/staging/speakup/keyhelp.c | 22 +-
+ drivers/staging/speakup/main.c | 4 -
+ drivers/staging/speakup/speakup_acntpc.c | 5 -
+ drivers/staging/speakup/speakup_acntsa.c | 4 -
+ drivers/staging/speakup/speakup_apollo.c | 4 -
+ drivers/staging/speakup/speakup_audptr.c | 4 -
+ drivers/staging/speakup/speakup_bns.c | 4 -
+ drivers/staging/speakup/speakup_decext.c | 28 +-
+ drivers/staging/speakup/speakup_decpc.c | 4 -
+ drivers/staging/speakup/speakup_dectlk.c | 4 -
+ drivers/staging/speakup/speakup_dtlk.c | 4 -
+ drivers/staging/speakup/speakup_dummy.c | 4 -
+ drivers/staging/speakup/speakup_keypc.c | 4 -
+ drivers/staging/speakup/speakup_ltlk.c | 4 -
+ drivers/staging/speakup/speakup_soft.c | 3 -
+ drivers/staging/speakup/speakup_spkout.c | 4 -
+ drivers/staging/speakup/speakup_txprt.c | 4 -
+ drivers/staging/speakup/spk_priv.h | 4 -
+ drivers/staging/speakup/spk_priv_keyinfo.h | 4 -
+ drivers/staging/speakup/spkguide.txt | 1 -
+ drivers/staging/speakup/varhandlers.c | 50 +-
+ drivers/staging/staging.c | 19 -
+ drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 9 +-
+ drivers/staging/unisys/visorbus/visorchipset.c | 15 +-
+ drivers/staging/unisys/visorhba/visorhba_main.c | 2 +-
+ drivers/staging/unisys/visornic/visornic_main.c | 20 +-
+ drivers/staging/vt6655/card.c | 18 +-
+ drivers/staging/vt6655/channel.c | 67 +-
+ drivers/staging/vt6655/channel.h | 2 +-
+ drivers/staging/vt6655/device_main.c | 24 +-
+ drivers/staging/vt6655/key.c | 8 +-
+ drivers/staging/vt6655/mac.c | 108 +-
+ drivers/staging/vt6655/mac.h | 58 +-
+ drivers/staging/vt6655/power.c | 66 +-
+ drivers/staging/vt6655/power.h | 8 +-
+ drivers/staging/vt6655/rf.c | 174 +-
+ drivers/staging/vt6656/device.h | 4 +-
+ drivers/staging/vt6656/main_usb.c | 14 +-
+ drivers/staging/vt6656/power.c | 2 +-
+ drivers/staging/wilc1000/Makefile | 6 +-
+ drivers/staging/wilc1000/coreconfigurator.c | 418 +-
+ drivers/staging/wilc1000/coreconfigurator.h | 73 +-
+ drivers/staging/wilc1000/host_interface.c | 1075 ++-
+ drivers/staging/wilc1000/host_interface.h | 113 +-
+ drivers/staging/wilc1000/linux_mon.c | 64 +-
+ drivers/staging/wilc1000/linux_wlan.c | 492 +-
+ drivers/staging/wilc1000/linux_wlan_common.h | 27 +-
+ drivers/staging/wilc1000/wilc_debugfs.c | 9 +-
+ drivers/staging/wilc1000/wilc_msgqueue.c | 142 +-
+ drivers/staging/wilc1000/wilc_msgqueue.h | 110 +-
+ drivers/staging/wilc1000/wilc_sdio.c | 112 +-
+ drivers/staging/wilc1000/wilc_spi.c | 6 +-
+ drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 773 +--
+ drivers/staging/wilc1000/wilc_wfi_netdevice.h | 13 +-
+ drivers/staging/wilc1000/wilc_wlan.c | 507 +-
+ drivers/staging/wilc1000/wilc_wlan.h | 20 +-
+ drivers/staging/wilc1000/wilc_wlan_cfg.c | 16 +-
+ drivers/staging/wilc1000/wilc_wlan_if.h | 14 +-
+ drivers/staging/wlan-ng/cfg80211.c | 41 +-
+ drivers/staging/wlan-ng/hfa384x_usb.c | 44 +-
+ drivers/staging/wlan-ng/p80211conv.c | 132 +-
+ drivers/staging/wlan-ng/p80211wep.c | 4 +-
+ drivers/staging/wlan-ng/prism2usb.c | 15 +-
+ drivers/staging/xgifb/XGI_main_26.c | 2 -
+ drivers/staging/xgifb/vgatypes.h | 7 +-
+ include/linux/fence.h | 2 +
+ include/linux/iio/common/st_sensors.h | 4 +
+ include/linux/irqdomain.h | 1 +
+ include/linux/msi.h | 9 +
+ include/linux/platform_data/ad5761.h | 44 +
+ include/uapi/linux/iio/types.h | 1 +
+ 377 files changed, 9444 insertions(+), 17325 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/at91-sama5d2_adc.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/chemical/atlas,ph-sm.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/light/opt3001.txt
+ rename {drivers/staging/panel => Documentation/misc-devices}/lcd-panel-cgram.txt (100%)
+ create mode 100644 drivers/iio/adc/at91-sama5d2_adc.c
+ create mode 100644 drivers/iio/chemical/atlas-ph-sensor.c
+ create mode 100644 drivers/iio/common/st_sensors/st_sensors_core.h
+ create mode 100644 drivers/iio/dac/ad5761.c
+ create mode 100644 drivers/iio/pressure/mpl115.h
+ create mode 100644 drivers/iio/pressure/mpl115_i2c.c
+ create mode 100644 drivers/iio/pressure/mpl115_spi.c
+ rename drivers/{staging/panel => misc}/panel.c (98%)
+ delete mode 100644 drivers/staging/dgap/Kconfig
+ delete mode 100644 drivers/staging/dgap/Makefile
+ delete mode 100644 drivers/staging/dgap/dgap.c
+ delete mode 100644 drivers/staging/dgap/dgap.h
+ create mode 100644 drivers/staging/fbtft/fb_ssd1305.c
+ create mode 100644 drivers/staging/fbtft/fb_ssd1325.c
+ create mode 100644 drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c
+ create mode 100644 drivers/staging/fsl-mc/bus/mc-msi.c
+ create mode 100644 drivers/staging/lustre/lustre/include/lustre_kernelcomm.h
+ rename drivers/staging/lustre/{include/linux/libcfs/libcfs_kernelcomm.h => lustre/include/uapi_kernelcomm.h} (51%)
+ rename drivers/staging/lustre/lustre/{libcfs/kernel_user_comm.c => obdclass/kernelcomm.c} (81%)
+ delete mode 100644 drivers/staging/olpc_dcon/Kconfig
+ delete mode 100644 drivers/staging/olpc_dcon/Makefile
+ delete mode 100644 drivers/staging/olpc_dcon/TODO
+ delete mode 100644 drivers/staging/olpc_dcon/olpc_dcon.c
+ delete mode 100644 drivers/staging/olpc_dcon/olpc_dcon.h
+ delete mode 100644 drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
+ delete mode 100644 drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c
+ delete mode 100644 drivers/staging/panel/Kconfig
+ delete mode 100644 drivers/staging/panel/Makefile
+ delete mode 100644 drivers/staging/panel/TODO
+ delete mode 100644 drivers/staging/staging.c
+ create mode 100644 include/linux/platform_data/ad5761.h
+Merging char-misc/char-misc-next (990162f03840 char: nwbutton: avoid unused variable warning)
+$ git merge char-misc/char-misc-next
+Auto-merging fs/compat_ioctl.c
+Auto-merging drivers/watchdog/Makefile
+Auto-merging drivers/watchdog/Kconfig
+Auto-merging drivers/staging/goldfish/goldfish_audio.c
+Auto-merging drivers/misc/mic/vop/vop_main.h
+Removing drivers/misc/mic/host/mic_virtio.c
+Removing drivers/misc/mic/host/mic_fops.h
+Removing drivers/misc/mic/host/mic_fops.c
+Removing drivers/misc/mic/card/mic_virtio.h
+Removing drivers/misc/mic/card/mic_virtio.c
+Removing drivers/misc/mei/wd.c
+Auto-merging drivers/misc/mei/main.c
+Auto-merging drivers/misc/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/stable/sysfs-bus-vmbus | 14 +
+ .../devicetree/bindings/goldfish/pipe.txt | 17 +
+ .../devicetree/bindings/misc/eeprom-93xx46.txt | 25 +
+ .../devicetree/bindings/nvmem/lpc1857-eeprom.txt | 28 +
+ .../devicetree/bindings/nvmem/mtk-efuse.txt | 36 +
+ Documentation/mic/mic_overview.txt | 54 +-
+ Documentation/mic/mpssd/mpss | 2 +-
+ Documentation/mic/mpssd/mpssd.c | 2 +-
+ Documentation/misc-devices/mei/mei.txt | 12 +-
+ MAINTAINERS | 1 +
+ drivers/base/firmware_class.c | 17 +-
+ drivers/char/nvram.c | 12 +-
+ drivers/char/nwbutton.c | 5 +-
+ drivers/char/ppdev.c | 87 +-
+ drivers/char/raw.c | 4 +-
+ drivers/hv/channel.c | 36 +-
+ drivers/hv/channel_mgmt.c | 268 ++++-
+ drivers/hv/connection.c | 8 +-
+ drivers/hv/hv.c | 26 +-
+ drivers/hv/hyperv_vmbus.h | 6 +-
+ drivers/hv/ring_buffer.c | 31 +-
+ drivers/hv/vmbus_drv.c | 25 +
+ drivers/hwtracing/coresight/coresight-etb10.c | 11 +-
+ drivers/hwtracing/coresight/coresight-etm3x.c | 21 +-
+ drivers/hwtracing/coresight/coresight-etm4x.c | 21 +-
+ drivers/hwtracing/coresight/coresight-funnel.c | 10 +-
+ .../coresight/coresight-replicator-qcom.c | 11 +-
+ drivers/hwtracing/coresight/coresight-replicator.c | 16 +-
+ drivers/hwtracing/coresight/coresight-tmc.c | 15 +-
+ drivers/hwtracing/coresight/coresight-tpiu.c | 10 +-
+ drivers/hwtracing/coresight/coresight.c | 57 +-
+ drivers/hwtracing/intel_th/Kconfig | 1 +
+ drivers/hwtracing/intel_th/pci.c | 10 +
+ drivers/hwtracing/stm/Kconfig | 5 +
+ drivers/hwtracing/stm/core.c | 43 +-
+ drivers/hwtracing/stm/policy.c | 18 +-
+ drivers/hwtracing/stm/stm.h | 1 +
+ drivers/misc/Kconfig | 4 +-
+ drivers/misc/apds990x.c | 8 +-
+ drivers/misc/arm-charlcd.c | 24 +-
+ drivers/misc/bh1770glc.c | 8 +-
+ drivers/misc/c2port/core.c | 8 +-
+ drivers/misc/cxl/sysfs.c | 5 +-
+ drivers/misc/eeprom/at24.c | 4 +-
+ drivers/misc/eeprom/at25.c | 4 +-
+ drivers/misc/eeprom/eeprom.c | 2 +-
+ drivers/misc/eeprom/eeprom_93xx46.c | 57 +-
+ drivers/misc/genwqe/card_sysfs.c | 2 +-
+ drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 8 +-
+ drivers/misc/lkdtm.c | 2 +-
+ drivers/misc/mei/Kconfig | 6 +-
+ drivers/misc/mei/Makefile | 1 -
+ drivers/misc/mei/amthif.c | 130 +--
+ drivers/misc/mei/bus-fixup.c | 41 +-
+ drivers/misc/mei/bus.c | 53 +-
+ drivers/misc/mei/client.c | 185 ++--
+ drivers/misc/mei/client.h | 27 +-
+ drivers/misc/mei/debugfs.c | 65 +-
+ drivers/misc/mei/hbm.c | 24 +-
+ drivers/misc/mei/hw-me.c | 10 +-
+ drivers/misc/mei/hw-txe.c | 10 +-
+ drivers/misc/mei/hw.h | 32 +-
+ drivers/misc/mei/init.c | 20 +-
+ drivers/misc/mei/interrupt.c | 92 +-
+ drivers/misc/mei/main.c | 80 +-
+ drivers/misc/mei/mei-trace.c | 2 +
+ drivers/misc/mei/mei-trace.h | 40 +-
+ drivers/misc/mei/mei_dev.h | 118 +-
+ drivers/misc/mei/pci-me.c | 4 +-
+ drivers/misc/mei/pci-txe.c | 4 +-
+ drivers/misc/mei/wd.c | 391 -------
+ drivers/misc/mic/Kconfig | 44 +-
+ drivers/misc/mic/Makefile | 1 +
+ drivers/misc/mic/bus/Makefile | 1 +
+ drivers/misc/mic/bus/cosm_bus.h | 2 +
+ drivers/misc/mic/bus/vop_bus.c | 203 ++++
+ drivers/misc/mic/bus/vop_bus.h | 140 +++
+ drivers/misc/mic/card/Makefile | 1 -
+ drivers/misc/mic/card/mic_device.c | 89 +-
+ drivers/misc/mic/card/mic_device.h | 3 +
+ drivers/misc/mic/card/mic_virtio.c | 634 -----------
+ drivers/misc/mic/card/mic_virtio.h | 76 --
+ drivers/misc/mic/card/mic_x100.c | 1 +
+ drivers/misc/mic/cosm/cosm_main.c | 13 +-
+ drivers/misc/mic/host/Makefile | 2 -
+ drivers/misc/mic/host/mic_boot.c | 125 ++-
+ drivers/misc/mic/host/mic_debugfs.c | 190 ----
+ drivers/misc/mic/host/mic_device.h | 9 +-
+ drivers/misc/mic/host/mic_fops.c | 222 ----
+ drivers/misc/mic/host/mic_fops.h | 32 -
+ drivers/misc/mic/host/mic_main.c | 49 +-
+ drivers/misc/mic/host/mic_virtio.c | 811 --------------
+ drivers/misc/mic/host/mic_x100.c | 19 +-
+ drivers/misc/mic/scif/scif_dma.c | 41 +-
+ drivers/misc/mic/scif/scif_rma.c | 7 +-
+ drivers/misc/mic/vop/Makefile | 9 +
+ drivers/misc/mic/vop/vop_debugfs.c | 232 ++++
+ drivers/misc/mic/vop/vop_main.c | 755 +++++++++++++
+ .../misc/mic/{host/mic_virtio.h => vop/vop_main.h} | 129 ++-
+ drivers/misc/mic/vop/vop_vringh.c | 1164 ++++++++++++++++++++
+ drivers/misc/pch_phub.c | 6 +-
+ drivers/misc/ti-st/st_core.c | 1 -
+ drivers/misc/vmw_vmci/vmci_driver.c | 2 +-
+ drivers/nvmem/Kconfig | 20 +
+ drivers/nvmem/Makefile | 4 +
+ drivers/nvmem/lpc18xx_eeprom.c | 330 ++++++
+ drivers/nvmem/mtk-efuse.c | 89 ++
+ drivers/nvmem/rockchip-efuse.c | 90 +-
+ drivers/nvmem/sunxi_sid.c | 9 +-
+ drivers/platform/Kconfig | 3 +-
+ drivers/platform/goldfish/Kconfig | 18 +
+ drivers/platform/goldfish/Makefile | 2 +-
+ drivers/platform/goldfish/goldfish_pipe.c | 169 +--
+ drivers/staging/goldfish/goldfish_audio.c | 2 +-
+ drivers/staging/goldfish/goldfish_nand.c | 50 +-
+ drivers/vme/bridges/vme_ca91cx42.c | 11 +-
+ drivers/w1/masters/omap_hdq.c | 1 -
+ drivers/watchdog/Kconfig | 15 +
+ drivers/watchdog/Makefile | 1 +
+ drivers/watchdog/mei_wdt.c | 724 ++++++++++++
+ fs/compat_ioctl.c | 22 -
+ include/linux/coresight.h | 3 +
+ include/linux/hyperv.h | 95 ++
+ include/linux/vmw_vmci_defs.h | 43 +-
+ lib/devres.c | 2 +-
+ scripts/ver_linux | 2 +-
+ tools/hv/Makefile | 2 +
+ 127 files changed, 5657 insertions(+), 3500 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/goldfish/pipe.txt
+ create mode 100644 Documentation/devicetree/bindings/misc/eeprom-93xx46.txt
+ create mode 100644 Documentation/devicetree/bindings/nvmem/lpc1857-eeprom.txt
+ create mode 100644 Documentation/devicetree/bindings/nvmem/mtk-efuse.txt
+ delete mode 100644 drivers/misc/mei/wd.c
+ create mode 100644 drivers/misc/mic/bus/vop_bus.c
+ create mode 100644 drivers/misc/mic/bus/vop_bus.h
+ delete mode 100644 drivers/misc/mic/card/mic_virtio.c
+ delete mode 100644 drivers/misc/mic/card/mic_virtio.h
+ delete mode 100644 drivers/misc/mic/host/mic_fops.c
+ delete mode 100644 drivers/misc/mic/host/mic_fops.h
+ delete mode 100644 drivers/misc/mic/host/mic_virtio.c
+ create mode 100644 drivers/misc/mic/vop/Makefile
+ create mode 100644 drivers/misc/mic/vop/vop_debugfs.c
+ create mode 100644 drivers/misc/mic/vop/vop_main.c
+ rename drivers/misc/mic/{host/mic_virtio.h => vop/vop_main.h} (58%)
+ create mode 100644 drivers/misc/mic/vop/vop_vringh.c
+ create mode 100644 drivers/nvmem/lpc18xx_eeprom.c
+ create mode 100644 drivers/nvmem/mtk-efuse.c
+ create mode 100644 drivers/watchdog/mei_wdt.c
+Merging extcon/extcon-next (0331966df0a2 arm: boot: beaglex15: pass correct interrupt)
+$ git merge extcon/extcon-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/am57xx-beagle-x15.dts | 3 +-
+ drivers/extcon/extcon-arizona.c | 4 +--
+ drivers/extcon/extcon-gpio.c | 2 +-
+ drivers/extcon/extcon-max14577.c | 3 ++
+ drivers/extcon/extcon-max77693.c | 12 +++++++-
+ drivers/extcon/extcon-max77843.c | 5 +++-
+ drivers/extcon/extcon-max8997.c | 3 ++
+ drivers/extcon/extcon-palmas.c | 50 +++++++++++++++++++++++++++++++++
+ drivers/extcon/extcon-rt8973a.c | 8 ++++--
+ drivers/extcon/extcon-sm5502.c | 8 ++++--
+ include/linux/mfd/palmas.h | 3 ++
+ 11 files changed, 90 insertions(+), 11 deletions(-)
+Merging cgroup/for-next (9a2ddda572a0 Documentation: cgroup: Fix 'cgroup-legacy' -> 'cgroup-v1')
+$ git merge cgroup/for-next
+Already up-to-date.
+Merging scsi/for-next (1440a6835981 Merge branch 'misc' into for-next)
+$ git merge scsi/for-next
+Auto-merging block/blk-core.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/scsi/hisilicon-sas.txt | 21 +-
+ block/blk-core.c | 6 +-
+ drivers/scsi/aacraid/aachba.c | 27 +-
+ drivers/scsi/aacraid/aacraid.h | 14 +-
+ drivers/scsi/aacraid/commctrl.c | 13 +-
+ drivers/scsi/aacraid/comminit.c | 6 +-
+ drivers/scsi/aacraid/commsup.c | 69 +-
+ drivers/scsi/aacraid/dpcsup.c | 2 -
+ drivers/scsi/aacraid/linit.c | 199 +-
+ drivers/scsi/aacraid/src.c | 30 +-
+ drivers/scsi/be2iscsi/be.h | 20 +-
+ drivers/scsi/be2iscsi/be_cmds.c | 867 ++++----
+ drivers/scsi/be2iscsi/be_cmds.h | 148 +-
+ drivers/scsi/be2iscsi/be_iscsi.c | 62 +-
+ drivers/scsi/be2iscsi/be_main.c | 297 +--
+ drivers/scsi/be2iscsi/be_main.h | 25 +-
+ drivers/scsi/be2iscsi/be_mgmt.c | 573 ++---
+ drivers/scsi/be2iscsi/be_mgmt.h | 2 +
+ drivers/scsi/bfa/bfa_ioc.c | 2 +-
+ drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 9 +
+ drivers/scsi/bnx2fc/bnx2fc_io.c | 5 +-
+ drivers/scsi/device_handler/scsi_dh_rdac.c | 4 +-
+ drivers/scsi/hisi_sas/Kconfig | 2 +-
+ drivers/scsi/hisi_sas/Makefile | 2 +-
+ drivers/scsi/hisi_sas/hisi_sas.h | 41 +-
+ drivers/scsi/hisi_sas/hisi_sas_main.c | 77 +-
+ drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 96 +-
+ drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 2205 ++++++++++++++++++++
+ drivers/scsi/hosts.c | 22 +-
+ drivers/scsi/megaraid/megaraid_sas.h | 338 ++-
+ drivers/scsi/megaraid/megaraid_sas_base.c | 1044 +++++----
+ drivers/scsi/megaraid/megaraid_sas_fp.c | 2 +
+ drivers/scsi/megaraid/megaraid_sas_fusion.c | 1244 ++++++++---
+ drivers/scsi/megaraid/megaraid_sas_fusion.h | 136 +-
+ drivers/scsi/qla2xxx/qla_attr.c | 22 +-
+ drivers/scsi/qla2xxx/qla_bsg.c | 201 ++
+ drivers/scsi/qla2xxx/qla_bsg.h | 34 +
+ drivers/scsi/qla2xxx/qla_dbg.c | 146 +-
+ drivers/scsi/qla2xxx/qla_def.h | 56 +-
+ drivers/scsi/qla2xxx/qla_fw.h | 14 +-
+ drivers/scsi/qla2xxx/qla_gbl.h | 2 +
+ drivers/scsi/qla2xxx/qla_init.c | 119 +-
+ drivers/scsi/qla2xxx/qla_inline.h | 4 +-
+ drivers/scsi/qla2xxx/qla_isr.c | 4 -
+ drivers/scsi/qla2xxx/qla_mbx.c | 27 +-
+ drivers/scsi/qla2xxx/qla_os.c | 10 +
+ drivers/scsi/qla2xxx/qla_sup.c | 70 +-
+ drivers/scsi/qla2xxx/qla_version.h | 2 +-
+ drivers/scsi/scsi_devinfo.c | 1 +
+ drivers/scsi/scsi_scan.c | 12 +-
+ drivers/scsi/scsi_transport_iscsi.c | 2 +
+ drivers/scsi/sd.c | 4 +-
+ drivers/scsi/storvsc_drv.c | 16 +-
+ include/linux/blkdev.h | 9 +-
+ include/scsi/iscsi_if.h | 2 +
+ include/scsi/scsi_device.h | 1 +
+ 56 files changed, 6345 insertions(+), 2023 deletions(-)
+ create mode 100644 drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
+Merging target-updates/for-next (fab683eb12e7 scsi: qla2xxxx: avoid type mismatch in comparison)
+$ git merge target-updates/for-next
+Already up-to-date.
+Merging target-merge/for-next-merge (bc0195aad0da Linux 4.2-rc2)
+$ git merge target-merge/for-next-merge
+Already up-to-date.
+Merging pinctrl/for-next (45d1df700a55 Merge branch 'devel' into for-next)
+$ git merge pinctrl/for-next
+Auto-merging drivers/pinctrl/tegra/pinctrl-tegra.c
+Auto-merging drivers/pinctrl/tegra/pinctrl-tegra-xusb.c
+Merge made by the 'recursive' strategy.
+ .../bindings/gpio/microchip,pic32-gpio.txt | 49 +
+ .../bindings/pinctrl/microchip,pic32-pinctrl.txt | 60 +
+ .../bindings/pinctrl/st,stm32-pinctrl.txt | 126 ++
+ arch/arm/boot/dts/mt2701-pinfunc.h | 735 +++++++
+ drivers/pinctrl/Kconfig | 50 +-
+ drivers/pinctrl/Makefile | 14 +-
+ drivers/pinctrl/freescale/pinctrl-imx.c | 26 +
+ drivers/pinctrl/mediatek/Kconfig | 6 +
+ drivers/pinctrl/mediatek/Makefile | 1 +
+ drivers/pinctrl/mediatek/pinctrl-mt2701.c | 586 +++++
+ drivers/pinctrl/mediatek/pinctrl-mt8127.c | 8 +-
+ drivers/pinctrl/mediatek/pinctrl-mt8135.c | 8 +-
+ drivers/pinctrl/mediatek/pinctrl-mt8173.c | 8 +-
+ drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 52 +
+ drivers/pinctrl/mediatek/pinctrl-mtk-common.h | 12 +-
+ drivers/pinctrl/mediatek/pinctrl-mtk-mt2701.h | 2323 ++++++++++++++++++++
+ drivers/pinctrl/nomadik/pinctrl-abx500.c | 5 +-
+ drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c | 7 +
+ drivers/pinctrl/pinctrl-pic32.c | 2312 +++++++++++++++++++
+ drivers/pinctrl/pinctrl-pic32.h | 141 ++
+ drivers/pinctrl/pinctrl-st.c | 1 +
+ drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 1 +
+ drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 30 +-
+ drivers/pinctrl/stm32/Kconfig | 16 +
+ drivers/pinctrl/stm32/Makefile | 5 +
+ drivers/pinctrl/stm32/pinctrl-stm32.c | 829 +++++++
+ drivers/pinctrl/stm32/pinctrl-stm32.h | 51 +
+ drivers/pinctrl/stm32/pinctrl-stm32f429.c | 1598 ++++++++++++++
+ drivers/pinctrl/sunxi/Kconfig | 30 +-
+ drivers/pinctrl/sunxi/Makefile | 2 +-
+ drivers/pinctrl/tegra/Kconfig | 30 +
+ drivers/pinctrl/tegra/Makefile | 7 +
+ drivers/pinctrl/{ => tegra}/pinctrl-tegra-xusb.c | 4 +-
+ drivers/pinctrl/{ => tegra}/pinctrl-tegra.c | 4 +-
+ drivers/pinctrl/{ => tegra}/pinctrl-tegra.h | 0
+ drivers/pinctrl/{ => tegra}/pinctrl-tegra114.c | 0
+ drivers/pinctrl/{ => tegra}/pinctrl-tegra124.c | 0
+ drivers/pinctrl/{ => tegra}/pinctrl-tegra20.c | 0
+ drivers/pinctrl/{ => tegra}/pinctrl-tegra210.c | 0
+ drivers/pinctrl/{ => tegra}/pinctrl-tegra30.c | 0
+ 40 files changed, 9043 insertions(+), 94 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/gpio/microchip,pic32-gpio.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/microchip,pic32-pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt
+ create mode 100644 arch/arm/boot/dts/mt2701-pinfunc.h
+ create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt2701.c
+ create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt2701.h
+ create mode 100644 drivers/pinctrl/pinctrl-pic32.c
+ create mode 100644 drivers/pinctrl/pinctrl-pic32.h
+ create mode 100644 drivers/pinctrl/stm32/Kconfig
+ create mode 100644 drivers/pinctrl/stm32/Makefile
+ create mode 100644 drivers/pinctrl/stm32/pinctrl-stm32.c
+ create mode 100644 drivers/pinctrl/stm32/pinctrl-stm32.h
+ create mode 100644 drivers/pinctrl/stm32/pinctrl-stm32f429.c
+ create mode 100644 drivers/pinctrl/tegra/Kconfig
+ create mode 100644 drivers/pinctrl/tegra/Makefile
+ rename drivers/pinctrl/{ => tegra}/pinctrl-tegra-xusb.c (99%)
+ rename drivers/pinctrl/{ => tegra}/pinctrl-tegra.c (99%)
+ rename drivers/pinctrl/{ => tegra}/pinctrl-tegra.h (100%)
+ rename drivers/pinctrl/{ => tegra}/pinctrl-tegra114.c (100%)
+ rename drivers/pinctrl/{ => tegra}/pinctrl-tegra124.c (100%)
+ rename drivers/pinctrl/{ => tegra}/pinctrl-tegra20.c (100%)
+ rename drivers/pinctrl/{ => tegra}/pinctrl-tegra210.c (100%)
+ rename drivers/pinctrl/{ => tegra}/pinctrl-tegra30.c (100%)
+Merging vhost/linux-next (481eaec37e91 tools/virtio: add ringtest utilities)
+$ git merge vhost/linux-next
+Already up-to-date.
+Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
+$ git merge remoteproc/for-next
+Auto-merging drivers/remoteproc/remoteproc_core.c
+Merge made by the 'recursive' strategy.
+ drivers/remoteproc/remoteproc_core.c | 4 +++-
+ drivers/remoteproc/wkup_m3_rproc.c | 1 +
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+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 (8d68bb842800 Merge branch 'devel' into for-next)
+$ git merge gpio/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/gpio/gpio-ts4800.txt | 20 +
+ MAINTAINERS | 12 +
+ arch/blackfin/kernel/bfin_gpio.c | 2 +-
+ arch/powerpc/sysdev/ppc4xx_gpio.c | 2 +-
+ arch/powerpc/sysdev/simple_gpio.c | 2 +-
+ arch/unicore32/kernel/gpio.c | 2 +-
+ drivers/gpio/Kconfig | 37 +-
+ drivers/gpio/Makefile | 3 +
+ drivers/gpio/gpio-104-dio-48e.c | 439 +++++++++++++++++++++
+ drivers/gpio/gpio-104-idi-48.c | 3 +-
+ drivers/gpio/gpio-altera.c | 5 +-
+ drivers/gpio/gpio-davinci.c | 3 +-
+ drivers/gpio/gpio-f7188x.c | 27 +-
+ drivers/gpio/gpio-mpc8xxx.c | 259 +++++-------
+ drivers/gpio/gpio-ts4800.c | 94 +++++
+ drivers/gpio/gpio-ws16c48.c | 436 ++++++++++++++++++++
+ drivers/soc/fsl/qe/gpio.c | 2 +-
+ 17 files changed, 1171 insertions(+), 177 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/gpio/gpio-ts4800.txt
+ create mode 100644 drivers/gpio/gpio-104-dio-48e.c
+ create mode 100644 drivers/gpio/gpio-ts4800.c
+ create mode 100644 drivers/gpio/gpio-ws16c48.c
+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 (ff01c944cfa9 pwm: Mark all devices as "might sleep")
+$ git merge pwm/for-next
+Already up-to-date.
+Merging dma-buf/for-next (168309855a7d Linux 4.4-rc8)
+$ git merge dma-buf/for-next
+Already up-to-date.
+Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
+$ git merge userns/for-next
+Already up-to-date.
+Merging ktest/for-next (b953c0d234bc Linux 4.1)
+$ git merge ktest/for-next
+Already up-to-date.
+Merging clk/clk-next (7e0810c9485c clk: lpc32xx: add HCLK PLL output configuration)
+$ git merge clk/clk-next
+Auto-merging include/linux/device.h
+Auto-merging drivers/clk/rockchip/clk.c
+Auto-merging drivers/clk/rockchip/clk-rk3368.c
+Auto-merging drivers/clk/rockchip/clk-rk3036.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/clock/axi-clkgen.txt | 5 +-
+ .../bindings/clock/brcm,iproc-clocks.txt | 6 +
+ .../bindings/clock/rockchip,rk3036-cru.txt | 2 +-
+ Documentation/devicetree/bindings/clock/xgene.txt | 2 +
+ arch/arm/mach-s3c24xx/Kconfig | 1 +
+ drivers/clk/Kconfig | 26 ++-
+ drivers/clk/Makefile | 2 +-
+ drivers/clk/bcm/clk-cygnus.c | 59 ++++++
+ drivers/clk/bcm/clk-iproc-pll.c | 41 +++-
+ drivers/clk/bcm/clk-iproc.h | 43 +++-
+ drivers/clk/clk-axi-clkgen.c | 170 ++++------------
+ drivers/clk/clk-composite.c | 2 -
+ drivers/clk/clk-divider.c | 18 +-
+ drivers/clk/clk-fixed-factor.c | 15 +-
+ drivers/clk/clk-fixed-rate.c | 15 +-
+ drivers/clk/clk-fractional-divider.c | 2 -
+ drivers/clk/clk-gate.c | 2 -
+ drivers/clk/clk-gpio.c | 167 +++++----------
+ drivers/clk/clk-multiplier.c | 2 -
+ drivers/clk/clk-mux.c | 2 -
+ drivers/clk/clk-palmas.c | 16 +-
+ drivers/clk/clk-s2mps11.c | 108 +++-------
+ drivers/clk/clk-scpi.c | 2 +-
+ drivers/clk/clk-vt8500.c | 100 ++++++---
+ drivers/clk/clk-xgene.c | 105 ++++++----
+ drivers/clk/clk.c | 226 +++++++++------------
+ drivers/clk/imx/clk-busy.c | 4 +-
+ drivers/clk/imx/clk-fixup-div.c | 5 +-
+ drivers/clk/imx/clk-fixup-mux.c | 2 -
+ drivers/clk/imx/clk-gate-exclusive.c | 2 +-
+ drivers/clk/mediatek/clk-gate.c | 8 +-
+ drivers/clk/mediatek/clk-gate.h | 2 +-
+ drivers/clk/mediatek/clk-mtk.c | 6 +-
+ drivers/clk/meson/clkc.c | 2 +-
+ drivers/clk/mvebu/common.c | 2 -
+ drivers/clk/mvebu/dove-divider.c | 2 +-
+ drivers/clk/mvebu/kirkwood.c | 2 -
+ drivers/clk/mxs/clk-div.c | 2 +-
+ drivers/clk/nxp/clk-lpc18xx-ccu.c | 4 +-
+ drivers/clk/nxp/clk-lpc32xx.c | 10 +-
+ drivers/clk/qcom/common.c | 17 +-
+ drivers/clk/qcom/gcc-msm8916.c | 18 ++
+ drivers/clk/rockchip/clk-rk3036.c | 26 +--
+ drivers/clk/rockchip/clk-rk3368.c | 26 +--
+ drivers/clk/rockchip/clk.c | 4 +-
+ drivers/clk/samsung/Kconfig | 1 -
+ drivers/clk/socfpga/clk-pll-a10.c | 2 +-
+ drivers/clk/st/clkgen-fsyn.c | 8 +-
+ drivers/clk/st/clkgen-mux.c | 9 +-
+ drivers/clk/ti/composite.c | 2 -
+ drivers/clk/ti/divider.c | 2 -
+ drivers/clk/ti/gate.c | 2 -
+ drivers/clk/ti/mux.c | 2 -
+ drivers/clk/versatile/clk-icst.c | 3 +
+ include/dt-bindings/clock/bcm-cygnus.h | 6 +
+ include/dt-bindings/clock/lpc32xx-clock.h | 1 +
+ include/dt-bindings/clock/qcom,gcc-msm8916.h | 1 +
+ include/linux/clk-provider.h | 28 ++-
+ include/linux/device.h | 12 ++
+ 59 files changed, 688 insertions(+), 674 deletions(-)
+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 (fb2e69217129 aio: Fix compile error due to unexpected use of cmpxchg())
+$ git merge aio/master
+Auto-merging net/unix/af_unix.c
+Auto-merging net/sctp/socket.c
+Auto-merging net/core/stream.c
+Auto-merging net/atm/common.c
+Auto-merging mm/readahead.c
+Auto-merging mm/internal.h
+Auto-merging mm/filemap.c
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/signal.c
+Auto-merging kernel/auditsc.c
+Auto-merging init/Kconfig
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/fs.h
+Auto-merging fs/splice.c
+Auto-merging fs/read_write.c
+Auto-merging fs/pipe.c
+Auto-merging fs/namei.c
+Auto-merging fs/internal.h
+Auto-merging fs/attr.c
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/drm_lock.c | 2 +-
+ drivers/gpu/drm/ttm/ttm_lock.c | 6 +-
+ fs/aio.c | 729 ++++++++++++++++++++++++++++++++++++++---
+ fs/attr.c | 2 +-
+ fs/binfmt_flat.c | 2 +-
+ fs/fuse/dev.c | 2 +-
+ fs/internal.h | 6 +
+ fs/namei.c | 2 +-
+ fs/pipe.c | 4 +-
+ fs/read_write.c | 5 +-
+ fs/splice.c | 8 +-
+ include/linux/aio.h | 9 +
+ include/linux/fs.h | 3 +
+ include/linux/sched.h | 6 +
+ include/uapi/linux/aio_abi.h | 15 +-
+ init/Kconfig | 13 +
+ kernel/auditsc.c | 6 +-
+ kernel/signal.c | 20 ++
+ kernel/sysctl.c | 9 +
+ mm/filemap.c | 6 +-
+ mm/internal.h | 4 +-
+ mm/readahead.c | 13 +-
+ net/atm/common.c | 4 +-
+ net/ax25/af_ax25.c | 2 +-
+ net/caif/caif_socket.c | 2 +-
+ net/core/stream.c | 2 +-
+ net/decnet/af_decnet.c | 2 +-
+ net/irda/af_irda.c | 4 +-
+ net/netrom/af_netrom.c | 2 +-
+ net/rose/af_rose.c | 2 +-
+ net/sctp/socket.c | 2 +-
+ net/unix/af_unix.c | 4 +-
+ net/x25/af_x25.c | 2 +-
+ 33 files changed, 819 insertions(+), 81 deletions(-)
+$ git reset --hard HEAD^
+HEAD is now at f5285635e017 Merge remote-tracking branch 'clk/clk-next'
+Merging next-20160111 version of aio
+$ git merge -m next-20160111/aio 6a81013efc4013555c5de34c01530b805f45c92c
+Auto-merging net/unix/af_unix.c
+Auto-merging net/sctp/socket.c
+Auto-merging net/core/stream.c
+Auto-merging net/atm/common.c
+Auto-merging mm/filemap.c
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/signal.c
+Auto-merging kernel/auditsc.c
+Auto-merging init/Kconfig
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/fs.h
+Auto-merging fs/splice.c
+Auto-merging fs/read_write.c
+Auto-merging fs/pipe.c
+Auto-merging fs/internal.h
+Auto-merging fs/attr.c
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/drm_lock.c | 2 +-
+ drivers/gpu/drm/ttm/ttm_lock.c | 6 +-
+ fs/aio.c | 382 ++++++++++++++++++++++++++++++++++++++---
+ fs/attr.c | 2 +-
+ fs/binfmt_flat.c | 2 +-
+ fs/fuse/dev.c | 2 +-
+ fs/internal.h | 6 +
+ fs/pipe.c | 4 +-
+ fs/read_write.c | 5 +-
+ fs/splice.c | 8 +-
+ include/linux/aio.h | 8 +
+ include/linux/fs.h | 2 +
+ include/linux/sched.h | 6 +
+ include/uapi/linux/aio_abi.h | 2 +-
+ init/Kconfig | 13 ++
+ kernel/auditsc.c | 6 +-
+ kernel/signal.c | 20 +++
+ kernel/sysctl.c | 9 +
+ mm/filemap.c | 6 +-
+ net/atm/common.c | 4 +-
+ net/ax25/af_ax25.c | 2 +-
+ net/caif/caif_socket.c | 2 +-
+ net/core/stream.c | 2 +-
+ net/decnet/af_decnet.c | 2 +-
+ net/irda/af_irda.c | 4 +-
+ net/netrom/af_netrom.c | 2 +-
+ net/rose/af_rose.c | 2 +-
+ net/sctp/socket.c | 2 +-
+ net/unix/af_unix.c | 4 +-
+ net/x25/af_x25.c | 2 +-
+ 30 files changed, 455 insertions(+), 64 deletions(-)
+Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
+$ git merge llvmlinux/for-next
+Merge made by the 'recursive' strategy.
+Merging kselftest/next (92e963f50fc7 Linux 4.5-rc1)
+$ git merge kselftest/next
+Already up-to-date.
+Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval')
+$ git merge y2038/y2038
+Merge made by the 'recursive' strategy.
+ drivers/scsi/qla2xxx/qla_mr.c | 5 ++---
+ fs/afs/main.c | 6 ++----
+ 2 files changed, 4 insertions(+), 7 deletions(-)
+Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
+$ git merge luto-misc/next
+Already up-to-date.
+Merging borntraeger/linux-next (36f90b0a2ddd Linux 4.5-rc2)
+$ git merge borntraeger/linux-next
+Already up-to-date.
+Merging livepatching/for-next (03f726f415f5 Merge branch 'for-4.5/upstream-fixes' into for-next)
+$ git merge livepatching/for-next
+Merge made by the 'recursive' strategy.
+ arch/s390/include/asm/livepatch.h | 2 +-
+ arch/x86/include/asm/livepatch.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Merging coresight/next (37fe87dbde16 coresight: implementing 'cpu_id()' API)
+$ git merge coresight/next
+Auto-merging drivers/hwtracing/coresight/coresight-tmc.c
+Auto-merging drivers/hwtracing/coresight/coresight-etm4x.c
+Merge made by the 'recursive' strategy.
+ drivers/hwtracing/coresight/coresight-etm4x.c | 2 +-
+ drivers/hwtracing/coresight/coresight-tmc.c | 4 ++--
+ drivers/hwtracing/coresight/of_coresight.c | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+Merging rtc/rtc-next (9d4be765c76d drivers: rtc: allow compilation of sun6i RTC for all sunxi SoCs)
+$ git merge rtc/rtc-next
+Auto-merging drivers/rtc/rtc-rx8025.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/rtc/epson,rx6110.txt | 39 ++
+ drivers/rtc/Kconfig | 27 +-
+ drivers/rtc/Makefile | 1 +
+ drivers/rtc/rtc-ds1305.c | 4 +-
+ drivers/rtc/rtc-ds1307.c | 117 +++++-
+ drivers/rtc/rtc-pcf2123.c | 214 +++++++----
+ drivers/rtc/rtc-rx6110.c | 402 +++++++++++++++++++++
+ drivers/rtc/rtc-rx8025.c | 1 -
+ 8 files changed, 719 insertions(+), 86 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/rtc/epson,rx6110.txt
+ create mode 100644 drivers/rtc/rtc-rx6110.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 (36f90b0a2ddd Linux 4.5-rc2)
+$ git merge nvdimm/libnvdimm-for-next
+Already up-to-date.
+Merging akpm-current/current (234d02a19863 ipc/msg.c: use freezable blocking call)
+$ git merge --no-ff akpm-current/current
+Resolved 'fs/ocfs2/aops.c' using previous resolution.
+Auto-merging scripts/link-vmlinux.sh
+Auto-merging net/sctp/socket.c
+Auto-merging mm/memory_hotplug.c
+Auto-merging mm/memory.c
+Auto-merging mm/huge_memory.c
+Auto-merging mm/filemap.c
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/time/hrtimer.c
+Auto-merging kernel/signal.c
+Auto-merging kernel/rcu/Makefile
+Auto-merging kernel/profile.c
+Auto-merging kernel/memremap.c
+Auto-merging kernel/kexec_file.c
+Auto-merging kernel/kexec_core.c
+Auto-merging kernel/auditsc.c
+Auto-merging init/main.c
+Auto-merging init/Kconfig
+Removing include/trace/events/gfpflags.h
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/mm.h
+Auto-merging fs/xfs/xfs_aops.c
+Auto-merging fs/ocfs2/quota_global.c
+Auto-merging fs/ocfs2/ocfs2_trace.h
+Auto-merging fs/ocfs2/aops.c
+CONFLICT (content): Merge conflict in fs/ocfs2/aops.c
+Auto-merging fs/ext4/dir.c
+Auto-merging drivers/xen/balloon.c
+Auto-merging drivers/usb/common/common.c
+Auto-merging drivers/staging/lustre/lustre/llite/llite_internal.h
+Auto-merging drivers/rapidio/rio.c
+Auto-merging drivers/net/wireless/marvell/mwifiex/debugfs.c
+Auto-merging drivers/media/platform/coda/coda-bit.c
+Auto-merging drivers/gpu/host1x/job.c
+Auto-merging drivers/firmware/efi/efivars.c
+Auto-merging arch/x86/mm/pageattr.c
+Auto-merging arch/x86/kernel/cpu/Makefile
+Auto-merging arch/x86/Kconfig
+Removing arch/s390/mm/extable.c
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/arm/Kconfig
+Removing arch/alpha/mm/extable.c
+Auto-merging Documentation/kernel-parameters.txt
+Auto-merging Documentation/cgroup-v2.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 74256136ec77] Merge branch 'akpm-current/current'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/blockdev/zram.txt | 10 +
+ Documentation/cgroup-v2.txt | 19 +
+ .../filesystems/ocfs2-online-filecheck.txt | 94 +
+ Documentation/kcov.txt | 111 +
+ Documentation/kernel-parameters.txt | 17 +-
+ Documentation/memory-hotplug.txt | 23 +-
+ Documentation/printk-formats.txt | 18 +
+ Documentation/rapidio/mport_cdev.txt | 104 +
+ Documentation/rapidio/tsi721.txt | 9 +
+ Documentation/vm/ksm.txt | 63 +
+ Documentation/vm/page_owner.txt | 9 +-
+ Makefile | 11 +-
+ arch/Kconfig | 4 +
+ arch/alpha/include/asm/uaccess.h | 10 +-
+ arch/alpha/mm/Makefile | 2 +-
+ arch/alpha/mm/extable.c | 92 -
+ arch/arm/Kconfig | 1 +
+ arch/arm/include/asm/page.h | 2 +
+ arch/arm/kernel/smp.c | 2 +
+ arch/arm/mach-lpc32xx/phy3250.c | 13 +-
+ arch/arm/mach-netx/fb.c | 14 +-
+ arch/arm/mach-nspire/clcd.c | 13 +-
+ arch/arm/mm/mmap.c | 2 +-
+ arch/arm64/include/asm/assembler.h | 15 +-
+ arch/arm64/include/asm/futex.h | 12 +-
+ arch/arm64/include/asm/uaccess.h | 30 +-
+ arch/arm64/include/asm/word-at-a-time.h | 7 +-
+ arch/arm64/kernel/armv8_deprecated.c | 7 +-
+ arch/arm64/mm/extable.c | 2 +-
+ arch/arm64/mm/mmap.c | 4 +-
+ arch/avr32/Kconfig | 1 +
+ arch/blackfin/Kconfig | 1 +
+ arch/cris/Kconfig | 1 +
+ arch/ia64/include/asm/uaccess.h | 8 +-
+ arch/ia64/mm/extable.c | 97 +-
+ arch/m32r/mm/init.c | 27 +-
+ arch/mips/Kconfig | 1 +
+ arch/mips/mm/mmap.c | 4 +-
+ arch/powerpc/Kconfig | 1 +
+ arch/powerpc/kernel/process.c | 4 +-
+ arch/powerpc/kernel/rtasd.c | 9 +-
+ arch/powerpc/mm/mmap.c | 4 +-
+ arch/powerpc/platforms/pseries/hotplug-cpu.c | 10 +-
+ arch/powerpc/sysdev/fsl_rio.c | 18 +-
+ arch/s390/Kconfig | 1 +
+ arch/s390/include/asm/uaccess.h | 8 +-
+ arch/s390/kernel/dumpstack.c | 6 +-
+ arch/s390/kernel/time.c | 8 +-
+ arch/s390/kernel/topology.c | 7 +-
+ arch/s390/mm/Makefile | 2 +-
+ arch/s390/mm/extable.c | 85 -
+ arch/s390/mm/vmem.c | 10 +-
+ arch/sh/Kconfig | 1 +
+ arch/sparc/Kconfig | 1 +
+ arch/sparc/include/asm/compat.h | 7 +
+ arch/sparc/include/asm/syscall.h | 9 +-
+ arch/sparc/kernel/sys_sparc_64.c | 2 +-
+ arch/tile/Kconfig | 1 +
+ arch/tile/mm/init.c | 11 +-
+ arch/x86/Kconfig | 8 +-
+ arch/x86/boot/Makefile | 6 +
+ arch/x86/boot/compressed/Makefile | 2 +
+ arch/x86/entry/vdso/Makefile | 2 +
+ arch/x86/include/asm/compat.h | 3 +-
+ arch/x86/include/asm/ftrace.h | 2 +-
+ arch/x86/include/asm/uaccess.h | 5 +-
+ arch/x86/kernel/Makefile | 5 +
+ arch/x86/kernel/aperture_64.c | 12 +-
+ arch/x86/kernel/apic/Makefile | 4 +
+ arch/x86/kernel/apic/hw_nmi.c | 1 -
+ arch/x86/kernel/cpu/Makefile | 4 +
+ arch/x86/kernel/dumpstack.c | 5 +-
+ arch/x86/kernel/machine_kexec_64.c | 46 +
+ arch/x86/kernel/process_64.c | 2 +-
+ arch/x86/lib/Makefile | 3 +
+ arch/x86/mm/Makefile | 3 +
+ arch/x86/mm/extable.c | 106 +-
+ arch/x86/mm/init.c | 36 +-
+ arch/x86/mm/mmap.c | 6 +-
+ arch/x86/mm/pageattr.c | 14 +-
+ arch/x86/realmode/rm/Makefile | 2 +
+ block/genhd.c | 2 +-
+ block/partition-generic.c | 11 +
+ drivers/ata/pata_hpt366.c | 13 +-
+ drivers/base/memory.c | 34 +-
+ drivers/base/property.c | 12 +-
+ drivers/block/zram/zcomp.c | 24 +
+ drivers/block/zram/zcomp.h | 2 +
+ drivers/block/zram/zram_drv.c | 7 +-
+ drivers/char/random.c | 22 +
+ drivers/dma/iop-adma.c | 8 +-
+ drivers/dma/mv_xor.c | 4 +-
+ drivers/dma/qcom_bam_dma.c | 14 +-
+ drivers/firewire/core-cdev.c | 4 +-
+ drivers/firmware/efi/efivars.c | 2 +-
+ drivers/firmware/efi/libstub/Makefile | 2 +
+ drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2 +-
+ drivers/gpu/drm/drm_edid_load.c | 17 +-
+ drivers/gpu/drm/drm_gem_cma_helper.c | 13 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 8 +-
+ drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 13 +-
+ drivers/gpu/drm/omapdrm/omap_gem.c | 8 +-
+ drivers/gpu/drm/sti/sti_cursor.c | 20 +-
+ drivers/gpu/drm/sti/sti_gdp.c | 3 +-
+ drivers/gpu/drm/sti/sti_hqvdp.c | 6 +-
+ drivers/gpu/drm/tegra/gem.c | 11 +-
+ drivers/gpu/drm/vc4/vc4_bo.c | 5 +-
+ drivers/gpu/host1x/cdma.c | 8 +-
+ drivers/gpu/host1x/job.c | 10 +-
+ drivers/hid/uhid.c | 2 +-
+ drivers/ide/hpt366.c | 9 +-
+ drivers/input/input-compat.h | 12 +-
+ drivers/media/platform/coda/coda-bit.c | 10 +-
+ drivers/net/rionet.c | 277 +-
+ drivers/net/wireless/marvell/mwifiex/debugfs.c | 10 +-
+ drivers/pinctrl/pinmux.c | 13 +-
+ drivers/power/ab8500_btemp.c | 15 +-
+ drivers/power/ab8500_charger.c | 16 +-
+ drivers/power/ab8500_fg.c | 15 +-
+ drivers/power/abx500_chargalg.c | 14 +-
+ drivers/power/charger-manager.c | 27 +-
+ drivers/rapidio/Kconfig | 8 +
+ drivers/rapidio/devices/Makefile | 1 +
+ drivers/rapidio/devices/rio_mport_cdev.c | 2711 ++++++++++++++++++++
+ drivers/rapidio/devices/tsi721.c | 1034 +++++---
+ drivers/rapidio/devices/tsi721.h | 87 +-
+ drivers/rapidio/devices/tsi721_dma.c | 397 ++-
+ drivers/rapidio/rio-driver.c | 12 +
+ drivers/rapidio/rio-scan.c | 135 +-
+ drivers/rapidio/rio.c | 433 +++-
+ drivers/rapidio/rio.h | 5 +
+ .../staging/lustre/lustre/llite/llite_internal.h | 2 +-
+ drivers/usb/common/common.c | 22 +-
+ drivers/video/fbdev/acornfb.c | 4 +-
+ drivers/video/fbdev/amba-clcd-versatile.c | 14 +-
+ drivers/video/fbdev/amba-clcd.c | 4 +-
+ drivers/video/fbdev/atmel_lcdfb.c | 9 +-
+ drivers/video/fbdev/ep93xx-fb.c | 8 +-
+ drivers/video/fbdev/gbefb.c | 8 +-
+ drivers/video/fbdev/imxfb.c | 12 +-
+ drivers/video/fbdev/mx3fb.c | 9 +-
+ drivers/video/fbdev/nuc900fb.c | 8 +-
+ drivers/video/fbdev/omap/lcdc.c | 16 +-
+ drivers/video/fbdev/pxa168fb.c | 8 +-
+ drivers/video/fbdev/pxafb.c | 4 +-
+ drivers/video/fbdev/s3c-fb.c | 7 +-
+ drivers/video/fbdev/s3c2410fb.c | 8 +-
+ drivers/video/fbdev/sa1100fb.c | 8 +-
+ drivers/xen/Kconfig | 23 +-
+ drivers/xen/balloon.c | 11 +-
+ fs/autofs4/autofs_i.h | 72 +-
+ fs/autofs4/dev-ioctl.c | 57 +-
+ fs/autofs4/expire.c | 84 +-
+ fs/autofs4/init.c | 10 +-
+ fs/autofs4/inode.c | 52 +-
+ fs/autofs4/root.c | 163 +-
+ fs/autofs4/symlink.c | 11 +-
+ fs/autofs4/waitq.c | 78 +-
+ fs/binfmt_elf.c | 2 +-
+ fs/btrfs/tests/btrfs-tests.c | 3 +-
+ fs/buffer.c | 24 +-
+ fs/cifs/cifs_debug.c | 56 +-
+ fs/cifs/cifs_debug.h | 2 +-
+ fs/cifs/cifsfs.c | 6 +-
+ fs/cifs/cifsglob.h | 4 +-
+ fs/ext4/dir.c | 2 +-
+ fs/ext4/fsync.c | 5 +-
+ fs/mpage.c | 3 +-
+ fs/ocfs2/Makefile | 3 +-
+ fs/ocfs2/alloc.c | 105 +-
+ fs/ocfs2/aops.c | 1146 ++++-----
+ fs/ocfs2/aops.h | 19 +-
+ fs/ocfs2/cluster/heartbeat.c | 191 +-
+ fs/ocfs2/dlm/dlmcommon.h | 21 +-
+ fs/ocfs2/dlm/dlmconvert.c | 30 +-
+ fs/ocfs2/dlm/dlmdomain.c | 11 +-
+ fs/ocfs2/dlm/dlmmaster.c | 124 +-
+ fs/ocfs2/dlm/dlmrecovery.c | 33 +-
+ fs/ocfs2/dlm/dlmthread.c | 7 +
+ fs/ocfs2/file.c | 165 +-
+ fs/ocfs2/filecheck.c | 605 +++++
+ fs/ocfs2/filecheck.h | 48 +
+ fs/ocfs2/inode.c | 203 +-
+ fs/ocfs2/inode.h | 9 +-
+ fs/ocfs2/journal.c | 8 +-
+ fs/ocfs2/localalloc.c | 4 +-
+ fs/ocfs2/mmap.c | 4 +-
+ fs/ocfs2/ocfs2.h | 8 +
+ fs/ocfs2/ocfs2_trace.h | 18 +-
+ fs/ocfs2/quota_global.c | 2 +-
+ fs/ocfs2/resize.c | 2 +-
+ fs/ocfs2/stackglue.c | 3 +-
+ fs/ocfs2/stackglue.h | 2 +
+ fs/ocfs2/super.c | 49 +-
+ fs/ocfs2/super.h | 2 -
+ fs/proc/page.c | 8 +-
+ fs/xfs/xfs_aops.c | 11 +-
+ include/asm-generic/atomic-long.h | 6 +-
+ include/linux/auto_dev-ioctl.h | 6 -
+ include/linux/auto_fs.h | 10 +-
+ include/linux/buffer_head.h | 10 +-
+ include/linux/compaction.h | 16 +
+ include/linux/compat.h | 15 +
+ include/linux/crc64_ecma.h | 56 +
+ include/linux/dma-mapping.h | 25 +-
+ include/linux/err.h | 4 +-
+ include/linux/fault-inject.h | 5 +-
+ include/linux/gfp.h | 45 +-
+ include/linux/hardirq.h | 2 +
+ include/linux/kcov.h | 27 +
+ include/linux/kernel.h | 2 +
+ include/linux/kexec.h | 4 +
+ include/linux/list_bl.h | 4 +-
+ include/linux/memcontrol.h | 147 +-
+ include/linux/memory.h | 3 +
+ include/linux/memory_hotplug.h | 7 +-
+ include/linux/migrate.h | 6 +-
+ include/linux/mm.h | 41 +-
+ include/linux/mmdebug.h | 3 +-
+ include/linux/mmzone.h | 24 +-
+ include/linux/oom.h | 2 +-
+ include/linux/page-flags-layout.h | 2 +
+ include/linux/page-flags.h | 32 +-
+ include/linux/page_ext.h | 1 +
+ include/linux/page_owner.h | 50 +-
+ include/linux/pagemap.h | 3 +-
+ include/linux/percpu.h | 3 -
+ include/linux/poison.h | 4 +
+ include/linux/printk.h | 12 +-
+ include/linux/radix-tree.h | 27 +-
+ include/linux/random.h | 1 +
+ include/linux/rio.h | 97 +-
+ include/linux/rio_drv.h | 15 +-
+ include/linux/rio_mport_cdev.h | 271 ++
+ include/linux/rio_regs.h | 3 +
+ include/linux/sched.h | 15 +
+ include/linux/sem.h | 1 +
+ include/linux/slab.h | 11 +-
+ include/linux/slab_def.h | 3 +
+ include/linux/slub_def.h | 1 +
+ include/linux/string.h | 9 +-
+ include/linux/swap.h | 1 +
+ include/linux/tick.h | 2 +-
+ include/linux/trace_events.h | 10 -
+ include/linux/tracepoint-defs.h | 14 +-
+ include/linux/unaligned/access_ok.h | 24 +-
+ include/linux/vm_event_item.h | 2 +
+ include/trace/events/btrfs.h | 2 +-
+ include/trace/events/compaction.h | 57 +-
+ include/trace/events/gfpflags.h | 43 -
+ include/trace/events/huge_memory.h | 40 +-
+ include/trace/events/kmem.h | 2 +-
+ include/trace/events/mmflags.h | 165 ++
+ include/trace/events/vmscan.h | 2 +-
+ include/uapi/linux/Kbuild | 1 +
+ include/uapi/linux/auto_fs.h | 21 +-
+ include/uapi/linux/auto_fs4.h | 17 +-
+ include/uapi/linux/byteorder/big_endian.h | 24 +-
+ include/uapi/linux/byteorder/little_endian.h | 24 +-
+ include/uapi/linux/kcov.h | 10 +
+ include/uapi/linux/swab.h | 10 +-
+ init/Kconfig | 49 +
+ init/main.c | 5 +-
+ ipc/msg.c | 5 +-
+ ipc/sem.c | 124 +-
+ ipc/shm.c | 53 +-
+ kernel/Makefile | 12 +
+ kernel/auditsc.c | 4 +-
+ kernel/exit.c | 4 +-
+ kernel/fork.c | 13 +-
+ kernel/hung_task.c | 21 +-
+ kernel/kallsyms.c | 42 +-
+ kernel/kcov.c | 261 ++
+ kernel/kexec.c | 9 +-
+ kernel/kexec_core.c | 6 +
+ kernel/kexec_file.c | 8 +-
+ kernel/locking/Makefile | 3 +
+ kernel/memremap.c | 4 +-
+ kernel/printk/Makefile | 1 +
+ kernel/printk/internal.h | 55 +
+ kernel/printk/nmi.c | 222 ++
+ kernel/printk/printk.c | 29 +-
+ kernel/profile.c | 4 +-
+ kernel/ptrace.c | 2 +-
+ kernel/rcu/Makefile | 4 +
+ kernel/sched/Makefile | 4 +
+ kernel/seccomp.c | 4 +-
+ kernel/signal.c | 4 +
+ kernel/time/hrtimer.c | 10 +-
+ kernel/time/tick-sched.c | 10 +-
+ kernel/time/timer.c | 11 +
+ lib/Kconfig | 7 +
+ lib/Kconfig.debug | 21 +
+ lib/Kconfig.ubsan | 9 +-
+ lib/Makefile | 13 +
+ lib/bug.c | 11 +
+ lib/crc64_ecma.c | 341 +++
+ lib/extable.c | 50 +-
+ lib/kstrtox.c | 64 +
+ lib/nmi_backtrace.c | 89 +-
+ lib/radix-tree.c | 182 +-
+ lib/string.c | 45 +-
+ lib/test_printf.c | 53 +
+ lib/vsprintf.c | 101 +-
+ mm/Kconfig | 7 +-
+ mm/Kconfig.debug | 53 +-
+ mm/Makefile | 20 +-
+ mm/backing-dev.c | 22 +-
+ mm/compaction.c | 324 ++-
+ mm/debug-pagealloc.c | 127 +-
+ mm/debug.c | 165 +-
+ mm/failslab.c | 12 +-
+ mm/filemap.c | 169 +-
+ mm/huge_memory.c | 109 +-
+ mm/internal.h | 31 +-
+ mm/kasan/Makefile | 1 +
+ mm/kmemcheck.c | 3 +
+ mm/ksm.c | 733 +++++-
+ mm/madvise.c | 19 +-
+ mm/memblock.c | 11 +-
+ mm/memcontrol.c | 223 +-
+ mm/memory-failure.c | 2 -
+ mm/memory.c | 26 +-
+ mm/memory_hotplug.c | 41 +-
+ mm/mempolicy.c | 4 +-
+ mm/migrate.c | 23 +-
+ mm/mprotect.c | 24 +-
+ mm/mremap.c | 2 +
+ mm/oom_kill.c | 208 +-
+ mm/page-writeback.c | 62 +-
+ mm/page_alloc.c | 426 ++-
+ mm/page_owner.c | 100 +-
+ mm/page_poison.c | 158 ++
+ mm/rmap.c | 16 +-
+ mm/shmem.c | 37 +-
+ mm/slab.c | 1043 ++++----
+ mm/slab.h | 95 +-
+ mm/slab_common.c | 11 +-
+ mm/slob.c | 4 +
+ mm/slub.c | 298 ++-
+ mm/truncate.c | 6 +-
+ mm/util.c | 30 +
+ mm/vmalloc.c | 25 +-
+ mm/vmscan.c | 234 +-
+ mm/vmstat.c | 17 +-
+ mm/workingset.c | 170 +-
+ net/sctp/socket.c | 2 +-
+ net/xfrm/xfrm_user.c | 2 +-
+ scripts/Makefile.lib | 6 +
+ scripts/Makefile.ubsan | 4 +
+ scripts/gdb/linux/proc.py | 41 +
+ scripts/gdb/vmlinux-gdb.py | 1 +
+ scripts/kallsyms.c | 93 +-
+ scripts/link-vmlinux.sh | 6 +-
+ scripts/namespace.pl | 2 +
+ scripts/sortextable.c | 2 +-
+ sound/arm/pxa2xx-pcm-lib.c | 12 +-
+ sound/drivers/pcsp/pcsp.c | 9 +-
+ sound/soc/fsl/imx-pcm-fiq.c | 10 +-
+ sound/soc/nuc900/nuc900-pcm.c | 6 +-
+ sound/soc/omap/omap-pcm.c | 12 +-
+ tools/perf/builtin-kmem.c | 49 +-
+ tools/testing/radix-tree/.gitignore | 2 +
+ tools/testing/radix-tree/Makefile | 20 +
+ tools/testing/radix-tree/find_next_bit.c | 57 +
+ tools/testing/radix-tree/linux.c | 60 +
+ tools/testing/radix-tree/linux/bitops.h | 150 ++
+ tools/testing/radix-tree/linux/bitops/__ffs.h | 43 +
+ tools/testing/radix-tree/linux/bitops/ffs.h | 41 +
+ tools/testing/radix-tree/linux/bitops/ffz.h | 12 +
+ tools/testing/radix-tree/linux/bitops/find.h | 13 +
+ tools/testing/radix-tree/linux/bitops/fls.h | 41 +
+ tools/testing/radix-tree/linux/bitops/fls64.h | 14 +
+ tools/testing/radix-tree/linux/bitops/hweight.h | 11 +
+ tools/testing/radix-tree/linux/bitops/le.h | 53 +
+ tools/testing/radix-tree/linux/bitops/non-atomic.h | 111 +
+ tools/testing/radix-tree/linux/bug.h | 1 +
+ tools/testing/radix-tree/linux/cpu.h | 35 +
+ tools/testing/radix-tree/linux/export.h | 2 +
+ tools/testing/radix-tree/linux/gfp.h | 8 +
+ tools/testing/radix-tree/linux/kernel.h | 35 +
+ tools/testing/radix-tree/linux/kmemleak.h | 1 +
+ tools/testing/radix-tree/linux/mempool.h | 17 +
+ tools/testing/radix-tree/linux/notifier.h | 8 +
+ tools/testing/radix-tree/linux/percpu.h | 7 +
+ tools/testing/radix-tree/linux/preempt.h | 5 +
+ tools/testing/radix-tree/linux/radix-tree.h | 1 +
+ tools/testing/radix-tree/linux/rcupdate.h | 9 +
+ tools/testing/radix-tree/linux/slab.h | 28 +
+ tools/testing/radix-tree/linux/types.h | 28 +
+ tools/testing/radix-tree/main.c | 272 ++
+ tools/testing/radix-tree/rcupdate.c | 86 +
+ tools/testing/radix-tree/regression.h | 8 +
+ tools/testing/radix-tree/regression1.c | 221 ++
+ tools/testing/radix-tree/regression2.c | 126 +
+ tools/testing/radix-tree/regression3.c | 86 +
+ tools/testing/radix-tree/tag_check.c | 332 +++
+ tools/testing/radix-tree/test.c | 219 ++
+ tools/testing/radix-tree/test.h | 40 +
+ tools/vm/page-types.c | 125 +-
+ 401 files changed, 16605 insertions(+), 5074 deletions(-)
+ create mode 100644 Documentation/filesystems/ocfs2-online-filecheck.txt
+ create mode 100644 Documentation/kcov.txt
+ create mode 100644 Documentation/rapidio/mport_cdev.txt
+ delete mode 100644 arch/alpha/mm/extable.c
+ delete mode 100644 arch/s390/mm/extable.c
+ create mode 100644 drivers/rapidio/devices/rio_mport_cdev.c
+ create mode 100644 fs/ocfs2/filecheck.c
+ create mode 100644 fs/ocfs2/filecheck.h
+ create mode 100644 include/linux/crc64_ecma.h
+ create mode 100644 include/linux/kcov.h
+ create mode 100644 include/linux/rio_mport_cdev.h
+ delete mode 100644 include/trace/events/gfpflags.h
+ create mode 100644 include/trace/events/mmflags.h
+ create mode 100644 include/uapi/linux/kcov.h
+ create mode 100644 kernel/kcov.c
+ create mode 100644 kernel/printk/internal.h
+ create mode 100644 kernel/printk/nmi.c
+ create mode 100644 lib/crc64_ecma.c
+ create mode 100644 mm/page_poison.c
+ create mode 100644 scripts/gdb/linux/proc.py
+ create mode 100644 tools/testing/radix-tree/.gitignore
+ create mode 100644 tools/testing/radix-tree/Makefile
+ create mode 100644 tools/testing/radix-tree/find_next_bit.c
+ create mode 100644 tools/testing/radix-tree/linux.c
+ create mode 100644 tools/testing/radix-tree/linux/bitops.h
+ create mode 100644 tools/testing/radix-tree/linux/bitops/__ffs.h
+ create mode 100644 tools/testing/radix-tree/linux/bitops/ffs.h
+ create mode 100644 tools/testing/radix-tree/linux/bitops/ffz.h
+ create mode 100644 tools/testing/radix-tree/linux/bitops/find.h
+ create mode 100644 tools/testing/radix-tree/linux/bitops/fls.h
+ create mode 100644 tools/testing/radix-tree/linux/bitops/fls64.h
+ create mode 100644 tools/testing/radix-tree/linux/bitops/hweight.h
+ create mode 100644 tools/testing/radix-tree/linux/bitops/le.h
+ create mode 100644 tools/testing/radix-tree/linux/bitops/non-atomic.h
+ create mode 100644 tools/testing/radix-tree/linux/bug.h
+ create mode 100644 tools/testing/radix-tree/linux/cpu.h
+ create mode 100644 tools/testing/radix-tree/linux/export.h
+ create mode 100644 tools/testing/radix-tree/linux/gfp.h
+ create mode 100644 tools/testing/radix-tree/linux/kernel.h
+ create mode 100644 tools/testing/radix-tree/linux/kmemleak.h
+ create mode 100644 tools/testing/radix-tree/linux/mempool.h
+ create mode 100644 tools/testing/radix-tree/linux/notifier.h
+ create mode 100644 tools/testing/radix-tree/linux/percpu.h
+ create mode 100644 tools/testing/radix-tree/linux/preempt.h
+ create mode 100644 tools/testing/radix-tree/linux/radix-tree.h
+ create mode 100644 tools/testing/radix-tree/linux/rcupdate.h
+ create mode 100644 tools/testing/radix-tree/linux/slab.h
+ create mode 100644 tools/testing/radix-tree/linux/types.h
+ create mode 100644 tools/testing/radix-tree/main.c
+ create mode 100644 tools/testing/radix-tree/rcupdate.c
+ create mode 100644 tools/testing/radix-tree/regression.h
+ create mode 100644 tools/testing/radix-tree/regression1.c
+ create mode 100644 tools/testing/radix-tree/regression2.c
+ create mode 100644 tools/testing/radix-tree/regression3.c
+ create mode 100644 tools/testing/radix-tree/tag_check.c
+ create mode 100644 tools/testing/radix-tree/test.c
+ create mode 100644 tools/testing/radix-tree/test.h
+$ git clone -s -l -n -q . ../rebase-tmp
+$ cd ../rebase-tmp
+$ git checkout -b akpm remotes/origin/akpm/master
+Switched to a new branch 'akpm'
+$ git rebase --onto master remotes/origin/akpm/master-base
+First, rewinding head to replay your work on top of it...
+Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + 5888beab66ff...2c1975dd89fc akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (2c1975dd89fc drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression)
+$ git merge --no-ff akpm/master
+Merge made by the 'recursive' strategy.
+ drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
projects / karo-tx-linux.git / commitdiff