path: root/Next/merge.log

$ date -R
Mon, 31 Jul 2017 09:56:16 +1000
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at 0ce2f3851193 Merge tag 'acpi-4.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Merging origin/master (16f73eb02d7e Linux 4.13-rc3)
$ git merge origin/master
Updating 0ce2f3851193..16f73eb02d7e
Fast-forward
 Documentation/device-mapper/dm-raid.txt            |   1 +
 .../bindings/crypto/inside-secure-safexcel.txt     |   2 -
 .../devicetree/bindings/mmc/exynos-dw-mshc.txt     |   1 -
 .../devicetree/bindings/mmc/img-dw-mshc.txt        |   1 -
 .../devicetree/bindings/mmc/k3-dw-mshc.txt         |   2 -
 .../devicetree/bindings/mmc/synopsys-dw-mshc.txt   |  16 +-
 .../devicetree/bindings/mmc/zx-dw-mshc.txt         |   1 -
 Makefile                                           |   2 +-
 arch/arm/mach-omap2/hsmmc.c                        | 239 +--------------------
 arch/arm/mach-omap2/hsmmc.h                        |   9 -
 arch/arm/mach-ux500/cpu-db8500.c                   |   1 +
 arch/arm64/include/asm/atomic_lse.h                |   2 +-
 arch/arm64/include/asm/sysreg.h                    |   4 +-
 arch/arm64/include/asm/uaccess.h                   |   2 +-
 arch/arm64/kernel/cpu_ops.c                        |   4 +-
 arch/arm64/kernel/smp.c                            |  12 +-
 arch/arm64/kernel/topology.c                       |  22 +-
 arch/arm64/kernel/traps.c                          |   8 +-
 arch/arm64/lib/copy_page.S                         |   9 +-
 arch/arm64/mm/mmu.c                                |  18 +-
 arch/arm64/mm/numa.c                               |   7 +-
 arch/powerpc/Makefile                              |  25 +--
 arch/powerpc/include/asm/book3s/64/mmu.h           |  15 +-
 arch/powerpc/include/asm/mmu_context.h             |  18 +-
 arch/powerpc/kvm/book3s_64_mmu_hv.c                |   4 +-
 arch/powerpc/kvm/book3s_hv.c                       |   2 +
 arch/powerpc/kvm/book3s_hv_rmhandlers.S            |  59 ++++-
 arch/powerpc/mm/mmu_context_book3s64.c             |   5 +-
 arch/powerpc/mm/pgtable-radix.c                    |  34 ++-
 arch/powerpc/mm/subpage-prot.c                     |   2 +-
 arch/powerpc/mm/tlb-radix.c                        |  45 +++-
 arch/powerpc/platforms/pseries/reconfig.c          |   1 -
 arch/s390/kvm/kvm-s390.c                           |   8 +-
 arch/x86/boot/compressed/Makefile                  |   1 +
 arch/x86/boot/string.c                             |   9 +
 arch/x86/entry/entry_64.S                          |   1 +
 arch/x86/events/intel/uncore_snbep.c               |  51 ++++-
 arch/x86/include/asm/entry_arch.h                  |   2 +
 arch/x86/include/asm/hardirq.h                     |   1 +
 arch/x86/include/asm/hw_irq.h                      |   2 +
 arch/x86/include/asm/irq_vectors.h                 |   3 +-
 arch/x86/kernel/irq.c                              |  19 ++
 arch/x86/kernel/irqinit.c                          |   2 +
 arch/x86/kernel/kprobes/core.c                     |  10 +-
 arch/x86/kernel/reboot.c                           |   6 +-
 arch/x86/kvm/lapic.c                               |  17 +-
 arch/x86/kvm/vmx.c                                 |  25 +--
 arch/x86/kvm/x86.c                                 |   4 +-
 block/blk-core.c                                   |   4 +
 block/blk-mq-cpumap.c                              |   4 +-
 crypto/authencesn.c                                |   5 +
 drivers/block/nbd.c                                |  18 +-
 drivers/block/xen-blkfront.c                       |  25 ++-
 drivers/crypto/Kconfig                             |   2 +-
 drivers/crypto/bcm/spu2.c                          |   1 +
 drivers/crypto/cavium/nitrox/nitrox_main.c         |   3 +-
 drivers/crypto/inside-secure/safexcel.c            |   5 +-
 drivers/dax/super.c                                |   6 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c        |  10 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c              |  24 ++-
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c |  12 +-
 drivers/gpu/drm/drm_dp_helper.c                    |   5 +-
 drivers/gpu/drm/exynos/Kconfig                     |   1 +
 drivers/gpu/drm/exynos/exynos_drm_drv.c            |   1 -
 drivers/gpu/drm/exynos/exynos_drm_dsi.c            |  10 +-
 drivers/gpu/drm/exynos/exynos_drm_mic.c            |  24 ++-
 drivers/gpu/drm/exynos/exynos_hdmi.c               |  10 +-
 drivers/gpu/drm/exynos/exynos_mixer.c              |  10 +-
 drivers/gpu/drm/i915/gvt/display.c                 |  22 +-
 drivers/gpu/drm/i915/i915_gem_clflush.c            |   7 +-
 drivers/gpu/drm/i915/i915_gem_clflush.h            |   2 +-
 drivers/gpu/drm/i915/i915_gem_execbuffer.c         |  24 ++-
 drivers/gpu/drm/i915/i915_vma.h                    |   2 +-
 drivers/gpu/drm/i915/intel_ddi.c                   |   4 +-
 drivers/gpu/drm/i915/intel_display.c               |  86 ++++----
 drivers/gpu/drm/i915/intel_gvt.c                   |   2 +-
 drivers/gpu/drm/i915/intel_pm.c                    |   4 +-
 drivers/gpu/drm/i915/selftests/mock_gem_device.c   |   2 +-
 drivers/gpu/drm/nouveau/nouveau_connector.c        |   2 -
 drivers/gpu/drm/nouveau/nouveau_display.c          |   5 -
 drivers/gpu/drm/nouveau/nv50_display.c             |  31 ++-
 drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h     |   1 +
 drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h    |   2 +-
 drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c    |   1 +
 drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c    |   2 +-
 drivers/gpu/drm/nouveau/nvkm/subdev/i2c/Kbuild     |   1 +
 drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c      |   4 +
 drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.h      |   6 +
 drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c   |  30 ++-
 drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgf119.c |  35 +++
 drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c |   5 +-
 drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padgf119.c |   4 +-
 drivers/gpu/drm/rockchip/Kconfig                   |  19 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c             |  24 +--
 drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c             |  10 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c         |   4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_context.c            |   6 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c            |   2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c                |   8 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c            |   8 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_fence.c              |  10 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c      |   2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c                |   9 +
 drivers/gpu/drm/vmwgfx/vmwgfx_mob.c                |   6 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_msg.c                |   6 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_resource.c           |   4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_shader.c             |   6 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c               |   4 +-
 drivers/gpu/host1x/dev.c                           |   8 +-
 drivers/lightnvm/pblk-rb.c                         |   4 +-
 drivers/lightnvm/pblk-read.c                       |  23 +-
 drivers/lightnvm/pblk.h                            |   2 +-
 drivers/md/dm-bufio.c                              |   3 +-
 drivers/md/dm-integrity.c                          |  22 +-
 drivers/md/dm-raid.c                               |  29 +--
 drivers/md/dm-table.c                              |  35 +++
 drivers/md/dm-verity-fec.c                         |  21 +-
 drivers/md/dm-zoned-metadata.c                     |  12 +-
 drivers/md/dm-zoned-reclaim.c                      |   2 +-
 drivers/md/dm-zoned-target.c                       |   8 +-
 drivers/md/md.c                                    |   2 +-
 drivers/md/md.h                                    |  54 -----
 drivers/md/raid1-10.c                              |  81 +++++++
 drivers/md/raid1.c                                 |  68 ++----
 drivers/md/raid10.c                                |  25 +--
 drivers/md/raid5.c                                 |  11 +-
 drivers/mmc/host/dw_mmc.c                          |   2 +-
 drivers/mmc/host/omap_hsmmc.c                      |  11 -
 drivers/mmc/host/sunxi-mmc.c                       |   8 +-
 drivers/nvme/host/core.c                           |   6 +-
 drivers/nvme/host/fc.c                             | 121 ++++++-----
 drivers/nvme/host/pci.c                            |   6 +-
 drivers/nvme/target/fc.c                           | 101 ++++-----
 drivers/of/irq.c                                   |   2 +-
 drivers/perf/arm_pmu.c                             |  41 ++--
 drivers/perf/arm_pmu_platform.c                    |   9 +-
 drivers/perf/qcom_l2_pmu.c                         |   2 +
 drivers/xen/events/events_base.c                   |  13 +-
 drivers/xen/xen-selfballoon.c                      |   4 +-
 drivers/xen/xenfs/super.c                          |   1 -
 fs/btrfs/extent-tree.c                             |  11 +-
 fs/btrfs/tree-log.c                                |   3 +-
 fs/btrfs/volumes.c                                 |   4 +-
 fs/nfs/file.c                                      |   4 +-
 fs/nfs/nfs4proc.c                                  |  14 +-
 fs/xfs/libxfs/xfs_bmap.c                           |  21 ++
 fs/xfs/libxfs/xfs_btree.c                          |   6 +-
 fs/xfs/libxfs/xfs_dir2_data.c                      |   4 +
 fs/xfs/libxfs/xfs_refcount.c                       |   4 +
 fs/xfs/xfs_qm.c                                    |   3 +
 fs/xfs/xfs_reflink.c                               |   4 +-
 include/linux/dax.h                                |   1 +
 include/linux/irq.h                                |   7 +-
 include/linux/kvm_host.h                           |   1 +
 include/linux/nvme-fc.h                            |  19 ++
 include/linux/nvme.h                               |   2 +-
 include/linux/perf/arm_pmu.h                       |   4 +
 include/linux/platform_data/hsmmc-omap.h           |  10 -
 include/linux/wait.h                               |   8 +-
 kernel/irq/cpuhotplug.c                            |   9 +-
 kernel/sched/core.c                                |   2 +-
 scripts/dtc/dtx_diff                               |   2 +-
 tools/kvm/kvm_stat/kvm_stat                        |  22 +-
 virt/kvm/kvm_main.c                                |  35 ++-
 164 files changed, 1229 insertions(+), 1034 deletions(-)
 create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgf119.c
 create mode 100644 drivers/md/raid1-10.c
Merging fixes/master (b4b8cbf679c4 Cavium CNN55XX: fix broken default Kconfig entry)
$ git merge fixes/master
Already up-to-date.
Merging kbuild-current/fixes (ad8181060788 kconfig: fix sparse warnings in nconfig)
$ git merge kbuild-current/fixes
Already up-to-date.
Merging arc-current/for-curr (37f1db0e85ff ARC: [plat-axs10x]: prepare dts files for enabling PAE40 on axs103)
$ git merge arc-current/for-curr
Merge made by the 'recursive' strategy.
 arch/arc/boot/dts/axc001.dtsi     | 20 +++++++++-----------
 arch/arc/boot/dts/axc003.dtsi     | 21 ++++++++++-----------
 arch/arc/boot/dts/axc003_idu.dtsi | 21 ++++++++++-----------
 arch/arc/boot/dts/axs10x_mb.dtsi  |  2 +-
 arch/arc/configs/nps_defconfig    |  1 -
 arch/arc/configs/tb10x_defconfig  |  1 -
 arch/arc/mm/cache.c               |  3 +++
 7 files changed, 33 insertions(+), 36 deletions(-)
Merging arm-current/fixes (ce184a0dee92 ARM: 8687/1: signal: Fix unparseable iwmmxt_sigframe in uc_regspace[])
$ git merge arm-current/fixes
Already up-to-date.
Merging m68k-current/for-linus (204a2be30a7a m68k: Remove ptrace_signal_deliver)
$ git merge m68k-current/for-linus
Already up-to-date.
Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups)
$ git merge metag-fixes/fixes
Already up-to-date.
Merging powerpc-fixes/fixes (c9c98bc5cc2a powerpc/mm: Fix pmd/pte_devmap() on non-leaf entries)
$ git merge powerpc-fixes/fixes
Merge made by the 'recursive' strategy.
 arch/powerpc/include/asm/book3s/64/pgtable.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
Merging sparc/master (8cd3ec51c0c3 sbus: Convert to using %pOF instead of full_name)
$ git merge sparc/master
Merge made by the 'recursive' strategy.
 arch/sparc/configs/sparc32_defconfig    |  4 ----
 arch/sparc/configs/sparc64_defconfig    |  4 ----
 arch/sparc/include/asm/mmu_context_64.h | 14 +++++++++-----
 arch/sparc/kernel/tsb.S                 | 12 ++++++++++++
 arch/sparc/mm/init_64.c                 | 25 ++++++++++++++++++++++++-
 arch/sparc/power/hibernate.c            |  3 +--
 drivers/sbus/char/display7seg.c         |  4 ++--
 drivers/sbus/char/flash.c               |  4 ++--
 drivers/sbus/char/uctrl.c               |  4 ++--
 9 files changed, 52 insertions(+), 22 deletions(-)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
$ git merge fscrypt-current/for-stable
Already up-to-date.
Merging net/master (9975a54b3c9e bpf: fix bpf_prog_get_info_by_fd to dump correct xlated_prog_len)
$ git merge net/master
Merge made by the 'recursive' strategy.
 drivers/net/bonding/bond_main.c                    |   2 +
 drivers/net/ethernet/aurora/nb8800.c               |   9 +-
 drivers/net/ethernet/cavium/thunder/thunder_bgx.c  |  27 ++-
 drivers/net/ethernet/cavium/thunder/thunder_bgx.h  |   2 +
 drivers/net/ethernet/faraday/ftgmac100.c           |   7 +-
 drivers/net/ethernet/mediatek/mtk_eth_soc.c        |   5 +
 drivers/net/ethernet/mellanox/mlx5/core/cmd.c      |  25 ++-
 drivers/net/ethernet/mellanox/mlx5/core/en.h       |  10 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_clock.c | 222 +++++++++++++++------
 .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c    |   4 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_main.c  |   1 -
 drivers/net/ethernet/mellanox/mlx5/core/eq.c       |   2 +-
 drivers/net/ethernet/mellanox/mlx5/core/eswitch.c  |   3 +-
 .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c  |  16 +-
 drivers/net/ethernet/mellanox/mlx5/core/lag.c      |  25 +--
 .../net/ethernet/mellanox/mlx5/core/mlx5_core.h    |   5 +
 drivers/net/ethernet/mellanox/mlx5/core/sriov.c    |   5 +
 .../net/ethernet/mellanox/mlxsw/spectrum_router.c  |   7 +
 .../net/ethernet/stmicro/stmmac/dwmac1000_dma.c    |   2 +-
 drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c |   2 +-
 drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h    |   3 +
 .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c   |   5 +
 drivers/net/ethernet/toshiba/tc35815.c             |   2 +-
 drivers/net/hyperv/netvsc_drv.c                    |  43 +++-
 drivers/net/irda/mcs7780.c                         |  16 +-
 drivers/net/phy/Kconfig                            |  13 +-
 drivers/net/team/team.c                            |   8 +-
 drivers/net/tun.c                                  |  10 +-
 .../wireless/broadcom/brcm80211/brcmfmac/core.c    |   2 +-
 .../wireless/broadcom/brcm80211/brcmfmac/sdio.c    |   8 +-
 drivers/net/wireless/intel/iwlwifi/dvm/tx.c        |   2 +-
 drivers/net/wireless/intel/iwlwifi/iwl-devtrace.h  |   4 +-
 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c  |   8 +-
 drivers/net/wireless/intel/iwlwifi/mvm/mvm.h       |   2 +
 drivers/net/wireless/intel/iwlwifi/mvm/ops.c       |   6 +-
 drivers/net/wireless/intel/iwlwifi/mvm/sta.c       |  15 +-
 drivers/net/wireless/intel/iwlwifi/pcie/trans.c    |   3 +-
 drivers/net/wireless/intel/iwlwifi/pcie/tx.c       |   3 +
 .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c    |   3 -
 drivers/net/wireless/realtek/rtlwifi/wifi.h        |   1 -
 drivers/phy/broadcom/Kconfig                       |   2 +-
 drivers/vhost/vhost.c                              |  28 +--
 drivers/vhost/vhost.h                              |   3 -
 include/linux/mlx5/mlx5_ifc.h                      |  10 +-
 include/linux/phy.h                                |   2 +-
 include/net/sctp/sctp.h                            |   4 +-
 include/net/udp.h                                  |  34 +++-
 kernel/bpf/syscall.c                               |   4 +-
 kernel/bpf/verifier.c                              |  21 +-
 lib/test_rhashtable.c                              |  57 ++++--
 net/core/dev_ioctl.c                               |   2 +
 net/core/netpoll.c                                 |   2 +-
 net/dccp/feat.c                                    |   7 +-
 net/dccp/ipv4.c                                    |   1 +
 net/dccp/ipv6.c                                    |   1 +
 net/dsa/dsa2.c                                     |  13 +-
 net/ipv4/tcp_output.c                              |   5 +-
 net/ipv4/udp.c                                     |  41 ++--
 net/ipv6/ip6_output.c                              |   4 -
 net/ipv6/udp.c                                     |  27 ++-
 net/openvswitch/conntrack.c                        |   7 +-
 net/packet/af_packet.c                             |   2 +-
 net/socket.c                                       |   5 +-
 tools/lib/bpf/bpf.c                                |   1 -
 tools/testing/selftests/bpf/test_progs.c           |   8 +-
 tools/testing/selftests/bpf/test_verifier.c        |  28 +++
 66 files changed, 581 insertions(+), 276 deletions(-)
Merging ipsec/master (e6194923237f esp: Fix memleaks on error paths.)
$ git merge ipsec/master
Merge made by the 'recursive' strategy.
 net/ipv4/esp4.c | 13 ++++++++-----
 net/ipv6/esp6.c |  9 +++++----
 2 files changed, 13 insertions(+), 9 deletions(-)
Merging netfilter/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set)
$ git merge netfilter/master
Merge made by the 'recursive' strategy.
 net/ipv4/netfilter/ipt_CLUSTERIP.c | 4 +++-
 net/netfilter/nft_compat.c         | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)
Merging ipvs/master (3c5ab3f395d6 ipvs: SNAT packet replies only for NATed connections)
$ git merge ipvs/master
Already up-to-date.
Merging wireless-drivers/master (5f5d03143de5 brcmfmac: fix memleak due to calling brcmf_sdiod_sgtable_alloc() twice)
$ git merge wireless-drivers/master
Already up-to-date.
Merging mac80211/master (d7f13f745036 cfg80211: Validate frequencies nested in NL80211_ATTR_SCAN_FREQUENCIES)
$ git merge mac80211/master
Already up-to-date.
Merging sound-current/for-linus (ba92b1142879 ALSA: hda - Add mute led support for HP ProBook 440 G4)
$ git merge sound-current/for-linus
Already up-to-date.
Merging pci-current/for-linus (34d5ac2af644 PCI: rockchip: Check for pci_scan_root_bus_bridge() failure correctly)
$ git merge pci-current/for-linus
Already up-to-date.
Merging driver-core.current/driver-core-linus (5771a8c08880 Linux v4.13-rc1)
$ git merge driver-core.current/driver-core-linus
Already up-to-date.
Merging tty.current/tty-linus (37ef38f3f838 tty: pl011: fix initialization order of QDF2400 E44)
$ git merge tty.current/tty-linus
Merge made by the 'recursive' strategy.
 drivers/acpi/spcr.c             | 36 ++++++++++++++++++++++++++++++++++--
 drivers/tty/serial/amba-pl011.c | 37 +++++++++++++++++++------------------
 include/linux/acpi.h            |  1 +
 3 files changed, 54 insertions(+), 20 deletions(-)
Merging usb.current/usb-linus (45d73860530a usb: musb: fix tx fifo flush handling again)
$ git merge usb.current/usb-linus
Merge made by the 'recursive' strategy.
 drivers/usb/core/hcd.c            |  4 +++-
 drivers/usb/musb/musb_host.c      |  1 +
 drivers/usb/storage/unusual_uas.h |  4 ++--
 drivers/usb/storage/usb.c         | 18 ++++++++++++------
 4 files changed, 18 insertions(+), 9 deletions(-)
Merging usb-gadget-fixes/fixes (520eccdfe187 Linux 4.13-rc2)
$ git merge usb-gadget-fixes/fixes
Already up-to-date.
Merging usb-serial-fixes/usb-linus (9585e340db9f USB: serial: cp210x: add support for Qivicon USB ZigBee dongle)
$ git merge usb-serial-fixes/usb-linus
Merge made by the 'recursive' strategy.
 drivers/usb/serial/cp210x.c | 1 +
 1 file changed, 1 insertion(+)
Merging usb-chipidea-fixes/ci-for-usb-stable (cbb22ebcfb99 usb: chipidea: core: check before accessing ci_role in ci_role_show)
$ git merge usb-chipidea-fixes/ci-for-usb-stable
Already up-to-date.
Merging phy/fixes (5771a8c08880 Linux v4.13-rc1)
$ git merge phy/fixes
Already up-to-date.
Merging staging.current/staging-linus (cef988642cda staging: comedi: comedi_fops: do not call blocking ops when !TASK_RUNNING)
$ git merge staging.current/staging-linus
Merge made by the 'recursive' strategy.
 drivers/iio/accel/bmc150-accel-core.c           |  9 +-----
 drivers/iio/accel/st_accel_core.c               | 32 +++++++++++++++++++
 drivers/iio/adc/aspeed_adc.c                    | 26 +++++++++++++++
 drivers/iio/adc/axp288_adc.c                    | 42 ++++++++++++++++++++++++-
 drivers/iio/adc/sun4i-gpadc-iio.c               |  3 +-
 drivers/iio/adc/vf610_adc.c                     |  2 +-
 drivers/iio/common/st_sensors/st_sensors_core.c | 29 +++++++++++++++++
 drivers/iio/light/tsl2563.c                     |  2 +-
 drivers/iio/pressure/st_pressure_core.c         |  2 +-
 drivers/staging/comedi/comedi_fops.c            |  3 ++
 drivers/staging/iio/resolver/ad2s1210.c         |  2 +-
 include/linux/iio/common/st_sensors.h           |  7 +++++
 include/linux/platform_data/st_sensors_pdata.h  |  2 ++
 13 files changed, 146 insertions(+), 15 deletions(-)
Merging char-misc.current/char-misc-linus (520eccdfe187 Linux 4.13-rc2)
$ git merge char-misc.current/char-misc-linus
Already up-to-date.
Merging input-current/for-linus (293b915fd9be Input: trackpoint - assume 3 buttons when buttons detection fails)
$ git merge input-current/for-linus
Merge made by the 'recursive' strategy.
 drivers/input/mouse/trackpoint.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Merging crypto-current/master (41cdf7a45389 crypto: authencesn - Fix digest_null crash)
$ git merge crypto-current/master
Already up-to-date.
Merging ide/master (921edf312a6a ide: avoid warning for timings calculation)
$ git merge ide/master
Already up-to-date.
Merging vfio-fixes/for-linus (bb67b496c338 include/linux/vfio.h: Guard powerpc-specific functions with CONFIG_VFIO_SPAPR_EEH)
$ git merge vfio-fixes/for-linus
Merge made by the 'recursive' strategy.
 include/linux/vfio.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Merging kselftest-fixes/fixes (5771a8c08880 Linux v4.13-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 nand-fixes/nand/fixes (d4ed3b9015b5 mtd: nand: make nand_ooblayout_lp_hamming_ops static)
$ git merge nand-fixes/nand/fixes
Already up-to-date.
Merging spi-nor-fixes/spi-nor/fixes (5771a8c08880 Linux v4.13-rc1)
$ git merge spi-nor-fixes/spi-nor/fixes
Already up-to-date.
Merging mfd-fixes/for-mfd-fixes (9e69672e90cc dt-bindings: mfd: Update STM32 timers clock names)
$ git merge mfd-fixes/for-mfd-fixes
Already up-to-date.
Merging v4l-dvb-fixes/fixes (8033120f36c0 media: atomisp2: array underflow in imx_enum_frame_size())
$ git merge v4l-dvb-fixes/fixes
Merge made by the 'recursive' strategy.
 Documentation/media/kapi/dtv-core.rst              |  443 +-
 Documentation/media/typical_media_device.svg       | 3054 +--------
 Documentation/media/uapi/dvb/dvbstb.svg            |  668 +-
 Documentation/media/uapi/v4l/bayer.svg             | 1013 +--
 Documentation/media/uapi/v4l/constraints.svg       |  356 +-
 Documentation/media/uapi/v4l/crop.svg              |  253 +-
 Documentation/media/uapi/v4l/fieldseq_bt.svg       |  170 +-
 Documentation/media/uapi/v4l/fieldseq_tb.svg       |  175 +-
 Documentation/media/uapi/v4l/nv12mt.svg            |  764 +--
 Documentation/media/uapi/v4l/nv12mt_example.svg    | 2474 +++----
 Documentation/media/uapi/v4l/selection.svg         | 6957 ++++----------------
 .../uapi/v4l/subdev-image-processing-crop.svg      |   10 +-
 .../uapi/v4l/subdev-image-processing-full.svg      |   10 +-
 ...ubdev-image-processing-scaling-multi-source.svg |   10 +-
 Documentation/media/uapi/v4l/vbi_525.svg           |  614 +-
 Documentation/media/uapi/v4l/vbi_625.svg           |  388 +-
 Documentation/media/uapi/v4l/vbi_hsync.svg         |  238 +-
 Documentation/media/uapi/v4l/vidioc-g-fmt.rst      |    6 +
 Documentation/media/v4l-drivers/imx.rst            |    7 +-
 Documentation/media/v4l-drivers/index.rst          |    1 +
 drivers/media/cec/cec-adap.c                       |    2 +-
 drivers/media/cec/cec-notifier.c                   |    6 +
 drivers/media/dvb-core/dvb_ca_en50221.c            |  143 +-
 drivers/media/dvb-core/dvb_ca_en50221.h            |    7 +
 drivers/media/dvb-frontends/cxd2841er.c            |    5 +-
 drivers/media/dvb-frontends/drx39xyj/drx_driver.h  |   15 +-
 drivers/media/dvb-frontends/lnbh25.c               |    6 +-
 drivers/media/dvb-frontends/stv0367.c              |  210 +-
 drivers/media/i2c/et8ek8/et8ek8_driver.c           |    1 -
 drivers/media/i2c/tvp5150.c                        |   25 +-
 drivers/media/pci/ddbridge/ddbridge-core.c         |  102 +-
 drivers/media/pci/ngene/ngene-core.c               |   32 +-
 drivers/media/pci/ngene/ngene-i2c.c                |    6 +-
 drivers/media/pci/ngene/ngene.h                    |    6 +-
 drivers/media/pci/tw5864/tw5864-video.c            |    1 +
 drivers/media/platform/Kconfig                     |    4 +-
 drivers/media/platform/coda/coda-bit.c             |    8 +-
 drivers/media/platform/coda/coda-common.c          |    4 +-
 drivers/media/platform/coda/coda.h                 |    2 +-
 drivers/media/platform/davinci/ccdc_hw_device.h    |   10 -
 drivers/media/platform/davinci/dm355_ccdc.c        |   92 +-
 drivers/media/platform/davinci/dm644x_ccdc.c       |  151 +-
 drivers/media/platform/davinci/vpfe_capture.c      |   93 -
 drivers/media/platform/davinci/vpif_capture.c      |    2 -
 drivers/media/platform/davinci/vpif_display.c      |    2 -
 drivers/media/platform/omap/omap_vout_vrfb.c       |  133 +-
 drivers/media/platform/omap/omap_voutdef.h         |    6 +-
 drivers/media/platform/qcom/venus/core.c           |   18 +-
 drivers/media/platform/qcom/venus/core.h           |    1 -
 drivers/media/platform/qcom/venus/firmware.c       |   76 +-
 drivers/media/platform/qcom/venus/firmware.h       |    5 +-
 drivers/media/platform/qcom/venus/hfi_msgs.c       |   11 +-
 drivers/media/platform/sti/bdisp/bdisp-debug.c     |   14 +-
 drivers/media/platform/vimc/vimc-capture.c         |   15 +-
 drivers/media/platform/vimc/vimc-debayer.c         |   15 +-
 drivers/media/platform/vimc/vimc-scaler.c          |   15 +-
 drivers/media/platform/vimc/vimc-sensor.c          |   15 +-
 drivers/media/radio/radio-wl1273.c                 |   15 +-
 drivers/media/rc/ir-lirc-codec.c                   |    2 +-
 drivers/media/tuners/fc0011.c                      |    1 +
 drivers/media/tuners/mxl5005s.c                    |    2 -
 drivers/media/usb/au0828/au0828-input.c            |    2 +-
 drivers/media/usb/dvb-usb-v2/lmedm04.c             |   10 +-
 drivers/media/usb/dvb-usb/dib0700_core.c           |   38 +-
 drivers/media/usb/em28xx/em28xx-cards.c            |   18 +
 drivers/media/usb/em28xx/em28xx-dvb.c              |    1 +
 drivers/media/usb/em28xx/em28xx-i2c.c              |    2 -
 drivers/media/usb/em28xx/em28xx-input.c            |    2 +-
 drivers/media/usb/em28xx/em28xx.h                  |    1 +
 drivers/media/usb/pulse8-cec/pulse8-cec.c          |    2 +-
 drivers/media/usb/rainshadow-cec/rainshadow-cec.c  |   18 +-
 drivers/media/usb/stkwebcam/stk-sensor.c           |   32 +-
 drivers/media/usb/stkwebcam/stk-webcam.c           |   70 +-
 drivers/media/usb/stkwebcam/stk-webcam.h           |    6 -
 drivers/media/v4l2-core/tuner-core.c               |    2 -
 drivers/staging/media/atomisp/i2c/ap1302.h         |    4 +-
 drivers/staging/media/atomisp/i2c/gc0310.h         |    2 +-
 drivers/staging/media/atomisp/i2c/gc2235.h         |    2 +-
 drivers/staging/media/atomisp/i2c/imx/imx.h        |    2 +-
 drivers/staging/media/atomisp/i2c/ov2680.h         |    3 +-
 drivers/staging/media/atomisp/i2c/ov2722.h         |    2 +-
 drivers/staging/media/atomisp/i2c/ov5693/ov5693.h  |    2 +-
 drivers/staging/media/atomisp/i2c/ov8858.h         |    2 +-
 drivers/staging/media/atomisp/i2c/ov8858_btns.h    |    2 +-
 .../staging/media/atomisp/pci/atomisp2/Makefile    |   10 +-
 .../media/atomisp/pci/atomisp2/atomisp_internal.h  |    2 +-
 drivers/staging/media/cxd2099/cxd2099.c            |  165 +-
 drivers/staging/media/cxd2099/cxd2099.h            |    6 +-
 include/media/cec-notifier.h                       |   15 +
 include/media/davinci/dm644x_ccdc.h                |   12 -
 include/media/davinci/vpfe_capture.h               |   10 -
 91 files changed, 5162 insertions(+), 14173 deletions(-)
Merging reset-fixes/reset/fixes (4497a224f759 reset: hi6220: Set module license so that it can be loaded)
$ git merge reset-fixes/reset/fixes
Already up-to-date.
Merging drm-intel-fixes/for-linux-next-fixes (5fe220a160e5 Merge tag 'gvt-fixes-2017-07-26' of https://github.com/01org/gvt-linux into drm-intel-fixes)
$ git merge drm-intel-fixes/for-linux-next-fixes
Already up-to-date.
Merging drm-misc-fixes/for-linux-next-fixes (d630213f2a47 drm/bridge: tc358767: fix probe without attached output node)
$ git merge drm-misc-fixes/for-linux-next-fixes
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/bridge/tc358767.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging kbuild/for-next (5771a8c08880 Linux v4.13-rc1)
$ git merge kbuild/for-next
Already up-to-date.
Merging uuid/for-next (832e4c83abc5 uuid: remove uuid_be)
$ git merge uuid/for-next
Already up-to-date.
Merging dma-mapping/for-next (878ec36765fa ARM: NOMMU: Wire-up default DMA interface)
$ git merge dma-mapping/for-next
Already up-to-date.
Merging asm-generic/master (a351e9b9fc24 Linux 4.11)
$ git merge asm-generic/master
Already up-to-date.
Merging arc/for-next (6f8119230ed0 ARC: set boot print log level to PR_INFO)
$ git merge arc/for-next
Auto-merging arch/arc/mm/cache.c
Auto-merging arch/arc/kernel/setup.c
Merge made by the 'recursive' strategy.
 arch/arc/include/asm/irqflags-arcv2.h   |  3 ---
 arch/arc/include/asm/irqflags-compact.h |  2 --
 arch/arc/include/asm/spinlock.h         | 12 ++++++++++++
 arch/arc/kernel/entry-compact.S         | 22 +++++++++++-----------
 arch/arc/kernel/process.c               | 29 +++++++++++++++++++++++++++--
 arch/arc/kernel/setup.c                 |  6 +++---
 arch/arc/kernel/traps.c                 |  2 +-
 arch/arc/mm/cache.c                     |  2 +-
 arch/arc/mm/fault.c                     |  2 +-
 arch/arc/mm/tlb.c                       |  2 +-
 arch/arc/mm/tlbex.S                     |  9 +++++++++
 arch/arc/plat-eznps/Kconfig             | 15 +++++++++++++--
 arch/arc/plat-eznps/include/plat/ctop.h |  1 +
 arch/arc/plat-eznps/mtm.c               | 11 +++++++++--
 14 files changed, 89 insertions(+), 29 deletions(-)
Merging arm/for-next (640265076a84 Merge branches 'fixes' and 'misc' into for-next)
$ git merge arm/for-next
Merge made by the 'recursive' strategy.
 arch/arm/Kconfig               |  4 ++--
 arch/arm/include/asm/smp_scu.h |  1 +
 arch/arm/include/asm/suspend.h |  2 ++
 arch/arm/kernel/entry-common.S | 44 +++++++++++++++++++++++++++++-------------
 4 files changed, 36 insertions(+), 15 deletions(-)
Merging arm-perf/for-next/perf (5771a8c08880 Linux v4.13-rc1)
$ git merge arm-perf/for-next/perf
Already up-to-date.
Merging arm-soc/for-next (1d20d8a9fce8 ARM: pxa: select both FB and FB_W100 for eseries)
$ git merge arm-soc/for-next
Auto-merging arch/arm/Kconfig
Merge made by the 'recursive' strategy.
 arch/arm/Kconfig                                 |  2 +-
 arch/arm/boot/dts/armada-388-gp.dts              |  4 +-
 arch/arm/boot/dts/dm8168-evm.dts                 | 34 ++++++++++++++-
 arch/arm/boot/dts/dm816x.dtsi                    |  2 +-
 arch/arm/boot/dts/dra71-evm.dts                  |  4 +-
 arch/arm/boot/dts/exynos4.dtsi                   |  3 ++
 arch/arm/mach-davinci/board-da850-evm.c          |  4 +-
 arch/arm/mach-davinci/clock.c                    |  9 ++++
 arch/arm/mach-ep93xx/clock.c                     | 20 +++++++++
 arch/arm/mach-ixp4xx/include/mach/io.h           | 34 +++++++++++----
 arch/arm/mach-mmp/devices.c                      |  2 +-
 arch/arm/mach-mvebu/platsmp.c                    |  2 +-
 arch/arm/mach-omap1/board-ams-delta.c            | 12 +++++-
 arch/arm/mach-omap1/board-osk.c                  |  4 --
 arch/arm/mach-omap2/board-generic.c              |  2 +-
 arch/arm/mach-omap2/io.c                         |  2 +-
 arch/arm/mach-omap2/pm34xx.c                     |  1 -
 arch/arm/mach-omap2/prm3xxx.c                    |  7 +--
 arch/arm/mach-omap2/prm44xx.c                    | 55 ++++++++++++++++++++++++
 arch/arm/mach-prima2/common.c                    |  2 +-
 arch/arm/mach-pxa/Kconfig                        |  1 +
 arch/arm/mach-pxa/include/mach/mtd-xip.h         | 10 +++--
 arch/arm/mach-rpc/include/mach/hardware.h        |  4 +-
 arch/arm/mach-sa1100/clock.c                     | 25 +++++++++++
 arch/arm/mach-sa1100/include/mach/mtd-xip.h      |  4 +-
 arch/arm/mach-w90x900/clock.c                    | 29 +++++++++++++
 arch/arm64/boot/dts/renesas/salvator-common.dtsi |  2 +-
 arch/arm64/boot/dts/renesas/ulcb.dtsi            |  2 +-
 drivers/soc/zte/Kconfig                          |  1 +
 29 files changed, 239 insertions(+), 44 deletions(-)
Merging actions/for-next (253d192bc4aa Merge branch 'v4.14/dt' into next)
$ git merge actions/for-next
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/owl-s500.dtsi | 3 +++
 1 file changed, 3 insertions(+)
Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values)
$ git merge alpine/alpine/for-next
Merge made by the 'recursive' strategy.
Merging amlogic/for-next (f211bbd6b110 Merge branch 'v4.14/drivers' into tmp/aml-rebuild)
$ git merge amlogic/for-next
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/arm/amlogic.txt  |  29 ++++
 arch/arm/boot/dts/meson.dtsi                       |  22 +++
 arch/arm/boot/dts/meson8.dtsi                      |  15 ++
 arch/arm/boot/dts/meson8b.dtsi                     |  32 ++--
 arch/arm64/boot/dts/amlogic/meson-gx.dtsi          |  16 +-
 .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts     |   4 +-
 .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts   | 103 ++++++++++--
 drivers/soc/Kconfig                                |   1 +
 drivers/soc/Makefile                               |   1 +
 drivers/soc/amlogic/Kconfig                        |  12 ++
 drivers/soc/amlogic/Makefile                       |   1 +
 drivers/soc/amlogic/meson-gx-socinfo.c             | 177 +++++++++++++++++++++
 12 files changed, 374 insertions(+), 39 deletions(-)
 create mode 100644 drivers/soc/amlogic/Kconfig
 create mode 100644 drivers/soc/amlogic/Makefile
 create mode 100644 drivers/soc/amlogic/meson-gx-socinfo.c
Merging aspeed/for-next (4944e5dbb215 Merge branches 'dt-for-v4.12' and 'defconfig-for-v4.12' into for-next)
$ git merge aspeed/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging at91/at91-next (01c1fe77824e Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
$ git merge at91/at91-next
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/Makefile                  |   1 +
 arch/arm/boot/dts/at91-sama5d27_som1.dtsi   | 102 ++++++
 arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 537 ++++++++++++++++++++++++++++
 arch/arm/boot/dts/at91-sama5d2_xplained.dts |  23 +-
 arch/arm/boot/dts/sama5d2.dtsi              |  50 ++-
 drivers/memory/atmel-ebi.c                  |  10 +-
 drivers/mfd/atmel-smc.c                     |   2 +-
 drivers/soc/atmel/soc.c                     |   8 +
 drivers/soc/atmel/soc.h                     |   4 +
 9 files changed, 715 insertions(+), 22 deletions(-)
 create mode 100644 arch/arm/boot/dts/at91-sama5d27_som1.dtsi
 create mode 100644 arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
Merging bcm2835/for-next (389c81b7e7ae Merge branch anholt/bcm2835-defconfig-next into for-next)
$ git merge bcm2835/for-next
Merge made by the 'recursive' strategy.
 arch/arm/configs/bcm2835_defconfig | 7 +++++++
 1 file changed, 7 insertions(+)
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
$ git merge berlin/berlin/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
$ git merge cortex-m/for-next
Already up-to-date.
Merging imx-mxs/for-next (83bf680264c1 Merge branch 'zte/dt64' into for-next)
$ git merge imx-mxs/for-next
Removing arch/arm/boot/dts/imx6ul-isiot-common.dtsi
Auto-merging arch/arm/boot/dts/imx6ul-geam.dts
Removing arch/arm/boot/dts/imx6ul-geam-kit.dts
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/Makefile                         |   2 +-
 arch/arm/boot/dts/imx6dl-gw52xx.dts                |  58 +++++++
 arch/arm/boot/dts/imx6dl-gw53xx.dts                |  58 +++++++
 arch/arm/boot/dts/imx6dl-gw54xx.dts                |  58 +++++++
 arch/arm/boot/dts/imx6dl-riotboard.dts             |  45 +++++
 arch/arm/boot/dts/imx6q-b850v3.dts                 |   2 +-
 arch/arm/boot/dts/imx6q-gw52xx.dts                 |  58 +++++++
 arch/arm/boot/dts/imx6q-gw53xx.dts                 |  58 +++++++
 arch/arm/boot/dts/imx6q-gw54xx.dts                 |  58 +++++++
 arch/arm/boot/dts/imx6qdl-gw51xx.dtsi              |  54 ++++++
 arch/arm/boot/dts/imx6qdl-gw52xx.dtsi              |   1 -
 arch/arm/boot/dts/imx6qdl-gw53xx.dtsi              |   1 -
 arch/arm/boot/dts/imx6qdl-gw54xx.dtsi              |   1 -
 arch/arm/boot/dts/imx6qdl-gw553x.dtsi              |  54 ++++++
 arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi           |   1 -
 arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi          |  19 +++
 arch/arm/boot/dts/imx6qdl-sabrelite.dtsi           |  19 +++
 arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi            | 112 ++++++++++++-
 arch/arm/boot/dts/imx6qdl.dtsi                     |   1 +
 arch/arm/boot/dts/imx6sl.dtsi                      |   1 +
 arch/arm/boot/dts/imx6sx.dtsi                      |   1 +
 arch/arm/boot/dts/imx6ul-14x14-evk.dts             |  39 ++---
 arch/arm/boot/dts/imx6ul-geam-kit.dts              | 101 ------------
 .../boot/dts/{imx6ul-geam.dtsi => imx6ul-geam.dts} |  74 +++++++++
 arch/arm/boot/dts/imx6ul-isiot-common.dtsi         | 141 ----------------
 arch/arm/boot/dts/imx6ul-isiot-emmc.dts            |   1 -
 arch/arm/boot/dts/imx6ul-isiot-nand.dts            |   1 -
 arch/arm/boot/dts/imx6ul-isiot.dtsi                | 183 +++++++++++++++++++++
 arch/arm/boot/dts/imx6ul.dtsi                      |   1 +
 arch/arm/boot/dts/imx7d-sdb.dts                    |  78 +++++----
 arch/arm/boot/dts/imx7s.dtsi                       |   1 +
 arch/arm/boot/dts/zx296702-ad1.dts                 |   2 -
 arch/arm/configs/imx_v6_v7_defconfig               |  15 +-
 arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi     |  17 ++
 arch/arm64/boot/dts/zte/zx296718.dtsi              |   2 -
 35 files changed, 995 insertions(+), 323 deletions(-)
 delete mode 100644 arch/arm/boot/dts/imx6ul-geam-kit.dts
 rename arch/arm/boot/dts/{imx6ul-geam.dtsi => imx6ul-geam.dts} (87%)
 delete mode 100644 arch/arm/boot/dts/imx6ul-isiot-common.dtsi
Merging keystone/next (841dfc638309 Merge branch 'for_4.14/driver-soc' into next)
$ git merge keystone/next
Removing include/dt-bindings/genpd/k2g.h
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/soc/ti/sci-pm-domain.txt   |  5 +-
 arch/arm/boot/dts/keystone-k2g.dtsi                | 29 +++++++
 arch/arm/configs/keystone_defconfig                |  6 ++
 drivers/soc/ti/ti_sci_pm_domains.c                 |  2 +
 include/dt-bindings/genpd/k2g.h                    | 90 ----------------------
 5 files changed, 40 insertions(+), 92 deletions(-)
 delete mode 100644 include/dt-bindings/genpd/k2g.h
Merging mvebu/for-next (fd63b625307d Merge branch 'mvebu/dt64' into mvebu/for-next)
$ git merge mvebu/for-next
Merge made by the 'recursive' strategy.
 .../boot/dts/marvell/armada-3720-espressobin.dts   |  5 ++
 arch/arm64/boot/dts/marvell/armada-37xx.dtsi       | 11 ++-
 arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts  | 94 +++++++++++++++++++++-
 .../boot/dts/marvell/armada-cp110-master.dtsi      | 26 ++++--
 .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 26 ++++--
 arch/arm64/configs/defconfig                       |  1 +
 6 files changed, 144 insertions(+), 19 deletions(-)
Merging omap/for-next (191ae5a41246 Merge branch 'omap-for-v4.14/debug-ll' into for-next)
$ git merge omap/for-next
Auto-merging include/linux/platform_data/hsmmc-omap.h
Merge made by the 'recursive' strategy.
 arch/arm/Kconfig.debug                        |  44 ++++++++---
 arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts |   2 +-
 arch/arm/boot/dts/dra7-evm.dts                |  10 ++-
 arch/arm/boot/dts/dra7.dtsi                   |   5 ++
 arch/arm/boot/dts/dra71-evm.dts               |  14 ++++
 arch/arm/boot/dts/dra72-evm-common.dtsi       |   2 -
 arch/arm/boot/dts/dra72-evm-revc.dts          |  18 +++++
 arch/arm/boot/dts/dra72-evm.dts               |  18 +++++
 arch/arm/include/debug/omap2plus.S            | 108 --------------------------
 arch/arm/mach-omap2/pdata-quirks.c            |  31 ++++++++
 include/linux/platform_data/hsmmc-omap.h      |   3 +
 11 files changed, 132 insertions(+), 123 deletions(-)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
$ git merge omap-pending/for-next
Already up-to-date.
Merging reset/reset/next (e0be864f1424 ARC: reset: introduce HSDKv1 reset driver)
$ git merge reset/reset/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 55d592a3fc91] Merge remote-tracking branch 'reset/reset/next'
$ git diff -M --stat --summary HEAD^..
 MAINTAINERS                                    |   7 +
 drivers/reset/Kconfig                          |   6 +
 drivers/reset/Makefile                         |   1 +
 drivers/reset/core.c                           | 238 ++++++++++++++++++++++++-
 drivers/reset/reset-hsdk-v1.c                  | 137 ++++++++++++++
 drivers/reset/reset-zx2967.c                   |   2 +-
 include/dt-bindings/reset/snps,hsdk-v1-reset.h |  17 ++
 include/linux/reset.h                          |  68 +++++++
 8 files changed, 470 insertions(+), 6 deletions(-)
 create mode 100644 drivers/reset/reset-hsdk-v1.c
 create mode 100644 include/dt-bindings/reset/snps,hsdk-v1-reset.h
Merging qcom/for-next (c3c9fffc9384 soc: qcom: mdt_loader: Use request_firmware_into_buf())
$ git merge qcom/for-next
Auto-merging arch/arm64/configs/defconfig
Merge made by the 'recursive' strategy.
 arch/arm64/configs/defconfig  | 1 +
 drivers/soc/qcom/mdt_loader.c | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)
Merging realtek/for-next (5771a8c08880 Linux v4.13-rc1)
$ git merge realtek/for-next
Already up-to-date.
Merging renesas/next (6a116f0bf8c7 Merge branches 'fixes-for-v4.13', 'arm64-dt-for-v4.14', 'arm64-defconfig-for-v4.14', 'defconfig-for-v4.14', 'drivers-for-v4.14', 'dt-bindings-for-v4.14', 'dt-for-v4.14' and 'soc-for-v4.14' into next)
$ git merge renesas/next
Auto-merging arch/arm64/configs/defconfig
Auto-merging arch/arm/Kconfig.debug
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/arm/shmobile.txt |   4 +
 .../bindings/display/bridge/renesas,dw-hdmi.txt    |   1 +
 .../devicetree/bindings/display/renesas,du.txt     |  51 ++--
 .../bindings/power/renesas,rcar-sysc.txt           |   1 +
 .../devicetree/bindings/reset/renesas,rst.txt      |   1 +
 .../devicetree/bindings/sram/renesas,smp-sram.txt  |  27 ++
 arch/arm/Kconfig.debug                             |   9 +-
 arch/arm/boot/dts/r7s72100-genmai.dts              |  71 ++++-
 arch/arm/boot/dts/r7s72100-rskrza1.dts             |  61 ++++
 arch/arm/boot/dts/r7s72100.dtsi                    |  78 ++++++
 arch/arm/boot/dts/r8a7743-iwg20d-q7.dts            |  31 ++
 arch/arm/boot/dts/r8a7743-iwg20m.dtsi              |  26 ++
 arch/arm/boot/dts/r8a7743-sk-rzg1m.dts             |  25 +-
 arch/arm/boot/dts/r8a7743.dtsi                     | 179 +++++++++++-
 arch/arm/boot/dts/r8a7745.dtsi                     |  23 ++
 arch/arm/boot/dts/r8a7790.dtsi                     |  26 +-
 arch/arm/boot/dts/r8a7791-koelsch.dts              |   2 +-
 arch/arm/boot/dts/r8a7791.dtsi                     |  24 +-
 arch/arm/boot/dts/r8a7792.dtsi                     |  18 ++
 arch/arm/boot/dts/r8a7793.dtsi                     |  18 ++
 arch/arm/boot/dts/r8a7794.dtsi                     |  22 +-
 arch/arm/configs/multi_v7_defconfig                |   5 +-
 arch/arm/configs/shmobile_defconfig                |  17 +-
 arch/arm/mach-shmobile/Kconfig                     |   4 -
 arch/arm/mach-shmobile/pm-rcar-gen2.c              |  33 ++-
 arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c |   6 +-
 arch/arm/mach-shmobile/setup-rcar-gen2.c           |  21 +-
 arch/arm64/Kconfig.platforms                       |   6 +
 arch/arm64/boot/dts/renesas/Makefile               |   1 +
 arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts |   2 -
 .../boot/dts/renesas/r8a7795-es1-salvator-x.dts    |   2 -
 arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi       |   9 +-
 arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts     |  16 +-
 arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts |   2 -
 .../arm64/boot/dts/renesas/r8a7795-salvator-xs.dts |   8 +-
 arch/arm64/boot/dts/renesas/r8a7795.dtsi           | 311 +++++++++++++++++++++
 arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts     |  14 +-
 arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts |  31 +-
 arch/arm64/boot/dts/renesas/r8a7796.dtsi           | 301 +++++++++++++++++++-
 arch/arm64/boot/dts/renesas/r8a77995-draak.dts     |  46 +++
 arch/arm64/boot/dts/renesas/r8a77995.dtsi          | 150 ++++++++++
 arch/arm64/boot/dts/renesas/salvator-xs.dtsi       |  10 +
 arch/arm64/boot/dts/renesas/ulcb.dtsi              |  51 ++++
 arch/arm64/configs/defconfig                       |   4 +-
 drivers/soc/renesas/Kconfig                        |   7 +-
 drivers/soc/renesas/Makefile                       |   1 +
 drivers/soc/renesas/r8a77995-sysc.c                |  31 ++
 drivers/soc/renesas/rcar-rst.c                     |   1 +
 drivers/soc/renesas/rcar-sysc.c                    |   3 +
 drivers/soc/renesas/rcar-sysc.h                    |   1 +
 drivers/soc/renesas/renesas-soc.c                  |   8 +
 include/dt-bindings/power/r8a77995-sysc.h          |  23 ++
 52 files changed, 1741 insertions(+), 82 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/sram/renesas,smp-sram.txt
 create mode 100644 arch/arm64/boot/dts/renesas/r8a77995-draak.dts
 create mode 100644 arch/arm64/boot/dts/renesas/r8a77995.dtsi
 create mode 100644 drivers/soc/renesas/r8a77995-sysc.c
 create mode 100644 include/dt-bindings/power/r8a77995-sysc.h
Merging rockchip/for-next (29a737be1eab Merge branch 'v4.14-armsoc/dts64' into for-next)
$ git merge rockchip/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/gpu/arm,mali-midgard.txt   |   1 +
 .../bindings/soc/rockchip/power_domain.txt         |   3 +
 arch/arm/boot/dts/rk3036-kylin.dts                 |   2 -
 arch/arm/boot/dts/rk3036.dtsi                      |   3 +-
 arch/arm/boot/dts/rk3066a-bqcurie2.dts             |   2 -
 arch/arm/boot/dts/rk3066a-mk808.dts                |   2 -
 arch/arm/boot/dts/rk3066a-rayeager.dts             |   3 -
 arch/arm/boot/dts/rk3188-px3-evb.dts               |   2 -
 arch/arm/boot/dts/rk3188-radxarock.dts             |   1 -
 arch/arm/boot/dts/rk3229-evb.dts                   | 129 ++++++++++++++++++++-
 arch/arm/boot/dts/rk3229.dtsi                      |  89 ++++++++++++++
 arch/arm/boot/dts/rk322x.dtsi                      | 113 +++++++++++++++++-
 arch/arm/boot/dts/rk3288-evb.dtsi                  |  49 +++++++-
 arch/arm/boot/dts/rk3288-fennec.dts                |   6 +-
 arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi  |   1 -
 arch/arm/boot/dts/rk3288-firefly-reload.dts        |   2 -
 arch/arm/boot/dts/rk3288-firefly.dtsi              |   3 -
 arch/arm/boot/dts/rk3288-miqi.dts                  |   2 -
 arch/arm/boot/dts/rk3288-phycore-rdk.dts           |   1 -
 arch/arm/boot/dts/rk3288-phycore-som.dtsi          |   1 -
 arch/arm/boot/dts/rk3288-popmetal.dts              |   2 -
 arch/arm/boot/dts/rk3288-r89.dts                   |   1 -
 arch/arm/boot/dts/rk3288-rock2-som.dtsi            |   1 -
 arch/arm/boot/dts/rk3288-rock2-square.dts          |   2 -
 arch/arm/boot/dts/rk3288-tinker.dts                |   6 +-
 arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi         |   1 -
 arch/arm/boot/dts/rk3288-veyron.dtsi               |   2 -
 arch/arm/boot/dts/rv1108-evb.dts                   |   4 +
 arch/arm/boot/dts/rv1108.dtsi                      |  20 ++--
 arch/arm/mach-rockchip/platsmp.c                   |   2 +-
 arch/arm64/boot/dts/rockchip/rk3328-evb.dts        |  24 ++++
 arch/arm64/boot/dts/rockchip/rk3328.dtsi           |  81 +++++++++++++
 arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi       |   1 -
 arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts    |   1 -
 .../boot/dts/rockchip/rk3368-orion-r68-meta.dts    |   2 -
 arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts    |   3 -
 arch/arm64/boot/dts/rockchip/rk3368-r88.dts        |   2 -
 arch/arm64/boot/dts/rockchip/rk3399-evb.dts        |   2 +-
 arch/arm64/boot/dts/rockchip/rk3399-firefly.dts    |  15 ++-
 arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts  |  44 +++++++
 arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi       | 119 +++++++++++++------
 arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi   |  33 ++++++
 arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi       |  33 ++++++
 arch/arm64/boot/dts/rockchip/rk3399.dtsi           |  41 +++++--
 drivers/soc/rockchip/grf.c                         |  14 +++
 drivers/soc/rockchip/pm_domains.c                  |  32 +++++
 include/dt-bindings/power/rk3366-power.h           |  24 ++++
 47 files changed, 817 insertions(+), 110 deletions(-)
 create mode 100644 arch/arm/boot/dts/rk3229.dtsi
 create mode 100644 include/dt-bindings/power/rk3366-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 (2ea659a9ef48 Linux 4.12-rc1)
$ git merge samsung/for-next
Already up-to-date.
Merging samsung-krzk/for-next (4157348c49de Merge branch 'next/dt' into for-next)
$ git merge samsung-krzk/for-next
Auto-merging arch/arm/configs/multi_v7_defconfig
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/exynos3250-artik5-eval.dts       |  1 -
 arch/arm/boot/dts/exynos3250-artik5.dtsi           |  1 -
 arch/arm/boot/dts/exynos3250-monk.dts              |  1 -
 arch/arm/boot/dts/exynos3250-rinato.dts            | 22 ------
 arch/arm/boot/dts/exynos4210-trats.dts             | 21 ------
 arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi    |  1 -
 arch/arm/boot/dts/exynos4412-odroid-common.dtsi    |  1 -
 arch/arm/boot/dts/exynos4412-origen.dts            |  1 -
 arch/arm/boot/dts/exynos4412-trats2.dts            | 22 ------
 arch/arm/boot/dts/exynos5250-arndale.dts           |  2 -
 arch/arm/boot/dts/exynos5250-smdk5250.dts          |  2 -
 arch/arm/boot/dts/exynos5250-snow-common.dtsi      |  3 -
 arch/arm/boot/dts/exynos5250-spring.dts            |  2 -
 arch/arm/boot/dts/exynos5260-xyref5260.dts         |  2 -
 arch/arm/boot/dts/exynos5410-smdk5410.dts          |  2 -
 arch/arm/boot/dts/exynos5420-peach-pit.dts         |  3 -
 arch/arm/boot/dts/exynos5440.dtsi                  |  2 +
 arch/arm/boot/dts/exynos5800-peach-pi.dts          |  3 -
 arch/arm/configs/exynos_defconfig                  | 79 ++++++++++++++++++++--
 arch/arm/configs/ezx_defconfig                     |  1 -
 arch/arm/configs/ixp4xx_defconfig                  |  4 --
 arch/arm/configs/multi_v7_defconfig                |  7 --
 arch/arm/configs/qcom_defconfig                    |  1 -
 arch/arm/configs/vexpress_defconfig                |  1 -
 arch/arm/mach-s3c24xx/Kconfig                      |  2 +-
 arch/arm/mach-s3c24xx/common.c                     |  2 +-
 arch/arm/mach-s3c24xx/include/mach/regs-clock.h    |  4 +-
 arch/arm/mach-s3c24xx/mach-smdk2443.c              |  8 ---
 arch/arm/mach-s3c24xx/sleep.S                      | 11 +--
 arch/arm/plat-samsung/include/plat/map-s3c.h       |  2 +-
 .../boot/dts/exynos/exynos5433-tm2-common.dtsi     | 19 +-----
 arch/arm64/boot/dts/exynos/exynos5433.dtsi         |  4 +-
 arch/arm64/boot/dts/exynos/exynos7-espresso.dts    |  2 -
 drivers/soc/samsung/pm_domains.c                   |  2 +-
 34 files changed, 91 insertions(+), 150 deletions(-)
Merging sunxi/sunxi/for-next (4d9e6924be57 Merge branches 'sunxi/fixes-for-4.13', 'sunxi/dt-for-4.14', 'sunxi/dt64-for-4.14', 'sunxi/config-for-4.14', 'sunxi/clk-fixes-for-4.13' and 'sunxi/clk-for-4.14' into sunxi/for-next)
$ git merge sunxi/sunxi/for-next
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/Makefile                         |   1 +
 arch/arm/boot/dts/sun6i-a31.dtsi                   |   6 +-
 arch/arm/boot/dts/sun7i-a20-cubietruck.dts         |   4 +
 arch/arm/boot/dts/sun8i-a23-a33.dtsi               |   6 +-
 arch/arm/boot/dts/sun8i-a83t.dtsi                  |  25 +-
 arch/arm/boot/dts/sun8i-h3-beelink-x2.dts          |  31 +-
 arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts       | 321 +++++++++++++++++++++
 arch/arm/boot/dts/sunxi-h3-h5.dtsi                 |   2 +-
 arch/arm/configs/sunxi_defconfig                   |  15 +-
 arch/arm64/boot/dts/allwinner/axp803.dtsi          | 150 ++++++++++
 .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts |   1 +
 .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 114 ++++++++
 .../dts/allwinner/sun50i-a64-sopine-baseboard.dts  |  24 ++
 .../boot/dts/allwinner/sun50i-a64-sopine.dtsi      |  86 ++++++
 arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi      |  11 +-
 drivers/clk/sunxi-ng/ccu-sun5i.c                   |   2 +-
 drivers/clk/sunxi-ng/ccu-sun8i-r.h                 |   2 +-
 17 files changed, 772 insertions(+), 29 deletions(-)
 create mode 100644 arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
 create mode 100644 arch/arm64/boot/dts/allwinner/axp803.dtsi
Merging tegra/for-next (07bb9460b188 Merge branch for-4.13/arm64/dt into for-next)
$ git merge tegra/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging arm64/for-next/core (425e1ed73e65 arm64: fix endianness annotation for 'struct jit_ctx' and friends)
$ git merge arm64/for-next/core
Already up-to-date.
Merging clk/clk-next (1667393126d7 clk: Convert to using %pOF instead of full_name)
$ git merge clk/clk-next
Resolved 'MAINTAINERS' using previous resolution.
Auto-merging drivers/clk/sunxi-ng/ccu-sun5i.c
Auto-merging MAINTAINERS
CONFLICT (content): Merge conflict in MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master ae7ddd0bbfb3] Merge remote-tracking branch 'clk/clk-next'
$ git diff -M --stat --summary HEAD^..
 .../devicetree/bindings/clock/idt,versaclock5.txt  |  30 +-
 .../devicetree/bindings/clock/snps,pll-clock.txt   |  28 ++
 MAINTAINERS                                        |   6 +
 drivers/clk/Kconfig                                |   6 +-
 drivers/clk/axs10x/Makefile                        |   1 +
 drivers/clk/axs10x/pll_clock.c                     | 346 +++++++++++++++++++++
 drivers/clk/berlin/bg2.c                           |   3 +-
 drivers/clk/berlin/bg2q.c                          |   7 +-
 drivers/clk/clk-asm9260.c                          |   4 +-
 drivers/clk/clk-conf.c                             |  16 +-
 drivers/clk/clk-gemini.c                           |  14 +
 drivers/clk/clk-moxart.c                           |  16 +-
 drivers/clk/clk-qoriq.c                            |  26 +-
 drivers/clk/clk-stm32f4.c                          |   4 +-
 drivers/clk/clk-versaclock5.c                      | 172 +++++++++-
 drivers/clk/clk-xgene.c                            |  15 +-
 drivers/clk/clk.c                                  |   4 +-
 drivers/clk/clkdev.c                               |   4 +-
 drivers/clk/mediatek/clk-cpumux.c                  |   6 +-
 drivers/clk/mediatek/clk-mtk.c                     |   2 +-
 drivers/clk/mediatek/reset.c                       |   2 +-
 drivers/clk/mmp/clk.c                              |   2 +-
 drivers/clk/qcom/clk-smd-rpm.c                     |   2 -
 drivers/clk/renesas/clk-mstp.c                     |   2 +-
 drivers/clk/renesas/clk-rcar-gen2.c                |   3 +-
 drivers/clk/sunxi-ng/ccu-sun5i.c                   |   3 +-
 drivers/clk/sunxi-ng/ccu-sun6i-a31.c               |   3 +-
 drivers/clk/sunxi-ng/ccu-sun8i-a23.c               |   3 +-
 drivers/clk/sunxi-ng/ccu-sun8i-a33.c               |   3 +-
 drivers/clk/sunxi-ng/ccu-sun8i-h3.c                |   3 +-
 drivers/clk/sunxi-ng/ccu-sun8i-r.c                 |   3 +-
 drivers/clk/sunxi-ng/ccu-sun8i-v3s.c               |   3 +-
 drivers/clk/sunxi/clk-sunxi.c                      |  17 +-
 drivers/clk/tegra/clk-emc.c                        |  12 +-
 drivers/clk/ti/clockdomain.c                       |   4 +-
 drivers/clk/x86/clk-pmc-atom.c                     |   7 +
 36 files changed, 670 insertions(+), 112 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/clock/snps,pll-clock.txt
 create mode 100644 drivers/clk/axs10x/pll_clock.c
Merging c6x/for-linux-next (eab89e215ae4 c6x: defconfig: Cleanup from old Kconfig options)
$ git merge c6x/for-linux-next
Merge made by the 'recursive' strategy.
 arch/c6x/configs/dsk6455_defconfig  | 2 --
 arch/c6x/configs/evmc6457_defconfig | 2 --
 arch/c6x/configs/evmc6472_defconfig | 2 --
 arch/c6x/configs/evmc6474_defconfig | 2 --
 arch/c6x/configs/evmc6678_defconfig | 2 --
 5 files changed, 10 deletions(-)
Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
$ git merge cris/for-next
Already up-to-date.
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
$ git merge h8300/h8300-next
Merge made by the 'recursive' strategy.
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
$ git merge hexagon/linux-next
Already up-to-date.
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
$ git merge ia64/next
Already up-to-date.
Merging m68k/for-next (204a2be30a7a m68k: Remove ptrace_signal_deliver)
$ git merge m68k/for-next
Already up-to-date.
Merging m68knommu/for-next (896329b870dd m68k: allow NULL clock for clk_get_rate)
$ git merge m68knommu/for-next
Merge made by the 'recursive' strategy.
 arch/m68k/coldfire/clk.c | 3 +++
 1 file changed, 3 insertions(+)
Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment)
$ git merge metag/for-next
Already up-to-date.
Merging microblaze/next (14ef905bb2ee microblaze: Fix MSR flags when returning from exception)
$ git merge microblaze/next
Already up-to-date.
Merging mips/mips-for-linux-next (e36f14f04d11 Merge branch '4.13-fixes' into mips-for-linux-next)
$ git merge mips/mips-for-linux-next
Merge made by the 'recursive' strategy.
 arch/mips/ath79/clock.c                         |  9 ++++-----
 arch/mips/configs/gpr_defconfig                 |  4 ----
 arch/mips/configs/lemote2f_defconfig            |  1 -
 arch/mips/configs/mtx1_defconfig                |  4 ----
 arch/mips/configs/nlm_xlp_defconfig             |  1 -
 arch/mips/configs/nlm_xlr_defconfig             |  4 ----
 arch/mips/include/asm/mach-ralink/ralink_regs.h |  2 ++
 arch/mips/kernel/mips-r2-to-r6-emul.c           |  8 ++++----
 arch/mips/pci/pci-legacy.c                      |  2 +-
 arch/mips/pci/pci-rt3883.c                      | 11 +++++------
 arch/mips/ralink/mt7620.c                       |  1 +
 11 files changed, 17 insertions(+), 30 deletions(-)
Merging nios2/for-next (e118c3fec9c0 nios2: remove custom early console implementation)
$ git merge nios2/for-next
Already up-to-date.
Merging openrisc/for-next (9d15eb228b10 openrisc: defconfig: Cleanup from old Kconfig options)
$ git merge openrisc/for-next
Merge made by the 'recursive' strategy.
Merging parisc-hd/for-next (6f7da290413b Linux 4.12)
$ git merge parisc-hd/for-next
Already up-to-date.
Merging powerpc/next (f74c89bd80fb powerpc/perf: Add thread IMC PMU support)
$ git merge powerpc/next
Auto-merging arch/powerpc/platforms/pseries/reconfig.c
Merge made by the 'recursive' strategy.
 arch/powerpc/include/asm/Kbuild                |    1 +
 arch/powerpc/include/asm/imc-pmu.h             |  128 +++
 arch/powerpc/include/asm/opal-api.h            |   12 +-
 arch/powerpc/include/asm/opal.h                |    5 +
 arch/powerpc/mm/init_64.c                      |    4 +-
 arch/powerpc/perf/Makefile                     |    1 +
 arch/powerpc/perf/imc-pmu.c                    | 1306 ++++++++++++++++++++++++
 arch/powerpc/platforms/powernv/Makefile        |    1 +
 arch/powerpc/platforms/powernv/opal-imc.c      |  226 ++++
 arch/powerpc/platforms/powernv/opal-prd.c      |   13 +-
 arch/powerpc/platforms/powernv/opal-wrappers.S |    3 +
 arch/powerpc/platforms/powernv/opal.c          |   14 +
 arch/powerpc/platforms/powernv/smp.c           |    3 +-
 arch/powerpc/platforms/pseries/reconfig.c      |   15 +-
 arch/powerpc/sysdev/ipic.c                     |    1 +
 include/linux/cpuhotplug.h                     |    3 +
 16 files changed, 1711 insertions(+), 25 deletions(-)
 create mode 100644 arch/powerpc/include/asm/imc-pmu.h
 create mode 100644 arch/powerpc/perf/imc-pmu.c
 create mode 100644 arch/powerpc/platforms/powernv/opal-imc.c
Merging fsl/next (61baf1555512 powerpc/64e: Don't place the stack beyond TASK_SIZE)
$ 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 (dd783b4c7bf6 Merge tag 'vfio-ccw-20170724' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/vfio-ccw into features)
$ git merge s390/features
Merge made by the 'recursive' strategy.
 arch/s390/Kconfig                    |  18 ++++
 arch/s390/Makefile                   |   6 +-
 arch/s390/include/asm/elf.h          |   2 +-
 arch/s390/include/asm/ipl.h          |   2 +-
 arch/s390/include/asm/lowcore.h      |  48 ++++-----
 arch/s390/include/asm/mmu_context.h  |   6 +-
 arch/s390/include/asm/page-states.h  |   1 +
 arch/s390/include/asm/page.h         |  13 ++-
 arch/s390/include/asm/pgalloc.h      |  18 ++--
 arch/s390/include/asm/pgtable.h      | 195 +++++++++++++++++++++--------------
 arch/s390/include/asm/qdio.h         |   2 +-
 arch/s390/include/asm/setup.h        |  11 +-
 arch/s390/include/asm/spinlock.h     |   9 +-
 arch/s390/include/asm/timex.h        |  38 ++++++-
 arch/s390/include/asm/tlb.h          |   6 +-
 arch/s390/include/asm/tlbflush.h     |   7 +-
 arch/s390/kernel/asm-offsets.c       |   1 +
 arch/s390/kernel/debug.c             |   9 +-
 arch/s390/kernel/dumpstack.c         |   2 +-
 arch/s390/kernel/early.c             |  15 ++-
 arch/s390/kernel/head.S              |   3 +-
 arch/s390/kernel/head64.S            |   4 +-
 arch/s390/kernel/irq.c               |   3 +-
 arch/s390/kernel/relocate_kernel.S   |   5 +-
 arch/s390/kernel/setup.c             |  13 ++-
 arch/s390/kernel/suspend.c           |  24 ++++-
 arch/s390/kernel/time.c              |  65 ++++++++----
 arch/s390/kernel/vdso.c              |   2 +
 arch/s390/kernel/vdso32/vdso32.lds.S |   4 +-
 arch/s390/kernel/vdso64/vdso64.lds.S |   4 +-
 arch/s390/kvm/diag.c                 |   8 +-
 arch/s390/kvm/gaccess.c              |  35 +++----
 arch/s390/kvm/priv.c                 |   8 +-
 arch/s390/kvm/vsie.c                 |   2 +-
 arch/s390/lib/delay.c                |   2 +-
 arch/s390/lib/spinlock.c             |  87 +++++++++-------
 arch/s390/mm/fault.c                 |  10 +-
 arch/s390/mm/gmap.c                  | 124 +++++++++++-----------
 arch/s390/mm/init.c                  |   7 +-
 arch/s390/mm/page-states.c           | 192 +++++++++++++++++++++++++++++++---
 arch/s390/mm/pageattr.c              |   5 +-
 arch/s390/mm/pgalloc.c               |  12 ++-
 arch/s390/mm/pgtable.c               | 154 +++++++++++++++++++++------
 arch/s390/mm/vmem.c                  |  47 +++------
 arch/s390/tools/gen_facilities.c     |   3 +
 drivers/s390/block/dasd_devmap.c     |   2 +-
 drivers/s390/char/raw3270.c          |   2 +-
 drivers/s390/char/sclp_cmd.c         |   1 +
 drivers/s390/char/sclp_early.c       |   6 +-
 drivers/s390/char/sclp_ocf.c         |   2 +-
 drivers/s390/char/tape_core.c        |   2 +-
 drivers/s390/cio/device.c            |   4 +-
 drivers/s390/cio/vfio_ccw_cp.c       |   2 +-
 drivers/s390/crypto/zcrypt_card.c    |   2 +-
 drivers/s390/crypto/zcrypt_queue.c   |   2 +-
 drivers/s390/net/qeth_l3_sys.c       |   8 +-
 56 files changed, 847 insertions(+), 418 deletions(-)
Merging sparc-next/master (cb8c65ccff7f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
$ git merge sparc-next/master
Already up-to-date.
Merging sh/for-next (6e2fbfdd585f sh: fix futex FUTEX_OP_SET op on userspace addresses)
$ git merge sh/for-next
Merge made by the 'recursive' strategy.
 arch/sh/include/asm/futex.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
Merging tile/master (637f23abca87 tile: array underflow in setup_maxnodemem())
$ git merge tile/master
Merge made by the 'recursive' strategy.
 arch/tile/configs/tilegx_defconfig  | 1 -
 arch/tile/configs/tilepro_defconfig | 2 --
 arch/tile/kernel/setup.c            | 2 +-
 3 files changed, 1 insertion(+), 4 deletions(-)
Merging uml/linux-next (61e8d462457f um: Correctly check for PTRACE_GETRESET/SETREGSET)
$ git merge uml/linux-next
Already up-to-date.
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
$ git merge unicore32/unicore32
Resolved 'arch/unicore32/include/asm/Kbuild' using previous resolution.
Auto-merging arch/unicore32/include/asm/Kbuild
CONFLICT (content): Merge conflict in arch/unicore32/include/asm/Kbuild
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master f1b08ffad248] Merge remote-tracking branch 'unicore32/unicore32'
$ git diff -M --stat --summary HEAD^..
 arch/unicore32/Kconfig                          |  14 +
 arch/unicore32/include/asm/Kbuild               |   1 -
 arch/unicore32/include/asm/signal.h             |  21 +
 arch/unicore32/include/asm/syscalls.h           |  25 +
 arch/unicore32/include/uapi/asm/sigcontext.h    |  14 +
 arch/unicore32/include/uapi/asm/stat-oldabi.h   |  71 +++
 arch/unicore32/include/uapi/asm/stat.h          |  19 +
 arch/unicore32/include/uapi/asm/unistd-oldabi.h | 770 ++++++++++++++++++++++++
 arch/unicore32/include/uapi/asm/unistd.h        |   8 +
 arch/unicore32/kernel/entry.S                   |  17 +
 arch/unicore32/kernel/signal.c                  |  41 ++
 11 files changed, 1000 insertions(+), 1 deletion(-)
 create mode 100644 arch/unicore32/include/asm/signal.h
 create mode 100644 arch/unicore32/include/asm/syscalls.h
 create mode 100644 arch/unicore32/include/uapi/asm/stat-oldabi.h
 create mode 100644 arch/unicore32/include/uapi/asm/stat.h
 create mode 100644 arch/unicore32/include/uapi/asm/unistd-oldabi.h
Merging xtensa/xtensa-for-next (51b5e9756efd Merge branch 'xtensa-fixes' into xtensa-for-next)
$ git merge xtensa/xtensa-for-next
Removing arch/xtensa/include/asm/param.h
Removing arch/xtensa/include/asm/device.h
Merge made by the 'recursive' strategy.
 arch/xtensa/include/asm/Kbuild   |  2 ++
 arch/xtensa/include/asm/device.h | 15 ---------------
 arch/xtensa/include/asm/param.h  | 18 ------------------
 3 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 arch/xtensa/include/asm/device.h
 delete mode 100644 arch/xtensa/include/asm/param.h
Merging fscrypt/master (c250b7dd8e73 fscrypt: make ->dummy_context() return bool)
$ git merge fscrypt/master
Already up-to-date.
Merging befs/for-next (5771a8c08880 Linux v4.13-rc1)
$ git merge befs/for-next
Already up-to-date.
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
$ git merge btrfs/next
Already up-to-date.
Merging btrfs-kdave/for-next (3497efbab8dc Merge branch 'for-next-next-v4.14-20170728' into for-next-20170728)
$ git merge btrfs-kdave/for-next
Resolved 'fs/btrfs/extent_io.c' using previous resolution.
Resolved 'fs/btrfs/scrub.c' using previous resolution.
Auto-merging fs/btrfs/volumes.c
Auto-merging fs/btrfs/super.c
Auto-merging fs/btrfs/scrub.c
CONFLICT (content): Merge conflict in fs/btrfs/scrub.c
Auto-merging fs/btrfs/inode.c
Auto-merging fs/btrfs/file.c
Auto-merging fs/btrfs/extent_io.h
Auto-merging fs/btrfs/extent_io.c
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
Auto-merging fs/btrfs/disk-io.h
Auto-merging fs/btrfs/disk-io.c
Auto-merging fs/btrfs/ctree.h
Auto-merging fs/btrfs/compression.h
Auto-merging fs/btrfs/compression.c
Auto-merging fs/btrfs/check-integrity.c
Auto-merging fs/btrfs/btrfs_inode.h
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 24bf46739629] Merge remote-tracking branch 'btrfs-kdave/for-next'
$ git diff -M --stat --summary HEAD^..
 fs/btrfs/async-thread.c                |    6 +-
 fs/btrfs/async-thread.h                |    6 +-
 fs/btrfs/backref.c                     | 1074 ++++++++++++++------------------
 fs/btrfs/backref.h                     |   16 +-
 fs/btrfs/btrfs_inode.h                 |   13 +-
 fs/btrfs/check-integrity.c             |    6 +-
 fs/btrfs/compression.c                 |   35 +-
 fs/btrfs/compression.h                 |    2 +
 fs/btrfs/ctree.c                       |   14 +-
 fs/btrfs/ctree.h                       |  164 +++--
 fs/btrfs/delayed-inode.c               |    1 +
 fs/btrfs/dev-replace.c                 |   74 ++-
 fs/btrfs/disk-io.c                     |  229 +++----
 fs/btrfs/disk-io.h                     |   10 +-
 fs/btrfs/extent-tree.c                 |   96 ++-
 fs/btrfs/extent_io.c                   |   72 +--
 fs/btrfs/extent_io.h                   |   19 +-
 fs/btrfs/file.c                        |   19 +-
 fs/btrfs/free-space-cache.c            |    2 +-
 fs/btrfs/inode.c                       |  196 ++++--
 fs/btrfs/ioctl.c                       |  110 ++--
 fs/btrfs/print-tree.c                  |   12 +-
 fs/btrfs/print-tree.h                  |    4 +-
 fs/btrfs/props.c                       |   10 +-
 fs/btrfs/qgroup.c                      |    4 +-
 fs/btrfs/relocation.c                  |    2 -
 fs/btrfs/root-tree.c                   |    2 +-
 fs/btrfs/scrub.c                       |    5 +-
 fs/btrfs/send.c                        |    2 +-
 fs/btrfs/struct-funcs.c                |    9 +-
 fs/btrfs/super.c                       |   41 +-
 fs/btrfs/tests/btrfs-tests.c           |    1 -
 fs/btrfs/tests/free-space-tree-tests.c |    2 +-
 fs/btrfs/volumes.c                     |  242 +++----
 fs/btrfs/volumes.h                     |    7 +-
 include/trace/events/btrfs.h           |  313 ++++++----
 36 files changed, 1419 insertions(+), 1401 deletions(-)
Merging ceph/master (7799311dc11c libceph: make RECOVERY_DELETES feature create a new interval)
$ git merge ceph/master
Merge made by the 'recursive' strategy.
 include/linux/ceph/osd_client.h |  1 +
 include/linux/ceph/osdmap.h     |  2 ++
 include/linux/ceph/rados.h      |  4 +++
 include/linux/crush/crush.h     |  2 +-
 net/ceph/crush/mapper.c         |  2 +-
 net/ceph/messenger.c            |  6 ++---
 net/ceph/osd_client.c           | 14 +++++++---
 net/ceph/osdmap.c               | 60 ++++++++++++++++++++---------------------
 8 files changed, 53 insertions(+), 38 deletions(-)
Merging cifs/for-next (235b84fc862a Merge branch 'i2c/for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
$ git merge cifs/for-next
Already up-to-date.
Merging configfs/for-next (19e72d3abb63 configfs: Introduce config_item_get_unless_zero())
$ git merge configfs/for-next
Already up-to-date.
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
$ git merge ecryptfs/next
Auto-merging fs/ecryptfs/main.c
Auto-merging fs/ecryptfs/ecryptfs_kernel.h
Merge made by the 'recursive' strategy.
 fs/ecryptfs/crypto.c          | 15 ---------------
 fs/ecryptfs/ecryptfs_kernel.h |  9 ++++++++-
 fs/ecryptfs/keystore.c        |  2 +-
 fs/ecryptfs/main.c            |  2 +-
 fs/ecryptfs/miscdev.c         |  2 +-
 5 files changed, 11 insertions(+), 19 deletions(-)
Merging ext3/for_next (84969465ddc4 hfsplus: Don't clear SGID when inheriting ACLs)
$ git merge ext3/for_next
Already up-to-date.
Merging ext4/dev (ff95015648df ext4: fix spelling mistake: "prellocated" -> "preallocated")
$ git merge ext4/dev
Already up-to-date.
Merging f2fs/dev (1766871af8a0 f2fs: support project quota)
$ git merge f2fs/dev
Merge made by the 'recursive' strategy.
 Documentation/filesystems/f2fs.txt |   1 +
 fs/f2fs/acl.c                      |   5 +-
 fs/f2fs/data.c                     |  19 +++--
 fs/f2fs/f2fs.h                     | 138 ++++++++++++++++++++++++++++++++-----
 fs/f2fs/file.c                     |  61 +++++++++++-----
 fs/f2fs/gc.c                       |  10 ++-
 fs/f2fs/inline.c                   | 132 ++++++++++++++++++-----------------
 fs/f2fs/inode.c                    |  58 ++++++++++++----
 fs/f2fs/namei.c                    |  40 +++++++++++
 fs/f2fs/node.c                     |  47 ++++++++-----
 fs/f2fs/recovery.c                 |   7 +-
 fs/f2fs/segment.c                  |  16 ++++-
 fs/f2fs/super.c                    |  27 +++++++-
 fs/f2fs/xattr.c                    |   2 +-
 include/linux/f2fs_fs.h            |  39 ++++-------
 15 files changed, 428 insertions(+), 174 deletions(-)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
$ git merge freevxfs/for-next
Already up-to-date.
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
$ git merge fscache/fscache
Already up-to-date.
Merging fuse/for-next (68227c03cba8 fuse: initialize the flock flag in fuse_file on allocation)
$ git merge fuse/for-next
Merge made by the 'recursive' strategy.
 fs/fuse/file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging jfs/jfs-next (f070e5ac9bc7 jfs: preserve i_mode if __jfs_set_acl() fails)
$ git merge jfs/jfs-next
Already up-to-date.
Merging nfs/linux-next (6f7da290413b Linux 4.12)
$ git merge nfs/linux-next
Already up-to-date.
Merging nfsd/nfsd-next (b20dae70bfa5 svcrdma: fix an incorrect check on -E2BIG and -EINVAL)
$ git merge nfsd/nfsd-next
Already up-to-date.
Merging orangefs/for-next (2f713b5c7d2a orangefs: count directory pieces correctly)
$ git merge orangefs/for-next
Already up-to-date.
Merging overlayfs/overlayfs-next (0e082555cec9 ovl: check for bad and whiteout index on lookup)
$ git merge overlayfs/overlayfs-next
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 (a6664433d383 ubifs: Set double hash cookie also for RENAME_EXCHANGE)
$ git merge ubifs/linux-next
Already up-to-date.
Merging xfs/for-next (cd87d8679201 xfs: don't crash on unexpected holes in dir/attr btrees)
$ git merge xfs/for-next
Already up-to-date.
Merging file-locks/locks-next (3953704fde7e locks: restore a warn for leaked locks on close)
$ git merge file-locks/locks-next
Auto-merging include/linux/fs.h
Auto-merging fs/fuse/file.c
Merge made by the 'recursive' strategy.
 drivers/staging/lustre/lustre/ldlm/ldlm_flock.c |   2 +-
 fs/9p/vfs_file.c                                |   2 +-
 fs/ceph/locks.c                                 |   2 +-
 fs/cifs/cifssmb.c                               |   2 +-
 fs/dlm/plock.c                                  |   2 +-
 fs/fuse/file.c                                  |   6 +-
 fs/locks.c                                      | 130 ++++++++++++++++--------
 include/linux/fs.h                              |   1 -
 8 files changed, 93 insertions(+), 54 deletions(-)
Merging wberr/wberr-next (89d62b5aa1c5 gfs2: convert to errseq_t based writeback error reporting for fsync)
$ git merge wberr/wberr-next
Auto-merging include/linux/fs.h
Merge made by the 'recursive' strategy.
 Documentation/errseq.rst | 149 +++++++++++++++++++++++++++++++++++++++++++++++
 fs/gfs2/file.c           |   6 +-
 fs/sync.c                |   4 +-
 include/linux/errseq.h   |  14 ++---
 include/linux/fs.h       |   9 ++-
 lib/errseq.c             |   6 +-
 mm/filemap.c             |  72 ++++++++++++++++++++---
 7 files changed, 233 insertions(+), 27 deletions(-)
 create mode 100644 Documentation/errseq.rst
Merging vfs/for-next (66bf97967726 annotate RWF_... flags)
$ git merge vfs/for-next
Auto-merging include/uapi/linux/fs.h
Auto-merging include/linux/fs.h
Auto-merging fs/read_write.c
Merge made by the 'recursive' strategy.
 arch/s390/include/asm/compat.h |  5 +++--
 fs/nfsd/vfs.c                  |  2 +-
 fs/read_write.c                | 50 +++++++++++++++++++++---------------------
 include/linux/compat.h         | 18 ++++++++++++---
 include/linux/fs.h             | 12 +++++-----
 include/linux/syscalls.h       | 13 ++++++-----
 include/uapi/linux/aio_abi.h   | 21 +++++++++---------
 include/uapi/linux/fs.h        | 28 ++++++++++++++++-------
 8 files changed, 89 insertions(+), 60 deletions(-)
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
$ git merge vfs-jk/vfs
Already up-to-date.
Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
$ git merge vfs-miklos/next
Already up-to-date.
Merging printk/for-next (5a814231ae3d printk/console: Enhance the check for consoles using init memory)
$ git merge printk/for-next
Merge made by the 'recursive' strategy.
 kernel/printk/printk.c | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)
Merging pci/next (af3c8d98508d Merge tag 'drm-for-v4.13' of git://people.freedesktop.org/~airlied/linux)
$ git merge pci/next
Already up-to-date.
Merging pstore/for-next/pstore (520eccdfe187 Linux 4.13-rc2)
$ git merge pstore/for-next/pstore
Already up-to-date.
Merging hid/for-next (57bbec7de54d Merge branch 'for-4.14/wacom' into for-next)
$ git merge hid/for-next
Merge made by the 'recursive' strategy.
 drivers/hid/hid-asus.c        | 144 +++++++++++++++++++++++++++++++-----------
 drivers/hid/hid-core.c        |   1 +
 drivers/hid/hid-ids.h         |   1 +
 drivers/hid/i2c-hid/i2c-hid.c |   3 +-
 drivers/hid/uhid.c            |   3 +-
 drivers/hid/usbhid/hid-core.c |   3 +-
 drivers/hid/wacom_sys.c       |  63 ++++++++----------
 include/linux/hid.h           |  11 ++++
 net/bluetooth/hidp/core.c     |   3 +-
 9 files changed, 155 insertions(+), 77 deletions(-)
Merging i2c/i2c/for-next (efe2cda164b1 Merge tag 'ib-mfd-arm-i2c-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into i2c/for-next)
$ git merge i2c/i2c/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/i2c/i2c-cbus-gpio.txt      |  4 ++--
 Documentation/devicetree/bindings/mfd/retu.txt     | 25 ++++++++++++++++++++++
 Documentation/devicetree/bindings/mfd/tps6105x.txt | 17 +++++++++++++++
 arch/arm/boot/dts/omap2420-n8x0-common.dtsi        |  4 ++--
 arch/arm/boot/dts/ste-hrefprev60.dtsi              |  2 +-
 arch/arm/mach-omap1/board-nokia770.c               |  4 ++--
 drivers/mfd/retu-mfd.c                             | 12 +++++++++--
 drivers/mfd/tps6105x.c                             |  8 +++++++
 8 files changed, 67 insertions(+), 9 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mfd/retu.txt
 create mode 100644 Documentation/devicetree/bindings/mfd/tps6105x.txt
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge jdelvare-hwmon/master
Already up-to-date.
Merging dmi/master (8efa050f19fe firmware: dmi_scan: Check DMI structure length)
$ git merge dmi/master
Merge made by the 'recursive' strategy.
Merging hwmon-staging/hwmon-next (2732fc0ffb35 hwmon: (i5k_amb) constify pci_device_id)
$ git merge hwmon-staging/hwmon-next
Merge made by the 'recursive' strategy.
 drivers/hwmon/adc128d818.c |  2 +-
 drivers/hwmon/ads1015.c    | 14 ++++++--------
 drivers/hwmon/adt7475.c    | 16 ++++++++--------
 drivers/hwmon/hwmon.c      |  2 +-
 drivers/hwmon/i5k_amb.c    |  2 +-
 drivers/hwmon/jc42.c       | 19 +++++++++++++++++++
 drivers/hwmon/nct7802.c    | 10 +++++-----
 7 files changed, 41 insertions(+), 24 deletions(-)
Merging jc_docs/docs-next (bc7938deaca7 docs: submitting-patches - change non-ascii character to ascii)
$ git merge jc_docs/docs-next
Auto-merging Makefile
Merge made by the 'recursive' strategy.
 Documentation/Makefile                           |  10 -
 Documentation/arm/firmware.txt                   |   2 +-
 Documentation/dev-tools/gdb-kernel-debugging.rst |   6 +-
 Documentation/dev-tools/kgdb.rst                 |  11 +-
 Documentation/doc-guide/sphinx.rst               | 109 ++++-
 Documentation/driver-api/basics.rst              |   5 +-
 Documentation/driver-api/dma-buf.rst             |   3 -
 Documentation/driver-api/s390-drivers.rst        |   2 +-
 Documentation/driver-api/scsi.rst                |   8 -
 Documentation/gpu/drm-mm.rst                     |   2 +-
 Documentation/process/changes.rst                |  16 +-
 Documentation/process/submitting-patches.rst     |   2 +-
 Documentation/sphinx-static/theme_overrides.css  |  17 +
 Documentation/sphinx/requirements.txt            |   3 +
 Documentation/translations/zh_CN/HOWTO           |   2 -
 Makefile                                         |   2 +-
 scripts/sphinx-pre-install                       | 579 +++++++++++++++++++++++
 17 files changed, 730 insertions(+), 49 deletions(-)
 create mode 100644 Documentation/sphinx/requirements.txt
 create mode 100755 scripts/sphinx-pre-install
Merging v4l-dvb/master (da48c948c263 media: fix warning on v4l2_subdev_call() result interpreted as bool)
$ git merge v4l-dvb/master
Auto-merging include/media/cec-notifier.h
Auto-merging drivers/staging/media/atomisp/pci/atomisp2/atomisp_internal.h
Auto-merging drivers/staging/media/atomisp/i2c/gc2235.h
Auto-merging drivers/media/usb/pulse8-cec/pulse8-cec.c
Auto-merging drivers/media/platform/Kconfig
Auto-merging drivers/media/i2c/ov6650.c
Auto-merging drivers/media/cec/cec-adap.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/media/i2c/adv748x.txt      |   95 +
 .../devicetree/bindings/media/renesas,drif.txt     |    1 +
 .../devicetree/bindings/media/video-interfaces.txt |    8 +-
 Documentation/media/cec-drivers/index.rst          |   32 +
 Documentation/media/cec-drivers/pulse8-cec.rst     |   11 +
 Documentation/media/index.rst                      |    1 +
 Documentation/media/kapi/cec-core.rst              |   40 +
 Documentation/media/uapi/cec/cec-funcs.rst         |    1 -
 .../media/uapi/cec/cec-ioc-adap-g-caps.rst         |    7 +
 .../media/uapi/cec/cec-ioc-adap-g-log-addrs.rst    |    4 +-
 Documentation/media/uapi/cec/cec-ioc-dqevent.rst   |   20 +
 Documentation/media/uapi/cec/cec-ioc-g-mode.rst    |   19 +-
 Documentation/media/uapi/v4l/dev-subdev.rst        |    2 +-
 MAINTAINERS                                        |   25 +-
 drivers/media/Kconfig                              |    3 +
 drivers/media/cec/Makefile                         |    4 +
 drivers/media/cec/cec-adap.c                       |  223 +-
 drivers/media/cec/cec-api.c                        |   73 +-
 drivers/media/cec/cec-core.c                       |    7 +-
 drivers/media/cec/cec-pin.c                        |  794 ++++
 drivers/media/common/saa7146/saa7146_i2c.c         |    2 +-
 drivers/media/dvb-core/demux.h                     |    2 +-
 drivers/media/dvb-core/dvb-usb-ids.h               |    1 +
 drivers/media/dvb-core/dvb_ca_en50221.c            |  945 ++--
 drivers/media/dvb-core/dvb_ca_en50221.h            |   10 +-
 drivers/media/dvb-frontends/Kconfig                |   18 +
 drivers/media/dvb-frontends/Makefile               |    2 +
 drivers/media/dvb-frontends/cx24123.c              |    2 +-
 drivers/media/dvb-frontends/cxd2841er.c            |   73 +-
 drivers/media/dvb-frontends/dib0090.c              |    2 +-
 drivers/media/dvb-frontends/dib7000p.c             |    2 +-
 drivers/media/dvb-frontends/dib8000.c              |    2 +-
 drivers/media/dvb-frontends/dib9000.c              |    4 +-
 drivers/media/dvb-frontends/drx39xyj/drxj.c        |   35 +-
 drivers/media/dvb-frontends/drxd_hard.c            |    6 +-
 drivers/media/dvb-frontends/mb86a16.c              |   25 +-
 drivers/media/dvb-frontends/s5h1420.c              |    2 +-
 drivers/media/dvb-frontends/stv0367.c              |  154 +-
 drivers/media/dvb-frontends/stv0910.c              | 1771 ++++++++
 drivers/media/dvb-frontends/stv0910.h              |   32 +
 drivers/media/dvb-frontends/stv0910_regs.h         | 4759 ++++++++++++++++++++
 drivers/media/dvb-frontends/stv6111.c              |  674 +++
 drivers/media/dvb-frontends/stv6111.h              |   20 +
 drivers/media/dvb-frontends/zd1301_demod.c         |    2 +-
 drivers/media/i2c/Kconfig                          |   35 +
 drivers/media/i2c/Makefile                         |    3 +
 drivers/media/i2c/adv7180.c                        |    2 +
 drivers/media/i2c/adv748x/Makefile                 |    7 +
 drivers/media/i2c/adv748x/adv748x-afe.c            |  552 +++
 drivers/media/i2c/adv748x/adv748x-core.c           |  832 ++++
 drivers/media/i2c/adv748x/adv748x-csi2.c           |  326 ++
 drivers/media/i2c/adv748x/adv748x-hdmi.c           |  768 ++++
 drivers/media/i2c/adv748x/adv748x.h                |  425 ++
 drivers/media/i2c/m5mols/m5mols_core.c             |    2 +-
 drivers/media/i2c/ov5640.c                         |    3 +-
 drivers/media/i2c/ov5645.c                         |   49 +-
 drivers/media/i2c/ov5670.c                         | 2588 +++++++++++
 drivers/media/i2c/{soc_camera => }/ov6650.c        |   77 +-
 drivers/media/i2c/s5k5baf.c                        |    2 +-
 drivers/media/i2c/saa717x.c                        |    2 +-
 drivers/media/i2c/smiapp/smiapp-core.c             |   14 +-
 drivers/media/i2c/smiapp/smiapp-quirk.c            |    8 +-
 drivers/media/i2c/soc_camera/Kconfig               |    6 -
 drivers/media/i2c/soc_camera/Makefile              |    1 -
 drivers/media/media-device.c                       |    9 +-
 drivers/media/media-entity.c                       |    2 +-
 drivers/media/pci/cx23885/cx23885-417.c            |    2 +-
 drivers/media/pci/cx25821/cx25821-core.c           |    5 +-
 drivers/media/pci/cx25821/cx25821.h                |    2 -
 drivers/media/pci/ddbridge/Kconfig                 |    4 +
 drivers/media/pci/ddbridge/ddbridge-core.c         |  153 +-
 drivers/media/pci/ddbridge/ddbridge.h              |    2 +
 drivers/media/pci/dm1105/dm1105.c                  |    2 +-
 drivers/media/pci/mantis/mantis_i2c.c              |    2 +-
 drivers/media/pci/ngene/ngene-i2c.c                |    2 +-
 drivers/media/pci/pt3/pt3.c                        |   11 +-
 drivers/media/pci/solo6x10/solo6x10-tw28.c         |    3 +-
 drivers/media/platform/Kconfig                     |    3 +-
 drivers/media/platform/atmel/atmel-isc.c           |    2 +-
 drivers/media/platform/blackfin/bfin_capture.c     |    2 +-
 drivers/media/platform/coda/coda-bit.c             |   16 +-
 drivers/media/platform/coda/coda-common.c          |   74 +-
 drivers/media/platform/coda/coda_regs.h            |    1 +
 drivers/media/platform/davinci/vpbe_display.c      |    2 +-
 drivers/media/platform/davinci/vpif_capture.c      |   12 +-
 drivers/media/platform/davinci/vpif_display.c      |    2 +-
 drivers/media/platform/exynos4-is/fimc-is-i2c.c    |    2 +-
 drivers/media/platform/fsl-viu.c                   |    2 +-
 drivers/media/platform/marvell-ccic/cafe-driver.c  |    2 +-
 drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c    |    2 +-
 drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c       |    2 +-
 drivers/media/platform/omap3isp/isp.c              |   25 +-
 drivers/media/platform/omap3isp/ispccdc.c          |    8 +-
 drivers/media/platform/omap3isp/ispccp2.c          |    6 +
 drivers/media/platform/omap3isp/ispcsiphy.c        |   41 +-
 drivers/media/platform/omap3isp/ispcsiphy.h        |    1 +
 drivers/media/platform/omap3isp/omap3isp.h         |    5 +
 drivers/media/platform/pxa_camera.c                |    5 +-
 drivers/media/platform/rcar_fdp1.c                 |    2 +-
 drivers/media/platform/s3c-camif/camif-core.c      |    2 +-
 drivers/media/platform/s5p-jpeg/jpeg-core.c        |  186 +-
 drivers/media/platform/s5p-jpeg/jpeg-core.h        |    7 +
 drivers/media/platform/soc_camera/soc_camera.c     |    2 +-
 drivers/media/platform/soc_camera/soc_mediabus.c   |    3 +
 drivers/media/platform/sti/delta/delta-v4l2.c      |    4 +-
 drivers/media/platform/stm32/stm32-dcmi.c          |    2 +-
 drivers/media/platform/video-mux.c                 |   53 +-
 drivers/media/tuners/fc0012.c                      |    2 +-
 drivers/media/tuners/fc0013.c                      |    2 +-
 drivers/media/tuners/tuner-simple.c                |    2 +-
 drivers/media/usb/au0828/au0828-video.c            |    2 +-
 drivers/media/usb/cx231xx/cx231xx-417.c            |    2 +-
 drivers/media/usb/dvb-usb-v2/af9035.c              |    2 +
 drivers/media/usb/go7007/go7007-v4l2.c             |    2 +-
 drivers/media/usb/gspca/gspca.c                    |    2 +-
 drivers/media/usb/gspca/xirlink_cit.c              |    2 +-
 drivers/media/usb/pulse8-cec/pulse8-cec.c          |    2 +-
 drivers/media/usb/pvrusb2/pvrusb2-encoder.c        |    6 +-
 drivers/media/usb/rainshadow-cec/rainshadow-cec.c  |    2 +-
 drivers/media/usb/stk1160/stk1160-v4l.c            |    2 +-
 drivers/media/usb/stkwebcam/stk-webcam.c           |    2 +-
 drivers/media/usb/tm6000/tm6000-video.c            |    2 +-
 drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c  |    2 +-
 drivers/media/usb/usbvision/usbvision-i2c.c        |    7 +-
 drivers/media/v4l2-core/v4l2-flash-led-class.c     |   30 +-
 drivers/media/v4l2-core/v4l2-fwnode.c              |  136 +-
 drivers/media/v4l2-core/videobuf2-dma-contig.c     |    2 +-
 drivers/media/v4l2-core/videobuf2-dma-sg.c         |    2 +-
 drivers/media/v4l2-core/videobuf2-vmalloc.c        |    2 +-
 drivers/staging/fbtft/fb_st7789v.c                 |    2 +-
 drivers/staging/greybus/light.c                    |    4 +-
 drivers/staging/media/atomisp/i2c/gc0310.c         |    2 +-
 drivers/staging/media/atomisp/i2c/gc2235.c         |    4 +-
 drivers/staging/media/atomisp/i2c/gc2235.h         |    6 +-
 drivers/staging/media/atomisp/i2c/lm3554.c         |    2 +-
 drivers/staging/media/atomisp/i2c/mt9m114.c        |    2 +-
 drivers/staging/media/atomisp/i2c/ov2680.c         |    2 +-
 drivers/staging/media/atomisp/i2c/ov2722.c         |    2 +-
 drivers/staging/media/atomisp/i2c/ov5693/ov5693.c  |    8 +-
 drivers/staging/media/atomisp/i2c/ov8858.c         |    2 +-
 .../staging/media/atomisp/include/linux/atomisp.h  |    6 -
 .../media/atomisp/pci/atomisp2/atomisp_cmd.c       |   19 +-
 .../media/atomisp/pci/atomisp2/atomisp_cmd.h       |    1 -
 .../atomisp/pci/atomisp2/atomisp_compat_css20.c    |    4 +-
 .../media/atomisp/pci/atomisp2/atomisp_internal.h  |   11 -
 .../media/atomisp/pci/atomisp2/atomisp_ioctl.c     |    3 -
 .../media/atomisp/pci/atomisp2/atomisp_subdev.c    |    6 +-
 .../media/atomisp/pci/atomisp2/atomisp_v4l2.c      |   33 +-
 .../css2400/runtime/isys/src/ibuf_ctrl_rmgr.c      |   27 +-
 .../atomisp/pci/atomisp2/css2400/sh_css_firmware.c |    8 +-
 .../staging/media/atomisp/pci/atomisp2/hmm/hmm.c   |  139 +-
 drivers/staging/media/bcm2048/radio-bcm2048.c      |    1 -
 drivers/staging/media/imx/imx-media-csi.c          |    2 +
 include/media/cec-notifier.h                       |   12 +
 include/media/cec-pin.h                            |  183 +
 include/media/cec.h                                |   69 +-
 include/media/media-entity.h                       |    2 +-
 include/media/v4l2-flash-led-class.h               |    6 +-
 include/media/v4l2-fwnode.h                        |   25 +-
 include/media/v4l2-mediabus.h                      |   30 +
 include/media/v4l2-subdev.h                        |   12 +-
 include/uapi/linux/cec.h                           |    8 +-
 162 files changed, 15928 insertions(+), 1222 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/media/i2c/adv748x.txt
 create mode 100644 Documentation/media/cec-drivers/index.rst
 create mode 100644 Documentation/media/cec-drivers/pulse8-cec.rst
 create mode 100644 drivers/media/cec/cec-pin.c
 create mode 100644 drivers/media/dvb-frontends/stv0910.c
 create mode 100644 drivers/media/dvb-frontends/stv0910.h
 create mode 100644 drivers/media/dvb-frontends/stv0910_regs.h
 create mode 100644 drivers/media/dvb-frontends/stv6111.c
 create mode 100644 drivers/media/dvb-frontends/stv6111.h
 create mode 100644 drivers/media/i2c/adv748x/Makefile
 create mode 100644 drivers/media/i2c/adv748x/adv748x-afe.c
 create mode 100644 drivers/media/i2c/adv748x/adv748x-core.c
 create mode 100644 drivers/media/i2c/adv748x/adv748x-csi2.c
 create mode 100644 drivers/media/i2c/adv748x/adv748x-hdmi.c
 create mode 100644 drivers/media/i2c/adv748x/adv748x.h
 create mode 100644 drivers/media/i2c/ov5670.c
 rename drivers/media/i2c/{soc_camera => }/ov6650.c (92%)
 create mode 100644 include/media/cec-pin.h
Merging v4l-dvb-next/master (474dfccf3685 media: svg: avoid too long lines)
$ git merge v4l-dvb-next/master
Already up-to-date.
Merging fbdev/fbdev-for-next (4c99ceda0d06 fbdev: make get_fb_unmapped_area depends of !MMU)
$ git merge fbdev/fbdev-for-next
Already up-to-date.
Merging pm/linux-next (976b5064109d Merge branch 'device-properties' into linux-next)
$ git merge pm/linux-next
Auto-merging include/linux/acpi.h
Auto-merging drivers/cpufreq/mediatek-cpufreq.c
Auto-merging MAINTAINERS
Removing Documentation/devicetree/bindings/clock/mt8173-cpu-dvfs.txt
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-power              |  12 +
 Documentation/admin-guide/pm/cpufreq.rst           |  16 +-
 Documentation/admin-guide/pm/intel_pstate.rst      |  61 +--
 .../devicetree/bindings/clock/mt8173-cpu-dvfs.txt  |  83 ---
 .../bindings/cpufreq/cpufreq-mediatek.txt          | 247 +++++++++
 Documentation/power/runtime_pm.txt                 |   3 +-
 MAINTAINERS                                        |   9 +
 arch/arm/boot/dts/tango4-smp8758.dtsi              |   1 -
 arch/arm64/kernel/acpi.c                           |   4 +-
 arch/ia64/kernel/acpi.c                            |   6 +-
 arch/x86/kernel/acpi/boot.c                        |  11 +-
 arch/x86/kernel/cpu/aperfmperf.c                   |  40 +-
 drivers/acpi/acpi_apd.c                            |   4 +-
 drivers/acpi/acpi_lpat.c                           |   6 +-
 drivers/acpi/acpi_lpss.c                           |  14 +
 drivers/acpi/acpi_watchdog.c                       |   7 +-
 drivers/acpi/acpica/acapps.h                       |   2 +
 drivers/acpi/acpica/aclocal.h                      |   5 +-
 drivers/acpi/acpica/acobject.h                     |  12 +-
 drivers/acpi/acpica/actables.h                     |   5 +-
 drivers/acpi/acpica/excreate.c                     |   5 +
 drivers/acpi/acpica/hwxfsleep.c                    |   9 +-
 drivers/acpi/acpica/nsaccess.c                     |   6 +
 drivers/acpi/acpica/psobject.c                     |  26 +
 drivers/acpi/acpica/tbdata.c                       | 230 +++++++-
 drivers/acpi/acpica/tbinstal.c                     | 161 +-----
 drivers/acpi/acpica/tbxface.c                      |  39 +-
 drivers/acpi/acpica/tbxfload.c                     |   2 +-
 drivers/acpi/acpica/utresrc.c                      |  14 +-
 drivers/acpi/bus.c                                 |   3 -
 drivers/acpi/pmic/intel_pmic_xpower.c              |  21 +-
 drivers/acpi/processor_driver.c                    |   2 +-
 drivers/acpi/property.c                            | 231 ++++----
 drivers/acpi/scan.c                                |   3 +-
 drivers/acpi/tables.c                              |   4 +-
 drivers/acpi/video_detect.c                        |  14 +
 drivers/base/power/domain.c                        | 237 ++++++++-
 drivers/base/power/main.c                          | 103 ++--
 drivers/base/power/opp/of.c                        |  37 +-
 drivers/base/property.c                            | 131 +++--
 drivers/cpufreq/Kconfig.arm                        |  12 +-
 drivers/cpufreq/Makefile                           |   3 +-
 drivers/cpufreq/arm_big_little.c                   |  10 +-
 drivers/cpufreq/cpufreq-dt-platdev.c               |   3 +-
 drivers/cpufreq/cpufreq-nforce2.c                  |   2 +-
 drivers/cpufreq/cpufreq.c                          |  23 +-
 drivers/cpufreq/cpufreq_conservative.c             |   6 -
 drivers/cpufreq/cpufreq_governor.c                 |  17 +-
 drivers/cpufreq/cpufreq_governor.h                 |   3 +-
 drivers/cpufreq/cpufreq_ondemand.c                 |  12 -
 drivers/cpufreq/elanfreq.c                         |   4 +-
 drivers/cpufreq/gx-suspmod.c                       |   2 +-
 drivers/cpufreq/intel_pstate.c                     | 296 +----------
 drivers/cpufreq/longrun.c                          |   1 -
 .../{mt8173-cpufreq.c => mediatek-cpufreq.c}       |   2 +
 drivers/cpufreq/pmac32-cpufreq.c                   |   7 +-
 drivers/cpufreq/s5pv210-cpufreq.c                  |   3 +
 drivers/cpufreq/sa1100-cpufreq.c                   |   5 +-
 drivers/cpufreq/sa1110-cpufreq.c                   |   5 +-
 drivers/cpufreq/sh-cpufreq.c                       |   3 +-
 drivers/cpufreq/speedstep-ich.c                    |   2 +-
 drivers/cpufreq/speedstep-smi.c                    |   2 +-
 drivers/cpufreq/tango-cpufreq.c                    |  38 ++
 drivers/cpufreq/unicore2-cpufreq.c                 |   3 +-
 drivers/mailbox/pcc.c                              |   2 +-
 drivers/of/property.c                              |  66 ++-
 drivers/thunderbolt/icm.c                          |   9 +-
 include/acpi/acpi_bus.h                            |  52 +-
 include/acpi/acpixf.h                              |  15 +-
 include/acpi/actbl.h                               |   1 +
 include/acpi/actbl2.h                              |  16 +-
 include/acpi/platform/acenv.h                      |   9 +-
 include/acpi/platform/aclinux.h                    |   3 +
 include/linux/acpi.h                               |  72 +--
 include/linux/cpufreq.h                            |  18 +-
 include/linux/fwnode.h                             |  56 +-
 include/linux/irqdomain.h                          |   4 +-
 include/linux/of.h                                 |   3 +-
 include/linux/pm.h                                 |   4 +
 include/linux/pm_domain.h                          |   3 +
 include/linux/property.h                           |  67 +--
 include/linux/suspend.h                            |  13 +
 kernel/irq/irqdomain.c                             |  11 +-
 kernel/power/hibernate.c                           |  29 +-
 kernel/power/main.c                                |  64 ++-
 kernel/power/power.h                               |   4 +
 kernel/power/suspend.c                             |  74 ++-
 kernel/sched/cpufreq_schedutil.c                   |  54 +-
 kernel/time/timekeeping_debug.c                    |   5 +-
 tools/power/pm-graph/Makefile                      |  19 +-
 tools/power/pm-graph/analyze_boot.py               | 586 ++++++++++++++-------
 tools/power/pm-graph/analyze_suspend.py            | 534 +++++++++++++------
 tools/power/pm-graph/bootgraph.8                   |  61 ++-
 tools/power/pm-graph/sleepgraph.8                  |  48 +-
 94 files changed, 2648 insertions(+), 1544 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/clock/mt8173-cpu-dvfs.txt
 create mode 100644 Documentation/devicetree/bindings/cpufreq/cpufreq-mediatek.txt
 rename drivers/cpufreq/{mt8173-cpufreq.c => mediatek-cpufreq.c} (99%)
 create mode 100644 drivers/cpufreq/tango-cpufreq.c
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
$ git merge idle/next
Merge made by the 'recursive' strategy.
Merging thermal/next (5d72ed35678a Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next)
$ git merge thermal/next
Already up-to-date.
Merging thermal-soc/next (aa647852c32a Merge branch 'work-linus' into work-next)
$ git merge thermal-soc/next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
$ git merge ieee1394/for-next
Auto-merging drivers/firewire/net.c
Merge made by the 'recursive' strategy.
 drivers/firewire/net.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
Merging dlm/next (e94d6f64e7ba dlm: print log message when cluster name is not set)
$ git merge dlm/next
Merge made by the 'recursive' strategy.
 fs/dlm/debug_fs.c  | 25 ++++++++++++-------------
 fs/dlm/lock.c      |  8 +++-----
 fs/dlm/lockspace.c |  7 ++++++-
 fs/dlm/member.c    | 15 ++++++---------
 fs/dlm/user.c      |  2 ++
 5 files changed, 29 insertions(+), 28 deletions(-)
Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback)
$ git merge swiotlb/linux-next
Already up-to-date.
Merging net-next/master (736b9b9c506e Merge branch 'ethtool-fec')
$ git merge net-next/master
Auto-merging net/socket.c
Auto-merging net/rxrpc/protocol.h
Auto-merging net/packet/af_packet.c
Auto-merging net/ipv6/udp.c
Auto-merging net/ipv6/ip6_output.c
Auto-merging net/ipv4/tcp_output.c
Removing net/core/flow.c
Auto-merging kernel/bpf/verifier.c
Auto-merging include/uapi/linux/rxrpc.h
Removing include/net/flowcache.h
Auto-merging drivers/net/virtio_net.c
Auto-merging drivers/net/tun.c
Auto-merging drivers/net/hyperv/netvsc_drv.c
Auto-merging drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
Auto-merging drivers/net/ethernet/mediatek/mtk_eth_soc.c
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/net/renesas,ravb.txt       |  29 +-
 .../devicetree/bindings/net/xilinx_axienet.txt     |  55 ++
 Documentation/networking/ip-sysctl.txt             |   6 +-
 drivers/atm/ambassador.c                           |   2 +-
 drivers/atm/eni.c                                  |   2 +-
 drivers/atm/firestream.c                           |   2 +-
 drivers/atm/fore200e.c                             |   2 +-
 drivers/atm/he.c                                   |   2 +-
 drivers/atm/horizon.c                              |   2 +-
 drivers/atm/idt77252.c                             |   2 +-
 drivers/atm/iphase.c                               |   2 +-
 drivers/atm/lanai.c                                |   2 +-
 drivers/atm/nicstar.c                              |   2 +-
 drivers/atm/solos-pci.c                            |   2 +-
 drivers/atm/zatm.c                                 |   2 +-
 drivers/infiniband/hw/bnxt_re/Kconfig              |   1 +
 drivers/isdn/hardware/eicon/divacapi.h             |  16 +-
 drivers/isdn/hardware/eicon/message.c              | 247 ++-----
 drivers/net/appletalk/ipddp.c                      |   4 +-
 drivers/net/arcnet/arcdevice.h                     |   2 +-
 drivers/net/arcnet/com20020-pci.c                  |   2 +-
 drivers/net/bonding/bond_sysfs.c                   |   2 +-
 drivers/net/can/at91_can.c                         |   2 +-
 drivers/net/can/janz-ican3.c                       |   2 +-
 drivers/net/dsa/mv88e6xxx/chip.c                   | 289 +++++---
 drivers/net/dsa/mv88e6xxx/chip.h                   | 152 +---
 drivers/net/dsa/mv88e6xxx/global2.c                | 102 ++-
 drivers/net/dsa/mv88e6xxx/global2.h                |  41 +-
 drivers/net/dsa/mv88e6xxx/phy.c                    |  97 ++-
 drivers/net/dsa/mv88e6xxx/phy.h                    |  22 +
 drivers/net/dsa/mv88e6xxx/port.c                   |  17 +
 drivers/net/dsa/mv88e6xxx/port.h                   |   6 +-
 drivers/net/dummy.c                                |   2 +-
 drivers/net/ethernet/amd/xgbe/xgbe.h               |   1 +
 drivers/net/ethernet/apple/mace.c                  |   8 +-
 drivers/net/ethernet/broadcom/Kconfig              |   1 +
 drivers/net/ethernet/broadcom/bnxt/Makefile        |   2 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt.c          | 237 ++++++-
 drivers/net/ethernet/broadcom/bnxt/bnxt.h          |  54 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c      |  17 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.h      |   1 +
 drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c  |  35 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h      | 322 ++++++++-
 drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c    |  15 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c      | 495 +++++++++++++
 drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.h      |  72 ++
 drivers/net/ethernet/cadence/macb_main.c           |   2 +-
 drivers/net/ethernet/cadence/macb_pci.c            |   2 +-
 drivers/net/ethernet/cavium/liquidio/lio_ethtool.c |   4 +
 drivers/net/ethernet/cavium/liquidio/lio_main.c    |   4 +-
 drivers/net/ethernet/cavium/liquidio/lio_vf_main.c |   4 +-
 .../net/ethernet/cavium/liquidio/liquidio_common.h |   6 +-
 .../net/ethernet/cavium/liquidio/octeon_console.c  |   7 +-
 .../net/ethernet/cavium/liquidio/octeon_device.c   |   8 +-
 .../net/ethernet/cavium/liquidio/octeon_device.h   |   2 +
 drivers/net/ethernet/cavium/liquidio/octeon_droq.c |   6 +-
 drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c    |   8 +-
 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h         |  14 +-
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 100 +++
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c    |  57 +-
 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c         | 376 ++++++++--
 drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h      |   2 +
 drivers/net/ethernet/dec/tulip/tulip_core.c        |   2 -
 drivers/net/ethernet/ec_bhf.c                      |   2 +-
 drivers/net/ethernet/emulex/benet/be_roce.c        |   3 -
 drivers/net/ethernet/freescale/dpaa/dpaa_eth.c     |   4 +-
 drivers/net/ethernet/freescale/fec_mpc52xx.c       |   4 +-
 drivers/net/ethernet/freescale/fman/fman.c         |  12 +-
 drivers/net/ethernet/freescale/fman/fman_port.c    |   4 +-
 drivers/net/ethernet/freescale/fman/mac.c          |  50 +-
 drivers/net/ethernet/freescale/fsl_pq_mdio.c       |  20 +-
 drivers/net/ethernet/hisilicon/hns/hns_ethtool.c   |   2 +-
 drivers/net/ethernet/ibm/ehea/ehea_main.c          |   5 +-
 drivers/net/ethernet/ibm/emac/core.c               |  53 +-
 drivers/net/ethernet/ibm/emac/debug.h              |   2 +-
 drivers/net/ethernet/ibm/emac/mal.c                |   8 +-
 drivers/net/ethernet/ibm/emac/rgmii.c              |  18 +-
 drivers/net/ethernet/ibm/emac/tah.c                |  12 +-
 drivers/net/ethernet/ibm/emac/zmii.c               |  17 +-
 drivers/net/ethernet/ibm/ibmvnic.c                 |   5 +-
 drivers/net/ethernet/intel/i40e/i40e_ethtool.c     |   6 +-
 drivers/net/ethernet/intel/i40e/i40e_main.c        |  57 +-
 drivers/net/ethernet/intel/i40e/i40e_nvm.c         |  21 +-
 drivers/net/ethernet/intel/i40e/i40e_ptp.c         |   5 +-
 drivers/net/ethernet/intel/i40e/i40e_txrx.c        |  18 +-
 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c |  32 +-
 drivers/net/ethernet/intel/i40evf/i40e_osdep.h     |   4 +-
 drivers/net/ethernet/intel/i40evf/i40e_txrx.c      |   6 +-
 drivers/net/ethernet/intel/i40evf/i40evf.h         |  11 +
 drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c |   4 +-
 drivers/net/ethernet/intel/i40evf/i40evf_main.c    |  14 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_common.c    |  30 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c       |   8 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c      |  65 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c     |   9 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_type.h      |   4 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c      | 102 ++-
 drivers/net/ethernet/mediatek/mtk_eth_soc.c        |   5 +-
 drivers/net/ethernet/mellanox/mlx4/en_cq.c         |   4 +-
 drivers/net/ethernet/mellanox/mlx4/en_main.c       |   9 +-
 drivers/net/ethernet/mellanox/mlx4/mlx4_en.h       |   2 +-
 .../ethernet/mellanox/mlxsw/core_acl_flex_keys.h   |   6 +
 drivers/net/ethernet/mellanox/mlxsw/reg.h          |  65 +-
 drivers/net/ethernet/mellanox/mlxsw/spectrum.c     |  68 +-
 drivers/net/ethernet/mellanox/mlxsw/spectrum.h     |   2 +
 .../mellanox/mlxsw/spectrum_acl_flex_keys.h        |   3 +
 .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c    |   3 +
 drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c |   2 +-
 .../net/ethernet/mellanox/mlxsw/spectrum_flower.c  |  44 +-
 .../net/ethernet/mellanox/mlxsw/spectrum_router.c  | 775 ++++++++++++++-------
 drivers/net/ethernet/mellanox/mlxsw/trap.h         |  25 +-
 drivers/net/ethernet/moxa/moxart_ether.c           |  15 +-
 drivers/net/ethernet/moxa/moxart_ether.h           |   8 +-
 drivers/net/ethernet/neterion/s2io.c               |  45 --
 drivers/net/ethernet/netronome/nfp/nfp_main.c      |  48 +-
 .../net/ethernet/netronome/nfp/nfp_net_common.c    |  10 +-
 drivers/net/ethernet/netronome/nfp/nfp_net_main.c  |   2 +-
 drivers/net/ethernet/netronome/nfp/nfp_net_repr.c  |  23 +-
 drivers/net/ethernet/netronome/nfp/nfp_port.c      |  27 +
 drivers/net/ethernet/netronome/nfp/nfp_port.h      |   1 +
 .../ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c   |  18 +-
 drivers/net/ethernet/qlogic/qed/qed_dev.c          | 145 +++-
 drivers/net/ethernet/qlogic/qed/qed_dev_api.h      |  43 +-
 drivers/net/ethernet/qlogic/qed/qed_hsi.h          |  49 ++
 drivers/net/ethernet/qlogic/qed/qed_l2.c           | 115 +++
 drivers/net/ethernet/qlogic/qed/qed_l2.h           |  18 +-
 drivers/net/ethernet/qlogic/qed/qed_main.c         |  58 +-
 drivers/net/ethernet/qlogic/qed/qed_mcp.c          |  66 ++
 drivers/net/ethernet/qlogic/qed/qed_mcp.h          |  37 +-
 drivers/net/ethernet/qlogic/qed/qed_sriov.c        | 157 +++++
 drivers/net/ethernet/qlogic/qed/qed_sriov.h        |   3 +
 drivers/net/ethernet/qlogic/qed/qed_vf.c           |  75 ++
 drivers/net/ethernet/qlogic/qed/qed_vf.h           |  53 +-
 drivers/net/ethernet/qlogic/qede/qede.h            |  19 +-
 drivers/net/ethernet/qlogic/qede/qede_ethtool.c    | 205 +++++-
 drivers/net/ethernet/qlogic/qede/qede_filter.c     | 483 +++++++++++--
 drivers/net/ethernet/qlogic/qede/qede_main.c       |   9 +-
 .../net/ethernet/qlogic/qlcnic/qlcnic_minidump.c   |   2 +-
 drivers/net/ethernet/sfc/mcdi_port.c               | 224 ++++--
 drivers/net/ethernet/sun/ldmvsw.c                  |   2 +-
 drivers/net/ethernet/sun/niu.c                     |  24 +-
 drivers/net/ethernet/sun/sunvnet.c                 |   2 +-
 drivers/net/ethernet/sun/sunvnet_common.c          |  90 ++-
 drivers/net/ethernet/synopsys/dwc-xlgmac-net.c     |   1 +
 drivers/net/ethernet/ti/cpsw.c                     |   8 +-
 drivers/net/ethernet/ti/davinci_emac.c             |   4 +-
 drivers/net/ethernet/xilinx/ll_temac_main.c        |   2 +-
 drivers/net/ethernet/xilinx/xilinx_axienet.h       |   4 +-
 drivers/net/ethernet/xilinx/xilinx_axienet_main.c  |  48 +-
 drivers/net/geneve.c                               | 242 +++++--
 drivers/net/hamradio/dmascc.c                      |   2 +-
 drivers/net/hyperv/hyperv_net.h                    |  46 +-
 drivers/net/hyperv/netvsc.c                        | 341 +++++----
 drivers/net/hyperv/netvsc_drv.c                    | 147 ++--
 drivers/net/hyperv/rndis_filter.c                  | 151 ++--
 drivers/net/ieee802154/ca8210.c                    |   1 +
 drivers/net/ipvlan/ipvlan_main.c                   |   2 +-
 drivers/net/ipvlan/ipvtap.c                        |   2 +-
 drivers/net/macvlan.c                              |   2 +-
 drivers/net/macvtap.c                              |   2 +-
 drivers/net/phy/mdio-mux-mmioreg.c                 |  18 +-
 drivers/net/phy/mdio-mux.c                         |  16 +-
 drivers/net/phy/mdio_bus.c                         |   6 +-
 drivers/net/phy/phy.c                              |  11 +-
 drivers/net/tap.c                                  |   7 +-
 drivers/net/tun.c                                  |   7 +-
 drivers/net/usb/cdc_ncm.c                          |   2 +-
 drivers/net/virtio_net.c                           | 344 +++++----
 drivers/net/vxlan.c                                |  31 +-
 .../wireless/broadcom/brcm80211/brcmfmac/debug.c   |   5 +-
 drivers/net/wireless/cisco/airo.c                  |   2 +-
 drivers/net/wireless/intel/ipw2x00/ipw2100.c       |   2 +-
 drivers/net/wireless/intel/ipw2x00/ipw2200.c       |   2 +-
 drivers/net/wireless/intel/iwlegacy/3945-mac.c     |   2 +-
 drivers/net/wireless/intel/iwlegacy/4965-mac.c     |   2 +-
 .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.c   |   6 -
 drivers/of/of_mdio.c                               |   6 +-
 drivers/virtio/virtio_ring.c                       |   2 +-
 fs/afs/misc.c                                      |   1 -
 fs/afs/rxrpc.c                                     |   1 -
 include/linux/bpf.h                                |  20 +
 include/linux/bpf_types.h                          |   3 +
 include/linux/ethtool.h                            |   4 +
 include/linux/filter.h                             |  14 +
 include/linux/netdev_features.h                    |   6 +-
 include/linux/netdevice.h                          |  17 +-
 include/linux/qed/qed_eth_if.h                     |   1 +
 include/linux/qed/qed_if.h                         |  37 +-
 include/linux/sctp.h                               | 102 ++-
 include/linux/skbuff.h                             |  37 +-
 include/linux/virtio_net.h                         |   5 -
 include/net/af_unix.h                              |   1 -
 include/net/dsa.h                                  |   5 -
 include/net/flow.h                                 |  34 -
 include/net/flowcache.h                            |  25 -
 include/net/inetpeer.h                             |  11 +-
 include/net/ip6_route.h                            |   2 +-
 include/net/netns/xfrm.h                           |  11 -
 include/net/sctp/command.h                         |   4 +-
 include/net/sctp/structs.h                         |   6 +-
 include/net/tcp.h                                  |   5 +-
 include/net/udp_tunnel.h                           |   8 +
 include/net/xfrm.h                                 |   9 +-
 include/trace/events/xdp.h                         |  31 +-
 include/uapi/linux/bpf.h                           |  10 +-
 include/uapi/linux/ethtool.h                       |  48 +-
 include/{ => uapi}/linux/rxrpc.h                   |  57 +-
 kernel/bpf/Makefile                                |   3 +
 kernel/bpf/devmap.c                                | 432 ++++++++++++
 kernel/bpf/verifier.c                              |  12 +
 net/bluetooth/6lowpan.c                            |   9 +-
 net/core/Makefile                                  |   1 -
 net/core/dev.c                                     | 298 ++++----
 net/core/ethtool.c                                 |  42 +-
 net/core/filter.c                                  | 178 ++++-
 net/core/flow.c                                    | 516 --------------
 net/core/skbuff.c                                  |  31 +-
 net/dsa/dsa.c                                      |   5 +
 net/ipv4/af_inet.c                                 |  12 +-
 net/ipv4/gre_offload.c                             |  14 +-
 net/ipv4/inetpeer.c                                | 428 +++---------
 net/ipv4/ip_output.c                               |  76 --
 net/ipv4/ip_vti.c                                  |  31 -
 net/ipv4/tcp_input.c                               |   3 +-
 net/ipv4/tcp_ipv4.c                                |   2 +-
 net/ipv4/tcp_output.c                              |  17 +-
 net/ipv4/tcp_probe.c                               |   5 +-
 net/ipv4/tcp_recovery.c                            |   2 +-
 net/ipv4/udp_offload.c                             |  64 +-
 net/ipv4/udp_tunnel.c                              |  25 +-
 net/ipv4/xfrm4_policy.c                            |  11 +-
 net/ipv6/ip6_gre.c                                 |   2 +-
 net/ipv6/ip6_output.c                              |  76 --
 net/ipv6/ip6_vti.c                                 |  31 -
 net/ipv6/tcp_ipv6.c                                |   4 +-
 net/ipv6/udp.c                                     |   2 +-
 net/ipv6/udp_offload.c                             | 100 +--
 net/ipv6/xfrm6_policy.c                            |  11 +-
 net/key/af_key.c                                   |   6 -
 net/l2tp/l2tp_ip6.c                                |   2 +-
 net/netfilter/xt_recent.c                          |   2 +-
 net/openvswitch/datapath.c                         |  14 -
 net/openvswitch/flow.c                             |  16 +-
 net/openvswitch/flow.h                             |   2 +
 net/openvswitch/flow_table.c                       |   4 +-
 net/packet/af_packet.c                             |   2 -
 net/rds/connection.c                               |  16 +-
 net/rds/rds.h                                      |   2 +-
 net/rds/tcp.c                                      |   2 +-
 net/rds/tcp_connect.c                              |   4 +-
 net/rds/tcp_send.c                                 |   2 +-
 net/rds/threads.c                                  |   2 +-
 net/rxrpc/ar-internal.h                            |   2 +-
 include/rxrpc/packet.h => net/rxrpc/protocol.h     |  45 --
 net/sched/act_csum.c                               |   6 -
 net/sctp/auth.c                                    |  13 +-
 net/sctp/chunk.c                                   |   2 +-
 net/sctp/endpointola.c                             |   8 +-
 net/sctp/ipv6.c                                    |   2 +-
 net/sctp/outqueue.c                                |  10 +-
 net/sctp/protocol.c                                |   2 +-
 net/sctp/sm_make_chunk.c                           |  50 +-
 net/sctp/sm_statefuns.c                            |  61 +-
 net/smc/Kconfig                                    |   4 -
 net/smc/af_smc.c                                   |  64 +-
 net/smc/smc_clc.c                                  |  12 +-
 net/smc/smc_core.c                                 | 388 ++++++-----
 net/smc/smc_core.h                                 |  31 +-
 net/smc/smc_ib.c                                   | 128 +++-
 net/smc/smc_ib.h                                   |  19 +-
 net/smc/smc_rx.c                                   |   3 +
 net/smc/smc_tx.c                                   |   9 +-
 net/smc/smc_wr.c                                   |  63 ++
 net/smc/smc_wr.h                                   |   1 +
 net/socket.c                                       |   6 +-
 net/unix/af_unix.c                                 |  24 +-
 net/xfrm/xfrm_device.c                             |   4 +-
 net/xfrm/xfrm_policy.c                             | 417 +++++------
 net/xfrm/xfrm_state.c                              |   5 +-
 net/xfrm/xfrm_user.c                               |   3 -
 samples/bpf/Makefile                               |   8 +
 samples/bpf/xdp_redirect_kern.c                    |  81 +++
 samples/bpf/xdp_redirect_map_kern.c                |  83 +++
 samples/bpf/xdp_redirect_map_user.c                | 137 ++++
 samples/bpf/xdp_redirect_user.c                    | 134 ++++
 security/selinux/include/xfrm.h                    |   4 +-
 tools/hv/bondvf.sh                                 |  27 +-
 tools/include/uapi/linux/bpf.h                     |   1 +
 tools/lib/bpf/Makefile                             |   4 +
 tools/testing/selftests/bpf/bpf_helpers.h          |   2 +
 tools/testing/selftests/bpf/test_maps.c            |  17 +
 291 files changed, 8455 insertions(+), 4625 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/net/xilinx_axienet.txt
 create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c
 create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.h
 delete mode 100644 include/net/flowcache.h
 rename include/{ => uapi}/linux/rxrpc.h (54%)
 create mode 100644 kernel/bpf/devmap.c
 delete mode 100644 net/core/flow.c
 rename include/rxrpc/packet.h => net/rxrpc/protocol.h (78%)
 create mode 100644 samples/bpf/xdp_redirect_kern.c
 create mode 100644 samples/bpf/xdp_redirect_map_kern.c
 create mode 100644 samples/bpf/xdp_redirect_map_user.c
 create mode 100644 samples/bpf/xdp_redirect_user.c
Merging ipsec-next/master (8bafd73093f2 xfrm: add UDP encapsulation port in migrate message)
$ git merge ipsec-next/master
Already up-to-date.
Merging netfilter-next/master (7a68ada6ec7d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge netfilter-next/master
Already up-to-date.
Merging nfc-next/master (bd751808f9ff NFC: trf7970a: Correct register settings for 27MHz clock)
$ git merge nfc-next/master
Already up-to-date.
Merging ipvs-next/master (fb90e8dedb46 ipvs: change comparison on sync_refresh_period)
$ git merge ipvs-next/master
Already up-to-date.
Merging wireless-drivers-next/master (d28ac7be15c7 rtlwifi: rtl8821ae: Fix HW_VAR_NAV_UPPER operation)
$ git merge wireless-drivers-next/master
Auto-merging drivers/net/wireless/realtek/rtlwifi/wifi.h
Auto-merging drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c
Merge made by the 'recursive' strategy.
 drivers/bcma/driver_gpio.c                         |   1 +
 drivers/net/wireless/ath/ath10k/ahb.c              |   3 +-
 drivers/net/wireless/ath/ath10k/ce.c               | 299 +++++++------
 drivers/net/wireless/ath/ath10k/ce.h               |  30 +-
 drivers/net/wireless/ath/ath10k/core.c             |   5 +
 drivers/net/wireless/ath/ath10k/core.h             |   2 +
 drivers/net/wireless/ath/ath10k/debug.c            |   2 +-
 drivers/net/wireless/ath/ath10k/hw.c               | 150 +++++++
 drivers/net/wireless/ath/ath10k/hw.h               |   9 +
 drivers/net/wireless/ath/ath10k/pci.c              |  55 ++-
 drivers/net/wireless/ath/ath10k/pci.h              |  14 +-
 drivers/net/wireless/ath/ath10k/wmi.c              |   2 +-
 .../wireless/broadcom/brcm80211/brcmfmac/pcie.c    |   2 +-
 drivers/net/wireless/intel/ipw2x00/ipw2100.c       |  28 +-
 drivers/net/wireless/marvell/mwifiex/cfg80211.c    |   6 +-
 drivers/net/wireless/marvell/mwifiex/cfp.c         |   4 +-
 drivers/net/wireless/marvell/mwifiex/cmdevt.c      |  15 +-
 drivers/net/wireless/marvell/mwifiex/debugfs.c     |   2 -
 drivers/net/wireless/marvell/mwifiex/init.c        |  32 +-
 drivers/net/wireless/marvell/mwifiex/main.c        | 133 +++---
 drivers/net/wireless/marvell/mwifiex/main.h        |   7 +-
 drivers/net/wireless/marvell/mwifiex/pcie.c        | 100 +----
 drivers/net/wireless/marvell/mwifiex/scan.c        |  11 +-
 drivers/net/wireless/marvell/mwifiex/sdio.c        |   3 +-
 drivers/net/wireless/marvell/mwifiex/sta_cmd.c     |  19 +-
 drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c |   5 +-
 drivers/net/wireless/marvell/mwifiex/sta_ioctl.c   |   6 +-
 drivers/net/wireless/marvell/mwifiex/tdls.c        |   2 +-
 drivers/net/wireless/marvell/mwifiex/usb.c         |   3 +-
 drivers/net/wireless/realtek/rtlwifi/base.c        |  17 +-
 .../realtek/rtlwifi/btcoexist/halbt_precomp.h      |  16 -
 .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c       |  17 +-
 .../wireless/realtek/rtlwifi/btcoexist/rtl_btc.c   |  28 ++
 .../wireless/realtek/rtlwifi/btcoexist/rtl_btc.h   |   1 +
 drivers/net/wireless/realtek/rtlwifi/core.c        |   2 +
 .../net/wireless/realtek/rtlwifi/rtl8188ee/sw.c    |   2 +
 .../net/wireless/realtek/rtlwifi/rtl8192ce/sw.c    |   2 +
 .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.c    |   5 -
 .../net/wireless/realtek/rtlwifi/rtl8192cu/mac.c   |   3 +-
 .../net/wireless/realtek/rtlwifi/rtl8192cu/sw.c    |   6 +-
 .../net/wireless/realtek/rtlwifi/rtl8192cu/trx.c   |  12 -
 .../net/wireless/realtek/rtlwifi/rtl8192cu/trx.h   |   3 -
 .../net/wireless/realtek/rtlwifi/rtl8192de/sw.c    |   2 +
 .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.c    |   9 +-
 .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c    |   5 +
 .../net/wireless/realtek/rtlwifi/rtl8192ee/sw.c    |   2 +
 .../net/wireless/realtek/rtlwifi/rtl8192se/sw.c    |   2 +
 .../net/wireless/realtek/rtlwifi/rtl8723ae/sw.c    |   2 +
 .../net/wireless/realtek/rtlwifi/rtl8723be/fw.c    |   9 +-
 .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c    |   7 +
 .../net/wireless/realtek/rtlwifi/rtl8723be/phy.c   | 365 +++++++---------
 .../net/wireless/realtek/rtlwifi/rtl8723be/sw.c    |   2 +
 .../net/wireless/realtek/rtlwifi/rtl8723be/table.c | 192 +++++----
 .../net/wireless/realtek/rtlwifi/rtl8723be/table.h |  10 +-
 .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.c    |  13 +-
 .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c    |  43 +-
 .../net/wireless/realtek/rtlwifi/rtl8821ae/sw.c    |   6 +
 drivers/net/wireless/realtek/rtlwifi/wifi.h        |  49 ++-
 drivers/net/wireless/rsi/rsi_91x_core.c            |  10 +-
 drivers/net/wireless/rsi/rsi_91x_debugfs.c         |   3 +
 drivers/net/wireless/rsi/rsi_91x_hal.c             | 270 +++++++-----
 drivers/net/wireless/rsi/rsi_91x_mac80211.c        |  63 ++-
 drivers/net/wireless/rsi/rsi_91x_main.c            |   3 +-
 drivers/net/wireless/rsi/rsi_91x_mgmt.c            | 470 +++++++++++----------
 drivers/net/wireless/rsi/rsi_91x_sdio.c            | 154 +++++--
 drivers/net/wireless/rsi/rsi_91x_sdio_ops.c        |  44 +-
 drivers/net/wireless/rsi/rsi_91x_usb.c             | 137 ++++--
 drivers/net/wireless/rsi/rsi_91x_usb_ops.c         |   6 +-
 drivers/net/wireless/rsi/rsi_hal.h                 |  64 +++
 drivers/net/wireless/rsi/rsi_main.h                |  52 ++-
 drivers/net/wireless/rsi/rsi_mgmt.h                | 171 +++++++-
 drivers/net/wireless/rsi/rsi_sdio.h                |   4 +-
 drivers/net/wireless/rsi/rsi_usb.h                 |   6 +-
 drivers/net/wireless/ti/wl1251/main.c              |   1 +
 drivers/net/wireless/wl3501_cs.c                   |   2 +-
 drivers/net/wireless/zydas/zd1211rw/zd_rf_rf2959.c |   2 +-
 76 files changed, 2033 insertions(+), 1211 deletions(-)
Merging bluetooth/master (c3327bde514d Bluetooth: btrtl: Fix a error code in rtl_load_config())
$ git merge bluetooth/master
Merge made by the 'recursive' strategy.
 drivers/bluetooth/Kconfig         |  1 +
 drivers/bluetooth/ath3k.c         |  3 ++-
 drivers/bluetooth/bt3c_cs.c       |  8 +++++---
 drivers/bluetooth/btmrvl_sdio.c   |  6 ++++--
 drivers/bluetooth/btqca.c         |  2 +-
 drivers/bluetooth/btrtl.c         |  2 ++
 drivers/bluetooth/btsdio.c        |  3 ++-
 drivers/bluetooth/btuart_cs.c     |  8 +++++---
 drivers/bluetooth/btusb.c         | 43 +++++++++++++++++++++++++++++++--------
 drivers/bluetooth/btwilink.c      |  8 ++++----
 drivers/bluetooth/hci_bcm.c       | 30 ++++++++++++++-------------
 drivers/bluetooth/hci_ldisc.c     |  3 ++-
 drivers/bluetooth/hci_ll.c        | 11 +++-------
 drivers/bluetooth/hci_nokia.c     | 10 +--------
 drivers/bluetooth/hci_serdev.c    | 13 ++++++++++++
 drivers/bluetooth/hci_uart.h      |  1 +
 drivers/net/ieee802154/mrf24j40.c |  3 ++-
 17 files changed, 99 insertions(+), 56 deletions(-)
Merging mac80211-next/master (3dc02251f43f Merge branch 'skb-accessor-cleanups')
$ git merge mac80211-next/master
Already up-to-date.
Merging rdma/for-next (ecd840ff9b79 RDMA/hns: fix build regression)
$ git merge rdma/for-next
Auto-merging include/linux/mlx5/mlx5_ifc.h
Auto-merging drivers/net/ethernet/mellanox/mlx5/core/sriov.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eq.c
Auto-merging drivers/net/ethernet/mellanox/mlx4/en_cq.c
Merge made by the 'recursive' strategy.
 drivers/infiniband/core/cma.c                      |   22 +-
 drivers/infiniband/core/roce_gid_mgmt.c            |    2 +
 drivers/infiniband/core/uverbs_cmd.c               |   17 +-
 drivers/infiniband/core/verbs.c                    |  117 ++-
 drivers/infiniband/hw/bnxt_re/ib_verbs.c           |   88 +-
 drivers/infiniband/hw/bnxt_re/ib_verbs.h           |    3 -
 drivers/infiniband/hw/bnxt_re/main.c               |   58 +-
 drivers/infiniband/hw/bnxt_re/qplib_fp.c           |  465 +++++++--
 drivers/infiniband/hw/bnxt_re/qplib_fp.h           |   25 +-
 drivers/infiniband/hw/bnxt_re/qplib_rcfw.c         |   26 +-
 drivers/infiniband/hw/bnxt_re/qplib_rcfw.h         |   10 +-
 drivers/infiniband/hw/bnxt_re/qplib_res.c          |   10 +
 drivers/infiniband/hw/bnxt_re/qplib_res.h          |    2 +
 drivers/infiniband/hw/bnxt_re/qplib_sp.c           |   77 +-
 drivers/infiniband/hw/bnxt_re/qplib_sp.h           |    2 +
 drivers/infiniband/hw/bnxt_re/roce_hsi.h           |    4 +-
 drivers/infiniband/hw/cxgb3/iwch.c                 |    1 -
 drivers/infiniband/hw/cxgb4/device.c               |    1 -
 drivers/infiniband/hw/hfi1/Makefile                |    2 +-
 drivers/infiniband/hw/hfi1/affinity.c              |   18 +-
 drivers/infiniband/hw/hfi1/affinity.h              |   14 +-
 drivers/infiniband/hw/hfi1/chip.c                  |  303 +++---
 drivers/infiniband/hw/hfi1/chip.h                  |    4 +-
 drivers/infiniband/hw/hfi1/common.h                |    1 +
 drivers/infiniband/hw/hfi1/driver.c                |  170 +++-
 drivers/infiniband/hw/hfi1/eprom.c                 |   11 +-
 drivers/infiniband/hw/hfi1/exp_rcv.c               |  114 +++
 drivers/infiniband/hw/hfi1/exp_rcv.h               |  187 ++++
 drivers/infiniband/hw/hfi1/file_ops.c              |   43 +-
 drivers/infiniband/hw/hfi1/hfi.h                   |  103 +-
 drivers/infiniband/hw/hfi1/init.c                  |   62 +-
 drivers/infiniband/hw/hfi1/mad.c                   |  323 +++---
 drivers/infiniband/hw/hfi1/mad.h                   |    2 +-
 drivers/infiniband/hw/hfi1/mmu_rb.c                |   14 +-
 drivers/infiniband/hw/hfi1/mmu_rb.h                |    5 +-
 drivers/infiniband/hw/hfi1/pcie.c                  |   80 +-
 drivers/infiniband/hw/hfi1/platform.c              |   30 +-
 drivers/infiniband/hw/hfi1/qp.c                    |   12 +-
 drivers/infiniband/hw/hfi1/rc.c                    |   42 +-
 drivers/infiniband/hw/hfi1/ruc.c                   |   91 +-
 drivers/infiniband/hw/hfi1/sdma.c                  |    6 +-
 drivers/infiniband/hw/hfi1/trace.c                 |   58 +-
 drivers/infiniband/hw/hfi1/trace_ibhdrs.h          |  322 ++++--
 drivers/infiniband/hw/hfi1/trace_misc.h            |   20 +
 drivers/infiniband/hw/hfi1/trace_rx.h              |   90 +-
 drivers/infiniband/hw/hfi1/uc.c                    |   18 +-
 drivers/infiniband/hw/hfi1/ud.c                    |   64 +-
 drivers/infiniband/hw/hfi1/user_exp_rcv.c          |  121 ---
 drivers/infiniband/hw/hfi1/user_exp_rcv.h          |   23 +-
 drivers/infiniband/hw/hfi1/user_sdma.c             |  207 ++--
 drivers/infiniband/hw/hfi1/verbs.c                 |  106 +-
 drivers/infiniband/hw/hfi1/verbs.h                 |   10 +-
 drivers/infiniband/hw/hfi1/vnic_main.c             |   11 +-
 drivers/infiniband/hw/hns/Kconfig                  |    2 +-
 drivers/infiniband/hw/hns/hns_roce_alloc.c         |    1 +
 drivers/infiniband/hw/hns/hns_roce_device.h        |    1 +
 drivers/infiniband/hw/hns/hns_roce_eq.c            |    2 +-
 drivers/infiniband/hw/hns/hns_roce_hw_v1.c         |    3 +-
 drivers/infiniband/hw/hns/hns_roce_mr.c            |    1 +
 drivers/infiniband/hw/hns/hns_roce_qp.c            |    2 +-
 drivers/infiniband/hw/i40iw/i40iw_main.c           |    1 -
 drivers/infiniband/hw/mlx4/cq.c                    |    2 +
 drivers/infiniband/hw/mlx4/main.c                  |   49 +-
 drivers/infiniband/hw/mlx4/mlx4_ib.h               |   42 +-
 drivers/infiniband/hw/mlx4/qp.c                    | 1031 ++++++++++++++++++--
 drivers/infiniband/hw/mlx5/Makefile                |    2 +-
 drivers/infiniband/hw/mlx5/cmd.c                   |   20 +
 drivers/infiniband/hw/mlx5/cmd.h                   |    4 +
 drivers/infiniband/hw/mlx5/cong.c                  |  421 ++++++++
 drivers/infiniband/hw/mlx5/ib_virt.c               |    9 +
 drivers/infiniband/hw/mlx5/main.c                  |  328 ++++++-
 drivers/infiniband/hw/mlx5/mlx5_ib.h               |   79 +-
 drivers/infiniband/hw/mlx5/mr.c                    |   18 +-
 drivers/infiniband/hw/mlx5/odp.c                   |    2 +-
 drivers/infiniband/hw/mlx5/qp.c                    |  122 ++-
 drivers/infiniband/hw/mthca/mthca_main.c           |    1 -
 drivers/infiniband/hw/nes/nes.c                    |    1 -
 drivers/infiniband/hw/ocrdma/ocrdma_main.c         |    1 -
 drivers/infiniband/hw/qedr/main.c                  |    2 +-
 drivers/infiniband/hw/qedr/qedr.h                  |    3 +-
 drivers/infiniband/hw/qedr/verbs.c                 |    3 +
 drivers/infiniband/hw/qib/qib.h                    |    8 +-
 drivers/infiniband/hw/qib/qib_driver.c             |    1 -
 drivers/infiniband/hw/qib/qib_iba6120.c            |    6 +-
 drivers/infiniband/hw/qib/qib_iba7220.c            |    7 +-
 drivers/infiniband/hw/qib/qib_iba7322.c            |   48 +-
 drivers/infiniband/hw/qib/qib_mad.c                |   15 +-
 drivers/infiniband/hw/qib/qib_pcie.c               |  149 ++-
 drivers/infiniband/hw/qib/qib_ruc.c                |   22 +-
 drivers/infiniband/hw/qib/qib_ud.c                 |   43 +-
 drivers/infiniband/hw/qib/qib_verbs.h              |    4 +-
 drivers/infiniband/hw/usnic/usnic_ib_main.c        |    2 +-
 drivers/infiniband/hw/usnic/usnic_ib_verbs.c       |   41 +-
 drivers/infiniband/hw/usnic/usnic_ib_verbs.h       |    1 +
 drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c     |    1 -
 drivers/infiniband/sw/rdmavt/mr.c                  |   51 +-
 drivers/infiniband/sw/rdmavt/qp.c                  |   60 +-
 drivers/infiniband/sw/rdmavt/trace_mr.h            |   62 ++
 drivers/infiniband/sw/rdmavt/trace_tx.h            |   11 +-
 drivers/infiniband/sw/rdmavt/vt.c                  |    9 +-
 drivers/infiniband/sw/rxe/rxe.c                    |    1 -
 drivers/infiniband/sw/rxe/rxe.h                    |    2 +-
 drivers/infiniband/sw/rxe/rxe_loc.h                |    2 +-
 drivers/infiniband/sw/rxe/rxe_mmap.c               |    2 +-
 drivers/infiniband/sw/rxe/rxe_pool.c               |    2 +-
 drivers/infiniband/sw/rxe/rxe_req.c                |    2 +-
 drivers/infiniband/sw/rxe/rxe_task.c               |    4 +-
 drivers/infiniband/sw/rxe/rxe_verbs.c              |   65 +-
 drivers/infiniband/ulp/ipoib/ipoib_main.c          |    1 -
 drivers/infiniband/ulp/iser/iscsi_iser.c           |    1 -
 drivers/infiniband/ulp/isert/ib_isert.c            |    1 -
 drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c    |   28 +-
 drivers/infiniband/ulp/srp/ib_srp.c                |    1 -
 drivers/net/ethernet/mellanox/mlx4/cq.c            |    7 +-
 drivers/net/ethernet/mellanox/mlx4/en_cq.c         |    1 +
 drivers/net/ethernet/mellanox/mlx4/en_netdev.c     |    3 +-
 drivers/net/ethernet/mellanox/mlx4/en_rx.c         |    6 +-
 drivers/net/ethernet/mellanox/mlx4/en_tx.c         |    3 +-
 drivers/net/ethernet/mellanox/mlx4/main.c          |    7 +-
 drivers/net/ethernet/mellanox/mlx4/qp.c            |    5 +-
 .../net/ethernet/mellanox/mlx5/core/en_selftest.c  |   13 +
 drivers/net/ethernet/mellanox/mlx5/core/eq.c       |   23 +
 drivers/net/ethernet/mellanox/mlx5/core/fw.c       |    6 +
 drivers/net/ethernet/mellanox/mlx5/core/main.c     |   19 +
 drivers/net/ethernet/mellanox/mlx5/core/qp.c       |   14 +
 drivers/net/ethernet/mellanox/mlx5/core/sriov.c    |   42 +
 drivers/net/ethernet/mellanox/mlx5/core/vport.c    |   62 ++
 include/linux/mlx4/device.h                        |   12 +-
 include/linux/mlx5/device.h                        |   11 +-
 include/linux/mlx5/driver.h                        |   18 +-
 include/linux/mlx5/mlx5_ifc.h                      |   88 +-
 include/linux/mlx5/qp.h                            |    4 +-
 include/linux/mlx5/vport.h                         |    3 +-
 include/rdma/ib_addr.h                             |    8 +-
 include/rdma/ib_hdrs.h                             |   84 ++
 include/rdma/ib_verbs.h                            |   13 +-
 include/rdma/rdma_vt.h                             |    4 +-
 include/rdma/rdmavt_qp.h                           |    2 +-
 include/uapi/rdma/ib_user_verbs.h                  |    2 +-
 include/uapi/rdma/mlx4-abi.h                       |   54 +-
 include/uapi/rdma/qedr-abi.h                       |    3 +
 141 files changed, 5113 insertions(+), 1827 deletions(-)
 create mode 100644 drivers/infiniband/hw/hfi1/exp_rcv.c
 create mode 100644 drivers/infiniband/hw/hfi1/exp_rcv.h
 create mode 100644 drivers/infiniband/hw/mlx5/cong.c
$ git reset --hard HEAD^
HEAD is now at 5baff5819e8a Merge remote-tracking branch 'bluetooth/master'
Merging next-20170728 version of rdma
$ git merge -m next-20170728/rdma a5f66725c7748a6831005a091b4aa9d18abb3b03
Auto-merging include/linux/mlx5/mlx5_ifc.h
Auto-merging drivers/net/ethernet/mellanox/mlx5/core/sriov.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eq.c
Auto-merging drivers/net/ethernet/mellanox/mlx4/en_cq.c
Merge made by the 'recursive' strategy.
 drivers/infiniband/core/cma.c                      |   22 +-
 drivers/infiniband/core/roce_gid_mgmt.c            |    2 +
 drivers/infiniband/core/uverbs_cmd.c               |   17 +-
 drivers/infiniband/core/verbs.c                    |  117 ++-
 drivers/infiniband/hw/bnxt_re/ib_verbs.c           |   88 +-
 drivers/infiniband/hw/bnxt_re/ib_verbs.h           |    3 -
 drivers/infiniband/hw/bnxt_re/main.c               |   58 +-
 drivers/infiniband/hw/bnxt_re/qplib_fp.c           |  465 +++++++--
 drivers/infiniband/hw/bnxt_re/qplib_fp.h           |   25 +-
 drivers/infiniband/hw/bnxt_re/qplib_rcfw.c         |   26 +-
 drivers/infiniband/hw/bnxt_re/qplib_rcfw.h         |   10 +-
 drivers/infiniband/hw/bnxt_re/qplib_res.c          |   10 +
 drivers/infiniband/hw/bnxt_re/qplib_res.h          |    2 +
 drivers/infiniband/hw/bnxt_re/qplib_sp.c           |   77 +-
 drivers/infiniband/hw/bnxt_re/qplib_sp.h           |    2 +
 drivers/infiniband/hw/bnxt_re/roce_hsi.h           |    4 +-
 drivers/infiniband/hw/cxgb3/iwch.c                 |    1 -
 drivers/infiniband/hw/cxgb4/device.c               |    1 -
 drivers/infiniband/hw/hfi1/Makefile                |    2 +-
 drivers/infiniband/hw/hfi1/affinity.c              |   18 +-
 drivers/infiniband/hw/hfi1/affinity.h              |   14 +-
 drivers/infiniband/hw/hfi1/chip.c                  |  303 +++---
 drivers/infiniband/hw/hfi1/chip.h                  |    4 +-
 drivers/infiniband/hw/hfi1/common.h                |    1 +
 drivers/infiniband/hw/hfi1/driver.c                |  170 +++-
 drivers/infiniband/hw/hfi1/eprom.c                 |   11 +-
 drivers/infiniband/hw/hfi1/exp_rcv.c               |  114 +++
 drivers/infiniband/hw/hfi1/exp_rcv.h               |  187 ++++
 drivers/infiniband/hw/hfi1/file_ops.c              |   43 +-
 drivers/infiniband/hw/hfi1/hfi.h                   |  103 +-
 drivers/infiniband/hw/hfi1/init.c                  |   62 +-
 drivers/infiniband/hw/hfi1/mad.c                   |  323 +++---
 drivers/infiniband/hw/hfi1/mad.h                   |    2 +-
 drivers/infiniband/hw/hfi1/mmu_rb.c                |   14 +-
 drivers/infiniband/hw/hfi1/mmu_rb.h                |    5 +-
 drivers/infiniband/hw/hfi1/pcie.c                  |   80 +-
 drivers/infiniband/hw/hfi1/platform.c              |   30 +-
 drivers/infiniband/hw/hfi1/qp.c                    |   12 +-
 drivers/infiniband/hw/hfi1/rc.c                    |   42 +-
 drivers/infiniband/hw/hfi1/ruc.c                   |   91 +-
 drivers/infiniband/hw/hfi1/sdma.c                  |    6 +-
 drivers/infiniband/hw/hfi1/trace.c                 |   58 +-
 drivers/infiniband/hw/hfi1/trace_ibhdrs.h          |  322 ++++--
 drivers/infiniband/hw/hfi1/trace_misc.h            |   20 +
 drivers/infiniband/hw/hfi1/trace_rx.h              |   90 +-
 drivers/infiniband/hw/hfi1/uc.c                    |   18 +-
 drivers/infiniband/hw/hfi1/ud.c                    |   64 +-
 drivers/infiniband/hw/hfi1/user_exp_rcv.c          |  121 ---
 drivers/infiniband/hw/hfi1/user_exp_rcv.h          |   23 +-
 drivers/infiniband/hw/hfi1/user_sdma.c             |  207 ++--
 drivers/infiniband/hw/hfi1/verbs.c                 |  106 +-
 drivers/infiniband/hw/hfi1/verbs.h                 |   10 +-
 drivers/infiniband/hw/hfi1/vnic_main.c             |   11 +-
 drivers/infiniband/hw/i40iw/i40iw_main.c           |    1 -
 drivers/infiniband/hw/mlx4/cq.c                    |    2 +
 drivers/infiniband/hw/mlx4/main.c                  |   49 +-
 drivers/infiniband/hw/mlx4/mlx4_ib.h               |   42 +-
 drivers/infiniband/hw/mlx4/qp.c                    | 1031 ++++++++++++++++++--
 drivers/infiniband/hw/mlx5/Makefile                |    2 +-
 drivers/infiniband/hw/mlx5/cmd.c                   |   20 +
 drivers/infiniband/hw/mlx5/cmd.h                   |    4 +
 drivers/infiniband/hw/mlx5/cong.c                  |  421 ++++++++
 drivers/infiniband/hw/mlx5/ib_virt.c               |    9 +
 drivers/infiniband/hw/mlx5/main.c                  |  328 ++++++-
 drivers/infiniband/hw/mlx5/mlx5_ib.h               |   79 +-
 drivers/infiniband/hw/mlx5/mr.c                    |   18 +-
 drivers/infiniband/hw/mlx5/odp.c                   |    2 +-
 drivers/infiniband/hw/mlx5/qp.c                    |  122 ++-
 drivers/infiniband/hw/mthca/mthca_main.c           |    1 -
 drivers/infiniband/hw/nes/nes.c                    |    1 -
 drivers/infiniband/hw/ocrdma/ocrdma_main.c         |    1 -
 drivers/infiniband/hw/qedr/main.c                  |    2 +-
 drivers/infiniband/hw/qedr/qedr.h                  |    3 +-
 drivers/infiniband/hw/qedr/verbs.c                 |    3 +
 drivers/infiniband/hw/qib/qib.h                    |    8 +-
 drivers/infiniband/hw/qib/qib_driver.c             |    1 -
 drivers/infiniband/hw/qib/qib_iba6120.c            |    6 +-
 drivers/infiniband/hw/qib/qib_iba7220.c            |    7 +-
 drivers/infiniband/hw/qib/qib_iba7322.c            |   48 +-
 drivers/infiniband/hw/qib/qib_mad.c                |   15 +-
 drivers/infiniband/hw/qib/qib_pcie.c               |  149 ++-
 drivers/infiniband/hw/qib/qib_ruc.c                |   22 +-
 drivers/infiniband/hw/qib/qib_ud.c                 |   43 +-
 drivers/infiniband/hw/qib/qib_verbs.h              |    4 +-
 drivers/infiniband/hw/usnic/usnic_ib_main.c        |    2 +-
 drivers/infiniband/hw/usnic/usnic_ib_verbs.c       |   41 +-
 drivers/infiniband/hw/usnic/usnic_ib_verbs.h       |    1 +
 drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c     |    1 -
 drivers/infiniband/sw/rdmavt/mr.c                  |   51 +-
 drivers/infiniband/sw/rdmavt/qp.c                  |   60 +-
 drivers/infiniband/sw/rdmavt/trace_mr.h            |   62 ++
 drivers/infiniband/sw/rdmavt/trace_tx.h            |   11 +-
 drivers/infiniband/sw/rdmavt/vt.c                  |    9 +-
 drivers/infiniband/sw/rxe/rxe.c                    |    1 -
 drivers/infiniband/sw/rxe/rxe.h                    |    2 +-
 drivers/infiniband/sw/rxe/rxe_loc.h                |    2 +-
 drivers/infiniband/sw/rxe/rxe_mmap.c               |    2 +-
 drivers/infiniband/sw/rxe/rxe_pool.c               |    2 +-
 drivers/infiniband/sw/rxe/rxe_req.c                |    2 +-
 drivers/infiniband/sw/rxe/rxe_task.c               |    4 +-
 drivers/infiniband/sw/rxe/rxe_verbs.c              |   65 +-
 drivers/infiniband/ulp/ipoib/ipoib_main.c          |    1 -
 drivers/infiniband/ulp/iser/iscsi_iser.c           |    1 -
 drivers/infiniband/ulp/isert/ib_isert.c            |    1 -
 drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c    |   28 +-
 drivers/infiniband/ulp/srp/ib_srp.c                |    1 -
 drivers/net/ethernet/mellanox/mlx4/cq.c            |    7 +-
 drivers/net/ethernet/mellanox/mlx4/en_cq.c         |    1 +
 drivers/net/ethernet/mellanox/mlx4/en_netdev.c     |    3 +-
 drivers/net/ethernet/mellanox/mlx4/en_rx.c         |    6 +-
 drivers/net/ethernet/mellanox/mlx4/en_tx.c         |    3 +-
 drivers/net/ethernet/mellanox/mlx4/main.c          |    7 +-
 drivers/net/ethernet/mellanox/mlx4/qp.c            |    5 +-
 .../net/ethernet/mellanox/mlx5/core/en_selftest.c  |   13 +
 drivers/net/ethernet/mellanox/mlx5/core/eq.c       |   23 +
 drivers/net/ethernet/mellanox/mlx5/core/fw.c       |    6 +
 drivers/net/ethernet/mellanox/mlx5/core/main.c     |   19 +
 drivers/net/ethernet/mellanox/mlx5/core/qp.c       |   14 +
 drivers/net/ethernet/mellanox/mlx5/core/sriov.c    |   42 +
 drivers/net/ethernet/mellanox/mlx5/core/vport.c    |   62 ++
 include/linux/mlx4/device.h                        |   12 +-
 include/linux/mlx5/device.h                        |   11 +-
 include/linux/mlx5/driver.h                        |   18 +-
 include/linux/mlx5/mlx5_ifc.h                      |   88 +-
 include/linux/mlx5/qp.h                            |    4 +-
 include/linux/mlx5/vport.h                         |    3 +-
 include/rdma/ib_addr.h                             |    8 +-
 include/rdma/ib_hdrs.h                             |   84 ++
 include/rdma/ib_verbs.h                            |   13 +-
 include/rdma/rdma_vt.h                             |    4 +-
 include/rdma/rdmavt_qp.h                           |    2 +-
 include/uapi/rdma/ib_user_verbs.h                  |    2 +-
 include/uapi/rdma/mlx4-abi.h                       |   54 +-
 include/uapi/rdma/qedr-abi.h                       |    3 +
 134 files changed, 5106 insertions(+), 1822 deletions(-)
 create mode 100644 drivers/infiniband/hw/hfi1/exp_rcv.c
 create mode 100644 drivers/infiniband/hw/hfi1/exp_rcv.h
 create mode 100644 drivers/infiniband/hw/mlx5/cong.c
Merging gfs2/for-next (4676743ded4d GFS2: Delete debugfs files only after we evict the glocks)
$ git merge gfs2/for-next
Auto-merging fs/gfs2/file.c
Auto-merging fs/gfs2/dir.c
Merge made by the 'recursive' strategy.
 fs/gfs2/acl.c        | 27 ++++++++++++++-------------
 fs/gfs2/bmap.c       |  5 +++--
 fs/gfs2/dir.c        |  4 +++-
 fs/gfs2/file.c       |  3 +--
 fs/gfs2/glock.c      |  3 +++
 fs/gfs2/glock.h      | 34 ++++++++++++++++++++++++++++++++++
 fs/gfs2/glops.c      |  2 +-
 fs/gfs2/inode.c      | 12 +++++++-----
 fs/gfs2/meta_io.c    |  9 ++++++---
 fs/gfs2/ops_fstype.c |  1 -
 fs/gfs2/quota.c      |  2 +-
 fs/gfs2/rgrp.c       |  1 -
 fs/gfs2/super.c      | 16 +++++++++++++---
 13 files changed, 86 insertions(+), 33 deletions(-)
Merging mtd/master (5771a8c08880 Linux v4.13-rc1)
$ git merge mtd/master
Already up-to-date.
Merging l2-mtd/master (1fbef470f369 mtd: mtdswap: remove unused variables 'dev' and 'gd')
$ git merge l2-mtd/master
Merge made by the 'recursive' strategy.
 drivers/mtd/devices/docg3.c | 49 ++++++++++++++++-----------------------------
 drivers/mtd/devices/docg3.h |  2 --
 drivers/mtd/mtdcore.c       | 16 +++++++++++++++
 drivers/mtd/mtdswap.c       | 21 ++++---------------
 drivers/mtd/nand/nandsim.c  | 48 +++++++++++---------------------------------
 include/linux/mtd/mtd.h     | 10 +++++++++
 6 files changed, 59 insertions(+), 87 deletions(-)
Merging nand/nand/next (81667e9c8ad8 mtd: nand: mtk: release lock on error path)
$ git merge nand/nand/next
Already up-to-date.
Merging spi-nor/spi-nor/next (f384b352cbf0 mtd: spi-nor: parse Serial Flash Discoverable Parameters (SFDP) tables)
$ git merge spi-nor/spi-nor/next
Merge made by the 'recursive' strategy.
 drivers/mtd/spi-nor/spi-nor.c | 775 +++++++++++++++++++++++++++++++++++++++++-
 include/linux/mtd/spi-nor.h   |   6 +
 2 files changed, 768 insertions(+), 13 deletions(-)
Merging crypto/master (e28c190db668 csrypto: ccp - Expand RSA support for a v5 ccp)
$ git merge crypto/master
Removing drivers/crypto/ccp/ccp-platform.c
Removing drivers/crypto/ccp/ccp-pci.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/crypto/atmel-crypto.txt    |   13 +
 .../devicetree/bindings/crypto/st,stm32-hash.txt   |   30 +
 MAINTAINERS                                        |    6 +
 crypto/algif_aead.c                                |  766 ++++++----
 crypto/algif_skcipher.c                            |  561 ++++---
 crypto/rng.c                                       |    6 +-
 drivers/char/hw_random/core.c                      |   42 +-
 drivers/crypto/Kconfig                             |   28 +-
 drivers/crypto/Makefile                            |    3 +-
 drivers/crypto/atmel-ecc.c                         |  781 ++++++++++
 drivers/crypto/atmel-ecc.h                         |  128 ++
 drivers/crypto/bcm/cipher.c                        |    5 +
 drivers/crypto/caam/caamalg.c                      |   66 +-
 drivers/crypto/caam/caamalg_desc.c                 |    5 +-
 drivers/crypto/caam/caamalg_qi.c                   |   55 +-
 drivers/crypto/caam/caamrng.c                      |    6 +-
 drivers/crypto/caam/ctrl.c                         |    1 -
 drivers/crypto/caam/error.c                        |   40 +
 drivers/crypto/caam/error.h                        |    4 +
 drivers/crypto/caam/intern.h                       |    3 -
 drivers/crypto/caam/qi.c                           |   24 +-
 drivers/crypto/caam/qi.h                           |    3 +
 drivers/crypto/caam/sg_sw_sec4.h                   |   15 -
 drivers/crypto/ccp/Kconfig                         |   21 +-
 drivers/crypto/ccp/Makefile                        |    7 +-
 drivers/crypto/ccp/ccp-crypto-aes-galois.c         |    2 +-
 drivers/crypto/ccp/ccp-crypto-des3.c               |    2 +-
 drivers/crypto/ccp/ccp-crypto-main.c               |   21 +-
 drivers/crypto/ccp/ccp-crypto-rsa.c                |  299 ++++
 drivers/crypto/ccp/ccp-crypto-sha.c                |    2 +-
 drivers/crypto/ccp/ccp-crypto.h                    |   34 +-
 drivers/crypto/ccp/ccp-debugfs.c                   |   15 +-
 drivers/crypto/ccp/ccp-dev-v3.c                    |   20 +-
 drivers/crypto/ccp/ccp-dev-v5.c                    |   26 +-
 drivers/crypto/ccp/ccp-dev.c                       |  127 +-
 drivers/crypto/ccp/ccp-dev.h                       |   28 +-
 drivers/crypto/ccp/ccp-dmaengine.c                 |    2 +-
 drivers/crypto/ccp/ccp-ops.c                       |   85 +-
 drivers/crypto/ccp/ccp-pci.c                       |  356 -----
 drivers/crypto/ccp/ccp-platform.c                  |  293 ----
 drivers/crypto/ccp/sp-dev.c                        |  277 ++++
 drivers/crypto/ccp/sp-dev.h                        |  133 ++
 drivers/crypto/ccp/sp-pci.c                        |  276 ++++
 drivers/crypto/ccp/sp-platform.c                   |  256 ++++
 drivers/crypto/geode-aes.c                         |   17 +-
 drivers/crypto/mediatek/mtk-platform.c             |    2 +-
 drivers/crypto/mxc-scc.c                           |    4 +-
 drivers/crypto/mxs-dcp.c                           |    8 +-
 drivers/crypto/omap-aes.c                          |    1 +
 drivers/crypto/omap-des.c                          |    3 +-
 drivers/crypto/qat/qat_common/adf_aer.c            |    2 +-
 drivers/crypto/sahara.c                            |    2 +-
 drivers/crypto/stm32/Kconfig                       |   19 +-
 drivers/crypto/stm32/Makefile                      |    4 +-
 drivers/crypto/stm32/stm32-hash.c                  | 1575 ++++++++++++++++++++
 drivers/crypto/stm32/stm32_crc32.c                 |   17 +-
 drivers/crypto/sunxi-ss/Makefile                   |    1 +
 drivers/crypto/sunxi-ss/sun4i-ss-core.c            |   30 +
 drivers/crypto/sunxi-ss/sun4i-ss-prng.c            |   56 +
 drivers/crypto/sunxi-ss/sun4i-ss.h                 |   11 +
 drivers/crypto/virtio/virtio_crypto_algs.c         |  109 +-
 drivers/crypto/virtio/virtio_crypto_common.h       |   22 +-
 drivers/crypto/virtio/virtio_crypto_core.c         |   37 +-
 include/crypto/internal/akcipher.h                 |    6 +
 include/crypto/kpp.h                               |   10 +
 include/linux/ccp.h                                |    8 +-
 66 files changed, 5209 insertions(+), 1608 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/crypto/st,stm32-hash.txt
 create mode 100644 drivers/crypto/atmel-ecc.c
 create mode 100644 drivers/crypto/atmel-ecc.h
 create mode 100644 drivers/crypto/ccp/ccp-crypto-rsa.c
 delete mode 100644 drivers/crypto/ccp/ccp-pci.c
 delete mode 100644 drivers/crypto/ccp/ccp-platform.c
 create mode 100644 drivers/crypto/ccp/sp-dev.c
 create mode 100644 drivers/crypto/ccp/sp-dev.h
 create mode 100644 drivers/crypto/ccp/sp-pci.c
 create mode 100644 drivers/crypto/ccp/sp-platform.c
 create mode 100644 drivers/crypto/stm32/stm32-hash.c
 create mode 100644 drivers/crypto/sunxi-ss/sun4i-ss-prng.c
Merging drm/drm-next (e6742e1021a5 drm: linux-next: build failure after merge of the drm-misc tree)
$ git merge drm/drm-next
Resolved 'drivers/gpu/drm/i915/intel_pm.c' using previous resolution.
Recorded preimage for 'drivers/gpu/drm/nouveau/nv50_display.c'
Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
Auto-merging drivers/gpu/drm/nouveau/nv50_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/nouveau/nv50_display.c
Auto-merging drivers/gpu/drm/nouveau/nouveau_display.c
Auto-merging drivers/gpu/drm/i915/selftests/mock_gem_device.c
Auto-merging drivers/gpu/drm/i915/intel_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
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_gem_execbuffer.c
Auto-merging drivers/gpu/drm/exynos/exynos_hdmi.c
Auto-merging drivers/gpu/drm/exynos/exynos_drm_dsi.c
Auto-merging drivers/gpu/drm/exynos/exynos_drm_drv.c
Auto-merging drivers/gpu/drm/bridge/tc358767.c
Auto-merging MAINTAINERS
Auto-merging Documentation/gpu/drm-mm.rst
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
Recorded resolution for 'drivers/gpu/drm/nouveau/nv50_display.c'.
[master d932490f5bc0] Merge remote-tracking branch 'drm/drm-next'
$ git diff -M --stat --summary HEAD^..
 .../bindings/display/bridge/dw_mipi_dsi.txt        |   32 +
 .../devicetree/bindings/display/repaper.txt        |   52 +
 .../bindings/display/rockchip/dw_hdmi-rockchip.txt |    7 +-
 .../devicetree/bindings/vendor-prefixes.txt        |    1 +
 Documentation/gpu/drm-internals.rst                |    2 +
 Documentation/gpu/drm-kms.rst                      |   59 +-
 Documentation/gpu/drm-mm.rst                       |    2 +-
 Documentation/gpu/drm-uapi.rst                     |    2 +
 MAINTAINERS                                        |    6 +
 arch/x86/kernel/early-quirks.c                     |    1 +
 drivers/dma-buf/dma-fence.c                        |    4 +-
 drivers/dma-buf/sw_sync.c                          |  107 +-
 drivers/dma-buf/sync_debug.c                       |   19 +-
 drivers/dma-buf/sync_debug.h                       |   26 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c            |    1 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c             |    1 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c            |    1 -
 drivers/gpu/drm/amd/amdgpu/dce_v10_0.c             |    2 +-
 drivers/gpu/drm/amd/amdgpu/dce_v11_0.c             |    2 +-
 drivers/gpu/drm/amd/amdgpu/dce_v6_0.c              |    2 +-
 drivers/gpu/drm/amd/amdgpu/dce_v8_0.c              |    2 +-
 drivers/gpu/drm/arc/arcpgu_crtc.c                  |   41 +-
 drivers/gpu/drm/arm/hdlcd_crtc.c                   |   10 +-
 drivers/gpu/drm/arm/hdlcd_drv.c                    |    2 -
 drivers/gpu/drm/arm/malidp_crtc.c                  |   10 +-
 drivers/gpu/drm/arm/malidp_drv.c                   |    2 +-
 drivers/gpu/drm/armada/armada_crtc.c               |    9 +-
 drivers/gpu/drm/armada/armada_drv.c                |    4 +-
 drivers/gpu/drm/armada/armada_fbdev.c              |    1 -
 drivers/gpu/drm/armada/armada_overlay.c            |    2 +-
 drivers/gpu/drm/ast/ast_drv.c                      |    5 +-
 drivers/gpu/drm/ast/ast_fb.c                       |    1 -
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c     |   18 +-
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c       |   30 +-
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h       |   16 +
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c    |   29 +
 drivers/gpu/drm/bochs/bochs_drv.c                  |    5 +-
 drivers/gpu/drm/bochs/bochs_fbdev.c                |    7 +-
 drivers/gpu/drm/bridge/adv7511/adv7511_drv.c       |    6 +-
 drivers/gpu/drm/bridge/analogix-anx78xx.c          |    9 +-
 drivers/gpu/drm/bridge/dumb-vga-dac.c              |    9 +-
 drivers/gpu/drm/bridge/nxp-ptn3460.c               |    6 +-
 drivers/gpu/drm/bridge/panel.c                     |    5 +-
 drivers/gpu/drm/bridge/parade-ps8622.c             |    6 +-
 drivers/gpu/drm/bridge/sii902x.c                   |    8 +-
 drivers/gpu/drm/bridge/synopsys/Kconfig            |    6 +
 drivers/gpu/drm/bridge/synopsys/Makefile           |    2 +
 drivers/gpu/drm/bridge/synopsys/dw-hdmi.c          |    9 +-
 drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c      |  981 ++++++++++++++++++
 drivers/gpu/drm/bridge/tc358767.c                  |    6 +-
 drivers/gpu/drm/bridge/ti-tfp410.c                 |    6 +-
 drivers/gpu/drm/cirrus/cirrus_drv.c                |    5 +-
 drivers/gpu/drm/cirrus/cirrus_fbdev.c              |    1 -
 drivers/gpu/drm/drm_atomic.c                       |  121 ++-
 drivers/gpu/drm/drm_atomic_helper.c                |  345 ++++--
 drivers/gpu/drm/drm_color_mgmt.c                   |    3 +
 drivers/gpu/drm/drm_debugfs_crc.c                  |   59 +-
 drivers/gpu/drm/drm_dp_mst_topology.c              |   89 +-
 drivers/gpu/drm/drm_drv.c                          |   16 +
 drivers/gpu/drm/drm_edid.c                         |  440 +++++++-
 drivers/gpu/drm/drm_fb_cma_helper.c                |    4 +-
 drivers/gpu/drm/drm_fb_helper.c                    |  632 ++++++-----
 drivers/gpu/drm/drm_file.c                         |    7 +-
 drivers/gpu/drm/drm_framebuffer.c                  |    2 +-
 drivers/gpu/drm/drm_gem.c                          |   10 +-
 drivers/gpu/drm/drm_gem_cma_helper.c               |    2 +-
 drivers/gpu/drm/drm_internal.h                     |   14 +-
 drivers/gpu/drm/drm_ioc32.c                        |    2 +-
 drivers/gpu/drm/drm_ioctl.c                        |   13 +-
 drivers/gpu/drm/drm_mipi_dsi.c                     |    6 +-
 drivers/gpu/drm/drm_modes.c                        |   91 +-
 drivers/gpu/drm/drm_modeset_lock.c                 |   12 +-
 drivers/gpu/drm/drm_of.c                           |    4 +-
 drivers/gpu/drm/drm_pci.c                          |   40 +-
 drivers/gpu/drm/drm_probe_helper.c                 |    4 +
 drivers/gpu/drm/drm_property.c                     |   23 +
 drivers/gpu/drm/drm_simple_kms_helper.c            |   20 +-
 drivers/gpu/drm/drm_syncobj.c                      |    2 -
 drivers/gpu/drm/drm_vblank.c                       |  187 ++--
 drivers/gpu/drm/exynos/exynos_drm_crtc.c           |   10 +-
 drivers/gpu/drm/exynos/exynos_drm_drv.c            |    6 +-
 drivers/gpu/drm/exynos/exynos_drm_dsi.c            |    3 +-
 drivers/gpu/drm/exynos/exynos_drm_fb.c             |   27 +-
 drivers/gpu/drm/exynos/exynos_drm_fbdev.c          |   26 +-
 drivers/gpu/drm/exynos/exynos_hdmi.c               |    2 +-
 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c         |    5 +-
 drivers/gpu/drm/gma500/mdfld_intel_display.c       |    4 -
 drivers/gpu/drm/gma500/psb_drv.c                   |    5 +-
 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c     |   10 +-
 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c    |    3 +-
 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c  |    1 -
 drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c    |   13 +-
 drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c    |   28 +-
 drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h    |    2 -
 drivers/gpu/drm/i2c/tda998x_drv.c                  |    2 +-
 drivers/gpu/drm/i810/i810_drv.c                    |    5 +-
 drivers/gpu/drm/i915/Kconfig                       |    1 +
 drivers/gpu/drm/i915/gvt/scheduler.c               |    2 +-
 drivers/gpu/drm/i915/i915_debugfs.c                |  103 +-
 drivers/gpu/drm/i915/i915_drv.c                    |  138 ++-
 drivers/gpu/drm/i915/i915_drv.h                    |  186 ++--
 drivers/gpu/drm/i915/i915_gem.c                    |  165 ++-
 drivers/gpu/drm/i915/i915_gem_context.c            |  186 ++--
 drivers/gpu/drm/i915/i915_gem_context.h            |   34 +-
 drivers/gpu/drm/i915/i915_gem_execbuffer.c         |   21 +-
 drivers/gpu/drm/i915/i915_gem_gtt.c                |   66 +-
 drivers/gpu/drm/i915/i915_gem_gtt.h                |    3 +-
 drivers/gpu/drm/i915/i915_gem_request.c            |    7 +-
 drivers/gpu/drm/i915/i915_gem_request.h            |    2 +
 drivers/gpu/drm/i915/i915_gpu_error.c              |    3 +
 drivers/gpu/drm/i915/i915_irq.c                    |  161 ++-
 drivers/gpu/drm/i915/i915_params.c                 |   18 +-
 drivers/gpu/drm/i915/i915_params.h                 |    7 +-
 drivers/gpu/drm/i915/i915_pci.c                    |    6 +-
 drivers/gpu/drm/i915/i915_perf.c                   |    6 +-
 drivers/gpu/drm/i915/i915_reg.h                    |    6 +-
 drivers/gpu/drm/i915/i915_sysfs.c                  |   10 +-
 drivers/gpu/drm/i915/i915_vma.c                    |    9 +-
 drivers/gpu/drm/i915/intel_atomic_plane.c          |   15 +
 drivers/gpu/drm/i915/intel_bios.c                  |    9 +
 drivers/gpu/drm/i915/intel_color.c                 |    2 +-
 drivers/gpu/drm/i915/intel_ddi.c                   |  116 ++-
 drivers/gpu/drm/i915/intel_device_info.c           |    2 +-
 drivers/gpu/drm/i915/intel_display.c               |   45 +-
 drivers/gpu/drm/i915/intel_dp.c                    |  108 +-
 drivers/gpu/drm/i915/intel_dp_aux_backlight.c      |  185 +++-
 drivers/gpu/drm/i915/intel_dp_mst.c                |   47 +-
 drivers/gpu/drm/i915/intel_drv.h                   |    5 +-
 drivers/gpu/drm/i915/intel_engine_cs.c             |   38 +-
 drivers/gpu/drm/i915/intel_fbdev.c                 |   19 +-
 drivers/gpu/drm/i915/intel_hdmi.c                  |    7 +-
 drivers/gpu/drm/i915/intel_lrc.c                   |    2 +-
 drivers/gpu/drm/i915/intel_pm.c                    |  148 ++-
 drivers/gpu/drm/i915/intel_ringbuffer.c            |    5 +-
 drivers/gpu/drm/i915/intel_ringbuffer.h            |    1 +
 drivers/gpu/drm/i915/intel_runtime_pm.c            |  139 ++-
 drivers/gpu/drm/i915/intel_sdvo.c                  |    5 +-
 drivers/gpu/drm/i915/intel_sprite.c                |    2 +-
 drivers/gpu/drm/i915/intel_uncore.c                |   15 +-
 drivers/gpu/drm/i915/selftests/i915_gem_gtt.c      |   10 +-
 drivers/gpu/drm/i915/selftests/i915_vma.c          |    8 +-
 drivers/gpu/drm/i915/selftests/intel_hangcheck.c   |  159 +++
 drivers/gpu/drm/i915/selftests/mock_context.c      |   11 +-
 drivers/gpu/drm/i915/selftests/mock_context.h      |    2 +
 drivers/gpu/drm/i915/selftests/mock_gem_device.c   |    5 +-
 drivers/gpu/drm/i915/selftests/mock_gtt.c          |    3 +-
 drivers/gpu/drm/imx/imx-drm-core.c                 |    8 +-
 drivers/gpu/drm/imx/ipuv3-crtc.c                   |    5 +-
 drivers/gpu/drm/imx/ipuv3-plane.c                  |    2 +-
 drivers/gpu/drm/mediatek/mtk_disp_color.c          |    4 +-
 drivers/gpu/drm/mediatek/mtk_disp_ovl.c            |    4 +-
 drivers/gpu/drm/mediatek/mtk_disp_rdma.c           |    4 +-
 drivers/gpu/drm/mediatek/mtk_dpi.c                 |    6 +-
 drivers/gpu/drm/mediatek/mtk_drm_crtc.c            |   17 +-
 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c        |    6 +-
 drivers/gpu/drm/mediatek/mtk_drm_drv.c             |   30 +-
 drivers/gpu/drm/mediatek/mtk_dsi.c                 |    4 +-
 drivers/gpu/drm/mediatek/mtk_hdmi.c                |   10 +-
 drivers/gpu/drm/meson/meson_crtc.c                 |   10 +-
 drivers/gpu/drm/meson/meson_drv.c                  |    5 +-
 drivers/gpu/drm/mga/mga_drv.c                      |    5 +-
 drivers/gpu/drm/mgag200/mgag200_drv.c              |    6 +-
 drivers/gpu/drm/mgag200/mgag200_fb.c               |    1 -
 drivers/gpu/drm/msm/hdmi/hdmi_bridge.c             |    2 +-
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c           |   10 +-
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c           |   10 +-
 drivers/gpu/drm/msm/msm_atomic.c                   |   16 +-
 drivers/gpu/drm/msm/msm_fbdev.c                    |    1 -
 drivers/gpu/drm/mxsfb/mxsfb_drv.c                  |    3 +-
 drivers/gpu/drm/nouveau/nouveau_display.c          |    2 -
 drivers/gpu/drm/nouveau/nouveau_drm.c              |   12 +-
 drivers/gpu/drm/nouveau/nv50_display.c             |   17 +-
 drivers/gpu/drm/omapdrm/omap_crtc.c                |   10 +-
 drivers/gpu/drm/omapdrm/omap_encoder.c             |    3 +-
 drivers/gpu/drm/omapdrm/omap_fbdev.c               |    1 -
 drivers/gpu/drm/panel/panel-lvds.c                 |   16 +-
 drivers/gpu/drm/pl111/pl111_drv.c                  |    2 +-
 drivers/gpu/drm/qxl/qxl_display.c                  |   33 +-
 drivers/gpu/drm/qxl/qxl_drv.c                      |    7 +-
 drivers/gpu/drm/qxl/qxl_drv.h                      |    1 +
 drivers/gpu/drm/qxl/qxl_fb.c                       |    1 -
 drivers/gpu/drm/qxl/qxl_ioctl.c                    |   17 +-
 drivers/gpu/drm/qxl/qxl_object.c                   |    4 +-
 drivers/gpu/drm/qxl/qxl_ttm.c                      |    2 +-
 drivers/gpu/drm/r128/r128_drv.c                    |    5 +-
 drivers/gpu/drm/radeon/radeon_audio.c              |    2 +-
 drivers/gpu/drm/radeon/radeon_dp_mst.c             |    7 -
 drivers/gpu/drm/radeon/radeon_drv.c                |    6 +-
 drivers/gpu/drm/radeon/radeon_fb.c                 |    1 -
 drivers/gpu/drm/radeon/radeon_irq_kms.c            |    1 -
 drivers/gpu/drm/rcar-du/rcar_du_crtc.c             |   10 +-
 drivers/gpu/drm/rcar-du/rcar_du_encoder.c          |    4 +-
 drivers/gpu/drm/rcar-du/rcar_du_kms.c              |   16 +-
 drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c        |  110 +-
 drivers/gpu/drm/rockchip/inno_hdmi.c               |    2 +-
 drivers/gpu/drm/rockchip/rockchip_drm_drv.c        |    6 +-
 drivers/gpu/drm/rockchip/rockchip_drm_fb.c         |   25 +-
 drivers/gpu/drm/rockchip/rockchip_drm_vop.c        |   21 +-
 drivers/gpu/drm/savage/savage_drv.c                |    5 +-
 drivers/gpu/drm/shmobile/shmob_drm_drv.c           |    4 +-
 drivers/gpu/drm/sis/sis_drv.c                      |    5 +-
 drivers/gpu/drm/sti/sti_crtc.c                     |   10 +-
 drivers/gpu/drm/sti/sti_drv.c                      |    1 -
 drivers/gpu/drm/sti/sti_dvo.c                      |    2 +-
 drivers/gpu/drm/sti/sti_hdmi.c                     |    2 +-
 drivers/gpu/drm/sti/sti_hqvdp.c                    |    5 +-
 drivers/gpu/drm/stm/Kconfig                        |    2 +-
 drivers/gpu/drm/stm/ltdc.c                         |  230 +---
 drivers/gpu/drm/stm/ltdc.h                         |    3 +-
 drivers/gpu/drm/sun4i/sun4i_crtc.c                 |   10 +-
 drivers/gpu/drm/sun4i/sun4i_drv.c                  |    9 +-
 drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c             |    2 +-
 drivers/gpu/drm/tdfx/tdfx_drv.c                    |    5 +-
 drivers/gpu/drm/tegra/dc.c                         |   10 +-
 drivers/gpu/drm/tegra/drm.c                        |   12 +-
 drivers/gpu/drm/tegra/hdmi.c                       |    2 +-
 drivers/gpu/drm/tegra/sor.c                        |    2 +-
 drivers/gpu/drm/tilcdc/tilcdc_crtc.c               |   20 +-
 drivers/gpu/drm/tilcdc/tilcdc_drv.c                |    6 +-
 drivers/gpu/drm/tinydrm/Kconfig                    |   12 +
 drivers/gpu/drm/tinydrm/Makefile                   |    1 +
 drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c     |   74 +-
 drivers/gpu/drm/tinydrm/repaper.c                  | 1095 ++++++++++++++++++++
 drivers/gpu/drm/udl/udl_dmabuf.c                   |    2 +-
 drivers/gpu/drm/udl/udl_drv.c                      |    6 -
 drivers/gpu/drm/udl/udl_fb.c                       |    1 -
 drivers/gpu/drm/udl/udl_main.c                     |    2 -
 drivers/gpu/drm/vc4/vc4_crtc.c                     |   44 +-
 drivers/gpu/drm/vc4/vc4_dpi.c                      |   13 +-
 drivers/gpu/drm/vc4/vc4_drv.h                      |    1 -
 drivers/gpu/drm/vc4/vc4_dsi.c                      |   20 +-
 drivers/gpu/drm/vc4/vc4_hdmi.c                     |    2 +-
 drivers/gpu/drm/vc4/vc4_kms.c                      |   78 +-
 drivers/gpu/drm/vc4/vc4_plane.c                    |   17 +
 drivers/gpu/drm/vgem/vgem_drv.c                    |   82 +-
 drivers/gpu/drm/vgem/vgem_drv.h                    |    4 +
 drivers/gpu/drm/via/via_drv.c                      |    5 +-
 drivers/gpu/drm/virtio/virtgpu_display.c           |   10 +-
 drivers/gpu/drm/virtio/virtgpu_fb.c                |    1 -
 drivers/gpu/drm/virtio/virtgpu_ttm.c               |    2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c                |    5 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_fb.c                 |    1 -
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c                |   13 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.h                |    2 -
 drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c                |   31 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c               |   23 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c               |   37 +-
 drivers/gpu/drm/zte/zx_drm_drv.c                   |    4 +-
 drivers/gpu/drm/zte/zx_hdmi.c                      |    2 +-
 drivers/gpu/drm/zte/zx_vou.c                       |   10 +-
 drivers/gpu/ipu-v3/ipu-common.c                    |    4 +-
 drivers/staging/vboxvideo/vbox_drv.c               |    5 +-
 include/drm/bridge/dw_mipi_dsi.h                   |   39 +
 include/drm/drmP.h                                 |   37 +-
 include/drm/drm_atomic.h                           |  122 ++-
 include/drm/drm_atomic_helper.h                    |   16 +-
 include/drm/drm_connector.h                        |   32 +
 include/drm/drm_crtc.h                             |    3 +
 include/drm/drm_dp_mst_helper.h                    |   10 +
 include/drm/drm_drv.h                              |   20 +-
 include/drm/drm_edid.h                             |   11 +-
 include/drm/drm_fb_cma_helper.h                    |    4 +-
 include/drm/drm_fb_helper.h                        |   42 +-
 include/drm/drm_gem.h                              |   15 -
 include/drm/drm_modes.h                            |   11 +
 include/drm/drm_modeset_helper_vtables.h           |  109 +-
 include/drm/drm_pci.h                              |   11 +-
 include/drm/drm_property.h                         |    2 +
 include/drm/drm_vblank.h                           |    3 +-
 include/drm/tinydrm/tinydrm-helpers.h              |    1 +
 include/linux/dma-fence.h                          |   19 +-
 include/uapi/drm/qxl_drm.h                         |    6 +-
 272 files changed, 6673 insertions(+), 2450 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/display/bridge/dw_mipi_dsi.txt
 create mode 100644 Documentation/devicetree/bindings/display/repaper.txt
 create mode 100644 drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c
 create mode 100644 drivers/gpu/drm/tinydrm/repaper.c
 create mode 100644 include/drm/bridge/dw_mipi_dsi.h
Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD)
$ git merge drm-panel/drm/panel/for-next
Already up-to-date.
Merging drm-intel/for-linux-next (03e0c8329955 drm/i915: Remove unused i915_err_print_instdone)
$ git merge drm-intel/for-linux-next
Resolved 'drivers/gpu/drm/i915/intel_display.c' using previous resolution.
Auto-merging drivers/gpu/drm/i915/selftests/mock_gem_device.c
Auto-merging drivers/gpu/drm/i915/intel_pm.c
Auto-merging drivers/gpu/drm/i915/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
Auto-merging drivers/gpu/drm/i915/intel_ddi.c
Auto-merging drivers/gpu/drm/i915/gvt/display.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 40d8fd6e997f] Merge remote-tracking branch 'drm-intel/for-linux-next'
$ git diff -M --stat --summary HEAD^..
 drivers/gpu/drm/drm_atomic_helper.c              |   18 +-
 drivers/gpu/drm/i915/gvt/display.c               |    6 +-
 drivers/gpu/drm/i915/gvt/handlers.c              |    8 +-
 drivers/gpu/drm/i915/i915_debugfs.c              |   91 +-
 drivers/gpu/drm/i915/i915_drv.c                  |   79 +-
 drivers/gpu/drm/i915/i915_drv.h                  |   66 +-
 drivers/gpu/drm/i915/i915_gem.c                  |  206 ++--
 drivers/gpu/drm/i915/i915_gem_context.c          |    6 +-
 drivers/gpu/drm/i915/i915_gem_context.h          |    6 +-
 drivers/gpu/drm/i915/i915_gem_request.c          |    9 +-
 drivers/gpu/drm/i915/i915_gem_stolen.c           |    3 +-
 drivers/gpu/drm/i915/i915_gpu_error.c            |    8 +-
 drivers/gpu/drm/i915/i915_irq.c                  |  217 +---
 drivers/gpu/drm/i915/i915_params.c               |   12 +-
 drivers/gpu/drm/i915/i915_params.h               |    5 +-
 drivers/gpu/drm/i915/i915_pci.c                  |    1 +
 drivers/gpu/drm/i915/i915_perf.c                 |   32 +-
 drivers/gpu/drm/i915/i915_reg.h                  |   91 +-
 drivers/gpu/drm/i915/intel_color.c               |   45 +-
 drivers/gpu/drm/i915/intel_ddi.c                 |    3 +
 drivers/gpu/drm/i915/intel_display.c             | 1190 ++--------------------
 drivers/gpu/drm/i915/intel_dp_aux_backlight.c    |   87 +-
 drivers/gpu/drm/i915/intel_dp_link_training.c    |    8 +-
 drivers/gpu/drm/i915/intel_drv.h                 |   48 +-
 drivers/gpu/drm/i915/intel_engine_cs.c           |    7 +-
 drivers/gpu/drm/i915/intel_fbdev.c               |   22 +-
 drivers/gpu/drm/i915/intel_fifo_underrun.c       |    6 +-
 drivers/gpu/drm/i915/intel_hangcheck.c           |    2 +-
 drivers/gpu/drm/i915/intel_hdmi.c                |   64 +-
 drivers/gpu/drm/i915/intel_i2c.c                 |   36 +-
 drivers/gpu/drm/i915/intel_lrc.c                 |   36 +-
 drivers/gpu/drm/i915/intel_panel.c               |    3 +-
 drivers/gpu/drm/i915/intel_pm.c                  |   21 +-
 drivers/gpu/drm/i915/intel_ringbuffer.c          |    3 +
 drivers/gpu/drm/i915/intel_runtime_pm.c          |  910 ++++++++---------
 drivers/gpu/drm/i915/intel_sdvo.c                |   74 +-
 drivers/gpu/drm/i915/intel_sprite.c              |    8 +-
 drivers/gpu/drm/i915/selftests/intel_hangcheck.c |  230 ++++-
 drivers/gpu/drm/i915/selftests/mock_context.c    |    8 +
 drivers/gpu/drm/i915/selftests/mock_context.h    |    3 +
 drivers/gpu/drm/i915/selftests/mock_gem_device.c |   25 +-
 41 files changed, 1436 insertions(+), 2267 deletions(-)
Merging drm-tegra/drm/tegra/for-next (43240bbd871e gpu: host1x: At first try a non-blocking allocation for the gather copy)
$ git merge drm-tegra/drm/tegra/for-next
Already up-to-date.
Merging drm-misc/for-linux-next (9dd2aca46a13 drm/rockchip: vop: rk3328: fix overlay abnormal)
$ git merge drm-misc/for-linux-next
Merge made by the 'recursive' strategy.
 .../bindings/display/rockchip/rockchip-vop.txt     |   4 +
 .../devicetree/bindings/display/st,stm32-ltdc.txt  | 105 ++-
 drivers/dma-buf/sync_file.c                        |   5 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c            |   1 -
 drivers/gpu/drm/arc/arcpgu_drv.c                   |   2 -
 drivers/gpu/drm/arm/hdlcd_drv.c                    |   2 -
 drivers/gpu/drm/arm/malidp_drv.c                   |   2 -
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c       |   2 -
 drivers/gpu/drm/bridge/panel.c                     |  30 +
 drivers/gpu/drm/drm_dumb_buffers.c                 |  26 +-
 drivers/gpu/drm/drm_gem.c                          |  35 +
 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c    |   1 -
 drivers/gpu/drm/imx/imx-drm-core.c                 |   2 -
 drivers/gpu/drm/mediatek/mtk_drm_drv.c             |   2 -
 drivers/gpu/drm/mediatek/mtk_drm_gem.c             |  25 -
 drivers/gpu/drm/mediatek/mtk_drm_gem.h             |   3 -
 drivers/gpu/drm/nouveau/nouveau_drm.c              |   1 -
 drivers/gpu/drm/omapdrm/omap_drv.c                 |   1 -
 drivers/gpu/drm/pl111/pl111_drv.c                  |   2 -
 drivers/gpu/drm/rcar-du/rcar_du_drv.c              |   2 -
 drivers/gpu/drm/rockchip/rockchip_drm_drv.c        |   2 -
 drivers/gpu/drm/rockchip/rockchip_drm_gem.c        |  26 -
 drivers/gpu/drm/rockchip/rockchip_drm_gem.h        |   3 -
 drivers/gpu/drm/rockchip/rockchip_drm_vop.c        | 111 ++-
 drivers/gpu/drm/rockchip/rockchip_drm_vop.h        |  81 +-
 drivers/gpu/drm/rockchip/rockchip_vop_reg.c        | 375 ++++++---
 drivers/gpu/drm/rockchip/rockchip_vop_reg.h        | 905 ++++++++++++++++-----
 drivers/gpu/drm/shmobile/shmob_drm_drv.c           |   2 -
 drivers/gpu/drm/stm/Kconfig                        |   8 +-
 drivers/gpu/drm/stm/Makefile                       |   2 +
 drivers/gpu/drm/stm/drv.c                          |  23 +-
 drivers/gpu/drm/stm/dw_mipi_dsi-stm.c              | 352 ++++++++
 drivers/gpu/drm/stm/ltdc.c                         | 225 +++--
 drivers/gpu/drm/sun4i/sun4i_drv.c                  |   2 -
 drivers/gpu/drm/tilcdc/tilcdc_drv.c                |   2 -
 drivers/gpu/drm/tinydrm/Kconfig                    |   1 +
 drivers/gpu/drm/vc4/Kconfig                        |   8 +
 drivers/gpu/drm/vc4/vc4_bo.c                       | 265 ++++--
 drivers/gpu/drm/vc4/vc4_drv.c                      |  10 +-
 drivers/gpu/drm/vc4/vc4_drv.h                      |  39 +-
 drivers/gpu/drm/vc4/vc4_gem.c                      |  13 +-
 drivers/gpu/drm/vc4/vc4_hdmi.c                     | 287 ++++++-
 drivers/gpu/drm/vc4/vc4_regs.h                     | 113 +++
 drivers/gpu/drm/vc4/vc4_render_cl.c                |   2 +-
 drivers/gpu/drm/vc4/vc4_v3d.c                      |   3 +-
 drivers/gpu/drm/zte/zx_drm_drv.c                   |   2 -
 include/drm/drm_bridge.h                           |   3 +
 include/drm/drm_gem.h                              |   2 +
 include/drm/tinydrm/tinydrm.h                      |   4 +-
 include/linux/sync_file.h                          |   3 +-
 include/uapi/drm/vc4_drm.h                         |  11 +
 51 files changed, 2392 insertions(+), 746 deletions(-)
 create mode 100644 drivers/gpu/drm/stm/dw_mipi_dsi-stm.c
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
$ git merge drm-exynos/exynos-drm/for-next
Already up-to-date.
Merging drm-msm/msm-next (4a630fadbb29 drm/msm: Fix potential buffer overflow issue)
$ git merge drm-msm/msm-next
Already up-to-date.
Merging hdlcd/for-upstream/hdlcd (fee4964f0a6c drm/arm: hdlcd: remove unused variables)
$ git merge hdlcd/for-upstream/hdlcd
Already up-to-date.
Merging mali-dp/for-upstream/mali-dp (e40eda3dda1e drm/arm: mali-dp: Use CMA helper for plane buffer address calculation)
$ git merge mali-dp/for-upstream/mali-dp
Already up-to-date.
Merging sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/drm-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next)
$ git merge sunxi-drm/sunxi-drm/for-next
Auto-merging drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
Auto-merging drivers/gpu/drm/sun4i/sun4i_drv.c
Merge made by the 'recursive' strategy.
 .../bindings/display/sunxi/sun4i-drm.txt           |  36 +++-
 drivers/gpu/drm/sun4i/Kconfig                      |  16 +-
 drivers/gpu/drm/sun4i/Makefile                     |   1 +
 drivers/gpu/drm/sun4i/sun4i_drv.c                  |   8 +
 drivers/gpu/drm/sun4i/sun4i_hdmi.h                 |  32 +++
 drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c             | 156 ++++++---------
 drivers/gpu/drm/sun4i/sun4i_hdmi_i2c.c             | 220 +++++++++++++++++++++
 drivers/gpu/drm/sun4i/sun4i_layer.c                |   9 +-
 drivers/gpu/drm/sun4i/sun4i_rgb.c                  |   8 -
 drivers/gpu/drm/sun4i/sun4i_tcon.h                 |   2 -
 drivers/gpu/drm/sun4i/sun4i_tv.c                   |   8 -
 11 files changed, 367 insertions(+), 129 deletions(-)
 create mode 100644 drivers/gpu/drm/sun4i/sun4i_hdmi_i2c.c
Merging imx-drm/imx-drm/next (790cb4c7c954 drm/imx: lock scanout transfers for consecutive bursts)
$ git merge imx-drm/imx-drm/next
Auto-merging drivers/gpu/drm/imx/ipuv3-plane.c
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/imx/ipuv3-plane.c | 53 +++++++++++++++++++++++++++++++--------
 1 file changed, 42 insertions(+), 11 deletions(-)
Merging etnaviv/etnaviv/next (8cc47b3ea082 drm/etnaviv: populate GEM objects on cpu_prep)
$ git merge etnaviv/etnaviv/next
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/etnaviv/etnaviv_gem.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)
Merging kconfig/for-next (6f7da290413b Linux 4.12)
$ git merge kconfig/for-next
Already up-to-date.
Merging regmap/for-next (a7c33d98535c Merge remote-tracking branch 'regmap/topic/namespace' into regmap-next)
$ git merge regmap/for-next
Merge made by the 'recursive' strategy.
 include/linux/regmap.h | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
Merging sound/for-next (6c5a266029cc ALSA: hda: constify pci_device_id.)
$ git merge sound/for-next
Merge made by the 'recursive' strategy.
 sound/hda/hdac_i915.c              |  2 +-
 sound/isa/ad1848/ad1848.c          | 18 ++++++++------
 sound/isa/als100.c                 | 13 ++++++-----
 sound/isa/cs423x/cs4231.c          | 18 ++++++++------
 sound/isa/cs423x/cs4236.c          | 20 +++++++++-------
 sound/isa/opti9xx/miro.c           |  7 +++---
 sound/isa/opti9xx/opti92x-ad1848.c | 14 ++++++-----
 sound/pci/mixart/mixart.c          | 10 ++++----
 sound/pci/mixart/mixart.h          |  4 ----
 sound/pci/pcxhr/pcxhr.c            | 19 ++++++++-------
 sound/pci/pcxhr/pcxhr.h            |  3 +--
 sound/pci/rme9652/hdspm.c          | 48 ++++++++++++++++++++++----------------
 12 files changed, 97 insertions(+), 79 deletions(-)
Merging sound-asoc/for-next (385aefefd18a Merge remote-tracking branches 'asoc/topic/wm8524', 'asoc/topic/wm8804' and 'asoc/topic/zte' into asoc-next)
$ git merge sound-asoc/for-next
Removing include/sound/rt5677.h
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/sound/rt274.txt  |   33 +
 Documentation/devicetree/bindings/sound/rt5663.txt |    5 +
 .../devicetree/bindings/sound/tlv320aic32x4.txt    |   13 +-
 Documentation/devicetree/bindings/sound/wm8524.txt |   16 +
 include/sound/rt5663.h                             |   20 +
 include/sound/rt5677.h                             |   45 -
 include/sound/soc.h                                |    7 -
 include/sound/tlv320aic32x4.h                      |   23 +
 sound/atmel/ac97c.c                                |    8 +-
 sound/soc/au1x/psc-ac97.c                          |    2 +-
 sound/soc/au1x/psc-i2s.c                           |    2 +-
 sound/soc/codecs/Kconfig                           |   12 +
 sound/soc/codecs/Makefile                          |    4 +
 sound/soc/codecs/adau1977.c                        |    6 +-
 sound/soc/codecs/cs35l33.c                         |   12 +-
 sound/soc/codecs/cs35l34.c                         |    3 +-
 sound/soc/codecs/cs42l42.c                         |   11 +-
 sound/soc/codecs/cs53l30.c                         |   15 +-
 sound/soc/codecs/hdac_hdmi.c                       |   41 +-
 sound/soc/codecs/hdmi-codec.c                      |   33 +-
 sound/soc/codecs/inno_rk3036.c                     |    2 +-
 sound/soc/codecs/max9867.c                         |    2 +-
 sound/soc/codecs/max98926.c                        |    2 +-
 sound/soc/codecs/max98927.c                        |    1 -
 sound/soc/codecs/msm8916-wcd-analog.c              |    4 +-
 sound/soc/codecs/msm8916-wcd-digital.c             |    2 +-
 sound/soc/codecs/rt274.c                           | 1228 ++++++++++++++++++++
 sound/soc/codecs/rt274.h                           |  217 ++++
 sound/soc/codecs/rt5514-spi.c                      |  139 +--
 sound/soc/codecs/rt5514-spi.h                      |    7 +-
 sound/soc/codecs/rt5514.c                          |  101 +-
 sound/soc/codecs/rt5514.h                          |   19 +
 sound/soc/codecs/rt5616.c                          |    2 +-
 sound/soc/codecs/rt5659.c                          |    2 +-
 sound/soc/codecs/rt5663.c                          |  241 +++-
 sound/soc/codecs/rt5663.h                          |    2 +
 sound/soc/codecs/rt5665.c                          |   53 +-
 sound/soc/codecs/rt5665.h                          |   25 +-
 sound/soc/codecs/rt5670.c                          |   44 +-
 sound/soc/codecs/rt5677.c                          |   81 +-
 sound/soc/codecs/rt5677.h                          |   30 +-
 sound/soc/codecs/sgtl5000.c                        |    4 +-
 sound/soc/codecs/sta32x.c                          |    3 +-
 sound/soc/codecs/tas5720.c                         |    2 +-
 sound/soc/codecs/tlv320aic32x4-i2c.c               |    2 +
 sound/soc/codecs/tlv320aic32x4-spi.c               |    2 +
 sound/soc/codecs/tlv320aic32x4.c                   |  206 ++++
 sound/soc/codecs/tlv320aic32x4.h                   |    3 +
 sound/soc/codecs/twl6040.c                         |    4 +-
 sound/soc/codecs/wm8524.c                          |  265 +++++
 sound/soc/codecs/wm8804.c                          |    3 +-
 sound/soc/dwc/dwc-i2s.c                            |    2 +-
 sound/soc/fsl/fsl_asrc.c                           |    2 +-
 sound/soc/fsl/fsl_esai.c                           |    2 +-
 sound/soc/fsl/fsl_spdif.c                          |    2 +-
 sound/soc/fsl/imx-ssi.c                            |    4 +
 sound/soc/hisilicon/hi6210-i2s.c                   |    2 +-
 sound/soc/img/img-i2s-in.c                         |    2 +-
 sound/soc/img/img-i2s-out.c                        |    2 +-
 sound/soc/img/img-parallel-out.c                   |    2 +-
 sound/soc/img/img-spdif-in.c                       |    2 +-
 sound/soc/img/img-spdif-out.c                      |    2 +-
 sound/soc/intel/atom/sst-mfld-platform-pcm.c       |    6 +-
 sound/soc/intel/boards/bxt_rt298.c                 |   86 +-
 sound/soc/intel/boards/kbl_rt5663_max98927.c       |  246 +++-
 .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c  |   28 +-
 sound/soc/intel/skylake/skl-messages.c             |   10 +-
 sound/soc/intel/skylake/skl-pcm.c                  |    8 +-
 sound/soc/intel/skylake/skl.c                      |    7 +
 sound/soc/jz4740/jz4740-i2s.c                      |   21 +-
 sound/soc/kirkwood/kirkwood-i2s.c                  |    6 +-
 sound/soc/mediatek/mt2701/mt2701-afe-pcm.c         |    2 +-
 sound/soc/mxs/mxs-saif.c                           |   13 +-
 sound/soc/pxa/Kconfig                              |    1 +
 sound/soc/pxa/mmp-sspa.c                           |    2 +-
 sound/soc/samsung/i2s.c                            |   39 +-
 sound/soc/samsung/odroid.c                         |    6 +-
 sound/soc/samsung/pcm.c                            |    8 +-
 sound/soc/samsung/s3c-i2s-v2.c                     |   14 +-
 sound/soc/samsung/s3c-i2s-v2.h                     |    7 +
 sound/soc/samsung/s3c2412-i2s.c                    |   15 +-
 sound/soc/samsung/s3c24xx-i2s.c                    |   11 +-
 sound/soc/samsung/spdif.c                          |    8 +-
 sound/soc/sh/fsi.c                                 |    2 +-
 sound/soc/sh/hac.c                                 |    2 +
 sound/soc/sh/rcar/core.c                           |   94 +-
 sound/soc/sh/rcar/ctu.c                            |    5 +-
 sound/soc/sh/rcar/dvc.c                            |    5 +-
 sound/soc/sh/rcar/mix.c                            |    5 +-
 sound/soc/sh/rcar/rsnd.h                           |    1 +
 sound/soc/sh/rcar/src.c                            |    6 +-
 sound/soc/sh/rcar/ssi.c                            |    6 +-
 sound/soc/sh/rcar/ssiu.c                           |    2 +-
 sound/soc/soc-core.c                               |   25 -
 sound/soc/soc-pcm.c                                |   36 +-
 sound/soc/spear/spdif_in.c                         |    6 +-
 sound/soc/stm/stm32_i2s.c                          |    2 +-
 sound/soc/stm/stm32_sai.c                          |    2 +-
 sound/soc/stm/stm32_spdifrx.c                      |    2 +-
 sound/soc/sunxi/sun4i-codec.c                      |    8 +-
 sound/soc/sunxi/sun4i-i2s.c                        |    2 +-
 sound/soc/sunxi/sun4i-spdif.c                      |   14 +-
 sound/soc/sunxi/sun8i-codec.c                      |    2 +-
 sound/soc/tegra/tegra30_ahub.c                     |    4 +-
 sound/soc/tegra/tegra30_i2s.c                      |    2 +-
 sound/soc/ux500/mop500.c                           |    4 +
 sound/soc/zte/zx-i2s.c                             |    2 +-
 sound/soc/zte/zx-spdif.c                           |    2 +-
 sound/soc/zte/zx-tdm.c                             |    2 +-
 109 files changed, 3211 insertions(+), 609 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/sound/rt274.txt
 create mode 100644 Documentation/devicetree/bindings/sound/wm8524.txt
 create mode 100644 include/sound/rt5663.h
 delete mode 100644 include/sound/rt5677.h
 create mode 100644 sound/soc/codecs/rt274.c
 create mode 100644 sound/soc/codecs/rt274.h
 create mode 100644 sound/soc/codecs/wm8524.c
Merging modules/modules-next (0bf8bf50eddc module: Remove const attribute from alias for MODULE_DEVICE_TABLE)
$ git merge modules/modules-next
Merge made by the 'recursive' strategy.
 include/linux/module.h |  2 +-
 kernel/module.c        | 12 ++++++------
 scripts/mod/modpost.c  | 29 ++++++++++++++++++++++++-----
 3 files changed, 31 insertions(+), 12 deletions(-)
Merging input/next (4323418d62fe Input: sur40 - skip all blobs that are not touches)
$ git merge input/next
Auto-merging drivers/input/mouse/elantech.c
Merge made by the 'recursive' strategy.
 drivers/input/input.c                      |  6 ++--
 drivers/input/keyboard/gpio_keys.c         |  2 +-
 drivers/input/misc/ims-pcu.c               |  4 +--
 drivers/input/misc/yealink.c               |  2 +-
 drivers/input/mouse/elantech.c             |  2 +-
 drivers/input/mouse/psmouse-base.c         |  2 +-
 drivers/input/rmi4/rmi_f01.c               |  2 +-
 drivers/input/rmi4/rmi_f34.c               |  2 +-
 drivers/input/serio/serio.c                |  4 +--
 drivers/input/tablet/aiptek.c              |  2 +-
 drivers/input/touchscreen/ads7846.c        |  4 +--
 drivers/input/touchscreen/elants_i2c.c     |  2 +-
 drivers/input/touchscreen/raydium_i2c_ts.c |  2 +-
 drivers/input/touchscreen/sur40.c          | 46 +++++++++++++++++++-----------
 14 files changed, 48 insertions(+), 34 deletions(-)
Merging block/for-next (b2a5b74635f9 Merge branch 'for-4.14/block' into for-next)
$ git merge block/for-next
Merge made by the 'recursive' strategy.
 block/bfq-iosched.h               |  13 +-
 block/blk-mq.c                    |   5 +-
 block/blk-throttle.c              |  13 +-
 block/cfq-iosched.c               |  15 +--
 drivers/block/DAC960.c            |  12 +-
 fs/kernfs/dir.c                   | 111 ++++++++++++----
 fs/kernfs/file.c                  |  10 +-
 fs/kernfs/inode.c                 |   9 +-
 fs/kernfs/kernfs-internal.h       |   9 ++
 fs/kernfs/mount.c                 |  94 ++++++++++++--
 fs/kernfs/symlink.c               |   6 +-
 include/linux/blk-cgroup.h        |   3 +
 include/linux/blktrace_api.h      |  13 +-
 include/linux/cgroup.h            |  16 ++-
 include/linux/kernfs.h            |  28 ++++-
 include/trace/events/writeback.h  |   2 +-
 include/uapi/linux/blktrace_api.h |   3 +
 kernel/cgroup/cgroup.c            |  15 ++-
 kernel/trace/blktrace.c           | 259 ++++++++++++++++++++++++++------------
 19 files changed, 477 insertions(+), 159 deletions(-)
Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c)
$ git merge lightnvm/for-next
Already up-to-date.
Merging device-mapper/for-next (2298b6212f1c dm ioctl: constify ioctl lookup table)
$ git merge device-mapper/for-next
Merge made by the 'recursive' strategy.
 drivers/md/dm-bufio.c         | 95 ++++++++++++++++++++++++++++++-------------
 drivers/md/dm-bufio.h         |  9 ++++
 drivers/md/dm-cache-target.c  |  4 +-
 drivers/md/dm-crypt.c         |  2 +-
 drivers/md/dm-flakey.c        |  4 +-
 drivers/md/dm-integrity.c     | 14 +++++--
 drivers/md/dm-ioctl.c         |  2 +-
 drivers/md/dm-mpath.c         | 10 ++---
 drivers/md/dm-switch.c        |  2 +-
 drivers/md/dm-table.c         |  7 ++--
 drivers/md/dm-thin.c          |  2 +-
 drivers/md/dm-verity-target.c |  2 +-
 include/linux/device-mapper.h |  4 +-
 13 files changed, 106 insertions(+), 51 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/next (bb1407c0df2c Merge branch 'fixes' into next)
$ git merge mmc/next
Auto-merging arch/arc/boot/dts/axs10x_mb.dtsi
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/mmc/renesas,mmcif.txt      |   3 +-
 .../devicetree/bindings/mmc/rockchip-dw-mshc.txt   |   1 +
 arch/arc/boot/dts/axs10x_mb.dtsi                   |   1 -
 arch/arc/boot/dts/vdk_axs10x_mb.dtsi               |   1 -
 drivers/mmc/Kconfig                                |   7 -
 drivers/mmc/Makefile                               |   2 -
 drivers/mmc/core/block.c                           |   2 -
 drivers/mmc/core/core.c                            |  43 +---
 drivers/mmc/core/mmc_ops.c                         |   2 +-
 drivers/mmc/host/Kconfig                           |  32 ++-
 drivers/mmc/host/Makefile                          |   8 +-
 drivers/mmc/host/android-goldfish.c                |   8 +-
 drivers/mmc/host/atmel-mci.c                       |  10 +-
 drivers/mmc/host/cavium.c                          |   6 +-
 drivers/mmc/host/dw_mmc.c                          |   2 +-
 drivers/mmc/host/mtk-sd.c                          |   1 +
 drivers/mmc/host/mxcmmc.c                          |   9 +-
 drivers/mmc/host/omap_hsmmc.c                      |   8 +-
 drivers/mmc/host/renesas_sdhi.h                    |   2 +
 drivers/mmc/host/renesas_sdhi_core.c               |  24 +-
 drivers/mmc/host/renesas_sdhi_internal_dmac.c      | 271 +++++++++++++++++++++
 drivers/mmc/host/renesas_sdhi_sys_dmac.c           |   8 +-
 drivers/mmc/host/rtsx_usb_sdmmc.c                  |   2 +-
 drivers/mmc/host/sdhci-acpi.c                      |   7 +-
 drivers/mmc/host/sdhci-of-arasan.c                 |   4 +-
 drivers/mmc/host/sdhci-of-at91.c                   | 177 +++++++++-----
 drivers/mmc/host/sdhci-pci-core.c                  |  20 ++
 drivers/mmc/host/sdhci-st.c                        |  28 ++-
 drivers/mmc/host/sdhci-tegra.c                     |   3 +-
 drivers/mmc/host/sdhci-xenon.c                     |   5 +-
 drivers/mmc/host/sdhci.c                           |  15 +-
 drivers/mmc/host/sunxi-mmc.c                       |   3 +-
 drivers/mmc/host/tmio_mmc.h                        |   9 +-
 drivers/mmc/host/tmio_mmc_core.c                   |  32 ++-
 drivers/mmc/host/via-sdmmc.c                       |   2 +-
 drivers/mmc/host/wbsd.c                            |   2 -
 include/linux/mfd/tmio.h                           |   2 +
 include/linux/mmc/host.h                           |   3 -
 38 files changed, 571 insertions(+), 194 deletions(-)
 create mode 100644 drivers/mmc/host/renesas_sdhi_internal_dmac.c
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
$ git merge kgdb/kgdb-next
Auto-merging kernel/debug/kdb/kdb_io.c
Merge made by the 'recursive' strategy.
 kernel/debug/kdb/kdb_io.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging md/for-next (ed9b66d21866 MD: fix warnning for UP case)
$ git merge md/for-next
Already up-to-date.
Merging mfd/for-mfd-next (48a14b9f0cc6 mfd: max8998: Fix potential NULL pointer dereference)
$ git merge mfd/for-mfd-next
Auto-merging drivers/mfd/twl4030-irq.c
Auto-merging drivers/mfd/rtsx_pcr.c
Merge made by the 'recursive' strategy.
 drivers/mfd/da9052-core.c | 2 ++
 drivers/mfd/max8925-i2c.c | 2 +-
 drivers/mfd/max8998.c     | 6 ++----
 drivers/mfd/rtsx_pcr.c    | 4 ++--
 drivers/mfd/twl-core.c    | 4 ++--
 drivers/mfd/twl4030-irq.c | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)
Merging backlight/for-backlight-next (8c03a937ca99 backlight: pwm_bl: Make of_device_ids const)
$ git merge backlight/for-backlight-next
Merge made by the 'recursive' strategy.
 drivers/video/backlight/lm3630a_bl.c | 5 +++--
 drivers/video/backlight/pwm_bl.c     | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)
Merging battery/for-next (67bd22c09ac1 power: supply: bq27xxx: move platform driver code into bq27xxx_battery_hdq.c)
$ git merge battery/for-next
Removing drivers/w1/slaves/w1_bq27000.c
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/power/supply/ltc2941.txt   |  15 +-
 drivers/power/reset/at91-sama5d2_shdwc.c           |   4 +-
 drivers/power/supply/Kconfig                       |  23 ++
 drivers/power/supply/Makefile                      |   2 +
 drivers/power/supply/act8945a_charger.c            |   4 +-
 drivers/power/supply/bq27xxx_battery.c             | 104 -----
 drivers/power/supply/bq27xxx_battery_hdq.c         | 135 +++++++
 drivers/power/supply/ltc2941-battery-gauge.c       | 156 +++++--
 drivers/power/supply/max1721x_battery.c            | 448 +++++++++++++++++++++
 drivers/power/supply/pcf50633-charger.c            |   2 +-
 drivers/power/supply/sbs-battery.c                 |  26 +-
 drivers/w1/slaves/Kconfig                          |   6 -
 drivers/w1/slaves/Makefile                         |   1 -
 drivers/w1/slaves/w1_bq27000.c                     | 117 ------
 include/linux/power/bq27xxx_battery.h              |  17 -
 15 files changed, 746 insertions(+), 314 deletions(-)
 create mode 100644 drivers/power/supply/bq27xxx_battery_hdq.c
 create mode 100644 drivers/power/supply/max1721x_battery.c
 delete mode 100644 drivers/w1/slaves/w1_bq27000.c
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
$ git merge omap_dss2/for-next
Already up-to-date.
Merging regulator/for-next (7a6370a555be Merge remote-tracking branch 'regulator/topic/qcom' into regulator-next)
$ git merge regulator/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/regulator/pwm-regulator.txt |  2 +-
 drivers/regulator/axp20x-regulator.c                |  6 ++++++
 drivers/regulator/core.c                            | 16 ++++++++++++----
 drivers/regulator/cpcap-regulator.c                 | 21 ++++++++++++++++++---
 drivers/regulator/fan53555.c                        | 10 ++--------
 drivers/regulator/max1586.c                         |  2 +-
 drivers/regulator/of_regulator.c                    |  2 +-
 drivers/regulator/pwm-regulator.c                   |  6 ++----
 drivers/regulator/qcom_rpm-regulator.c              |  5 +++++
 drivers/regulator/qcom_smd-regulator.c              |  5 +++++
 drivers/regulator/s5m8767.c                         |  4 ++--
 drivers/reset/reset-socfpga.c                       |  4 ++--
 12 files changed, 57 insertions(+), 26 deletions(-)
Merging security/next (be6f039747e7 security: fix description of values returned by cap_inode_need_killpriv)
$ git merge security/next
Merge made by the 'recursive' strategy.
 Documentation/admin-guide/LSM/tomoyo.rst | 24 ++++++++++++------------
 include/linux/lsm_hooks.h                |  7 -------
 include/linux/security.h                 |  6 ------
 kernel/fork.c                            |  4 ----
 security/commoncap.c                     |  6 +++---
 security/security.c                      |  5 -----
 6 files changed, 15 insertions(+), 37 deletions(-)
Merging integrity/next (fc26bd50539b IMA: update IMA policy documentation to include pcr= option)
$ git merge integrity/next
Already up-to-date.
Merging keys/keys-next (8ab2a6905b28 KEYS: Add documentation for asymmetric keyring restrictions)
$ git merge keys/keys-next
Merge made by the 'recursive' strategy.
Merging selinux/next (cd0d877d633e selinux: update the selinux info in MAINTAINERS)
$ git merge selinux/next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 CREDITS                  | 8 +++-----
 MAINTAINERS              | 5 +++--
 security/selinux/hooks.c | 1 +
 3 files changed, 7 insertions(+), 7 deletions(-)
Merging tpmdd/next (e7d872bf1bc5 Documentation: tpm: add powered-while-suspended binding documentation)
$ git merge tpmdd/next
Auto-merging drivers/char/tpm/tpm_crb.c
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt | 6 ++++++
 drivers/char/tpm/tpm_crb.c                                 | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
Merging watchdog/master (c013b65ad8a1 watchdog: introduce watchdog_worker_should_ping helper)
$ git merge watchdog/master
Already up-to-date.
Merging iommu/next (4f019dc5a68e Merge branches 'iommu/fixes', 'arm/exynos', 'arm/renesas', 'arm/rockchip', 'x86/vt-d' and 'core' into next)
$ git merge iommu/next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/iommu/rockchip,iommu.txt   |   5 +
 drivers/iommu/amd_iommu.c                          |   1 +
 drivers/iommu/amd_iommu_init.c                     |   2 +-
 drivers/iommu/arm-smmu.c                           |  18 +-
 drivers/iommu/exynos-iommu.c                       |   2 +-
 drivers/iommu/fsl_pamu.c                           |  20 +--
 drivers/iommu/fsl_pamu_domain.c                    |  10 +-
 drivers/iommu/intel-iommu.c                        |  38 ++--
 drivers/iommu/io-pgtable-arm-v7s.c                 |   6 +
 drivers/iommu/io-pgtable-arm.c                     |   7 +
 drivers/iommu/io-pgtable.h                         |   9 +-
 drivers/iommu/ipmmu-vmsa.c                         | 192 +++++----------------
 drivers/iommu/mtk_iommu.c                          |   6 +
 drivers/iommu/mtk_iommu.h                          |   1 +
 drivers/iommu/of_iommu.c                           | 107 ++++++------
 drivers/iommu/rockchip-iommu.c                     |  52 ++++--
 include/linux/iommu.h                              |   4 +-
 17 files changed, 214 insertions(+), 266 deletions(-)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
$ git merge dwmw2-iommu/master
Already up-to-date.
Merging vfio/next (7f56c30bd0a2 vfio: Remove unnecessary uses of vfio_container.group_lock)
$ git merge vfio/next
Already up-to-date.
Merging trivial/for-next (6fbc8798d946 tty: fix comment for __tty_alloc_driver())
$ git merge trivial/for-next
Already up-to-date.
Merging audit/next (739bde1f2229 selinux: remove AVC init audit log message)
$ git merge audit/next
Auto-merging kernel/auditsc.c
Auto-merging kernel/audit.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS            | 7 ++++---
 kernel/audit.c         | 2 +-
 kernel/auditsc.c       | 2 +-
 security/selinux/avc.c | 2 --
 4 files changed, 6 insertions(+), 7 deletions(-)
Merging devicetree/for-next (b041303c3e88 Merge branch 'dt/linus' into for-next)
$ git merge devicetree/for-next
Auto-merging drivers/of/property.c
Auto-merging drivers/of/of_mdio.c
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/clock/silabs,si5351.txt    |   6 +-
 .../devicetree/bindings/clock/ti,sci-clk.txt       |   7 +-
 .../devicetree/bindings/input/ti,drv260x.txt       |   2 +-
 .../devicetree/bindings/nvmem/mtk-efuse.txt        |   5 +-
 .../devicetree/bindings/trivial-devices.txt        |  10 ++
 drivers/of/address.c                               |  24 ++--
 drivers/of/base.c                                  |  22 ++--
 drivers/of/device.c                                |   2 +-
 drivers/of/dynamic.c                               |  33 +++--
 drivers/of/irq.c                                   |  45 +++----
 drivers/of/of_mdio.c                               |   4 +-
 drivers/of/of_pci.c                                |  29 ++---
 drivers/of/overlay.c                               | 142 ++++++++++++++++++---
 drivers/of/platform.c                              |  32 ++---
 drivers/of/property.c                              |  19 ++-
 drivers/of/unittest-data/Makefile                  |  19 ++-
 drivers/of/unittest-data/overlay.dts               |  25 +++-
 drivers/of/unittest-data/overlay_bad_symbol.dts    |  22 ++++
 drivers/of/unittest-data/overlay_base.dts          |  11 ++
 drivers/of/unittest.c                              |  77 ++++++-----
 20 files changed, 361 insertions(+), 175 deletions(-)
 create mode 100644 drivers/of/unittest-data/overlay_bad_symbol.dts
Merging mailbox/mailbox-for-next (25bfee16d5a3 mailbox: Introduce Qualcomm APCS IPC driver)
$ git merge mailbox/mailbox-for-next
Already up-to-date.
Merging spi/for-next (29f920523b9e Merge remote-tracking branches 'spi/topic/stm32', 'spi/topic/sunxi', 'spi/topic/tegra' and 'spi/topic/tools' into spi-next)
$ git merge spi/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/spi/fsl-imx-cspi.txt       |  1 +
 Documentation/devicetree/bindings/spi/sh-msiof.txt |  1 +
 drivers/spi/spi-ath79.c                            | 13 ++--
 drivers/spi/spi-bcm-qspi.c                         | 89 ++++++++--------------
 drivers/spi/spi-bcm63xx-hsspi.c                    |  6 +-
 drivers/spi/spi-imx.c                              | 56 +++++++++++---
 drivers/spi/spi-loopback-test.c                    | 34 +++++++--
 drivers/spi/spi-orion.c                            |  4 +-
 drivers/spi/spi-pic32.c                            |  4 +-
 drivers/spi/spi-pxa2xx.c                           |  3 +-
 drivers/spi/spi-sh-msiof.c                         | 32 +++++---
 drivers/spi/spi-stm32.c                            |  2 +-
 drivers/spi/spi-sun6i.c                            |  2 +-
 drivers/spi/spi-tegra114.c                         |  2 +-
 drivers/spi/spi-tegra20-sflash.c                   |  2 +-
 drivers/spi/spi-tegra20-slink.c                    |  2 +-
 drivers/spi/spi.c                                  | 30 +++-----
 tools/Makefile                                     |  4 +-
 tools/spi/Build                                    |  2 +
 tools/spi/Makefile                                 | 64 +++++++++++++++-
 20 files changed, 230 insertions(+), 123 deletions(-)
 create mode 100644 tools/spi/Build
Merging tip/auto-latest (69779ccbf624 Merge branch 'x86/urgent')
$ git merge tip/auto-latest
Auto-merging tools/perf/tests/attr/test-record-no-buffering
Auto-merging include/linux/syscalls.h
Auto-merging drivers/iommu/amd_iommu_init.c
Auto-merging drivers/iommu/amd_iommu.c
Auto-merging drivers/gpu/drm/udl/udl_fb.c
Auto-merging drivers/gpu/drm/drm_gem.c
Auto-merging arch/x86/kvm/x86.c
Auto-merging arch/x86/kvm/vmx.c
Auto-merging arch/x86/kernel/acpi/boot.c
Auto-merging arch/x86/entry/entry_64.S
Auto-merging arch/arm64/include/asm/uaccess.h
Auto-merging arch/arm/kernel/signal.c
Auto-merging arch/arm/kernel/entry-common.S
Removing Documentation/x86/early-microcode.txt
Merge made by the 'recursive' strategy.
 Documentation/admin-guide/kernel-parameters.txt    |   13 +
 Documentation/x86/amd-memory-encryption.txt        |   68 ++
 Documentation/x86/early-microcode.txt              |   70 --
 Documentation/x86/microcode.txt                    |  137 +++
 Documentation/x86/orc-unwinder.txt                 |  179 ++++
 Documentation/x86/protection-keys.txt              |    6 +-
 Documentation/x86/x86_64/5level-paging.txt         |   64 ++
 arch/arm/include/asm/thread_info.h                 |   15 +-
 arch/arm/include/asm/uaccess.h                     |    2 +
 arch/arm/kernel/entry-common.S                     |    9 +-
 arch/arm/kernel/signal.c                           |    5 +
 arch/arm64/include/asm/thread_info.h               |    4 +-
 arch/arm64/include/asm/uaccess.h                   |    3 +
 arch/arm64/kernel/signal.c                         |    5 +
 arch/ia64/include/asm/acpi.h                       |    2 -
 arch/ia64/kernel/efi.c                             |    4 +-
 arch/um/include/asm/unwind.h                       |    8 +
 arch/x86/Kconfig                                   |   52 +-
 arch/x86/Kconfig.debug                             |   59 +-
 arch/x86/boot/compressed/kaslr.c                   |   63 +-
 arch/x86/boot/compressed/pagetable.c               |    7 +
 arch/x86/configs/tiny.config                       |    2 +
 arch/x86/entry/Makefile                            |    1 -
 arch/x86/entry/calling.h                           |    5 +
 arch/x86/entry/common.c                            |    3 +
 arch/x86/entry/entry_64.S                          |  170 +++-
 arch/x86/events/intel/lbr.c                        |   52 +-
 arch/x86/ia32/ia32_signal.c                        |    2 +-
 arch/x86/include/asm/acpi.h                        |   13 +-
 arch/x86/include/asm/atomic.h                      |   69 +-
 arch/x86/include/asm/atomic64_32.h                 |   81 +-
 arch/x86/include/asm/atomic64_64.h                 |   73 +-
 arch/x86/include/asm/cmdline.h                     |    2 +
 arch/x86/include/asm/cmpxchg.h                     |    2 +-
 arch/x86/include/asm/cpufeatures.h                 |    1 +
 arch/x86/include/asm/disabled-features.h           |    4 +-
 arch/x86/include/asm/dma-mapping.h                 |    5 +-
 arch/x86/include/asm/dmi.h                         |    8 +-
 arch/x86/include/asm/e820/api.h                    |    2 +
 arch/x86/include/asm/elf.h                         |   14 +-
 arch/x86/include/asm/fixmap.h                      |   20 +
 arch/x86/include/asm/init.h                        |    1 +
 arch/x86/include/asm/io.h                          |  106 +-
 arch/x86/include/asm/kexec.h                       |   11 +-
 arch/x86/include/asm/kvm_host.h                    |    2 +-
 arch/x86/include/asm/mem_encrypt.h                 |   80 ++
 arch/x86/include/asm/mmu.h                         |   25 +-
 arch/x86/include/asm/mmu_context.h                 |   15 +-
 arch/x86/include/asm/module.h                      |    9 +
 arch/x86/include/asm/mpx.h                         |    9 +
 arch/x86/include/asm/msr-index.h                   |    2 +
 arch/x86/include/asm/orc_lookup.h                  |   46 +
 arch/x86/include/asm/orc_types.h                   |  107 +++
 arch/x86/include/asm/page_types.h                  |    3 +-
 arch/x86/include/asm/pgtable.h                     |   28 +-
 arch/x86/include/asm/pgtable_types.h               |   58 +-
 arch/x86/include/asm/processor-flags.h             |    7 +-
 arch/x86/include/asm/processor.h                   |   23 +-
 arch/x86/include/asm/ptrace.h                      |   32 +-
 arch/x86/include/asm/realmode.h                    |   12 +
 arch/x86/include/asm/rmwcc.h                       |   37 +-
 arch/x86/include/asm/set_memory.h                  |    3 +
 arch/x86/include/asm/thread_info.h                 |    5 +-
 arch/x86/include/asm/tlbflush.h                    |   87 +-
 arch/x86/include/asm/topology.h                    |    6 -
 arch/x86/include/asm/uaccess.h                     |    7 +-
 arch/x86/include/asm/unwind.h                      |   76 +-
 arch/x86/include/asm/unwind_hints.h                |  103 ++
 arch/x86/include/asm/vga.h                         |   14 +-
 arch/x86/kernel/Makefile                           |    8 +-
 arch/x86/kernel/acpi/boot.c                        |    6 +-
 arch/x86/kernel/cpu/amd.c                          |   29 +-
 arch/x86/kernel/cpu/bugs.c                         |    8 +
 arch/x86/kernel/cpu/common.c                       |   40 +
 arch/x86/kernel/cpu/mcheck/mce_amd.c               |    9 +-
 arch/x86/kernel/cpu/microcode/amd.c                |    5 +-
 arch/x86/kernel/cpu/scattered.c                    |    1 +
 arch/x86/kernel/dumpstack.c                        |   14 +-
 arch/x86/kernel/dumpstack_32.c                     |    4 +-
 arch/x86/kernel/dumpstack_64.c                     |    4 +-
 arch/x86/kernel/e820.c                             |   26 +-
 arch/x86/kernel/espfix_64.c                        |    2 +-
 arch/x86/kernel/head64.c                           |   93 +-
 arch/x86/kernel/head_32.S                          |   20 +-
 arch/x86/kernel/head_64.S                          |   40 +-
 arch/x86/kernel/kdebugfs.c                         |   34 +-
 arch/x86/kernel/ksysfs.c                           |   28 +-
 arch/x86/kernel/ldt.c                              |   21 +
 arch/x86/kernel/machine_kexec_64.c                 |   25 +-
 arch/x86/kernel/module.c                           |   11 +-
 arch/x86/kernel/mpparse.c                          |  108 ++-
 arch/x86/kernel/pci-dma.c                          |   11 +-
 arch/x86/kernel/pci-nommu.c                        |    2 +-
 arch/x86/kernel/pci-swiotlb.c                      |   15 +-
 arch/x86/kernel/process.c                          |   17 +-
 arch/x86/kernel/process_32.c                       |    2 +-
 arch/x86/kernel/process_64.c                       |    6 +-
 arch/x86/kernel/relocate_kernel_64.S               |   14 +
 arch/x86/kernel/setup.c                            |   12 +
 arch/x86/kernel/signal.c                           |    2 +-
 arch/x86/kernel/step.c                             |    2 +-
 arch/x86/kernel/sys_x86_64.c                       |   30 +-
 arch/x86/kernel/unwind_frame.c                     |   39 +-
 arch/x86/kernel/unwind_guess.c                     |    5 +
 arch/x86/kernel/unwind_orc.c                       |  582 +++++++++++
 arch/x86/kernel/vmlinux.lds.S                      |    3 +
 arch/x86/kvm/mmu.c                                 |   11 +-
 arch/x86/kvm/mmu.h                                 |    2 +-
 arch/x86/kvm/svm.c                                 |   35 +-
 arch/x86/kvm/vmx.c                                 |    2 +-
 arch/x86/kvm/x86.c                                 |    3 +-
 arch/x86/lib/cmdline.c                             |  105 ++
 arch/x86/mm/Makefile                               |    2 +
 arch/x86/mm/dump_pagetables.c                      |   93 +-
 arch/x86/mm/extable.c                              |    2 +-
 arch/x86/mm/hugetlbpage.c                          |   27 +-
 arch/x86/mm/ident_map.c                            |   12 +-
 arch/x86/mm/init.c                                 |    2 +-
 arch/x86/mm/ioremap.c                              |  287 +++++-
 arch/x86/mm/kasan_init_64.c                        |    6 +-
 arch/x86/mm/mem_encrypt.c                          |  593 ++++++++++++
 arch/x86/mm/mem_encrypt_boot.S                     |  149 +++
 arch/x86/mm/mmap.c                                 |   12 +-
 arch/x86/mm/mpx.c                                  |   33 +-
 arch/x86/mm/numa_emulation.c                       |   55 +-
 arch/x86/mm/pageattr.c                             |   67 ++
 arch/x86/mm/pat.c                                  |    9 +-
 arch/x86/mm/tlb.c                                  |  331 +++++--
 arch/x86/pci/common.c                              |    4 +-
 arch/x86/pci/intel_mid_pci.c                       |   12 +-
 arch/x86/platform/efi/efi.c                        |    6 +-
 arch/x86/platform/efi/efi_64.c                     |   15 +-
 .../intel-mid/device_libs/platform_mrfld_wdt.c     |    6 +-
 arch/x86/platform/intel-mid/intel-mid.c            |    2 +-
 arch/x86/realmode/init.c                           |   12 +
 arch/x86/realmode/rm/trampoline_64.S               |   24 +
 arch/x86/xen/Kconfig                               |    5 +
 arch/x86/xen/enlighten_pv.c                        |    7 +
 arch/x86/xen/mmu_pv.c                              |    5 +-
 arch/x86/xen/xen-head.S                            |    2 +-
 drivers/acpi/processor_idle.c                      |    2 -
 drivers/firmware/dmi-sysfs.c                       |    5 +-
 drivers/firmware/efi/efi.c                         |   33 +
 drivers/firmware/pcdp.c                            |    4 +-
 drivers/gpu/drm/drm_gem.c                          |    2 +
 drivers/gpu/drm/drm_vm.c                           |    4 +
 drivers/gpu/drm/ttm/ttm_bo_vm.c                    |    7 +-
 drivers/gpu/drm/udl/udl_fb.c                       |    4 +
 drivers/idle/intel_idle.c                          |    9 +-
 drivers/iommu/amd_iommu.c                          |   30 +-
 drivers/iommu/amd_iommu_init.c                     |   34 +-
 drivers/iommu/amd_iommu_proto.h                    |   10 +
 drivers/iommu/amd_iommu_types.h                    |    2 +-
 drivers/sfi/sfi_core.c                             |   23 +-
 drivers/video/fbdev/core/fbmem.c                   |   12 +
 include/asm-generic/early_ioremap.h                |    2 +
 include/asm-generic/io.h                           |   27 +
 include/asm-generic/pgtable.h                      |   12 +
 include/asm-generic/vmlinux.lds.h                  |   27 +-
 include/linux/compiler-gcc.h                       |   13 +-
 include/linux/compiler.h                           |   32 +-
 include/linux/dma-mapping.h                        |   13 +
 include/linux/efi.h                                |    9 +-
 include/linux/io.h                                 |    2 +
 include/linux/kasan-checks.h                       |   10 +-
 include/linux/kexec.h                              |    8 +
 include/linux/mem_encrypt.h                        |   48 +
 include/linux/swiotlb.h                            |    1 +
 include/linux/syscalls.h                           |   16 +
 include/uapi/linux/perf_event.h                    |   27 +-
 init/main.c                                        |   10 +
 kernel/cpu.c                                       |   12 +-
 kernel/kexec_core.c                                |   12 +-
 kernel/memremap.c                                  |   20 +-
 lib/Kconfig.debug                                  |    9 +-
 lib/swiotlb.c                                      |   57 +-
 mm/early_ioremap.c                                 |   28 +-
 mm/kasan/kasan.c                                   |    4 +-
 scripts/Makefile.build                             |   17 +-
 tools/arch/x86/include/asm/unistd_32.h             |    3 +
 tools/arch/x86/include/asm/unistd_64.h             |    3 +
 tools/arch/x86/include/uapi/asm/unistd.h           |   17 +
 tools/build/Makefile.feature                       |    3 +-
 tools/build/feature/Makefile                       |    6 +-
 tools/build/feature/test-all.c                     |    5 +
 tools/build/feature/test-setns.c                   |    7 +
 tools/include/linux/string.h                       |   12 +-
 tools/include/uapi/asm-generic/fcntl.h             |  220 +++++
 tools/include/uapi/linux/fcntl.h                   |   21 +
 tools/include/uapi/linux/perf_event.h              |   27 +-
 tools/include/uapi/linux/sched.h                   |   52 +
 tools/lib/string.c                                 |   41 +-
 tools/lib/subcmd/help.c                            |    2 +-
 tools/lib/subcmd/parse-options.c                   |   18 +-
 tools/objtool/Build                                |    3 +
 tools/objtool/Documentation/stack-validation.txt   |   56 +-
 tools/objtool/Makefile                             |    6 +-
 tools/objtool/arch.h                               |    5 +-
 tools/objtool/arch/x86/decode.c                    |   43 +-
 tools/objtool/builtin-check.c                      |    7 +-
 tools/objtool/builtin-orc.c                        |   70 ++
 tools/objtool/builtin.h                            |    1 +
 tools/objtool/check.c                              |  345 ++++++-
 tools/objtool/check.h                              |   19 +-
 tools/objtool/elf.c                                |  212 +++-
 tools/objtool/elf.h                                |   15 +-
 tools/objtool/objtool.c                            |    3 +-
 tools/objtool/orc.h                                |   30 +
 tools/objtool/orc_dump.c                           |  212 ++++
 tools/objtool/orc_gen.c                            |  214 +++++
 tools/objtool/orc_types.h                          |  107 +++
 tools/perf/Build                                   |    2 +-
 tools/perf/Documentation/perf-buildid-cache.txt    |    5 +
 tools/perf/Documentation/perf-probe.txt            |   14 +
 tools/perf/Documentation/perf-record.txt           |    1 +
 tools/perf/Documentation/perf-top.txt              |    4 +
 tools/perf/Documentation/perf.data-file-format.txt |   10 +-
 tools/perf/MANIFEST                                |    2 +
 tools/perf/Makefile.config                         |    5 +
 tools/perf/Makefile.perf                           |   10 +-
 tools/perf/arch/powerpc/util/sym-handling.c        |    2 +-
 tools/perf/arch/s390/util/Build                    |    1 +
 tools/perf/arch/s390/util/sym-handling.c           |   22 +
 tools/perf/arch/x86/annotate/instructions.c        |   46 +
 tools/perf/arch/x86/util/intel-pt.c                |    3 +
 tools/perf/builtin-annotate.c                      |    7 +-
 tools/perf/builtin-buildid-cache.c                 |   54 +-
 tools/perf/builtin-config.c                        |    3 +-
 tools/perf/builtin-data.c                          |    2 +-
 tools/perf/builtin-ftrace.c                        |    2 +-
 tools/perf/builtin-help.c                          |    6 +-
 tools/perf/builtin-inject.c                        |    1 +
 tools/perf/builtin-probe.c                         |   45 +-
 tools/perf/builtin-record.c                        |    9 +-
 tools/perf/builtin-report.c                        |   57 +-
 tools/perf/builtin-script.c                        |   11 +-
 tools/perf/builtin-stat.c                          |   30 +-
 tools/perf/builtin-top.c                           |   22 +-
 tools/perf/builtin-trace.c                         |  704 ++++++++------
 tools/perf/check-headers.sh                        |    2 +
 tools/perf/perf.c                                  |   16 +-
 tools/perf/perf.h                                  |    1 +
 tools/perf/pmu-events/README                       |    4 -
 tools/perf/pmu-events/arch/powerpc/mapfile.csv     |    4 +
 .../perf/pmu-events/arch/powerpc/power9/cache.json |  176 ++++
 .../arch/powerpc/power9/floating-point.json        |   44 +
 .../pmu-events/arch/powerpc/power9/frontend.json   |  446 +++++++++
 .../pmu-events/arch/powerpc/power9/marked.json     |  782 +++++++++++++++
 .../pmu-events/arch/powerpc/power9/memory.json     |  158 +++
 .../perf/pmu-events/arch/powerpc/power9/other.json |  836 ++++++++++++++++
 .../pmu-events/arch/powerpc/power9/pipeline.json   |  680 +++++++++++++
 tools/perf/pmu-events/arch/powerpc/power9/pmc.json |  146 +++
 .../arch/powerpc/power9/translation.json           |  272 ++++++
 tools/perf/pmu-events/jevents.c                    |   21 +-
 tools/perf/tests/attr.c                            |   12 +-
 tools/perf/tests/attr.py                           |   50 +-
 tools/perf/tests/attr/base-record                  |    6 +-
 tools/perf/tests/attr/base-stat                    |    4 +-
 tools/perf/tests/attr/test-record-C0               |    1 +
 tools/perf/tests/attr/test-record-basic            |    1 +
 tools/perf/tests/attr/test-record-branch-any       |    2 +-
 .../perf/tests/attr/test-record-branch-filter-any  |    2 +-
 .../tests/attr/test-record-branch-filter-any_call  |    2 +-
 .../tests/attr/test-record-branch-filter-any_ret   |    2 +-
 tools/perf/tests/attr/test-record-branch-filter-hv |    2 +-
 .../tests/attr/test-record-branch-filter-ind_call  |    2 +-
 tools/perf/tests/attr/test-record-branch-filter-k  |    2 +-
 tools/perf/tests/attr/test-record-branch-filter-u  |    2 +-
 tools/perf/tests/attr/test-record-count            |    1 +
 tools/perf/tests/attr/test-record-data             |    3 +-
 tools/perf/tests/attr/test-record-freq             |    1 +
 tools/perf/tests/attr/test-record-graph-default    |    1 +
 tools/perf/tests/attr/test-record-graph-dwarf      |    4 +-
 tools/perf/tests/attr/test-record-graph-fp         |    1 +
 tools/perf/tests/attr/test-record-group            |    1 +
 tools/perf/tests/attr/test-record-group-sampling   |    1 +
 tools/perf/tests/attr/test-record-group1           |    1 +
 ...st-record-no-delay => test-record-no-buffering} |    4 +-
 tools/perf/tests/attr/test-record-no-inherit       |    1 +
 tools/perf/tests/attr/test-record-no-samples       |    1 +
 tools/perf/tests/attr/test-record-period           |    1 +
 tools/perf/tests/attr/test-record-raw              |    2 +-
 tools/perf/tests/attr/test-stat-C0                 |    4 +-
 tools/perf/tests/attr/test-stat-default            |    2 +
 tools/perf/tests/attr/test-stat-detailed-1         |    2 +
 tools/perf/tests/attr/test-stat-detailed-2         |    3 +
 tools/perf/tests/attr/test-stat-detailed-3         |    5 +
 tools/perf/tests/sdt.c                             |    8 +-
 tools/perf/trace/beauty/Build                      |    2 +
 tools/perf/trace/beauty/beauty.h                   |   68 ++
 tools/perf/trace/beauty/clone.c                    |   75 ++
 tools/perf/trace/beauty/fcntl.c                    |  100 ++
 tools/perf/trace/beauty/mmap.c                     |    3 +
 tools/perf/trace/beauty/open_flags.c               |   29 +-
 tools/perf/trace/beauty/pid.c                      |    4 +-
 tools/perf/ui/browser.c                            |   32 +-
 tools/perf/ui/browser.h                            |    2 +
 tools/perf/ui/browsers/annotate.c                  |   73 +-
 tools/perf/ui/browsers/hists.c                     |    3 -
 tools/perf/ui/gtk/annotate.c                       |    6 +-
 tools/perf/ui/stdio/hist.c                         |    6 +-
 tools/perf/util/Build                              |    5 +
 tools/perf/util/annotate.c                         |  135 ++-
 tools/perf/util/annotate.h                         |   22 +-
 tools/perf/util/bpf-loader.c                       |    2 +-
 tools/perf/util/branch.c                           |  147 +++
 tools/perf/util/branch.h                           |   25 +
 tools/perf/util/build-id.c                         |  129 ++-
 tools/perf/util/build-id.h                         |   16 +-
 tools/perf/util/callchain.c                        |  249 +++--
 tools/perf/util/callchain.h                        |    5 +-
 tools/perf/util/cgroup.c                           |    8 +-
 tools/perf/util/config.c                           |   13 +-
 tools/perf/util/counts.h                           |    1 +
 tools/perf/util/data-convert-bt.c                  |  127 ++-
 tools/perf/util/dso.c                              |   21 +-
 tools/perf/util/dso.h                              |    3 +
 tools/perf/util/event.c                            |    1 +
 tools/perf/util/event.h                            |   11 +-
 tools/perf/util/evlist.c                           |    4 +-
 tools/perf/util/evlist.h                           |   14 +-
 tools/perf/util/evsel.c                            |  165 +++-
 tools/perf/util/evsel.h                            |    5 +-
 tools/perf/util/header.c                           | 1015 +++++++++++---------
 tools/perf/util/header.h                           |   16 +-
 tools/perf/util/hist.c                             |    7 +-
 tools/perf/util/llvm-utils.c                       |    2 +-
 tools/perf/util/machine.c                          |   46 +-
 tools/perf/util/map.c                              |   23 +-
 tools/perf/util/map.h                              |    2 +-
 tools/perf/util/namespaces.c                       |  211 ++++
 tools/perf/util/namespaces.h                       |   38 +
 tools/perf/util/parse-branch-options.c             |    1 +
 tools/perf/util/parse-events.c                     |    2 +-
 tools/perf/util/probe-event.c                      |   86 +-
 tools/perf/util/probe-event.h                      |   10 +-
 tools/perf/util/probe-file.c                       |   19 +-
 tools/perf/util/probe-file.h                       |    4 +-
 tools/perf/util/python-ext-sources                 |    1 +
 .../util/scripting-engines/trace-event-python.c    |  246 +++--
 tools/perf/util/session.c                          |    4 +
 tools/perf/util/setns.c                            |    8 +
 tools/perf/util/sort.c                             |    2 +-
 tools/perf/util/stat.c                             |    4 +
 tools/perf/util/stat.h                             |    5 +-
 tools/perf/util/symbol.c                           |   92 +-
 tools/perf/util/thread.c                           |    3 +
 tools/perf/util/thread.h                           |    1 +
 tools/perf/util/tool.h                             |   10 +-
 tools/perf/util/util.c                             |   40 +-
 tools/perf/util/util.h                             |    8 +-
 351 files changed, 13709 insertions(+), 2329 deletions(-)
 create mode 100644 Documentation/x86/amd-memory-encryption.txt
 delete mode 100644 Documentation/x86/early-microcode.txt
 create mode 100644 Documentation/x86/microcode.txt
 create mode 100644 Documentation/x86/orc-unwinder.txt
 create mode 100644 Documentation/x86/x86_64/5level-paging.txt
 create mode 100644 arch/um/include/asm/unwind.h
 create mode 100644 arch/x86/include/asm/mem_encrypt.h
 create mode 100644 arch/x86/include/asm/orc_lookup.h
 create mode 100644 arch/x86/include/asm/orc_types.h
 create mode 100644 arch/x86/include/asm/unwind_hints.h
 create mode 100644 arch/x86/kernel/unwind_orc.c
 create mode 100644 arch/x86/mm/mem_encrypt.c
 create mode 100644 arch/x86/mm/mem_encrypt_boot.S
 create mode 100644 include/linux/mem_encrypt.h
 create mode 100644 tools/arch/x86/include/uapi/asm/unistd.h
 create mode 100644 tools/build/feature/test-setns.c
 create mode 100644 tools/include/uapi/asm-generic/fcntl.h
 create mode 100644 tools/include/uapi/linux/sched.h
 create mode 100644 tools/objtool/builtin-orc.c
 create mode 100644 tools/objtool/orc.h
 create mode 100644 tools/objtool/orc_dump.c
 create mode 100644 tools/objtool/orc_gen.c
 create mode 100644 tools/objtool/orc_types.h
 create mode 100644 tools/perf/arch/s390/util/sym-handling.c
 create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/cache.json
 create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/floating-point.json
 create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/frontend.json
 create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/marked.json
 create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/memory.json
 create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/other.json
 create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/pipeline.json
 create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/pmc.json
 create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/translation.json
 rename tools/perf/tests/attr/{test-record-no-delay => test-record-no-buffering} (61%)
 create mode 100644 tools/perf/trace/beauty/clone.c
 create mode 100644 tools/perf/trace/beauty/fcntl.c
 create mode 100644 tools/perf/util/branch.c
 create mode 100644 tools/perf/util/branch.h
 create mode 100644 tools/perf/util/setns.c
Merging clockevents/clockevents/next (2287d8664fe7 timers: Make the cpu base lock raw)
$ git merge clockevents/clockevents/next
Already up-to-date.
Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp)
$ git merge edac/linux_next
Already up-to-date.
Merging edac-amd/for-next (2efdda4a4108 EDAC, cpc925, ppc4xx: Convert to using %pOF instead of full_name)
$ git merge edac-amd/for-next
Merge made by the 'recursive' strategy.
 drivers/edac/altera_edac.c      | 2 --
 drivers/edac/amd64_edac.c       | 1 -
 drivers/edac/amd76x_edac.c      | 2 --
 drivers/edac/cpc925_edac.c      | 3 +--
 drivers/edac/e752x_edac.c       | 2 --
 drivers/edac/e7xxx_edac.c       | 2 --
 drivers/edac/edac_mc_sysfs.c    | 6 +++---
 drivers/edac/ghes_edac.c        | 3 ---
 drivers/edac/highbank_mc_edac.c | 1 -
 drivers/edac/i3000_edac.c       | 3 ---
 drivers/edac/i3200_edac.c       | 3 ---
 drivers/edac/i5000_edac.c       | 1 -
 drivers/edac/i5100_edac.c       | 1 -
 drivers/edac/i5400_edac.c       | 1 -
 drivers/edac/i7300_edac.c       | 1 -
 drivers/edac/i7core_edac.c      | 5 ++---
 drivers/edac/i82443bxgx_edac.c  | 3 ---
 drivers/edac/i82860_edac.c      | 2 --
 drivers/edac/i82875p_edac.c     | 2 --
 drivers/edac/i82975x_edac.c     | 2 --
 drivers/edac/ie31200_edac.c     | 2 --
 drivers/edac/mce_amd.c          | 6 +-----
 drivers/edac/mv64x60_edac.c     | 1 -
 drivers/edac/ppc4xx_edac.c      | 9 ++++-----
 drivers/edac/r82600_edac.c      | 2 --
 drivers/edac/sb_edac.c          | 1 -
 drivers/edac/skx_edac.c         | 3 ---
 drivers/edac/synopsys_edac.c    | 1 -
 drivers/edac/thunderx_edac.c    | 1 -
 drivers/edac/x38_edac.c         | 3 ---
 drivers/edac/xgene_edac.c       | 1 -
 include/linux/edac.h            | 1 -
 32 files changed, 11 insertions(+), 66 deletions(-)
Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1)
$ git merge irqchip/irqchip/for-next
Already up-to-date.
Merging ftrace/for-next (2e028c4fe129 ftrace: Fix uninitialized variable in match_records())
$ git merge ftrace/for-next
Already up-to-date.
Merging rcu/rcu/next (de7e0d44999a rcu: Provide GP ordering in face of migrations and delays)
$ git merge rcu/rcu/next
Recorded preimage for 'arch/x86/mm/tlb.c'
Removing tools/testing/selftests/rcutorture/configs/rcu/SRCU-C.boot
Auto-merging kernel/sched/core.c
Removing kernel/rcu/tiny_plugin.h
Removing kernel/membarrier.c
Auto-merging kernel/cpu.c
Auto-merging arch/x86/mm/tlb.c
CONFLICT (content): Merge conflict in arch/x86/mm/tlb.c
Auto-merging arch/s390/include/asm/spinlock.h
Auto-merging arch/arc/include/asm/spinlock.h
Auto-merging MAINTAINERS
Auto-merging Documentation/admin-guide/kernel-parameters.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
Recorded resolution for 'arch/x86/mm/tlb.c'.
[master c69793549a8a] Merge remote-tracking branch 'rcu/rcu/next'
$ git diff -M --stat --summary HEAD^..
 .../RCU/Design/Requirements/Requirements.html      | 130 +++++++++++
 Documentation/RCU/checklist.txt                    | 121 +++++++----
 Documentation/RCU/rcu.txt                          |   9 +-
 Documentation/RCU/rcu_dereference.txt              |  61 ++----
 Documentation/RCU/rcubarrier.txt                   |   5 +
 Documentation/RCU/torture.txt                      |  20 +-
 Documentation/RCU/whatisRCU.txt                    |   5 +-
 Documentation/admin-guide/kernel-parameters.txt    |   7 +-
 Documentation/core-api/kernel-api.rst              |  49 +++++
 Documentation/memory-barriers.txt                  |  41 ++--
 MAINTAINERS                                        |   2 +-
 arch/alpha/include/asm/spinlock.h                  |   5 -
 arch/arc/include/asm/spinlock.h                    |   5 -
 arch/arm/include/asm/spinlock.h                    |  16 --
 arch/arm64/include/asm/spinlock.h                  |  58 +----
 arch/arm64/kernel/process.c                        |   2 +
 arch/blackfin/include/asm/spinlock.h               |   5 -
 arch/blackfin/kernel/module.c                      |  39 ++--
 arch/hexagon/include/asm/spinlock.h                |   5 -
 arch/ia64/include/asm/spinlock.h                   |  21 --
 arch/m32r/include/asm/spinlock.h                   |   5 -
 arch/metag/include/asm/spinlock.h                  |   5 -
 arch/mn10300/include/asm/spinlock.h                |   5 -
 arch/parisc/include/asm/spinlock.h                 |   7 -
 arch/powerpc/include/asm/spinlock.h                |  33 ---
 arch/s390/include/asm/spinlock.h                   |   7 -
 arch/sh/include/asm/spinlock-cas.h                 |   5 -
 arch/sh/include/asm/spinlock-llsc.h                |   5 -
 arch/sparc/include/asm/spinlock_32.h               |   5 -
 arch/tile/include/asm/spinlock_32.h                |   2 -
 arch/tile/include/asm/spinlock_64.h                |   2 -
 arch/tile/lib/spinlock_32.c                        |  23 --
 arch/tile/lib/spinlock_64.c                        |  22 --
 arch/xtensa/include/asm/spinlock.h                 |   5 -
 drivers/ata/libata-eh.c                            |   8 +-
 include/asm-generic/qspinlock.h                    |  14 --
 include/linux/init_task.h                          |   8 +-
 include/linux/rcupdate.h                           |  15 +-
 include/linux/rcutiny.h                            |   8 +-
 include/linux/sched.h                              |   8 +-
 include/linux/spinlock.h                           |  31 ---
 include/linux/spinlock_up.h                        |   6 -
 include/linux/srcutiny.h                           |  13 ++
 include/linux/srcutree.h                           |   3 +-
 include/linux/swait.h                              |  55 +++++
 include/trace/events/rcu.h                         |   7 +-
 include/uapi/linux/membarrier.h                    |  23 +-
 ipc/sem.c                                          |   3 +-
 kernel/Makefile                                    |   1 -
 kernel/cpu.c                                       |   1 +
 kernel/exit.c                                      |  10 +-
 kernel/locking/qspinlock.c                         | 117 ----------
 kernel/membarrier.c                                |  70 ------
 kernel/rcu/Kconfig                                 |   3 +-
 kernel/rcu/rcu.h                                   | 128 ++---------
 kernel/rcu/rcu_segcblist.c                         | 108 +++-------
 kernel/rcu/rcu_segcblist.h                         |  28 +--
 kernel/rcu/rcuperf.c                               |  17 +-
 kernel/rcu/rcutorture.c                            |  83 +++----
 kernel/rcu/srcutiny.c                              |   8 +
 kernel/rcu/srcutree.c                              |  50 ++++-
 kernel/rcu/tiny.c                                  |   2 -
 kernel/rcu/tiny_plugin.h                           |  47 ----
 kernel/rcu/tree.c                                  | 236 ++++++++------------
 kernel/rcu/tree.h                                  |  15 +-
 kernel/rcu/tree_exp.h                              |   2 +-
 kernel/rcu/tree_plugin.h                           | 238 ++++++++++++---------
 kernel/rcu/update.c                                |  28 ++-
 kernel/sched/Makefile                              |   1 +
 kernel/sched/completion.c                          |   9 +-
 kernel/sched/core.c                                |  40 +++-
 kernel/sched/membarrier.c                          | 152 +++++++++++++
 kernel/task_work.c                                 |   8 +-
 kernel/torture.c                                   |   2 +-
 net/netfilter/nf_conntrack_core.c                  |  52 +++--
 .../selftests/rcutorture/bin/config_override.sh    |  61 ++++++
 .../testing/selftests/rcutorture/bin/functions.sh  |  27 ++-
 .../testing/selftests/rcutorture/bin/kvm-build.sh  |  11 +-
 .../selftests/rcutorture/bin/kvm-test-1-run.sh     |  58 ++---
 tools/testing/selftests/rcutorture/bin/kvm.sh      |  34 ++-
 .../selftests/rcutorture/configs/rcu/BUSTED.boot   |   2 +-
 .../selftests/rcutorture/configs/rcu/SRCU-C.boot   |   1 -
 .../selftests/rcutorture/configs/rcu/SRCU-u        |   3 +-
 .../selftests/rcutorture/configs/rcu/TREE01.boot   |   2 +-
 .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt  |   2 +-
 85 files changed, 1253 insertions(+), 1343 deletions(-)
 delete mode 100644 kernel/membarrier.c
 delete mode 100644 kernel/rcu/tiny_plugin.h
 create mode 100644 kernel/sched/membarrier.c
 create mode 100755 tools/testing/selftests/rcutorture/bin/config_override.sh
 delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-C.boot
Merging kvm/linux-next (7b5e0a4e82bf Merge branch 'kvm-ppc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into kvm-master)
$ git merge kvm/linux-next
Already up-to-date.
Merging kvm-arm/next (7e5a672289c9 KVM: arm/arm64: Handle hva aging while destroying the vm)
$ git merge kvm-arm/next
Merge made by the 'recursive' strategy.
 arch/arm64/kvm/sys_regs.c     |  2 +-
 include/kvm/arm_pmu.h         |  2 --
 virt/kvm/arm/mmu.c            |  4 ++++
 virt/kvm/arm/pmu.c            | 43 +++++++++++++++----------------------------
 virt/kvm/arm/vgic/vgic-init.c |  3 ---
 virt/kvm/arm/vgic/vgic-its.c  |  1 +
 6 files changed, 21 insertions(+), 34 deletions(-)
Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E)
$ git merge kvm-mips/next
Already up-to-date.
Merging kvm-ppc/kvm-ppc-next (8b24e69fc47e KVM: PPC: Book3S HV: Close race with testing for signals on guest entry)
$ git merge kvm-ppc/kvm-ppc-next
Already up-to-date.
Merging kvms390/next (5091d7c8ca2d KVM: s390: Multiple Epoch Facility support)
$ git merge kvms390/next
Auto-merging arch/s390/tools/gen_facilities.c
Auto-merging arch/s390/kvm/vsie.c
Auto-merging arch/s390/kvm/kvm-s390.c
Merge made by the 'recursive' strategy.
 Documentation/virtual/kvm/devices/vm.txt |  14 ++++-
 arch/s390/include/asm/kvm_host.h         |   6 +-
 arch/s390/include/uapi/asm/kvm.h         |   6 ++
 arch/s390/kvm/kvm-s390.c                 | 101 +++++++++++++++++++++++++++++++
 arch/s390/kvm/kvm-s390.h                 |   2 +
 arch/s390/kvm/sigp.c                     |  36 ++++++-----
 arch/s390/kvm/vsie.c                     |  10 +++
 arch/s390/tools/gen_facilities.c         |   2 +
 8 files changed, 156 insertions(+), 21 deletions(-)
Merging xen-tip/linux-next (e91b2b119433 xen: dont fiddle with event channel masking in suspend/resume)
$ git merge xen-tip/linux-next
Already up-to-date.
Merging percpu/for-next (5e81ee3e6a79 percpu: update header to contain bitmap allocator explanation.)
$ git merge percpu/for-next
Auto-merging init/main.c
Merge made by the 'recursive' strategy.
 include/linux/percpu.h |   20 +-
 init/main.c            |    1 -
 mm/percpu-internal.h   |   82 ++-
 mm/percpu-km.c         |    2 +-
 mm/percpu-stats.c      |  111 ++--
 mm/percpu.c            | 1522 ++++++++++++++++++++++++++++++------------------
 6 files changed, 1112 insertions(+), 626 deletions(-)
Merging workqueues/for-next (5dab90af0906 Merge branch 'for-4.13-fixes' into for-next)
$ git merge workqueues/for-next
Merge made by the 'recursive' strategy.
 Documentation/core-api/workqueue.rst | 10 +++++++---
 include/linux/workqueue.h            |  4 +++-
 kernel/workqueue.c                   | 30 ++++++++++++++++++++++++++----
 3 files changed, 36 insertions(+), 8 deletions(-)
Merging drivers-x86/for-next (972777171f33 platform/x86: wmi: Fix error handling in acpi_wmi_init())
$ git merge drivers-x86/for-next
Merge made by the 'recursive' strategy.
 drivers/platform/x86/Kconfig | 1 +
 drivers/platform/x86/wmi.c   | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
Merging chrome-platform/for-next (3c778a7fcfaa platform/chrome : Add myself as Maintainer)
$ git merge chrome-platform/for-next
Already up-to-date.
Merging hsi/for-next (67ddd75771b6 HSI: core: Use kcalloc() in two functions)
$ git merge hsi/for-next
Already up-to-date.
Merging leds/for-next (c68729119f4d leds: tlc591xx: add missing of_node_put)
$ git merge leds/for-next
Merge made by the 'recursive' strategy.
 drivers/leds/leds-tlc591xx.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
Merging ipmi/for-next (8c3cbb96adf6 char: ipmi: eliminate misleading print info when being probed via ACPI)
$ git merge ipmi/for-next
Merge made by the 'recursive' strategy.
 drivers/char/ipmi/ipmi_si_intf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging driver-core/driver-core-next (1af824f085e8 Merge branch 'bind_unbind' into driver-core-next)
$ git merge driver-core/driver-core-next
Auto-merging include/linux/kobject.h
Auto-merging drivers/input/rmi4/rmi_f01.c
Auto-merging drivers/input/keyboard/gpio_keys.c
Merge made by the 'recursive' strategy.
 drivers/base/arch_topology.c       |  78 +++++++++++-----------
 drivers/base/base.h                |   5 --
 drivers/base/core.c                | 132 +++++++++++++++++++++++++++++++++++++
 drivers/base/dd.c                  |   4 ++
 drivers/input/keyboard/gpio_keys.c |  16 +----
 drivers/input/misc/axp20x-pek.c    |  18 +----
 drivers/input/rmi4/rmi_f01.c       |  11 +---
 include/linux/arch_topology.h      |   4 +-
 include/linux/debugfs.h            |  16 +++++
 include/linux/device.h             |  30 +++++++++
 include/linux/kobject.h            |   2 +
 lib/kobject_uevent.c               |   2 +
 12 files changed, 234 insertions(+), 84 deletions(-)
Merging usb/usb-next (e978e9b977b0 c67x00-hcd: constify hc_driver structures)
$ git merge usb/usb-next
Merge made by the 'recursive' strategy.
 drivers/usb/atm/cxacru.c             |  2 --
 drivers/usb/atm/speedtch.c           |  4 +---
 drivers/usb/atm/ueagle-atm.c         |  2 +-
 drivers/usb/atm/usbatm.c             |  4 +---
 drivers/usb/atm/xusbatm.c            |  1 -
 drivers/usb/c67x00/c67x00-hcd.c      |  2 +-
 drivers/usb/chipidea/ci_hdrc_pci.c   |  1 -
 drivers/usb/class/cdc-wdm.c          |  4 ----
 drivers/usb/common/common.c          |  4 ++--
 drivers/usb/core/hub.c               | 17 +++++++++++++++--
 drivers/usb/core/ledtrig-usbport.c   |  4 ++--
 drivers/usb/core/sysfs.c             |  2 +-
 drivers/usb/gadget/legacy/webcam.c   |  1 -
 drivers/usb/gadget/udc/mv_udc_core.c |  2 --
 drivers/usb/gadget/udc/s3c2410_udc.c |  4 +---
 drivers/usb/host/fsl-mph-dr-of.c     |  4 ++--
 drivers/usb/host/hwa-hc.c            |  2 +-
 drivers/usb/host/isp116x-hcd.c       |  2 +-
 drivers/usb/host/isp1362-hcd.c       |  2 +-
 drivers/usb/host/max3421-hcd.c       |  2 +-
 drivers/usb/host/r8a66597-hcd.c      |  2 +-
 drivers/usb/host/sl811-hcd.c         |  2 +-
 drivers/usb/host/u132-hcd.c          |  2 +-
 drivers/usb/host/whci/hcd.c          |  2 +-
 drivers/usb/image/microtek.c         |  4 ----
 drivers/usb/isp1760/isp1760-hcd.c    |  6 ++----
 drivers/usb/misc/adutux.c            |  2 --
 drivers/usb/misc/chaoskey.c          |  2 --
 drivers/usb/misc/cytherm.c           |  1 -
 drivers/usb/misc/ftdi-elan.c         |  6 +++---
 drivers/usb/misc/idmouse.c           |  2 --
 drivers/usb/misc/iowarrior.c         |  4 +---
 drivers/usb/misc/ldusb.c             |  1 -
 drivers/usb/misc/legousbtower.c      |  2 --
 drivers/usb/misc/rio500.c            |  4 ----
 drivers/usb/misc/sisusbvga/sisusb.c  | 13 +++----------
 drivers/usb/misc/trancevibrator.c    |  2 --
 drivers/usb/misc/usb251xb.c          |  1 -
 drivers/usb/misc/uss720.c            |  7 +------
 drivers/usb/mtu3/mtu3.h              |  2 ++
 drivers/usb/mtu3/mtu3_gadget.c       |  4 ++++
 drivers/usb/mtu3/mtu3_gadget_ep0.c   | 23 ++++++++++++++++++++---
 drivers/usb/mtu3/mtu3_host.c         |  4 ++--
 drivers/usb/mtu3/mtu3_hw_regs.h      |  4 +++-
 drivers/usb/phy/phy-mv-usb.c         |  2 --
 drivers/usb/phy/phy.c                |  4 ++--
 drivers/usb/renesas_usbhs/mod_host.c |  2 +-
 drivers/usb/renesas_usbhs/pipe.c     |  2 +-
 drivers/usb/storage/realtek_cr.c     |  1 -
 drivers/usb/usbip/stub_main.c        |  2 --
 drivers/usb/usbip/usbip_common.c     |  2 --
 drivers/usb/usbip/usbip_common.h     |  2 --
 drivers/usb/usbip/vhci_hcd.c         |  2 --
 53 files changed, 80 insertions(+), 107 deletions(-)
Merging usb-gadget/next (5771a8c08880 Linux v4.13-rc1)
$ git merge usb-gadget/next
Already up-to-date.
Merging usb-serial/usb-next (5771a8c08880 Linux v4.13-rc1)
$ git merge usb-serial/usb-next
Already up-to-date.
Merging usb-chipidea-next/ci-for-usb-next (7c3a8b81503c usb: chipidea: core: do not register extcon notifier if extcon device is not existed)
$ git merge usb-chipidea-next/ci-for-usb-next
Merge made by the 'recursive' strategy.
 drivers/usb/chipidea/ci_hdrc_msm.c | 2 +-
 drivers/usb/chipidea/core.c        | 4 ++--
 drivers/usb/chipidea/udc.c         | 5 +----
 3 files changed, 4 insertions(+), 7 deletions(-)
Merging phy-next/next (e7cded272612 phy: allwinner: phy-sun4i-usb: Add log when probing)
$ git merge phy-next/next
Merge made by the 'recursive' strategy.
 drivers/phy/allwinner/phy-sun4i-usb.c | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)
Merging tty/tty-next (065ea0a7afd6 tty: improve tty_insert_flip_char() slow path)
$ git merge tty/tty-next
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/serial/rs485.txt |   5 +-
 .../devicetree/bindings/serial/st,stm32-usart.txt  |  17 +-
 drivers/tty/ehv_bytechan.c                         |   2 +-
 drivers/tty/hvc/hvc_opal.c                         |  16 +-
 drivers/tty/hvc/hvc_vio.c                          |   6 +-
 drivers/tty/isicom.c                               |   2 +-
 drivers/tty/moxa.c                                 |   2 +-
 drivers/tty/mxser.c                                |   2 +-
 drivers/tty/serdev/core.c                          |   2 +-
 drivers/tty/serial/8250/8250_aspeed_vuart.c        |   7 +-
 drivers/tty/serial/8250/8250_core.c                |  16 +-
 drivers/tty/serial/8250/8250_dw.c                  |   2 +-
 drivers/tty/serial/8250/8250_early.c               |   8 +-
 drivers/tty/serial/8250/8250_exar.c                |   2 +-
 drivers/tty/serial/8250/8250_ingenic.c             |   8 +-
 drivers/tty/serial/8250/8250_of.c                  |  23 +-
 drivers/tty/serial/8250/8250_pci.c                 |  43 +-
 drivers/tty/serial/8250/8250_port.c                |   2 +-
 drivers/tty/serial/Kconfig                         |   4 +-
 drivers/tty/serial/arc_uart.c                      |   4 +-
 drivers/tty/serial/fsl_lpuart.c                    |  63 +-
 drivers/tty/serial/imx.c                           |  13 +-
 drivers/tty/serial/jsm/jsm_driver.c                |   2 +-
 drivers/tty/serial/mpc52xx_uart.c                  |  12 +-
 drivers/tty/serial/omap-serial.c                   |  13 +-
 drivers/tty/serial/owl-uart.c                      | 635 ++++++++++++++++++++-
 drivers/tty/serial/pmac_zilog.c                    |   4 +-
 drivers/tty/serial/serial-tegra.c                  |   2 +-
 drivers/tty/serial/serial_core.c                   |   4 +-
 drivers/tty/serial/sprd_serial.c                   |   4 +-
 drivers/tty/serial/stm32-usart.c                   | 121 +++-
 drivers/tty/serial/stm32-usart.h                   |  37 +-
 drivers/tty/serial/sunsu.c                         |   4 +-
 drivers/tty/serial/xilinx_uartps.c                 |   2 +-
 drivers/tty/synclink.c                             |   2 +-
 drivers/tty/synclink_gt.c                          |   2 +-
 drivers/tty/synclinkmp.c                           |   2 +-
 drivers/tty/tty_buffer.c                           |  25 +
 include/linux/serial_core.h                        |   9 +-
 include/linux/tty_flip.h                           |   3 +-
 include/uapi/linux/serial_core.h                   |   1 +
 41 files changed, 1008 insertions(+), 125 deletions(-)
Merging char-misc/char-misc-next (24a81a2c2581 Merge 4.13-rc2 into char-misc-next)
$ git merge char-misc/char-misc-next
Auto-merging include/linux/fs.h
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-driver-altera-cvp  |    8 +
 Documentation/admin-guide/devices.txt              |    5 +
 .../bindings/fpga/altera-passive-serial.txt        |   29 +
 .../bindings/fpga/xilinx-pr-decoupler.txt          |   36 +
 .../devicetree/bindings/vendor-prefixes.txt        |    1 +
 arch/arm/boot/dts/imx6q-evi.dts                    |   16 +
 arch/x86/include/asm/mshyperv.h                    |    2 +
 arch/x86/kernel/cpu/mshyperv.c                     |   12 +-
 block/genhd.c                                      |   18 +-
 drivers/android/Makefile                           |    2 +-
 drivers/android/binder.c                           | 3455 +++++++++++++-------
 drivers/android/binder_alloc.c                     |  802 +++++
 drivers/android/binder_alloc.h                     |  163 +
 drivers/android/binder_trace.h                     |   41 +-
 drivers/auxdisplay/panel.c                         |    6 +-
 drivers/char/mwave/smapi.c                         |   48 +-
 drivers/char/ppdev.c                               |    3 -
 drivers/fpga/Kconfig                               |   20 +-
 drivers/fpga/Makefile                              |    2 +
 drivers/fpga/altera-cvp.c                          |  500 +++
 drivers/fpga/altera-ps-spi.c                       |  308 ++
 drivers/hv/ring_buffer.c                           |  169 +-
 drivers/misc/aspeed-lpc-snoop.c                    |   34 +-
 drivers/misc/mei/hw-me.c                           |   45 +-
 drivers/misc/mei/hw-me.h                           |   39 +-
 drivers/misc/mei/pci-me.c                          |  109 +-
 fs/char_dev.c                                      |   58 +-
 fs/proc/devices.c                                  |    8 +-
 include/linux/bitrev.h                             |   19 +
 include/linux/fpga/fpga-mgr.h                      |    4 +
 include/linux/fs.h                                 |   10 +-
 include/linux/hyperv.h                             |   65 -
 32 files changed, 4486 insertions(+), 1551 deletions(-)
 create mode 100644 Documentation/ABI/testing/sysfs-driver-altera-cvp
 create mode 100644 Documentation/devicetree/bindings/fpga/altera-passive-serial.txt
 create mode 100644 Documentation/devicetree/bindings/fpga/xilinx-pr-decoupler.txt
 create mode 100644 drivers/android/binder_alloc.c
 create mode 100644 drivers/android/binder_alloc.h
 create mode 100644 drivers/fpga/altera-cvp.c
 create mode 100644 drivers/fpga/altera-ps-spi.c
Merging extcon/extcon-next (5c27036d2b05 extcon: Convert to using %pOF instead of full_name)
$ git merge extcon/extcon-next
Merge made by the 'recursive' strategy.
 .../bindings/extcon/extcon-usbc-cros-ec.txt        |  24 ++
 drivers/extcon/Kconfig                             |   7 +
 drivers/extcon/Makefile                            |   1 +
 drivers/extcon/extcon-intel-int3496.c              |   2 +-
 drivers/extcon/extcon-usbc-cros-ec.c               | 415 +++++++++++++++++++++
 drivers/extcon/extcon.c                            |   4 +-
 include/linux/mfd/cros_ec_commands.h               |  75 ++++
 7 files changed, 525 insertions(+), 3 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/extcon/extcon-usbc-cros-ec.txt
 create mode 100644 drivers/extcon/extcon-usbc-cros-ec.c
Merging staging/staging-next (5551ad1e9fad staging: wlan-ng: Fix the types of the hfa384x_comm_tallies_16/32 members)
$ git merge staging/staging-next
Auto-merging include/linux/iio/common/st_sensors.h
Auto-merging drivers/staging/vboxvideo/vbox_drv.c
Removing drivers/staging/lustre/lustre/lov/lovsub_io.c
Removing drivers/staging/ccree/ssi_fips_local.h
Removing drivers/staging/ccree/ssi_fips_local.c
Removing drivers/staging/ccree/ssi_fips_ll.c
Removing drivers/staging/ccree/ssi_fips_ext.c
Removing drivers/staging/ccree/ssi_fips_data.h
Auto-merging drivers/iio/common/st_sensors/st_sensors_core.c
Auto-merging drivers/iio/accel/st_accel_core.c
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-bus-iio            |    9 +
 .../bindings/iio/adc/at91-sama5d2_adc.txt          |    6 +
 .../devicetree/bindings/iio/adc/mt6577_auxadc.txt  |    1 +
 .../devicetree/bindings/iio/dac/st,stm32-dac.txt   |    4 +-
 .../devicetree/bindings/iio/humidity/hdc100x.txt   |   17 +
 .../devicetree/bindings/iio/humidity/hts221.txt    |   11 +-
 .../devicetree/bindings/iio/humidity/htu21.txt     |   13 +
 .../devicetree/bindings/iio/imu/st_lsm6dsx.txt     |    8 +
 .../devicetree/bindings/iio/pressure/ms5637.txt    |   17 +
 .../devicetree/bindings/iio/st-sensors.txt         |    2 +
 .../devicetree/bindings/iio/temperature/tsys01.txt |   19 +
 .../bindings/iio/timer/stm32-timer-trigger.txt     |    2 +-
 Documentation/iio/ep93xx_adc.txt                   |   29 +
 drivers/iio/accel/bmc150-accel-i2c.c               |    1 +
 drivers/iio/accel/da311.c                          |    2 +-
 drivers/iio/accel/sca3000.c                        |    6 +-
 drivers/iio/accel/st_accel.h                       |    5 +-
 drivers/iio/accel/st_accel_core.c                  |    2 +-
 drivers/iio/accel/st_accel_i2c.c                   |    8 +-
 drivers/iio/accel/st_accel_spi.c                   |   86 +-
 drivers/iio/adc/Kconfig                            |   32 +-
 drivers/iio/adc/Makefile                           |    3 +
 drivers/iio/adc/ad7766.c                           |    6 +-
 drivers/iio/adc/at91-sama5d2_adc.c                 |  329 +++-
 drivers/iio/adc/at91_adc.c                         |    2 +-
 drivers/iio/adc/dln2-adc.c                         |  722 +++++++++
 drivers/iio/adc/ep93xx_adc.c                       |  255 +++
 drivers/iio/adc/ina2xx-adc.c                       |   36 +-
 drivers/iio/adc/ltc2471.c                          |  160 ++
 drivers/iio/adc/ltc2497.c                          |   54 +-
 drivers/iio/adc/max9611.c                          |    4 +-
 drivers/iio/adc/mcp3422.c                          |    6 +-
 drivers/iio/adc/meson_saradc.c                     |   13 +-
 drivers/iio/adc/mt6577_auxadc.c                    |   37 +
 drivers/iio/adc/rockchip_saradc.c                  |    5 +
 drivers/iio/adc/stm32-adc-core.c                   |    2 +-
 drivers/iio/adc/ti-ads1015.c                       |   16 +-
 drivers/iio/chemical/Kconfig                       |    7 +
 drivers/iio/chemical/Makefile                      |    1 +
 drivers/iio/chemical/ccs811.c                      |  339 ++++
 drivers/iio/common/st_sensors/st_sensors_core.c    |   31 +
 drivers/iio/common/st_sensors/st_sensors_i2c.c     |   29 -
 drivers/iio/dac/stm32-dac-core.c                   |   38 +-
 drivers/iio/dac/stm32-dac.c                        |    2 +-
 drivers/iio/gyro/mpu3050-core.c                    |   10 -
 drivers/iio/gyro/st_gyro.h                         |    1 +
 drivers/iio/gyro/st_gyro_core.c                    |   13 +-
 drivers/iio/gyro/st_gyro_i2c.c                     |    8 +-
 drivers/iio/gyro/st_gyro_spi.c                     |   54 +
 drivers/iio/humidity/Kconfig                       |    3 +-
 drivers/iio/humidity/hdc100x.c                     |   22 +
 drivers/iio/humidity/hts221.h                      |   11 +-
 drivers/iio/humidity/hts221_buffer.c               |   43 +-
 drivers/iio/humidity/hts221_core.c                 |  144 +-
 drivers/iio/humidity/htu21.c                       |    8 +
 drivers/iio/imu/adis16400_core.c                   |    4 +-
 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c     |   17 +
 drivers/iio/inkern.c                               |    6 +-
 drivers/iio/light/rpr0521.c                        |  336 +++-
 drivers/iio/light/tcs3472.c                        |    4 +-
 drivers/iio/magnetometer/ak8975.c                  |    2 +
 drivers/iio/magnetometer/st_magn_core.c            |    2 +-
 drivers/iio/magnetometer/st_magn_i2c.c             |    3 +-
 drivers/iio/magnetometer/st_magn_spi.c             |   25 +
 drivers/iio/orientation/hid-sensor-rotation.c      |    2 +-
 drivers/iio/pressure/ms5637.c                      |   12 +-
 drivers/iio/pressure/st_pressure_i2c.c             |    3 +-
 drivers/iio/pressure/st_pressure_spi.c             |   33 +
 drivers/iio/pressure/zpa2326.c                     |   12 +-
 drivers/iio/temperature/tsys01.c                   |    7 +
 drivers/staging/Kconfig                            |    2 +
 drivers/staging/Makefile                           |    1 +
 drivers/staging/android/ion/ion.h                  |   12 +-
 drivers/staging/android/ion/ion_cma_heap.c         |    5 +-
 drivers/staging/android/ion/ion_system_heap.c      |    2 -
 drivers/staging/ccree/Kconfig                      |    9 -
 drivers/staging/ccree/Makefile                     |    2 +-
 drivers/staging/ccree/cc_hw_queue_defs.h           |    3 +-
 drivers/staging/ccree/ssi_aead.c                   |  242 +--
 drivers/staging/ccree/ssi_aead.h                   |   12 +-
 drivers/staging/ccree/ssi_buffer_mgr.c             |  473 +++---
 drivers/staging/ccree/ssi_cipher.c                 |  142 +-
 drivers/staging/ccree/ssi_driver.c                 |   59 +-
 drivers/staging/ccree/ssi_driver.h                 |    1 -
 drivers/staging/ccree/ssi_fips.c                   |  119 +-
 drivers/staging/ccree/ssi_fips.h                   |   58 +-
 drivers/staging/ccree/ssi_fips_data.h              |  306 ----
 drivers/staging/ccree/ssi_fips_ext.c               |   92 --
 drivers/staging/ccree/ssi_fips_ll.c                | 1649 --------------------
 drivers/staging/ccree/ssi_fips_local.c             |  357 -----
 drivers/staging/ccree/ssi_fips_local.h             |   67 -
 drivers/staging/ccree/ssi_hash.c                   |  270 ++--
 drivers/staging/ccree/ssi_ivgen.c                  |    8 +-
 drivers/staging/ccree/ssi_pm.c                     |    4 +-
 drivers/staging/ccree/ssi_request_mgr.c            |   52 +-
 drivers/staging/ccree/ssi_sram_mgr.c               |    6 +-
 drivers/staging/ccree/ssi_sysfs.c                  |   80 +-
 drivers/staging/comedi/comedi_buf.c                |    2 +-
 drivers/staging/comedi/drivers/ni_mio_common.c     |    3 +-
 drivers/staging/fbtft/fbtft-core.c                 |    4 +-
 drivers/staging/fsl-dpaa2/Kconfig                  |    2 +-
 drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c     |    6 +-
 drivers/staging/fsl-dpaa2/ethernet/dpaa2-ethtool.c |    2 -
 drivers/staging/fsl-mc/bus/Kconfig                 |    4 +-
 drivers/staging/fsl-mc/bus/dpio/qbman-portal.c     |   24 +-
 drivers/staging/fsl-mc/bus/fsl-mc-bus.c            |    4 +-
 drivers/staging/fsl-mc/bus/fsl-mc-msi.c            |    9 +-
 .../staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c |   11 +-
 drivers/staging/fsl-mc/bus/mc-io.c                 |   11 +-
 drivers/staging/fsl-mc/bus/mc-sys.c                |   36 +-
 drivers/staging/fsl-mc/include/dpaa2-io.h          |    1 +
 drivers/staging/goldfish/goldfish_nand.c           |   20 +-
 drivers/staging/greybus/arche-platform.c           |   12 +-
 drivers/staging/greybus/interface.c                |   40 +-
 drivers/staging/greybus/spilib.h                   |    3 +-
 drivers/staging/greybus/tools/loopback_test.c      |   13 +-
 drivers/staging/greybus/usb.c                      |    2 +-
 drivers/staging/gs_fpgaboot/gs_fpgaboot.c          |   90 +-
 drivers/staging/gs_fpgaboot/gs_fpgaboot.h          |    2 +-
 drivers/staging/gs_fpgaboot/io.c                   |    4 -
 drivers/staging/iio/adc/ad7280a.c                  |   21 +-
 drivers/staging/iio/light/tsl2x7x.c                |  372 +++--
 drivers/staging/ks7010/ks_wlan_net.c               |    2 +-
 .../staging/lustre/include/linux/lnet/lib-lnet.h   |    3 +-
 .../staging/lustre/include/linux/lnet/lib-types.h  |   46 +-
 drivers/staging/lustre/include/linux/lnet/lnetst.h |  129 +-
 .../staging/lustre/include/linux/lnet/socklnd.h    |    3 +-
 .../staging/lustre/lnet/klnds/socklnd/socklnd.h    |   11 -
 .../lustre/lnet/klnds/socklnd/socklnd_lib.c        |   20 +-
 drivers/staging/lustre/lnet/libcfs/hash.c          |   47 +-
 .../lustre/lnet/libcfs/linux/linux-module.c        |    2 +-
 drivers/staging/lustre/lnet/selftest/conctl.c      |    2 +-
 drivers/staging/lustre/lnet/selftest/conrpc.c      |    5 +-
 drivers/staging/lustre/lustre/fld/fld_cache.c      |    3 +-
 drivers/staging/lustre/lustre/include/cl_object.h  |    2 +-
 .../staging/lustre/lustre/include/interval_tree.h  |    4 +
 .../staging/lustre/lustre/include/lprocfs_status.h |    4 +-
 .../lustre/lustre/include/lustre/lustre_idl.h      |    7 +-
 .../staging/lustre/lustre/include/lustre_linkea.h  |   15 +-
 drivers/staging/lustre/lustre/include/lustre_net.h |   10 +-
 drivers/staging/lustre/lustre/include/obd.h        |    2 -
 drivers/staging/lustre/lustre/include/obd_class.h  |    9 +-
 drivers/staging/lustre/lustre/ldlm/interval_tree.c |   40 +
 drivers/staging/lustre/lustre/ldlm/ldlm_internal.h |    3 -
 drivers/staging/lustre/lustre/ldlm/ldlm_lock.c     |    9 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c    |    2 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_resource.c |   47 +-
 drivers/staging/lustre/lustre/llite/file.c         |    3 -
 drivers/staging/lustre/lustre/llite/llite_lib.c    |    6 +-
 drivers/staging/lustre/lustre/llite/rw.c           |    2 +-
 drivers/staging/lustre/lustre/llite/vvp_dev.c      |    5 +-
 drivers/staging/lustre/lustre/llite/xattr.c        |    1 +
 .../staging/lustre/lustre/llite/xattr_security.c   |   23 +-
 drivers/staging/lustre/lustre/lmv/lmv_intent.c     |    5 -
 drivers/staging/lustre/lustre/lmv/lmv_internal.h   |    2 -
 drivers/staging/lustre/lustre/lmv/lmv_obd.c        |  161 +-
 drivers/staging/lustre/lustre/lmv/lproc_lmv.c      |    2 +-
 drivers/staging/lustre/lustre/lov/Makefile         |    2 +-
 .../staging/lustre/lustre/lov/lov_cl_internal.h    |   90 --
 drivers/staging/lustre/lustre/lov/lov_dev.c        |   85 -
 drivers/staging/lustre/lustre/lov/lov_ea.c         |   23 +-
 drivers/staging/lustre/lustre/lov/lov_internal.h   |   27 -
 drivers/staging/lustre/lustre/lov/lov_io.c         |  152 +-
 drivers/staging/lustre/lustre/lov/lov_lock.c       |   11 -
 drivers/staging/lustre/lustre/lov/lov_obd.c        |    3 +-
 drivers/staging/lustre/lustre/lov/lov_object.c     |  469 +++---
 drivers/staging/lustre/lustre/lov/lov_page.c       |    1 -
 drivers/staging/lustre/lustre/lov/lov_request.c    |   40 +-
 drivers/staging/lustre/lustre/lov/lovsub_dev.c     |    1 -
 drivers/staging/lustre/lustre/lov/lovsub_io.c      |   51 -
 drivers/staging/lustre/lustre/lov/lovsub_lock.c    |    2 -
 drivers/staging/lustre/lustre/lov/lproc_lov.c      |    2 +-
 drivers/staging/lustre/lustre/mdc/lproc_mdc.c      |    4 +-
 drivers/staging/lustre/lustre/obdclass/linkea.c    |   69 +-
 .../lustre/lustre/obdclass/linux/linux-module.c    |    2 +-
 .../lustre/lustre/obdclass/linux/linux-sysctl.c    |    2 +-
 .../lustre/lustre/obdclass/lprocfs_status.c        |    2 +-
 drivers/staging/lustre/lustre/osc/lproc_osc.c      |    2 +-
 drivers/staging/lustre/lustre/osc/osc_cache.c      |   31 +-
 drivers/staging/lustre/lustre/ptlrpc/client.c      |   35 +-
 drivers/staging/lustre/lustre/ptlrpc/import.c      |    2 +-
 .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c    |   15 +-
 drivers/staging/lustre/lustre/ptlrpc/sec_gc.c      |    2 +-
 drivers/staging/lustre/lustre/ptlrpc/service.c     |   15 +-
 drivers/staging/lustre/lustre/ptlrpc/wiretest.c    |   16 +-
 drivers/staging/media/atomisp/i2c/imx/imx.c        |   24 +-
 drivers/staging/nvec/nvec.c                        |    2 +-
 .../Documentation/devicetree/pi433-overlay.dts     |   53 +
 .../pi433/Documentation/devicetree/pi433.txt       |   62 +
 drivers/staging/pi433/Documentation/pi433.txt      |  274 ++++
 drivers/staging/pi433/Kconfig                      |   16 +
 drivers/staging/pi433/Makefile                     |    3 +
 drivers/staging/pi433/TODO                         |    5 +
 drivers/staging/pi433/pi433_if.c                   | 1322 ++++++++++++++++
 drivers/staging/pi433/pi433_if.h                   |  152 ++
 drivers/staging/pi433/rf69.c                       |  985 ++++++++++++
 drivers/staging/pi433/rf69.h                       |   82 +
 drivers/staging/pi433/rf69_enum.h                  |  201 +++
 drivers/staging/pi433/rf69_registers.h             |  489 ++++++
 drivers/staging/rtl8188eu/core/rtw_mlme_ext.c      |    3 +-
 drivers/staging/rtl8188eu/include/rtw_ioctl.h      |    3 +-
 drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c  |   78 +-
 .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c    |    2 +-
 drivers/staging/rtl8192u/r8192U_core.c             |   23 +-
 drivers/staging/rtl8192u/r8192U_hw.h               |   11 +-
 drivers/staging/rtl8192u/r819xU_cmdpkt.c           |    2 +-
 drivers/staging/rtl8712/mlme_linux.c               |    4 +-
 drivers/staging/rtl8712/rtl8712_cmd.c              |    2 +-
 drivers/staging/rtl8712/rtl8712_efuse.c            |    2 +-
 drivers/staging/rtl8712/rtl8712_xmit.c             |    8 +-
 drivers/staging/rtl8723bs/core/rtw_btcoex.c        |    2 +-
 drivers/staging/rtl8723bs/core/rtw_efuse.c         |    2 +-
 drivers/staging/rtl8723bs/core/rtw_mlme.c          |    5 +-
 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c      |    2 +-
 drivers/staging/rtl8723bs/core/rtw_pwrctrl.c       |    4 +-
 drivers/staging/rtl8723bs/core/rtw_recv.c          |    2 +-
 drivers/staging/rtl8723bs/core/rtw_security.c      |   14 +-
 drivers/staging/rtl8723bs/core/rtw_xmit.c          |    4 +-
 drivers/staging/rts5208/ms.c                       |    5 +-
 drivers/staging/rts5208/rtsx.c                     |    4 +-
 drivers/staging/rts5208/rtsx_chip.c                |    4 +-
 drivers/staging/rts5208/sd.c                       |   21 +-
 drivers/staging/rts5208/spi.c                      |    8 +-
 drivers/staging/rts5208/xd.c                       |   17 +-
 drivers/staging/skein/skein_block.c                |  323 ----
 drivers/staging/skein/skein_block.h                |  323 ++++
 drivers/staging/typec/tcpm.c                       |    3 +-
 drivers/staging/unisys/include/channel.h           |  338 ++--
 drivers/staging/unisys/include/iochannel.h         |  524 ++++---
 drivers/staging/unisys/include/visorbus.h          |    6 +-
 drivers/staging/unisys/visorbus/controlvmchannel.h |  706 +++++----
 drivers/staging/unisys/visorbus/vbuschannel.h      |   93 +-
 drivers/staging/unisys/visorbus/visorbus_main.c    |  373 ++---
 drivers/staging/unisys/visorbus/visorbus_private.h |    4 -
 drivers/staging/unisys/visorbus/visorchannel.c     |  129 +-
 drivers/staging/unisys/visorbus/visorchipset.c     |  108 +-
 drivers/staging/unisys/visorbus/vmcallinterface.h  |   57 +-
 drivers/staging/unisys/visorhba/visorhba_main.c    |  402 ++---
 .../staging/unisys/visorinput/ultrainputreport.h   |   65 +-
 drivers/staging/unisys/visorinput/visorinput.c     |   84 +-
 drivers/staging/unisys/visornic/visornic_main.c    |  213 ++-
 drivers/staging/vboxvideo/Kconfig                  |   10 +-
 drivers/staging/vboxvideo/vbox_drv.c               |    2 +-
 drivers/staging/vboxvideo/vbox_mode.c              |    5 -
 drivers/staging/vboxvideo/vbox_ttm.c               |    2 +-
 .../vc04_services/bcm2835-audio/bcm2835-pcm.c      |    4 +-
 .../vc04_services/interface/vchiq_arm/vchiq_util.c |    2 +-
 drivers/staging/vt6655/card.c                      |    6 +-
 drivers/staging/vt6655/mac.c                       |    2 +-
 drivers/staging/vt6656/device.h                    |    2 +-
 drivers/staging/vt6656/firmware.c                  |    2 +-
 drivers/staging/vt6656/key.h                       |    2 +-
 drivers/staging/vt6656/main_usb.c                  |    5 +-
 drivers/staging/vt6656/power.c                     |    6 +-
 drivers/staging/vt6656/rf.c                        |    6 +-
 drivers/staging/vt6656/usbpipe.c                   |    4 +-
 drivers/staging/wilc1000/host_interface.c          |    4 +-
 drivers/staging/wilc1000/linux_wlan.c              |    5 +-
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c  |   65 +-
 drivers/staging/wilc1000/wilc_wfi_netdevice.h      |    4 +-
 drivers/staging/wlan-ng/hfa384x.h                  |   98 +-
 drivers/staging/wlan-ng/p80211netdev.c             |    2 +-
 drivers/staging/wlan-ng/prism2fw.c                 |   27 +-
 drivers/staging/wlan-ng/prism2sta.c                |   25 +-
 include/linux/iio/common/st_sensors.h              |   12 +
 include/linux/iio/common/st_sensors_i2c.h          |   10 -
 include/linux/msi.h                                |    1 +
 267 files changed, 10664 insertions(+), 6988 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/iio/humidity/hdc100x.txt
 create mode 100644 Documentation/devicetree/bindings/iio/humidity/htu21.txt
 create mode 100644 Documentation/devicetree/bindings/iio/pressure/ms5637.txt
 create mode 100644 Documentation/devicetree/bindings/iio/temperature/tsys01.txt
 create mode 100644 Documentation/iio/ep93xx_adc.txt
 create mode 100644 drivers/iio/adc/dln2-adc.c
 create mode 100644 drivers/iio/adc/ep93xx_adc.c
 create mode 100644 drivers/iio/adc/ltc2471.c
 create mode 100644 drivers/iio/chemical/ccs811.c
 delete mode 100644 drivers/staging/ccree/ssi_fips_data.h
 delete mode 100644 drivers/staging/ccree/ssi_fips_ext.c
 delete mode 100644 drivers/staging/ccree/ssi_fips_ll.c
 delete mode 100644 drivers/staging/ccree/ssi_fips_local.c
 delete mode 100644 drivers/staging/ccree/ssi_fips_local.h
 delete mode 100644 drivers/staging/lustre/lustre/lov/lovsub_io.c
 create mode 100644 drivers/staging/pi433/Documentation/devicetree/pi433-overlay.dts
 create mode 100644 drivers/staging/pi433/Documentation/devicetree/pi433.txt
 create mode 100644 drivers/staging/pi433/Documentation/pi433.txt
 create mode 100644 drivers/staging/pi433/Kconfig
 create mode 100644 drivers/staging/pi433/Makefile
 create mode 100644 drivers/staging/pi433/TODO
 create mode 100644 drivers/staging/pi433/pi433_if.c
 create mode 100644 drivers/staging/pi433/pi433_if.h
 create mode 100644 drivers/staging/pi433/rf69.c
 create mode 100644 drivers/staging/pi433/rf69.h
 create mode 100644 drivers/staging/pi433/rf69_enum.h
 create mode 100644 drivers/staging/pi433/rf69_registers.h
Merging mux/for-next (a351e9b9fc24 Linux 4.11)
$ git merge mux/for-next
Already up-to-date.
Merging slave-dma/next (d4381f3cff0b Merge branch 'topic/bcm' into next)
$ git merge slave-dma/next
Merge made by the 'recursive' strategy.
 drivers/dma/Kconfig           |    6 +
 drivers/dma/Makefile          |    1 +
 drivers/dma/altera-msgdma.c   | 1031 +++++++++++++++++++++++++++++++++++++++++
 drivers/dma/bcm-sba-raid.c    |    6 +-
 drivers/dma/dmatest.c         |   88 +++-
 drivers/dma/ioat/init.c       |    2 +-
 drivers/dma/of-dma.c          |    8 +-
 drivers/dma/ppc4xx/adma.c     |   37 +-
 drivers/dma/qcom/hidma.c      |   37 +-
 drivers/dma/qcom/hidma.h      |    7 +-
 drivers/dma/qcom/hidma_ll.c   |   11 +-
 drivers/dma/qcom/hidma_mgmt.c |   14 +-
 12 files changed, 1181 insertions(+), 67 deletions(-)
 create mode 100644 drivers/dma/altera-msgdma.c
Merging cgroup/for-next (dba9eccd4164 Merge branch 'for-4.14' into for-next)
$ git merge cgroup/for-next
Auto-merging kernel/events/core.c
Auto-merging kernel/cgroup/cgroup.c
Auto-merging include/linux/cgroup.h
Merge made by the 'recursive' strategy.
 Documentation/cgroup-v2.txt     | 189 ++++++++-
 include/linux/cgroup-defs.h     |  50 ++-
 include/linux/cgroup.h          |  15 +-
 kernel/cgroup/cgroup-internal.h |  15 +-
 kernel/cgroup/cgroup-v1.c       |  69 +++-
 kernel/cgroup/cgroup.c          | 835 ++++++++++++++++++++++++++++++----------
 kernel/cgroup/cpuset.c          |   6 +-
 kernel/cgroup/debug.c           |  53 ++-
 kernel/cgroup/freezer.c         |   6 +-
 kernel/cgroup/pids.c            |   1 +
 kernel/events/core.c            |   1 +
 mm/memcontrol.c                 |   2 +-
 net/core/netclassid_cgroup.c    |   2 +-
 13 files changed, 975 insertions(+), 269 deletions(-)
Merging scsi/for-next (0dbbec278e24 Merge branch 'misc' into for-next)
$ git merge scsi/for-next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                                 |   3 +-
 drivers/message/fusion/mptbase.c            |   8 +-
 drivers/scsi/Kconfig                        |   2 +
 drivers/scsi/aacraid/aacraid.h              |   1 +
 drivers/scsi/aacraid/commsup.c              |   3 +-
 drivers/scsi/aacraid/linit.c                | 318 ++++++++++++++++++++--------
 drivers/scsi/aic7xxx/Makefile               |  12 +-
 drivers/scsi/aic7xxx/aicasm/Makefile        |  53 ++---
 drivers/scsi/aic94xx/aic94xx_init.c         |   4 +-
 drivers/scsi/be2iscsi/be_iscsi.c            |   6 +-
 drivers/scsi/be2iscsi/be_main.c             |   6 +-
 drivers/scsi/be2iscsi/be_main.h             |   2 +-
 drivers/scsi/csiostor/csio_hw.h             |   2 +-
 drivers/scsi/csiostor/csio_init.c           |  11 +-
 drivers/scsi/csiostor/csio_scsi.c           |   6 +-
 drivers/scsi/cxgbi/libcxgbi.c               |   7 +
 drivers/scsi/fnic/fnic.h                    |   2 +-
 drivers/scsi/g_NCR5380.c                    | 277 +++++++++++++-----------
 drivers/scsi/gdth.c                         |   2 +-
 drivers/scsi/gdth_proc.c                    |   2 +-
 drivers/scsi/lpfc/lpfc.h                    |  16 +-
 drivers/scsi/lpfc/lpfc_init.c               |  16 +-
 drivers/scsi/lpfc/lpfc_mem.c                |  90 ++++----
 drivers/scsi/lpfc/lpfc_nvme.c               |   6 +-
 drivers/scsi/lpfc/lpfc_nvmet.c              |   4 +-
 drivers/scsi/lpfc/lpfc_scsi.c               |  12 +-
 drivers/scsi/lpfc/lpfc_sli.c                |   6 +-
 drivers/scsi/mac53c94.c                     |  13 +-
 drivers/scsi/megaraid.c                     |   6 +-
 drivers/scsi/megaraid/megaraid_mbox.c       |  30 +--
 drivers/scsi/megaraid/megaraid_mm.c         |  29 +--
 drivers/scsi/megaraid/megaraid_sas_base.c   |  63 +++---
 drivers/scsi/megaraid/megaraid_sas_fusion.c |  52 +++--
 drivers/scsi/mpt3sas/mpt3sas_base.c         |  73 +++----
 drivers/scsi/mpt3sas/mpt3sas_base.h         |   2 +-
 drivers/scsi/mvsas/mv_init.c                |   6 +-
 drivers/scsi/mvsas/mv_sas.c                 |   6 +-
 drivers/scsi/osst.c                         |   4 +-
 drivers/scsi/pmcraid.c                      |  10 +-
 drivers/scsi/pmcraid.h                      |   2 +-
 drivers/scsi/qedi/Kconfig                   |   1 +
 drivers/scsi/qedi/qedi_iscsi.c              |   8 +-
 drivers/scsi/scsi_transport_fc.c            |   6 +-
 43 files changed, 689 insertions(+), 499 deletions(-)
Merging scsi-mkp/for-next (bb9be3739281 scsi: qla2xxx: Fix remoteport disconnect for FC-NVMe)
$ git merge scsi-mkp/for-next
Merge made by the 'recursive' strategy.
 drivers/scsi/qla2xxx/qla_dbg.c  |   2 +-
 drivers/scsi/qla2xxx/qla_def.h  |  13 ++--
 drivers/scsi/qla2xxx/qla_gbl.h  |  14 +---
 drivers/scsi/qla2xxx/qla_isr.c  |  43 +++++++++---
 drivers/scsi/qla2xxx/qla_mbx.c  |  71 ++++++++++++++++----
 drivers/scsi/qla2xxx/qla_nvme.c | 140 +++++++++++++++-------------------------
 drivers/scsi/qla2xxx/qla_nvme.h |  17 +++++
 drivers/scsi/qla2xxx/qla_os.c   |  31 ++++++---
 8 files changed, 197 insertions(+), 134 deletions(-)
Merging target-updates/for-next (40435d86a62f tcmu: clean up the scatter helper)
$ git merge target-updates/for-next
Merge made by the 'recursive' strategy.
 drivers/scsi/qla2xxx/tcm_qla2xxx.c          |  30 ------
 drivers/target/iscsi/cxgbit/cxgbit_cm.c     |  16 ++-
 drivers/target/iscsi/cxgbit/cxgbit_target.c |  12 ++-
 drivers/target/iscsi/iscsi_target.c         |   5 +-
 drivers/target/target_core_user.c           | 147 +++++++++++++++++++++++-----
 5 files changed, 142 insertions(+), 68 deletions(-)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
$ git merge target-merge/for-next-merge
Already up-to-date.
Merging target-bva/for-next (2ea659a9ef48 Linux 4.12-rc1)
$ git merge target-bva/for-next
Already up-to-date.
Merging libata/for-next (37cbf519e8c6 Merge branch 'for-4.13-fixes' into for-next)
$ git merge libata/for-next
Auto-merging drivers/ata/libata-eh.c
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/ata/sata_rcar.txt | 14 +++++++++++---
 drivers/ata/Kconfig                                 |  4 ++--
 drivers/ata/libata-core.c                           |  6 +++---
 drivers/ata/libata-eh.c                             |  3 +--
 drivers/ata/libata-scsi.c                           |  6 ++++--
 drivers/ata/sata_rcar.c                             |  8 ++++++++
 drivers/ata/sata_svw.c                              |  2 +-
 include/linux/libata.h                              |  2 +-
 8 files changed, 31 insertions(+), 14 deletions(-)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
$ git merge binfmt_misc/for-next
Already up-to-date.
Merging vhost/linux-next (cfa0ebc9d6d6 virtio-net: fix module unloading)
$ git merge vhost/linux-next
Already up-to-date.
Merging rpmsg/for-next (5771a8c08880 Linux v4.13-rc1)
$ git merge rpmsg/for-next
Already up-to-date.
Merging gpio/for-next (8d2c6297aec9 Merge branch 'devel' into for-next)
$ git merge gpio/for-next
Resolved 'drivers/gpio/gpio-mvebu.c' using previous resolution.
Auto-merging drivers/gpio/gpio-mvebu.c
CONFLICT (content): Merge conflict in drivers/gpio/gpio-mvebu.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 8294081a5e95] Merge remote-tracking branch 'gpio/for-next'
$ git diff -M --stat --summary HEAD^..
Merging pinctrl/for-next (ece5946c2eed Merge branch 'devel' into for-next)
$ git merge pinctrl/for-next
Merge made by the 'recursive' strategy.
Merging pinctrl-samsung/for-next (bbed85f45b2b pinctrl: samsung: Remove unneeded local variable initialization)
$ git merge pinctrl-samsung/for-next
Merge made by the 'recursive' strategy.
 drivers/pinctrl/samsung/pinctrl-exynos.c  | 32 ++++++++++---------------
 drivers/pinctrl/samsung/pinctrl-exynos.h  |  1 -
 drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 37 +++++++++++++++-------------
 drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 40 ++++++++++++++-----------------
 drivers/pinctrl/samsung/pinctrl-samsung.c | 12 ++++++++--
 drivers/pinctrl/samsung/pinctrl-samsung.h | 15 ++++++------
 include/dt-bindings/pinctrl/samsung.h     |  3 ++-
 7 files changed, 71 insertions(+), 69 deletions(-)
Merging pwm/for-next (5ec8c48a6235 Merge branch 'for-4.13/drivers' into for-next)
$ git merge pwm/for-next
Already up-to-date.
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
$ git merge dma-buf/for-next
Resolved 'drivers/dma-buf/Kconfig' using previous resolution.
Auto-merging drivers/dma-buf/Kconfig
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 1f22b96a1727] Merge remote-tracking branch 'dma-buf/for-next'
$ git diff -M --stat --summary HEAD^..
 MAINTAINERS | 11 +++++++++++
 1 file changed, 11 insertions(+)
Merging userns/for-next (64a76d0d64be signal: Fix sending signals with siginfo)
$ git merge userns/for-next
Auto-merging security/commoncap.c
Auto-merging kernel/exit.c
Auto-merging include/linux/user_namespace.h
Auto-merging arch/sparc/kernel/traps_64.c
Merge made by the 'recursive' strategy.
 arch/alpha/include/uapi/asm/siginfo.h         |  14 ++++
 arch/alpha/kernel/traps.c                     |   6 +-
 arch/arm64/kernel/signal32.c                  |  23 ++----
 arch/blackfin/include/uapi/asm/siginfo.h      |  30 ++++---
 arch/frv/include/uapi/asm/siginfo.h           |   2 +-
 arch/ia64/include/uapi/asm/siginfo.h          |  21 +++--
 arch/ia64/kernel/signal.c                     |  17 ++--
 arch/ia64/kernel/traps.c                      |   4 +-
 arch/mips/include/uapi/asm/siginfo.h          |  11 ++-
 arch/mips/kernel/signal32.c                   |  19 ++---
 arch/mips/kernel/traps.c                      |   2 +-
 arch/parisc/kernel/signal32.c                 |  31 ++++---
 arch/powerpc/kernel/signal_32.c               |  20 ++---
 arch/s390/kernel/compat_signal.c              |  32 ++++---
 arch/sparc/include/uapi/asm/siginfo.h         |   9 +-
 arch/sparc/kernel/signal32.c                  |  16 ++--
 arch/sparc/kernel/traps_32.c                  |   2 +-
 arch/sparc/kernel/traps_64.c                  |   2 +-
 arch/tile/include/uapi/asm/siginfo.h          |   4 +-
 arch/tile/kernel/compat_signal.c              |  18 ++--
 arch/tile/kernel/traps.c                      |   2 +-
 arch/x86/kernel/signal_compat.c               |  21 ++---
 fs/fcntl.c                                    |  13 ++-
 fs/signalfd.c                                 |  22 ++---
 include/linux/signal.h                        |  22 +++++
 include/linux/user_namespace.h                |   9 +-
 include/uapi/asm-generic/siginfo.h            | 115 +++++++++++---------------
 kernel/exit.c                                 |   4 +-
 kernel/pid_namespace.c                        |   4 +
 kernel/ptrace.c                               |   6 +-
 kernel/signal.c                               |  72 ++++++++++++----
 kernel/sys.c                                  |   8 +-
 kernel/user_namespace.c                       |  20 +++--
 security/commoncap.c                          |   7 +-
 tools/testing/selftests/x86/mpx-mini-test.c   |   3 +-
 tools/testing/selftests/x86/protection_keys.c |  13 ++-
 36 files changed, 349 insertions(+), 275 deletions(-)
Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout)
$ git merge ktest/for-next
Already up-to-date.
Merging random/dev (72e5c740f633 random: reorder READ_ONCE() in get_random_uXX)
$ git merge random/dev
Already up-to-date.
Merging aio/master (4c1d69950da4 fs: aio: fix the increment of aio-nr and counting against aio-max-nr)
$ git merge aio/master
Auto-merging fs/aio.c
Merge made by the 'recursive' strategy.
 fs/aio.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)
Merging kselftest/next (f471e1fd82df selftests: sync: convert to use TAP13 ksft framework)
$ git merge kselftest/next
Merge made by the 'recursive' strategy.
 .../selftests/breakpoints/breakpoint_test.c        |   4 +-
 tools/testing/selftests/ftrace/ftracetest          |  51 ++++--
 tools/testing/selftests/kselftest.h                |  10 ++
 tools/testing/selftests/nsfs/config                |   3 +
 tools/testing/selftests/splice/Makefile            |   5 +-
 tools/testing/selftests/sync/sync_test.c           |  71 +++++---
 tools/testing/selftests/sync/synctest.h            |   3 +-
 tools/testing/selftests/watchdog/watchdog-test.c   | 190 +++++++++++++--------
 8 files changed, 220 insertions(+), 117 deletions(-)
 create mode 100644 tools/testing/selftests/nsfs/config
Merging y2038/y2038 (69973b830859 Linux 4.9)
$ git merge y2038/y2038
Already up-to-date.
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
$ git merge luto-misc/next
Already up-to-date.
Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge borntraeger/linux-next
Already up-to-date.
Merging livepatching/for-next (26d8d1e9bb48 Merge branch 'for-4.12/upstream-fixes' into for-next)
$ git merge livepatching/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging coresight/next (ee0c4a55a06c perf: cs-etm: Fix ETMv4 CONFIGR entry in perf.data file)
$ git merge coresight/next
Auto-merging drivers/hwtracing/coresight/coresight-dynamic-replicator.c
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/arm/coresight.txt          |   4 +-
 arch/arm64/boot/dts/arm/juno-base.dtsi             |   2 +-
 drivers/hwtracing/coresight/Kconfig                |  10 +-
 drivers/hwtracing/coresight/Makefile               |   2 +-
 ...cator-qcom.c => coresight-dynamic-replicator.c} |  36 ++++++-
 drivers/hwtracing/coresight/coresight-etb10.c      |  70 ++++++++-----
 drivers/hwtracing/coresight/coresight-etm-perf.c   |   4 +-
 drivers/hwtracing/coresight/coresight-etm.h        |   1 +
 .../hwtracing/coresight/coresight-etm3x-sysfs.c    |  26 ++---
 drivers/hwtracing/coresight/coresight-etm3x.c      |  44 ++++++---
 .../hwtracing/coresight/coresight-etm4x-sysfs.c    |  24 ++---
 drivers/hwtracing/coresight/coresight-etm4x.c      |   4 +
 drivers/hwtracing/coresight/coresight-funnel.c     |   9 +-
 drivers/hwtracing/coresight/coresight-priv.h       |  39 +++++++-
 drivers/hwtracing/coresight/coresight-stm.c        |  38 +++----
 drivers/hwtracing/coresight/coresight-tmc-etf.c    |  42 ++++++--
 drivers/hwtracing/coresight/coresight-tmc-etr.c    |  49 ++++++---
 drivers/hwtracing/coresight/coresight-tmc.c        | 110 ++++++++++++++++-----
 drivers/hwtracing/coresight/coresight-tmc.h        |  85 +++++++++++++++-
 drivers/hwtracing/coresight/coresight-tpiu.c       |   9 +-
 drivers/hwtracing/coresight/coresight.c            |   8 ++
 include/linux/coresight-pmu.h                      |   6 ++
 tools/include/linux/coresight-pmu.h                |   6 ++
 tools/perf/arch/arm/util/cs-etm.c                  |  28 +++++-
 24 files changed, 502 insertions(+), 154 deletions(-)
 rename drivers/hwtracing/coresight/{coresight-replicator-qcom.c => coresight-dynamic-replicator.c} (86%)
Merging rtc/rtc-next (2f7f1b780dd6 rtc: max8925: remove redundant check on ret)
$ git merge rtc/rtc-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/power/wakeup-source.txt    |   9 +-
 .../devicetree/bindings/rtc/isil,isl12057.txt      |   1 -
 drivers/rtc/rtc-ds1307.c                           |   8 +-
 drivers/rtc/rtc-max8925.c                          |   2 -
 drivers/rtc/rtc-s35390a.c                          | 104 +++++++++++++++------
 drivers/rtc/rtc-sun6i.c                            |  10 +-
 6 files changed, 85 insertions(+), 49 deletions(-)
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 (bbb3be170ac2 device-dax: fix sysfs duplicate warnings)
$ git merge nvdimm/libnvdimm-for-next
Already up-to-date.
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
$ git merge dax-misc/dax-misc
Already up-to-date.
Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too)
$ git merge idr/idr-4.11
Already up-to-date.
Merging kspp/for-next/kspp (152b74676664 randstruct: Enable function pointer struct detection)
$ git merge kspp/for-next/kspp
Merge made by the 'recursive' strategy.
 arch/Kconfig                                   | 12 +++++++-----
 drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c |  8 ++++----
 scripts/gcc-plugins/randomize_layout_plugin.c  |  3 ---
 3 files changed, 11 insertions(+), 12 deletions(-)
Merging akpm-current/current (cc624835c3f0 kernel-reboot-add-devm_register_reboot_notifier-fix)
$ git merge --no-ff akpm-current/current
Auto-merging block/genhd.c
Auto-merging arch/x86/kernel/machine_kexec_64.c
Merge made by the 'recursive' strategy.
 arch/arm/include/asm/page.h        |   2 +
 arch/x86/kernel/machine_kexec_64.c |   1 +
 block/genhd.c                      |   2 +-
 fs/ocfs2/dlm/dlmmaster.c           |  66 +++++--
 fs/ocfs2/dlm/dlmrecovery.c         |  40 ++---
 fs/ocfs2/dlmglue.c                 |   2 +-
 fs/ocfs2/filecheck.c               | 357 ++++++++++++++-----------------------
 fs/ocfs2/filecheck.h               |  29 ++-
 fs/ocfs2/ocfs2.h                   |   8 +
 fs/ocfs2/stackglue.c               |   6 -
 fs/ocfs2/stackglue.h               |   3 -
 fs/ocfs2/super.c                   |  35 +++-
 fs/seq_file.c                      |  10 --
 include/linux/crash_core.h         |   2 +
 include/linux/reboot.h             |   4 +
 include/uapi/linux/sysctl.h        |   4 +
 kernel/reboot.c                    |  27 +++
 mm/memory_hotplug.c                |   4 +
 mm/page_alloc.c                    |  19 +-
 mm/page_owner.c                    |   4 +-
 mm/slub.c                          |   4 +-
 mm/vmscan.c                        |  17 +-
 22 files changed, 339 insertions(+), 307 deletions(-)
$ 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: sparc64: NG4 memset 32 bits overflow
Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant
$ cd ../next
$ git fetch -f ../rebase-tmp akpm:akpm/master
From ../rebase-tmp
 + 19335ad01d48...ea19a624ef52 akpm       -> akpm/master  (forced update)
$ rm -rf ../rebase-tmp
Merging akpm/master (ea19a624ef52 lib/crc-ccitt: add CCITT-FALSE CRC16 variant)
$ git merge --no-ff akpm/master
Merge made by the 'recursive' strategy.
 arch/sparc/lib/NG4memset.S | 26 ++++++++++-----------
 include/linux/crc-ccitt.h  |  7 ++++++
 lib/crc-ccitt.c            | 58 +++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 77 insertions(+), 14 deletions(-)