path: root/Next/merge.log

$ date -R
Mon, 09 Jul 2018 07:50:46 +1000
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at d02d21ea007b autofs: rename 'autofs' module back to 'autofs4'
Merging origin/master (ca04b3cca11a Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
$ git merge origin/master
Updating d02d21ea007b..ca04b3cca11a
Fast-forward
 MAINTAINERS                                        |   2 +-
 arch/arm/boot/dts/am335x-bone-common.dtsi          |   1 -
 arch/arm/boot/dts/am3517.dtsi                      |   4 +
 arch/arm/boot/dts/am437x-sk-evm.dts                |   2 +
 arch/arm/boot/dts/dra7.dtsi                        |   2 +-
 arch/arm/boot/dts/imx51-zii-rdu1.dts               |   2 +-
 arch/arm/configs/imx_v4_v5_defconfig               |   2 +
 arch/arm/configs/imx_v6_v7_defconfig               |   2 +
 arch/arm/crypto/speck-neon-core.S                  |   6 +-
 arch/arm64/Makefile                                |   8 +-
 arch/s390/Kconfig                                  |   1 +
 arch/s390/kernel/compat_wrapper.c                  |   1 +
 arch/s390/kernel/entry.S                           |   8 +-
 arch/s390/kernel/signal.c                          |   3 +-
 arch/s390/kernel/syscalls/syscall.tbl              |   2 +
 arch/s390/mm/pgalloc.c                             |   4 +
 arch/x86/crypto/aegis128-aesni-asm.S               |   1 +
 arch/x86/crypto/aegis128l-aesni-asm.S              |   1 +
 arch/x86/crypto/aegis256-aesni-asm.S               |   1 +
 arch/x86/crypto/morus1280-avx2-asm.S               |   1 +
 arch/x86/crypto/morus1280-sse2-asm.S               |   1 +
 arch/x86/crypto/morus640-sse2-asm.S                |   1 +
 arch/x86/hyperv/hv_apic.c                          |   5 +
 arch/x86/hyperv/hv_init.c                          |   5 +-
 arch/x86/include/asm/asm.h                         |  59 ++++++++++
 arch/x86/include/asm/irqflags.h                    |   2 +-
 arch/x86/include/asm/mshyperv.h                    |   5 +-
 arch/x86/kernel/Makefile                           |   1 +
 arch/x86/kernel/cpu/amd.c                          |   4 +-
 arch/x86/kernel/cpu/bugs.c                         |   8 +-
 arch/x86/kernel/cpu/mtrr/if.c                      |   3 +-
 arch/x86/kernel/irqflags.S                         |  26 ++++
 arch/x86/kernel/smpboot.c                          |   5 +
 drivers/block/drbd/drbd_worker.c                   |   2 +-
 drivers/block/loop.c                               |   1 +
 drivers/bus/ti-sysc.c                              |   8 +-
 drivers/char/ipmi/ipmi_si_intf.c                   |   6 +-
 drivers/char/ipmi/kcs_bmc.c                        |  31 ++---
 drivers/clk/Makefile                               |   2 +-
 drivers/clk/davinci/da8xx-cfgchip.c                |   2 +-
 drivers/clk/davinci/psc.h                          |   2 +-
 drivers/clk/sunxi-ng/Makefile                      |  39 +++---
 drivers/dma/k3dma.c                                |   2 +-
 drivers/dma/pl330.c                                |   2 +-
 drivers/dma/ti/omap-dma.c                          |   6 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu.h                |  46 ++------
 drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c           | 131 +++++++++++++++++----
 drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c   |   6 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c             |  12 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c             |   2 +-
 drivers/gpu/drm/amd/amdgpu/vce_v3_0.c              |   4 +-
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  |  49 +++++++-
 drivers/gpu/drm/amd/include/atomfirmware.h         |   5 +-
 drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c |  96 +++++++++++++--
 drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h |   5 +
 drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c |   4 +
 drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.h |   3 +
 .../amd/powerplay/hwmgr/vega12_processpptables.c   |   2 +
 .../drm/amd/powerplay/inc/vega12/smu9_driver_if.h  |   5 +-
 drivers/gpu/drm/bridge/sil-sii8620.c               |  86 +++++++++-----
 drivers/gpu/drm/drm_property.c                     |   6 +-
 drivers/gpu/drm/exynos/exynos5433_drm_decon.c      |   6 +-
 drivers/gpu/drm/exynos/exynos_drm_drv.c            |   4 +-
 drivers/gpu/drm/exynos/exynos_drm_fb.c             |   2 +-
 drivers/gpu/drm/exynos/exynos_drm_fimc.c           |  17 +--
 drivers/gpu/drm/exynos/exynos_drm_gem.c            |  10 +-
 drivers/gpu/drm/exynos/exynos_drm_gsc.c            |  51 ++++----
 drivers/gpu/drm/exynos/exynos_drm_ipp.c            | 110 +++++++++--------
 drivers/gpu/drm/exynos/exynos_drm_plane.c          |   2 +-
 drivers/gpu/drm/exynos/exynos_drm_rotator.c        |   4 +-
 drivers/gpu/drm/exynos/exynos_drm_scaler.c         |  44 +++++--
 drivers/gpu/drm/exynos/regs-gsc.h                  |   1 +
 drivers/gpu/drm/i915/gvt/display.c                 |   6 +-
 drivers/gpu/drm/i915/gvt/gtt.c                     |  58 +++++++++
 drivers/gpu/drm/i915/gvt/gtt.h                     |   2 +
 drivers/gpu/drm/i915/i915_gem.c                    |  28 +++--
 drivers/gpu/drm/i915/i915_vma.c                    |   2 +-
 drivers/gpu/drm/udl/udl_fb.c                       |   5 +-
 drivers/gpu/drm/udl/udl_transfer.c                 |  11 +-
 drivers/iommu/Kconfig                              |   1 -
 drivers/iommu/intel-iommu.c                        |  62 +++++++---
 drivers/net/ethernet/netronome/nfp/nfp_main.c      |   6 +-
 drivers/pci/controller/dwc/Kconfig                 |   1 -
 drivers/pci/controller/pci-ftpci100.c              |   2 +
 drivers/pci/controller/pcie-rcar.c                 |  16 ++-
 drivers/pci/controller/pcie-xilinx-nwl.c           |   2 +-
 drivers/pci/controller/pcie-xilinx.c               |   1 +
 drivers/pci/endpoint/pci-epf-core.c                |   4 +-
 drivers/pci/iov.c                                  |  16 +++
 drivers/pci/pci-driver.c                           |   1 +
 drivers/pci/pci.h                                  |   4 +
 drivers/s390/block/dasd.c                          |  13 +-
 drivers/s390/block/dasd_int.h                      |   8 --
 drivers/scsi/aacraid/aachba.c                      |  15 ++-
 drivers/scsi/sg.c                                  |  42 ++++++-
 drivers/target/target_core_pr.c                    |  15 ++-
 drivers/vfio/pci/Kconfig                           |  12 +-
 drivers/vfio/vfio_iommu_type1.c                    |  16 ++-
 fs/cifs/cifsglob.h                                 |   3 +-
 fs/cifs/cifsproto.h                                |   1 +
 fs/cifs/cifssmb.c                                  |  10 +-
 fs/cifs/connect.c                                  |   8 +-
 fs/cifs/smb1ops.c                                  |   1 +
 fs/cifs/smb2file.c                                 |  11 +-
 fs/cifs/smb2ops.c                                  |  14 +--
 fs/cifs/smb2pdu.c                                  |  32 +++--
 fs/cifs/smb2pdu.h                                  |   6 +-
 fs/cifs/smb2proto.h                                |   4 +-
 fs/cifs/smb2transport.c                            |  60 ++++++++--
 fs/cifs/smbdirect.c                                |   5 +-
 fs/cifs/smbdirect.h                                |   4 +-
 fs/cifs/transport.c                                |  27 ++++-
 fs/ext4/balloc.c                                   |  21 ++--
 fs/ext4/ext4.h                                     |   9 +-
 fs/ext4/ext4_extents.h                             |   1 +
 fs/ext4/extents.c                                  |   6 +
 fs/ext4/ialloc.c                                   |  14 ++-
 fs/ext4/inline.c                                   |  39 +-----
 fs/ext4/inode.c                                    |   7 +-
 fs/ext4/mballoc.c                                  |   6 +-
 fs/ext4/super.c                                    |  99 ++++++++++++++--
 fs/ext4/xattr.c                                    |  40 +++----
 fs/inode.c                                         |   6 +
 fs/jbd2/transaction.c                              |   9 +-
 include/dt-bindings/clock/imx6ul-clock.h           |  40 +++----
 include/linux/compiler-gcc.h                       |  29 +++--
 include/linux/ftrace.h                             |   2 -
 include/linux/kthread.h                            |   1 -
 include/linux/sched.h                              |   2 +-
 kernel/kthread.c                                   |  30 ++++-
 kernel/sched/core.c                                |  67 +++++------
 kernel/sched/cpufreq_schedutil.c                   |   2 +-
 kernel/sched/fair.c                                |  45 ++++---
 kernel/sched/rt.c                                  |  16 ++-
 kernel/sched/sched.h                               |  11 +-
 kernel/trace/ftrace.c                              |  13 +-
 kernel/trace/trace.c                               |   5 +
 kernel/trace/trace.h                               |   4 +-
 kernel/trace/trace_events_filter.c                 |   5 +
 kernel/trace/trace_events_hist.c                   |   2 +-
 kernel/trace/trace_functions_graph.c               |   5 +-
 samples/vfio-mdev/mbochs.c                         |  19 ++-
 tools/objtool/elf.c                                |  41 +++++--
 143 files changed, 1443 insertions(+), 683 deletions(-)
 create mode 100644 arch/x86/kernel/irqflags.S
Merging fixes/master (147a89bc71e7 Merge tag 'kconfig-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
$ git merge fixes/master
Already up to date.
Merging kbuild-current/fixes (47a18a2dabba scripts: teach extract-vmlinux about LZ4 and ZSTD)
$ git merge kbuild-current/fixes
Auto-merging Makefile
Merge made by the 'recursive' strategy.
 Documentation/kbuild/kbuild.txt  | 17 ++++++--------
 Documentation/kbuild/kconfig.txt | 51 +++++++++++++++++++++++++++++++++-------
 Makefile                         |  2 +-
 scripts/Kbuild.include           |  2 +-
 scripts/Makefile.build           |  3 ---
 scripts/Makefile.clean           |  3 ---
 scripts/Makefile.modbuiltin      |  4 ----
 scripts/Makefile.modinst         |  4 ----
 scripts/Makefile.modpost         |  4 ----
 scripts/Makefile.modsign         |  3 ---
 scripts/extract-vmlinux          |  2 ++
 11 files changed, 54 insertions(+), 41 deletions(-)
Merging arc-current/for-curr (3d561d86e99f ARC: Enable CONFIG_SWAP)
$ git merge arc-current/for-curr
Auto-merging arch/arc/include/asm/pgtable.h
Merge made by the 'recursive' strategy.
 arch/arc/Makefile                    | 15 +-----------
 arch/arc/configs/tb10x_defconfig     |  1 -
 arch/arc/include/asm/entry-compact.h |  6 +++++
 arch/arc/include/asm/entry.h         |  3 ---
 arch/arc/include/asm/mach_desc.h     |  2 --
 arch/arc/include/asm/pgtable.h       |  2 +-
 arch/arc/kernel/irq.c                |  2 +-
 arch/arc/kernel/process.c            | 47 +++++++++++++++++++++++++++---------
 arch/arc/plat-hsdk/Kconfig           |  1 +
 9 files changed, 46 insertions(+), 33 deletions(-)
Merging arm-current/fixes (92d44a42af81 ARM: fix kill( ,SIGFPE) breakage)
$ git merge arm-current/fixes
Already up to date.
Merging arm64-fixes/for-next/fixes (1a381d4a0a9a arm64: remove no-op -p linker flag)
$ git merge arm64-fixes/for-next/fixes
Already up to date.
Merging m68k-current/for-linus (b12c8a70643f m68k: Set default dma mask for platform devices)
$ git merge m68k-current/for-linus
Already up to date.
Merging powerpc-fixes/fixes (22db552b50fa powerpc/powermac: Fix rtc read/write functions)
$ git merge powerpc-fixes/fixes
Already up to date.
Merging sparc/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux)
$ git merge sparc/master
Already up to date.
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
$ git merge fscrypt-current/for-stable
Already up to date.
Merging net/master (6508b6781be0 tcp: cleanup copied_seq and urg_data in tcp_disconnect)
$ git merge net/master
Auto-merging net/smc/af_smc.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                                        |   6 +-
 drivers/net/ethernet/aquantia/atlantic/aq_cfg.h    |   2 -
 drivers/net/ethernet/aquantia/atlantic/aq_hw.h     |   4 +-
 drivers/net/ethernet/aquantia/atlantic/aq_main.c   |  11 +-
 drivers/net/ethernet/aquantia/atlantic/aq_nic.c    |  47 ++++---
 drivers/net/ethernet/aquantia/atlantic/aq_nic.h    |   2 +-
 .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c  |   2 +-
 .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c  |   4 +-
 drivers/net/ethernet/cadence/macb.h                |  11 ++
 drivers/net/ethernet/cadence/macb_main.c           |  36 +++--
 drivers/net/ethernet/cavium/liquidio/lio_main.c    |   5 +-
 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c         |  35 ++---
 .../net/ethernet/mellanox/mlxsw/spectrum_router.c  |  48 +++----
 drivers/net/ethernet/qlogic/qed/qed.h              |   1 +
 drivers/net/ethernet/qlogic/qed/qed_debug.c        |   2 +-
 drivers/net/ethernet/qlogic/qed/qed_mcp.c          |  39 ++++--
 drivers/net/ethernet/realtek/r8169.c               |   1 +
 drivers/net/ethernet/renesas/ravb_main.c           |  93 +++---------
 drivers/net/ethernet/renesas/sh_eth.c              |  94 +++----------
 drivers/net/phy/marvell.c                          |  54 ++++---
 drivers/net/phy/phy_device.c                       |   7 +-
 drivers/net/usb/qmi_wwan.c                         |   1 +
 drivers/net/usb/smsc75xx.c                         |  62 ++++++++
 drivers/net/wireless/ath/ath10k/mac.c              |  16 ++-
 drivers/net/wireless/ath/ath10k/wmi.h              |   1 +
 drivers/net/wireless/ath/wcn36xx/testmode.c        |   2 +-
 .../wireless/broadcom/brcm80211/brcmfmac/sdio.c    |   7 +
 drivers/net/wireless/marvell/mwifiex/usb.c         |   7 +-
 drivers/net/wireless/mediatek/mt7601u/phy.c        |   6 +-
 drivers/net/wireless/quantenna/qtnfmac/cfg80211.c  |   3 +-
 drivers/net/wireless/realtek/rtlwifi/base.c        |  17 ++-
 drivers/net/wireless/realtek/rtlwifi/base.h        |   2 +-
 drivers/net/wireless/realtek/rtlwifi/core.c        |   3 +-
 drivers/net/wireless/realtek/rtlwifi/pci.c         |   2 +-
 drivers/net/wireless/realtek/rtlwifi/ps.c          |   4 +-
 drivers/net/wireless/realtek/rtlwifi/usb.c         |   2 +-
 include/linux/filter.h                             |   6 +-
 include/linux/if_bridge.h                          |   4 +-
 include/linux/marvell_phy.h                        |   2 +
 include/net/ip6_route.h                            |   6 +
 include/net/ipv6.h                                 |   9 +-
 include/net/tc_act/tc_csum.h                       |   1 -
 include/net/tc_act/tc_tunnel_key.h                 |   1 -
 include/net/tcp.h                                  |   4 +
 include/net/xdp_sock.h                             |   4 +
 kernel/bpf/devmap.c                                |   7 +-
 kernel/bpf/hashtab.c                               |  16 ++-
 kernel/bpf/sockmap.c                               |  43 +++---
 kernel/bpf/syscall.c                               |   4 +-
 lib/rhashtable.c                                   |   2 +-
 net/core/filter.c                                  | 110 +++++++++++++--
 net/core/gen_stats.c                               |  16 ++-
 net/ipv4/fib_frontend.c                            |   1 +
 net/ipv4/inet_fragment.c                           |   2 +-
 net/ipv4/sysctl_net_ipv4.c                         |   5 +-
 net/ipv4/tcp.c                                     |   5 +-
 net/ipv6/calipso.c                                 |   9 +-
 net/ipv6/exthdrs.c                                 | 111 ++++-----------
 net/ipv6/ip6_fib.c                                 | 156 ++++++++++++---------
 net/ipv6/ipv6_sockglue.c                           |  27 ++--
 net/ipv6/route.c                                   |   3 +-
 net/qrtr/qrtr.c                                    |  13 +-
 net/sched/act_csum.c                               |   6 +-
 net/sched/act_tunnel_key.c                         |   6 +-
 net/sctp/transport.c                               |   2 +-
 net/smc/af_smc.c                                   |  15 +-
 net/smc/smc_close.c                                |   2 +
 net/tipc/discover.c                                |  18 ++-
 net/tipc/net.c                                     |  17 ++-
 net/tipc/node.c                                    |   7 +-
 net/tls/tls_sw.c                                   |   5 +
 net/xdp/xsk.c                                      |  10 +-
 net/xdp/xsk_queue.h                                |   9 +-
 samples/bpf/.gitignore                             |  49 +++++++
 samples/bpf/parse_varlen.c                         |   6 +-
 samples/bpf/test_overhead_user.c                   |  19 ++-
 samples/bpf/trace_event_user.c                     |  27 +++-
 samples/bpf/xdpsock_user.c                         |   2 +-
 tools/testing/selftests/net/fib_tests.sh           |  41 ------
 79 files changed, 819 insertions(+), 628 deletions(-)
 create mode 100644 samples/bpf/.gitignore
Merging bpf/master (7f93d1295131 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf)
$ git merge bpf/master
Already up to date.
Merging ipsec/master (7284fdf39a91 esp6: fix memleak on error path in esp6_input)
$ git merge ipsec/master
Merge made by the 'recursive' strategy.
 net/ipv6/esp6.c        |  4 +++-
 net/ipv6/ip6_vti.c     | 11 ++++++-----
 net/xfrm/xfrm_policy.c |  3 +++
 net/xfrm/xfrm_user.c   | 18 +++++++++++-------
 4 files changed, 23 insertions(+), 13 deletions(-)
Merging netfilter/master (d376bef9c29b netfilter: x_tables: set module owner for icmp(6) matches)
$ git merge netfilter/master
Merge made by the 'recursive' strategy.
 net/ipv4/netfilter/ip_tables.c  | 1 +
 net/ipv6/netfilter/ip6_tables.c | 1 +
 2 files changed, 2 insertions(+)
Merging ipvs/master (312564269535 net: netsec: reduce DMA mask to 40 bits)
$ git merge ipvs/master
Already up to date.
Merging wireless-drivers/master (248c690a2dc8 Merge tag 'wireless-drivers-for-davem-2018-07-03' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers)
$ git merge wireless-drivers/master
Already up to date.
Merging mac80211/master (a948f713842a nl80211/mac80211: allow non-linear skb in rx_control_port)
$ git merge mac80211/master
Merge made by the 'recursive' strategy.
 include/net/cfg80211.h | 12 ++++++------
 net/mac80211/rx.c      |  5 +----
 net/mac80211/util.c    |  3 ++-
 net/wireless/nl80211.c | 24 +++++++++++++++---------
 net/wireless/trace.h   | 18 ++++++++++--------
 5 files changed, 34 insertions(+), 28 deletions(-)
Merging rdma-fixes/for-rc (fe48aecb4df8 RDMA/uverbs: Don't fail in creation of multiple flows)
$ git merge rdma-fixes/for-rc
Merge made by the 'recursive' strategy.
 drivers/infiniband/core/uverbs_cmd.c     | 28 +++++++++++++++++-----------
 drivers/infiniband/hw/cxgb4/mem.c        |  2 +-
 drivers/infiniband/hw/hfi1/rc.c          |  2 +-
 drivers/infiniband/hw/hfi1/uc.c          |  4 ++--
 drivers/infiniband/hw/hfi1/ud.c          |  4 ++--
 drivers/infiniband/hw/hfi1/verbs_txreq.c |  4 ++--
 drivers/infiniband/hw/hfi1/verbs_txreq.h |  4 ++--
 7 files changed, 27 insertions(+), 21 deletions(-)
Merging sound-current/for-linus (c6b17f1020d9 ALSA: hda/realtek - two more lenovo models need fixup of MIC_LOCATION)
$ git merge sound-current/for-linus
Merge made by the 'recursive' strategy.
 sound/pci/hda/patch_hdmi.c    | 19 ++++++++++++++-----
 sound/pci/hda/patch_realtek.c |  6 +++++-
 2 files changed, 19 insertions(+), 6 deletions(-)
Merging sound-asoc-fixes/for-linus (686e824bf24b Merge branch 'asoc-4.18' into asoc-linus)
$ git merge sound-asoc-fixes/for-linus
Merge made by the 'recursive' strategy.
 sound/soc/amd/acp-pcm-dma.c      |  3 ++-
 sound/soc/codecs/cs47l24.c       |  8 ++++++++
 sound/soc/codecs/wm5102.c        |  8 ++++++++
 sound/soc/codecs/wm5110.c        |  8 ++++++++
 sound/soc/qcom/qdsp6/q6afe-dai.c |  3 +++
 sound/soc/qcom/qdsp6/q6asm-dai.c |  4 +++-
 sound/soc/sh/rcar/core.c         |  6 ++++++
 sound/soc/sh/rcar/ssi.c          | 37 ++++++++++++++++++++++++-------------
 sound/soc/soc-dapm.c             |  7 +++++++
 sound/soc/soc-pcm.c              |  8 ++++++++
 sound/soc/soc-utils.c            |  2 +-
 11 files changed, 78 insertions(+), 16 deletions(-)
Merging regmap-fixes/for-linus (7daf201d7fe8 Linux 4.18-rc2)
$ git merge regmap-fixes/for-linus
Already up to date.
Merging regulator-fixes/for-linus (353bf62f7d2c Merge branch 'regulator-4.18' into regulator-linus)
$ git merge regulator-fixes/for-linus
Merge made by the 'recursive' strategy.
 drivers/regulator/arizona-ldo1.c | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)
Merging spi-fixes/for-linus (d28cbf8dcb01 Merge branch 'spi-4.18' into spi-linus)
$ git merge spi-fixes/for-linus
Merge made by the 'recursive' strategy.
 drivers/spi/spi-cadence.c  |  2 +-
 drivers/spi/spi-fsl-dspi.c | 12 ++++++++
 drivers/spi/spi-orion.c    | 77 ++++++++++++++++++++++++----------------------
 drivers/spi/spi-sh-msiof.c | 53 ++++++++++++++++---------------
 4 files changed, 82 insertions(+), 62 deletions(-)
Merging pci-current/for-linus (83235822b8b4 nfp: stop limiting VFs to 0)
$ git merge pci-current/for-linus
Already up to date.
Merging driver-core.current/driver-core-linus (7daf201d7fe8 Linux 4.18-rc2)
$ git merge driver-core.current/driver-core-linus
Already up to date.
Merging tty.current/tty-linus (021c91791a5e Linux 4.18-rc3)
$ git merge tty.current/tty-linus
Already up to date.
Merging usb.current/usb-linus (f1e255d60ae6 USB: yurex: fix out-of-bounds uaccess in read handler)
$ git merge usb.current/usb-linus
Merge made by the 'recursive' strategy.
 Documentation/admin-guide/kernel-parameters.txt |  5 +++++
 drivers/i2c/busses/i2c-cht-wc.c                 |  3 ++-
 drivers/usb/core/quirks.c                       |  4 ++++
 drivers/usb/gadget/udc/aspeed-vhub/Kconfig      |  1 +
 drivers/usb/host/xhci-dbgcap.c                  | 12 ++++++++----
 drivers/usb/host/xhci-mem.c                     |  2 +-
 drivers/usb/misc/yurex.c                        | 23 ++++++-----------------
 drivers/usb/serial/ch341.c                      |  2 +-
 drivers/usb/serial/cp210x.c                     |  1 +
 drivers/usb/serial/keyspan_pda.c                |  4 +++-
 drivers/usb/serial/mos7840.c                    |  3 +++
 drivers/usb/typec/tcpm.c                        |  5 +++--
 12 files changed, 38 insertions(+), 27 deletions(-)
Merging usb-gadget-fixes/fixes (1d8e5c002758 dwc2: gadget: Fix ISOC IN DDMA PID bitfield value calculation)
$ git merge usb-gadget-fixes/fixes
Already up to date.
Merging usb-serial-fixes/usb-linus (794744abfffe USB: serial: mos7840: fix status-register error handling)
$ git merge usb-serial-fixes/usb-linus
Already up to date.
Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: Always build ULPI code)
$ git merge usb-chipidea-fixes/ci-for-usb-stable
Merge made by the 'recursive' strategy.
 drivers/usb/chipidea/Kconfig  | 9 +--------
 drivers/usb/chipidea/Makefile | 3 +--
 drivers/usb/chipidea/ci.h     | 8 --------
 drivers/usb/chipidea/ulpi.c   | 3 +++
 4 files changed, 5 insertions(+), 18 deletions(-)
Merging phy/fixes (ad5003300b07 phy: mapphone-mdm6600: Fix wrong enum used for status lines)
$ git merge phy/fixes
Merge made by the 'recursive' strategy.
 drivers/phy/broadcom/phy-brcm-usb-init.c    | 4 ++++
 drivers/phy/motorola/phy-mapphone-mdm6600.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)
Merging staging.current/staging-linus (89dfe7f68f9f staging: speakup: fix wraparound in uaccess length check)
$ git merge staging.current/staging-linus
Merge made by the 'recursive' strategy.
 drivers/staging/rtl8723bs/core/rtw_ap.c | 2 +-
 drivers/staging/rtlwifi/rtl8822be/hw.c  | 2 +-
 drivers/staging/rtlwifi/wifi.h          | 1 +
 drivers/staging/speakup/speakup_soft.c  | 6 +++++-
 4 files changed, 8 insertions(+), 3 deletions(-)
Merging char-misc.current/char-misc-linus (87ed1405ef09 nvmem: Don't let a NULL cell_id for nvmem_cell_get() crash us)
$ git merge char-misc.current/char-misc-linus
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                    |   1 +
 drivers/fpga/altera-cvp.c      |   6 +-
 drivers/misc/ibmasm/ibmasmfs.c |  27 +-------
 drivers/misc/mei/interrupt.c   |   5 +-
 drivers/misc/vmw_balloon.c     |   4 +-
 drivers/nvmem/core.c           |   4 ++
 drivers/thunderbolt/domain.c   |   4 ++
 drivers/uio/uio.c              | 139 ++++++++++++++++++++++++++++++-----------
 include/linux/uio_driver.h     |   2 +-
 9 files changed, 126 insertions(+), 66 deletions(-)
Merging input-current/for-linus (28501bd2bcda MAINTAINERS: Add file patterns for serio device tree bindings)
$ git merge input-current/for-linus
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                         | 1 +
 drivers/input/mouse/elan_i2c_core.c | 1 +
 2 files changed, 2 insertions(+)
Merging crypto-current/master (221e00d1fce9 crypto: x86 - Add missing RETs)
$ git merge crypto-current/master
Already up to date.
Merging ide/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux)
$ git merge ide/master
Already up to date.
Merging vfio-fixes/for-linus (d7ef4899d718 sample/vfio-mdev: Change return type to vm_fault_t)
$ git merge vfio-fixes/for-linus
Already up to date.
Merging kselftest-fixes/fixes (ce397d215ccd Linux 4.18-rc1)
$ git merge kselftest-fixes/fixes
Already up to date.
Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address)
$ git merge modules-fixes/modules-linus
Already up to date.
Merging slave-dma-fixes/fixes (c4c2b7644cc9 dmaengine: k3dma: Off by one in k3_of_dma_simple_xlate())
$ git merge slave-dma-fixes/fixes
Already up to date.
Merging backlight-fixes/for-backlight-fixes (ce397d215ccd Linux 4.18-rc1)
$ git merge backlight-fixes/for-backlight-fixes
Already up to date.
Merging mtd-fixes/master (aa7eee8a143a mtd: spi-nor: cadence-quadspi: Fix direct mode write timeouts)
$ git merge mtd-fixes/master
Merge made by the 'recursive' strategy.
 drivers/mtd/spi-nor/cadence-quadspi.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
Merging nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode check)
$ git merge nand-fixes/nand/fixes
Already up to date.
Merging spi-nor-fixes/spi-nor/fixes (7928b2cbe55b Linux 4.16-rc1)
$ git merge spi-nor-fixes/spi-nor/fixes
Already up to date.
Merging mfd-fixes/for-mfd-fixes (ce397d215ccd Linux 4.18-rc1)
$ git merge mfd-fixes/for-mfd-fixes
Already up to date.
Merging v4l-dvb-fixes/fixes (0ca54b290541 media: rc: be less noisy when driver misbehaves)
$ git merge v4l-dvb-fixes/fixes
Merge made by the 'recursive' strategy.
 drivers/media/rc/rc-ir-raw.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Merging reset-fixes/reset/fixes (e6914365fd28 reset: uniphier: fix USB clock line for LD20)
$ git merge reset-fixes/reset/fixes
Already up to date.
Merging mips-fixes/mips-fixes (523402fa9101 MIPS: Fix ioremap() RAM check)
$ git merge mips-fixes/mips-fixes
Merge made by the 'recursive' strategy.
 arch/mips/kernel/process.c | 43 +++++++++++++++++++++++++++++--------------
 arch/mips/kernel/traps.c   |  1 +
 arch/mips/mm/ioremap.c     | 37 +++++++++++++++++++++++++------------
 3 files changed, 55 insertions(+), 26 deletions(-)
Merging omap-fixes/fixes (41bd6adf3c5d Revert "ARM: dts: logicpd-som-lv: Fix pinmux controller references")
$ git merge omap-fixes/fixes
Already up to date.
Merging kvm-fixes/master (6f0d349d922b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge kvm-fixes/master
Already up to date.
Merging kvms390-fixes/master (f4a551b72358 KVM: s390: vsie: fix < 8k check for the itdba)
$ git merge kvms390-fixes/master
Already up to date.
Merging hwmon-fixes/hwmon (7daf201d7fe8 Linux 4.18-rc2)
$ git merge hwmon-fixes/hwmon
Already up to date.
Merging nvdimm-fixes/libnvdimm-fixes (75bc37fefc44 Linux 4.17-rc4)
$ git merge nvdimm-fixes/libnvdimm-fixes
Already up to date.
Merging btrfs-fixes/next-fixes (cf63fc9616bc Merge branch 'for-next-current-v4.18-20180702' into next-fixes)
$ git merge btrfs-fixes/next-fixes
Merge made by the 'recursive' strategy.
 fs/btrfs/file.c       | 30 ++++++++++++++++++-----
 fs/btrfs/inode.c      | 67 +++++++++++++++++++++++++++++++++++++--------------
 fs/btrfs/ioctl.c      | 15 ++----------
 fs/btrfs/qgroup.c     | 38 +++++++++++++++++++++++------
 fs/btrfs/qgroup.h     |  6 ++---
 fs/btrfs/relocation.c | 23 +++++++++---------
 6 files changed, 120 insertions(+), 59 deletions(-)
Merging vfs-fixes/fixes (877f919e192a proc: add proc_seq_release)
$ git merge vfs-fixes/fixes
Already up to date.
Merging dma-mapping-fixes/for-linus (7ec916f82c48 Revert "iommu/intel-iommu: Enable CONFIG_DMA_DIRECT_OPS=y and clean up intel_{alloc,free}_coherent()")
$ git merge dma-mapping-fixes/for-linus
Already up to date.
Merging drivers-x86-fixes/fixes (ce397d215ccd Linux 4.18-rc1)
$ git merge drivers-x86-fixes/fixes
Already up to date.
Merging samsung-krzk-fixes/fixes (ce397d215ccd Linux 4.18-rc1)
$ git merge samsung-krzk-fixes/fixes
Already up to date.
Merging pinctrl-samsung-fixes/pinctrl-fixes (ce397d215ccd Linux 4.18-rc1)
$ git merge pinctrl-samsung-fixes/pinctrl-fixes
Already up to date.
Merging devicetree-fixes/dt/linus (a47c9b394316 dt-bindings: Fix unbalanced quotation marks)
$ git merge devicetree-fixes/dt/linus
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt        | 2 +-
 Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt             | 2 +-
 Documentation/devicetree/bindings/gpio/nintendo,hollywood-gpio.txt      | 2 +-
 Documentation/devicetree/bindings/input/touchscreen/hideep.txt          | 2 +-
 .../devicetree/bindings/interrupt-controller/nvidia,tegra20-ictlr.txt   | 2 +-
 .../devicetree/bindings/interrupt-controller/st,stm32-exti.txt          | 2 +-
 Documentation/devicetree/bindings/mips/brcm/soc.txt                     | 2 +-
 Documentation/devicetree/bindings/net/fsl-fman.txt                      | 2 +-
 Documentation/devicetree/bindings/power/power_domain.txt                | 2 +-
 Documentation/devicetree/bindings/regulator/tps65090.txt                | 2 +-
 Documentation/devicetree/bindings/reset/st,sti-softreset.txt            | 2 +-
 Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.txt             | 2 +-
 Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt            | 2 +-
 Documentation/devicetree/bindings/sound/qcom,apq8096.txt                | 2 +-
 Documentation/devicetree/bindings/w1/w1-gpio.txt                        | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)
Merging scsi-fixes/fixes (26b5b874aff5 scsi: sg: mitigate read/write abuse)
$ git merge scsi-fixes/fixes
Already up to date.
Merging drm-fixes/drm-fixes (c78d1f9d95a9 Merge tag 'exynos-drm-fixes-for-v4.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes)
$ git merge drm-fixes/drm-fixes
Already up to date.
Merging drm-intel-fixes/for-linux-next-fixes (3030deda0971 Merge tag 'gvt-fixes-2018-07-03' of https://github.com/intel/gvt-linux into drm-intel-fixes)
$ git merge drm-intel-fixes/for-linux-next-fixes
Already up to date.
Merging mmc-fixes/fixes (b8ba3578752b mmc: sunxi: Disable irq during pm_suspend)
$ git merge mmc-fixes/fixes
Merge made by the 'recursive' strategy.
 drivers/mmc/core/slot-gpio.c                  |  2 +-
 drivers/mmc/host/dw_mmc.c                     |  7 ++++---
 drivers/mmc/host/renesas_sdhi_internal_dmac.c | 15 +++++++--------
 drivers/mmc/host/sunxi-mmc.c                  |  7 +++++++
 4 files changed, 19 insertions(+), 12 deletions(-)
Merging rtc-fixes/rtc-fixes (ca95ef7c9867 rtc: mrst: fix error code in probe())
$ git merge rtc-fixes/rtc-fixes
Merge made by the 'recursive' strategy.
 drivers/rtc/rtc-mrst.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
Merging drm-misc-fixes/for-linux-next-fixes (44f9a4b0dc75 drm/bridge/sii8620: Fix link mode selection)
$ git merge drm-misc-fixes/for-linux-next-fixes
Already up to date.
Merging kbuild/for-next (006d7d9bfef7 Merge branches 'kbuild' and 'kconfig' into for-next)
$ git merge kbuild/for-next
Merge made by the 'recursive' strategy.
 Documentation/process/changes.rst                 |  27 +++--
 arch/arm64/kernel/vdso/note.S                     |   3 +
 arch/powerpc/kernel/vdso32/note.S                 |   3 +
 arch/powerpc/purgatory/Makefile                   |   3 +-
 arch/s390/purgatory/Makefile                      |   3 +-
 arch/x86/entry/vdso/vdso-note.S                   |   3 +
 arch/x86/entry/vdso/vdso32/note.S                 |   3 +
 arch/x86/purgatory/Makefile                       |   3 +-
 include/linux/build-salt.h                        |  20 ++++
 init/Kconfig                                      |   9 ++
 init/version.c                                    |   3 +
 kernel/Makefile                                   |   2 +-
 scripts/.gitignore                                |   1 +
 scripts/Makefile                                  |   1 +
 scripts/basic/.gitignore                          |   1 -
 scripts/basic/Makefile                            |   1 -
 scripts/{basic => }/bin2c.c                       |   0
 scripts/coccinelle/api/atomic_as_refcounter.cocci | 129 ++++++++++++++++++++++
 scripts/depmod.sh                                 |   8 +-
 scripts/kconfig/Makefile                          |   1 +
 scripts/kconfig/check-pkgconfig.sh                |   8 ++
 scripts/kconfig/confdata.c                        |   4 +-
 scripts/kconfig/expr.h                            |   2 +-
 scripts/kconfig/gconf.c                           |   4 +-
 scripts/kconfig/menu.c                            |   2 +-
 scripts/kconfig/symbol.c                          |   2 +-
 scripts/kconfig/zconf.y                           |   2 +-
 scripts/mod/modpost.c                             |   3 +
 security/tomoyo/Makefile                          |   2 +-
 29 files changed, 222 insertions(+), 31 deletions(-)
 create mode 100644 include/linux/build-salt.h
 rename scripts/{basic => }/bin2c.c (100%)
 create mode 100644 scripts/coccinelle/api/atomic_as_refcounter.cocci
 create mode 100644 scripts/kconfig/check-pkgconfig.sh
Merging leaks/leaks-next (9f84a0f7f1a6 leaking_addresses: check if file name contains address)
$ git merge leaks/leaks-next
Merge made by the 'recursive' strategy.
Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API)
$ git merge uuid/for-next
Already up to date.
Merging dma-mapping/for-next (2550bbfd4952 dma-direct: don't crash on device without dma_mask)
$ git merge dma-mapping/for-next
Already up to date.
Merging asm-generic/master (a71e7c44ffb7 io: change writeX_relaxed() to remove barriers)
$ git merge asm-generic/master
Already up to date.
Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1)
$ git merge arc/for-next
Already up to date.
Merging arm/for-next (0ac000e86703 Merge branches 'fixes', 'misc' and 'spectre' into for-linus)
$ git merge arm/for-next
Already up to date.
Merging arm-perf/for-next/perf (1201a5a25cf0 perf/arm-cci: Remove VLA usage)
$ git merge arm-perf/for-next/perf
Merge made by the 'recursive' strategy.
 drivers/perf/arm-cci.c | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)
Merging arm-soc/for-next (5628f09076e6 ARM: Document merges)
$ git merge arm-soc/for-next
Removing arch/arm/mach-shmobile/smp-r8a7791.c
Removing arch/arm/mach-shmobile/smp-r8a7790.c
Removing arch/arm/mach-shmobile/setup-r8a7791.c
Removing arch/arm/mach-shmobile/setup-r8a7790.c
Removing arch/arm/mach-shmobile/r8a7791.h
Removing arch/arm/mach-shmobile/r8a7790.h
Removing arch/arm/mach-shmobile/pm-r8a7779.c
Removing arch/arm/mach-shmobile/platsmp-apmu.h
Merge made by the 'recursive' strategy.
 arch/arm/arm-soc-for-next-contents.txt             |  32 ++
 arch/arm/boot/dts/highbank.dts                     |  30 ++
 arch/arm/boot/dts/keystone-k2e-netcp.dtsi          |  20 ++
 arch/arm/boot/dts/keystone-k2g-evm.dts             |  63 ++++
 arch/arm/boot/dts/keystone-k2g-ice.dts             |  59 ++++
 arch/arm/boot/dts/keystone-k2g-netcp.dtsi          | 147 ++++++++++
 arch/arm/boot/dts/keystone-k2g.dtsi                |  25 +-
 arch/arm/boot/dts/keystone-k2hk-netcp.dtsi         |  20 ++
 arch/arm/boot/dts/keystone-k2l-netcp.dtsi          |  20 ++
 arch/arm/boot/dts/socfpga_arria10.dtsi             |  12 +
 arch/arm/configs/keystone_defconfig                |   5 +
 arch/arm/include/debug/renesas-scif.S              |   5 +-
 arch/arm/mach-shmobile/Makefile                    |   6 +-
 arch/arm/mach-shmobile/common.h                    |   1 -
 arch/arm/mach-shmobile/headsmp-apmu.S              |   5 +-
 arch/arm/mach-shmobile/platsmp-apmu.c              | 245 +++++++---------
 arch/arm/mach-shmobile/platsmp-apmu.h              |  32 --
 arch/arm/mach-shmobile/platsmp.c                   |   9 -
 arch/arm/mach-shmobile/pm-r8a7779.c                |  41 ---
 arch/arm/mach-shmobile/pm-rcar-gen2.c              |  25 --
 arch/arm/mach-shmobile/r8a7779.h                   |   2 -
 arch/arm/mach-shmobile/r8a7790.h                   |   7 -
 arch/arm/mach-shmobile/r8a7791.h                   |   7 -
 arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c |  10 +-
 arch/arm/mach-shmobile/setup-emev2.c               |  10 +-
 arch/arm/mach-shmobile/setup-r7s72100.c            |  10 +-
 arch/arm/mach-shmobile/setup-r8a73a4.c             |  10 +-
 arch/arm/mach-shmobile/setup-r8a7740.c             |  10 +-
 arch/arm/mach-shmobile/setup-r8a7778.c             |  10 +-
 arch/arm/mach-shmobile/setup-r8a7779.c             |  10 +-
 arch/arm/mach-shmobile/setup-r8a7790.c             |  38 ---
 arch/arm/mach-shmobile/setup-r8a7791.c             |  39 ---
 arch/arm/mach-shmobile/setup-rcar-gen2.c           |  16 +-
 arch/arm/mach-shmobile/setup-sh73a0.c              |  10 +-
 arch/arm/mach-shmobile/smp-emev2.c                 |  10 +-
 arch/arm/mach-shmobile/smp-r8a7779.c               |  64 +---
 arch/arm/mach-shmobile/smp-r8a7790.c               |  71 -----
 arch/arm/mach-shmobile/smp-r8a7791.c               |  53 ----
 arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi  |  41 ++-
 .../boot/dts/altera/socfpga_stratix10_socdk.dts    |  35 +++
 .../boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts     |   5 +-
 arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts |   5 +-
 .../boot/dts/renesas/r8a7795-es1-salvator-x.dts    |   5 +-
 arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi       |   7 +-
 arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts  |   5 +-
 arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts     |   5 +-
 arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts |   5 +-
 .../arm64/boot/dts/renesas/r8a7795-salvator-xs.dts |   5 +-
 arch/arm64/boot/dts/renesas/r8a7795.dtsi           |  20 +-
 arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts  |   5 +-
 arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts     |   5 +-
 arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts |   5 +-
 .../arm64/boot/dts/renesas/r8a7796-salvator-xs.dts |   5 +-
 arch/arm64/boot/dts/renesas/r8a7796.dtsi           |  61 +++-
 arch/arm64/boot/dts/renesas/r8a77965.dtsi          | 159 +++++++++-
 arch/arm64/boot/dts/renesas/r8a77970-eagle.dts     |   5 +-
 arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts     |   5 +-
 arch/arm64/boot/dts/renesas/r8a77970.dtsi          |   7 +-
 arch/arm64/boot/dts/renesas/r8a77980-condor.dts    |  29 ++
 arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts     |  23 ++
 arch/arm64/boot/dts/renesas/r8a77980.dtsi          | 324 ++++++++++++++++++++-
 arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts     |  25 ++
 arch/arm64/boot/dts/renesas/r8a77990.dtsi          |  74 ++++-
 arch/arm64/boot/dts/renesas/r8a77995-draak.dts     | 133 ++++++++-
 arch/arm64/boot/dts/renesas/r8a77995.dtsi          | 133 +++++++--
 arch/arm64/boot/dts/renesas/salvator-common.dtsi   |  24 +-
 arch/arm64/boot/dts/renesas/salvator-x.dtsi        |   7 +-
 arch/arm64/boot/dts/renesas/salvator-xs.dtsi       |   7 +-
 arch/arm64/boot/dts/renesas/ulcb-kf.dtsi           |   5 +-
 arch/arm64/boot/dts/renesas/ulcb.dtsi              |   9 +-
 drivers/memory/ti-emif-pm.c                        |  33 +++
 drivers/soc/renesas/rcar-sysc.c                    |  64 ++--
 drivers/soc/ti/wkup_m3_ipc.c                       |  76 +++++
 drivers/tee/optee/Kconfig                          |   8 +
 drivers/tee/optee/core.c                           |   2 +-
 drivers/tee/optee/rpc.c                            |   2 +-
 include/linux/soc/renesas/rcar-sysc.h              |  13 +-
 include/linux/wkup_m3_ipc.h                        |   9 +
 78 files changed, 1749 insertions(+), 835 deletions(-)
 create mode 100644 arch/arm/arm-soc-for-next-contents.txt
 create mode 100644 arch/arm/boot/dts/keystone-k2g-netcp.dtsi
 delete mode 100644 arch/arm/mach-shmobile/platsmp-apmu.h
 delete mode 100644 arch/arm/mach-shmobile/pm-r8a7779.c
 delete mode 100644 arch/arm/mach-shmobile/r8a7790.h
 delete mode 100644 arch/arm/mach-shmobile/r8a7791.h
 delete mode 100644 arch/arm/mach-shmobile/setup-r8a7790.c
 delete mode 100644 arch/arm/mach-shmobile/setup-r8a7791.c
 delete mode 100644 arch/arm/mach-shmobile/smp-r8a7790.c
 delete mode 100644 arch/arm/mach-shmobile/smp-r8a7791.c
Merging actions/for-next (35afadd11222 Merge branch 'v4.19/drivers' into next)
$ git merge actions/for-next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                                       |  3 +++
 arch/arm/boot/dts/owl-s500-cubieboard6.dts        |  3 +--
 arch/arm/boot/dts/owl-s500-guitar-bb-rev-b.dts    |  3 +--
 arch/arm/boot/dts/owl-s500-guitar.dtsi            |  3 +--
 arch/arm/boot/dts/owl-s500.dtsi                   |  3 +--
 arch/arm64/boot/dts/actions/Makefile              |  2 ++
 arch/arm64/boot/dts/actions/s900-bubblegum-96.dts | 11 ++---------
 arch/arm64/boot/dts/actions/s900.dtsi             | 23 +++++++++++++++++++++--
 drivers/soc/actions/Makefile                      |  2 ++
 drivers/soc/actions/owl-sps-helper.c              |  6 +-----
 drivers/soc/actions/owl-sps.c                     |  6 +-----
 11 files changed, 36 insertions(+), 29 deletions(-)
Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1)
$ git merge alpine/alpine/for-next
Already up to date.
Merging amlogic/for-next (ccf2d85eccf7 Merge branch 'v4.18/fixes' into tmp/aml-rebuild)
$ git merge amlogic/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging aspeed/for-next (6534b2d0de36 Merge branch 'dt-for-v4.17' into for-next)
$ git merge aspeed/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging at91/at91-next (59ef2671a847 ARM: dts: fix PMC compatible)
$ git merge at91/at91-next
Removing Documentation/devicetree/bindings/arm/atmel-pmc.txt
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/arm/atmel-pmc.txt    | 14 --------------
 Documentation/devicetree/bindings/clock/at91-clock.txt |  9 ++++-----
 arch/arm/boot/dts/at91sam9261.dtsi                     |  2 +-
 arch/arm/boot/dts/at91sam9263.dtsi                     |  2 +-
 arch/arm/boot/dts/at91sam9rl.dtsi                      |  2 +-
 arch/arm/boot/dts/sama5d4.dtsi                         |  2 +-
 arch/arm/mach-at91/pm.c                                |  5 +++++
 7 files changed, 13 insertions(+), 23 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/arm/atmel-pmc.txt
Merging bcm2835/for-next (5997adb14985 Merge branch anholt/bcm2835-defconfig-64-next into for-next)
$ git merge bcm2835/for-next
Auto-merging arch/arm64/configs/defconfig
Auto-merging arch/arm/configs/multi_v7_defconfig
Merge made by the 'recursive' strategy.
 Documentation/hwmon/raspberrypi-hwmon      |  22 ++++
 arch/arm/boot/dts/Makefile                 |   1 +
 arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts  |  88 +++++++++++++++
 arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi     |  34 ++++++
 arch/arm/boot/dts/bcm2837.dtsi             |   6 ++
 arch/arm/configs/bcm2835_defconfig         |   2 +-
 arch/arm/configs/multi_v7_defconfig        |   1 +
 arch/arm64/configs/defconfig               |   1 +
 drivers/firmware/raspberrypi.c             |  19 ++++
 drivers/hwmon/Kconfig                      |  10 ++
 drivers/hwmon/Makefile                     |   1 +
 drivers/hwmon/raspberrypi-hwmon.c          | 166 +++++++++++++++++++++++++++++
 include/soc/bcm2835/raspberrypi-firmware.h |   1 +
 13 files changed, 351 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/hwmon/raspberrypi-hwmon
 create mode 100644 arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts
 create mode 100644 arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi
 create mode 100644 drivers/hwmon/raspberrypi-hwmon.c
Merging imx-mxs/for-next (24973f755f94 Merge branch 'imx/defconfig' into for-next)
$ git merge imx-mxs/for-next
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/arm/fsl.txt      |   4 +
 arch/arm/boot/dts/Makefile                         |   5 +
 arch/arm/boot/dts/imx50-evk.dts                    |   8 -
 arch/arm/boot/dts/imx50-pinfunc.h                  |   4 +-
 arch/arm/boot/dts/imx50.dtsi                       |  18 -
 arch/arm/boot/dts/imx51-babbage.dts                |  25 +-
 .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts  |  21 +-
 arch/arm/boot/dts/imx51-zii-rdu1.dts               |  67 +-
 arch/arm/boot/dts/imx51.dtsi                       |  47 +-
 arch/arm/boot/dts/imx53-kp-ddc.dts                 | 146 ++++
 arch/arm/boot/dts/imx53-kp-hsc.dts                 |  52 ++
 arch/arm/boot/dts/imx53-kp.dtsi                    | 189 +++++
 arch/arm/boot/dts/imx53-ppd.dts                    |  36 +-
 arch/arm/boot/dts/imx53-qsb-common.dtsi            |   9 +-
 arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts       |   3 -
 arch/arm/boot/dts/imx6dl-icore-mipi.dts            |  25 +
 arch/arm/boot/dts/imx6dl-riotboard.dts             |  54 +-
 arch/arm/boot/dts/imx6dl.dtsi                      |  24 +
 arch/arm/boot/dts/imx6q-cm-fx6.dts                 |  66 ++
 arch/arm/boot/dts/imx6q-icore-mipi.dts             |   8 +
 arch/arm/boot/dts/imx6q-var-dt6customboard.dts     |   1 +
 arch/arm/boot/dts/imx6q.dtsi                       |  88 ++-
 arch/arm/boot/dts/imx6qdl-colibri.dtsi             |   8 +-
 arch/arm/boot/dts/imx6qdl-icore.dtsi               |  49 +-
 arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi           |   1 +
 arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi       |   1 +
 arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi      |   1 +
 arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi          |   1 +
 arch/arm/boot/dts/imx6qdl-sabreauto.dtsi           |  25 +
 arch/arm/boot/dts/imx6qdl-wandboard.dtsi           |  59 +-
 arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi            |  30 +-
 arch/arm/boot/dts/imx6sl-evk.dts                   |   4 +
 arch/arm/boot/dts/imx6sl.dtsi                      |   9 +-
 arch/arm/boot/dts/imx6sll-evk.dts                  | 384 +++++++++
 arch/arm/boot/dts/imx6sll-pinfunc.h                | 880 +++++++++++++++++++++
 arch/arm/boot/dts/imx6sll.dtsi                     | 780 ++++++++++++++++++
 arch/arm/boot/dts/imx6sx.dtsi                      |   9 +-
 arch/arm/boot/dts/imx6ul.dtsi                      |   1 +
 arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi        |  14 -
 arch/arm/boot/dts/imx6ull.dtsi                     |  62 +-
 arch/arm/boot/dts/imx7d-sdb.dts                    |  33 +-
 arch/arm/boot/dts/imx7d.dtsi                       |   6 +
 arch/arm/boot/dts/ls1021a.dtsi                     |   1 +
 arch/arm/configs/imx_v6_v7_defconfig               |   2 +
 arch/arm/mach-imx/Kconfig                          |  33 +-
 arch/arm/mach-imx/Makefile                         |   7 +-
 arch/arm/mach-imx/common.h                         |   2 +-
 arch/arm/mach-imx/cpuidle-imx6sl.c                 |   7 +-
 arch/arm/mach-imx/cpuidle-imx6sx.c                 |   1 +
 arch/arm/mach-imx/gpc.c                            |  14 +
 arch/arm/mach-imx/mach-imx6sl.c                    |   5 +-
 arch/arm/mach-imx/mach-imx7d-cm4.c                 |  18 +
 arch/arm/mach-imx/pm-imx6.c                        |  33 +-
 arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts |  38 +-
 arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts  |  38 +-
 arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts  |  38 +-
 arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi     |  38 +-
 arch/arm64/boot/dts/freescale/fsl-ls1043-post.dtsi |   3 +-
 arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts  |  39 +-
 arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts  |  39 +-
 arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi     |  44 +-
 arch/arm64/boot/dts/freescale/fsl-ls1046-post.dtsi |   2 +-
 arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts  |  39 +-
 arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts  |  39 +-
 arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi     |  42 +-
 arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts  |  38 +-
 arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts  |  38 +-
 arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi     |  44 +-
 arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts  |  38 +-
 arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts  |  38 +-
 arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts |  38 +-
 arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi     |  42 +-
 arch/arm64/boot/dts/freescale/fsl-ls2088a-qds.dts  |  38 +-
 arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts  |  38 +-
 arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi     |  42 +-
 arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi |  38 +-
 arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi |  38 +-
 arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi     |  38 +-
 .../boot/dts/freescale/qoriq-bman-portals.dtsi     |   2 +-
 .../boot/dts/freescale/qoriq-fman3-0-10g-0.dtsi    |   2 +-
 .../boot/dts/freescale/qoriq-fman3-0-10g-1.dtsi    |   2 +-
 .../boot/dts/freescale/qoriq-fman3-0-1g-0.dtsi     |   2 +-
 .../boot/dts/freescale/qoriq-fman3-0-1g-1.dtsi     |   2 +-
 .../boot/dts/freescale/qoriq-fman3-0-1g-2.dtsi     |   2 +-
 .../boot/dts/freescale/qoriq-fman3-0-1g-3.dtsi     |   2 +-
 .../boot/dts/freescale/qoriq-fman3-0-1g-4.dtsi     |   2 +-
 .../boot/dts/freescale/qoriq-fman3-0-1g-5.dtsi     |   2 +-
 arch/arm64/boot/dts/freescale/qoriq-fman3-0.dtsi   |   2 +-
 .../boot/dts/freescale/qoriq-qman-portals.dtsi     |   2 +-
 include/linux/mfd/syscon/imx6q-iomuxc-gpr.h        |   3 +
 90 files changed, 3198 insertions(+), 1114 deletions(-)
 create mode 100644 arch/arm/boot/dts/imx53-kp-ddc.dts
 create mode 100644 arch/arm/boot/dts/imx53-kp-hsc.dts
 create mode 100644 arch/arm/boot/dts/imx53-kp.dtsi
 create mode 100644 arch/arm/boot/dts/imx6dl-icore-mipi.dts
 create mode 100644 arch/arm/boot/dts/imx6sll-evk.dts
 create mode 100644 arch/arm/boot/dts/imx6sll-pinfunc.h
 create mode 100644 arch/arm/boot/dts/imx6sll.dtsi
 create mode 100644 arch/arm/mach-imx/mach-imx7d-cm4.c
Merging keystone/next (ed3bf0f321b9 Merge branch 'for_4.19/drivers-soc' into next)
$ git merge keystone/next
Already up to date!
Merge made by the 'recursive' strategy.
Merging mediatek/for-next (9378b3427341 Merge branch 'v4.17-next/soc' into for-next)
$ git merge mediatek/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging mvebu/for-next (b9cfa4d84abb Merge branch 'mvebu/dt64' into mvebu/for-next)
$ git merge mvebu/for-next
Auto-merging arch/arm/configs/multi_v7_defconfig
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/Makefile                         |   1 +
 arch/arm/boot/dts/armada-388-clearfog-base.dts     |   5 -
 arch/arm/boot/dts/armada-388-clearfog-pro.dts      |   5 -
 arch/arm/boot/dts/armada-388-clearfog.dts          |   7 +-
 arch/arm/boot/dts/armada-388-clearfog.dtsi         |   7 +-
 arch/arm/boot/dts/armada-388-helios4.dts           | 313 +++++++++++++++++++++
 .../arm/boot/dts/armada-38x-solidrun-microsom.dtsi |   6 -
 arch/arm/boot/dts/armada-38x.dtsi                  |   2 +-
 arch/arm/configs/multi_v7_defconfig                |   1 +
 arch/arm/configs/mvebu_v7_defconfig                |  13 +-
 arch/arm/mach-mvebu/platsmp.c                      |  49 ++--
 arch/arm/mach-mvebu/pmsu.c                         |   6 +-
 arch/arm64/boot/dts/marvell/armada-37xx.dtsi       |  21 ++
 arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts  |   2 +-
 include/linux/cpuhotplug.h                         |   1 +
 15 files changed, 370 insertions(+), 69 deletions(-)
 create mode 100644 arch/arm/boot/dts/armada-388-helios4.dts
Merging omap/for-next (6f56a58a2ed1 Merge branch 'omap-for-v4.19/soc' into for-next)
$ git merge omap/for-next
Auto-merging include/linux/platform_data/ams-delta-fiq.h
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                                        |   1 +
 arch/arm/boot/dts/am335x-baltos.dtsi               |   2 +-
 arch/arm/boot/dts/am335x-evm.dts                   |   2 +-
 arch/arm/boot/dts/am335x-evmsk.dts                 |   2 +-
 arch/arm/boot/dts/am335x-sl50.dts                  | 297 ++++++++++++++++----
 arch/arm/boot/dts/am33xx.dtsi                      |   4 +-
 arch/arm/boot/dts/am3517-evm.dts                   |  47 +++-
 arch/arm/boot/dts/am3517-som.dtsi                  | 105 ++++++-
 arch/arm/boot/dts/am437x-gp-evm.dts                |   2 +-
 arch/arm/boot/dts/am571x-idk.dts                   |   4 -
 arch/arm/boot/dts/am572x-idk-common.dtsi           |   4 -
 arch/arm/boot/dts/am57xx-idk-common.dtsi           |   7 +-
 arch/arm/boot/dts/dra7-evm-common.dtsi             |  10 +
 arch/arm/boot/dts/dra7-evm.dts                     |   9 -
 arch/arm/boot/dts/dra7.dtsi                        |   4 +-
 arch/arm/boot/dts/dra71-evm.dts                    |   8 +
 arch/arm/boot/dts/dra72-evm-common.dtsi            |   1 +
 arch/arm/boot/dts/dra74x.dtsi                      |  10 +
 arch/arm/boot/dts/dra76-evm.dts                    |   8 +
 arch/arm/boot/dts/logicpd-som-lv.dtsi              |   2 +-
 arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts  |   2 +-
 arch/arm/boot/dts/omap3-cm-t3517.dts               |   2 +-
 arch/arm/boot/dts/omap3-cm-t3730.dts               |   2 +-
 arch/arm/boot/dts/omap3-evm-common.dtsi            |   2 +-
 arch/arm/boot/dts/omap3-igep0020-rev-f.dts         |   2 +-
 arch/arm/boot/dts/omap3-igep0030-rev-g.dts         |   2 +-
 arch/arm/boot/dts/omap3-zoom3.dts                  |   2 +-
 arch/arm/boot/dts/omap4-droid4-xt894.dts           |   7 +-
 arch/arm/boot/dts/omap4-duovero-parlor.dts         |   4 +-
 arch/arm/boot/dts/omap4-duovero.dtsi               |   1 +
 arch/arm/boot/dts/omap4-panda-common.dtsi          |   2 +-
 arch/arm/boot/dts/omap4-sdp.dts                    |   2 +-
 arch/arm/boot/dts/omap4-var-som-om44-wlan.dtsi     |   2 +-
 arch/arm/boot/dts/omap5-board-common.dtsi          |   2 +-
 arch/arm/boot/dts/omap5.dtsi                       |  14 +
 arch/arm/mach-omap1/ams-delta-fiq-handler.S        |   5 +-
 arch/arm/mach-omap1/ams-delta-fiq.c                | 113 ++++++--
 arch/arm/mach-omap1/ams-delta-fiq.h                |  42 +++
 arch/arm/mach-omap1/board-ams-delta.c              | 301 +++++++++++++++++----
 arch/arm/mach-omap1/board-h2.c                     |   2 +-
 arch/arm/mach-omap1/board-h3.c                     |   2 +-
 arch/arm/mach-omap1/board-htcherald.c              |   2 +-
 arch/arm/mach-omap1/board-osk.c                    |   4 +-
 arch/arm/mach-omap2/omap_hwmod_reset.c             |  12 +-
 drivers/input/serio/ams_delta_serio.c              | 198 +++++++-------
 .../linux/platform_data}/ams-delta-fiq.h           |  31 +--
 46 files changed, 977 insertions(+), 312 deletions(-)
 create mode 100644 arch/arm/mach-omap1/ams-delta-fiq.h
 rename {arch/arm/mach-omap1/include/mach => include/linux/platform_data}/ams-delta-fiq.h (68%)
Merging reset/reset/next (d7bab65b1f57 reset: uniphier: add LD11/LD20 stream demux system reset control)
$ git merge reset/reset/next
Already up to date.
Merging qcom/for-next (376e1f304fc7 firmware: qcom: scm: add a dummy qcom_scm_assign_mem())
$ git merge qcom/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/arm/msm/qcom,llcc.txt      |  26 +
 .../devicetree/bindings/soc/qcom/rpmh-rsc.txt      | 137 ++++
 arch/arm64/boot/dts/qcom/pm8005.dtsi               |  33 +
 arch/arm64/boot/dts/qcom/pm8998.dtsi               |  55 ++
 arch/arm64/boot/dts/qcom/sdm845-mtp.dts            |  45 ++
 arch/arm64/boot/dts/qcom/sdm845.dtsi               | 763 +++++++++++++++++++++
 drivers/soc/qcom/Kconfig                           |  27 +
 drivers/soc/qcom/Makefile                          |   6 +
 drivers/soc/qcom/llcc-sdm845.c                     |  94 +++
 drivers/soc/qcom/llcc-slice.c                      | 335 +++++++++
 drivers/soc/qcom/rpmh-internal.h                   | 114 +++
 drivers/soc/qcom/rpmh-rsc.c                        | 695 +++++++++++++++++++
 drivers/soc/qcom/rpmh.c                            | 513 ++++++++++++++
 drivers/soc/qcom/smem.c                            |  10 +-
 drivers/soc/qcom/trace-rpmh.h                      |  82 +++
 include/dt-bindings/soc/qcom,rpmh-rsc.h            |  14 +
 include/linux/qcom_scm.h                           |   4 +
 include/linux/soc/qcom/llcc-qcom.h                 | 180 +++++
 include/soc/qcom/rpmh.h                            |  51 ++
 include/soc/qcom/tcs.h                             |  56 ++
 20 files changed, 3235 insertions(+), 5 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,llcc.txt
 create mode 100644 Documentation/devicetree/bindings/soc/qcom/rpmh-rsc.txt
 create mode 100644 arch/arm64/boot/dts/qcom/pm8005.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/pm8998.dtsi
 create mode 100644 drivers/soc/qcom/llcc-sdm845.c
 create mode 100644 drivers/soc/qcom/llcc-slice.c
 create mode 100644 drivers/soc/qcom/rpmh-internal.h
 create mode 100644 drivers/soc/qcom/rpmh-rsc.c
 create mode 100644 drivers/soc/qcom/rpmh.c
 create mode 100644 drivers/soc/qcom/trace-rpmh.h
 create mode 100644 include/dt-bindings/soc/qcom,rpmh-rsc.h
 create mode 100644 include/linux/soc/qcom/llcc-qcom.h
 create mode 100644 include/soc/qcom/rpmh.h
 create mode 100644 include/soc/qcom/tcs.h
Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next)
$ git merge realtek/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging renesas/next (6d67c566bc94 Merge branches 'arm-soc-for-v4.19', 'arm-dt-for-v4.19', 'arm64-dt-for-v4.19' and 'dt-bindings-for-v4.19' into next)
$ git merge renesas/next
Auto-merging arch/arm64/configs/defconfig
Auto-merging arch/arm/boot/dts/Makefile
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/arm/cpus.txt     |   1 +
 Documentation/devicetree/bindings/arm/shmobile.txt |   5 +-
 MAINTAINERS                                        |   1 +
 arch/arm/boot/dts/Makefile                         |   1 +
 arch/arm/boot/dts/emev2-kzm9d.dts                  |   5 +-
 arch/arm/boot/dts/emev2.dtsi                       |   5 +-
 arch/arm/boot/dts/iwg20d-q7-common.dtsi            |   5 +-
 arch/arm/boot/dts/iwg20d-q7-dbcm-ca.dtsi           |   5 +-
 arch/arm/boot/dts/r7s72100-genmai.dts              |   5 +-
 arch/arm/boot/dts/r7s72100-gr-peach.dts            |   5 +-
 arch/arm/boot/dts/r7s72100-rskrza1.dts             |   5 +-
 arch/arm/boot/dts/r7s72100.dtsi                    |   5 +-
 arch/arm/boot/dts/r8a73a4-ape6evm.dts              |   5 +-
 arch/arm/boot/dts/r8a73a4.dtsi                     |   5 +-
 arch/arm/boot/dts/r8a7740-armadillo800eva.dts      |   5 +-
 arch/arm/boot/dts/r8a7740.dtsi                     |   5 +-
 arch/arm/boot/dts/r8a7743-iwg20d-q7-dbcm-ca.dts    |   5 +-
 arch/arm/boot/dts/r8a7743-iwg20d-q7.dts            |   5 +-
 arch/arm/boot/dts/r8a7743-iwg20m.dtsi              |   5 +-
 arch/arm/boot/dts/r8a7743-sk-rzg1m.dts             |   5 +-
 arch/arm/boot/dts/r8a7743.dtsi                     |  14 ++-
 .../arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dts |   5 +-
 arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts        |   5 +-
 arch/arm/boot/dts/r8a7745-iwg22m.dtsi              |   5 +-
 arch/arm/boot/dts/r8a7745-sk-rzg1e.dts             |   5 +-
 arch/arm/boot/dts/r8a7745.dtsi                     |   5 +-
 arch/arm/boot/dts/r8a7778-bockw.dts                |   5 +-
 arch/arm/boot/dts/r8a7778.dtsi                     |   5 +-
 arch/arm/boot/dts/r8a7779-marzen.dts               |   5 +-
 arch/arm/boot/dts/r8a7779.dtsi                     |   5 +-
 arch/arm/boot/dts/r8a7790-lager.dts                |  26 +----
 arch/arm/boot/dts/r8a7790-stout.dts                |  26 -----
 arch/arm/boot/dts/r8a7790.dtsi                     |  39 +++++--
 arch/arm/boot/dts/r8a7791-koelsch.dts              |  26 +----
 arch/arm/boot/dts/r8a7791-porter.dts               |  59 ++++++-----
 arch/arm/boot/dts/r8a7791.dtsi                     |  19 ++--
 arch/arm/boot/dts/r8a7792-blanche.dts              |   5 +-
 arch/arm/boot/dts/r8a7792-wheat.dts                |  26 +----
 arch/arm/boot/dts/r8a7792.dtsi                     |   5 +-
 arch/arm/boot/dts/r8a7793-gose.dts                 |  26 +----
 arch/arm/boot/dts/r8a7793.dtsi                     |  20 ++--
 arch/arm/boot/dts/r8a7794-alt.dts                  |  26 +----
 arch/arm/boot/dts/r8a7794-silk.dts                 |  26 +----
 arch/arm/boot/dts/r8a7794.dtsi                     |   5 +-
 arch/arm/boot/dts/r8a77xx-aa104xd12-panel.dtsi     |   5 +-
 arch/arm/boot/dts/r8a77xx-aa121td01-panel.dtsi     |   5 +-
 arch/arm/boot/dts/r9a06g032-rzn1d400-db.dts        |  28 +++++
 arch/arm/boot/dts/r9a06g032.dtsi                   | 115 +++++++++++++++++++++
 arch/arm/boot/dts/sh73a0-kzm9g.dts                 |   5 +-
 arch/arm/boot/dts/sh73a0.dtsi                      |   5 +-
 arch/arm/configs/shmobile_defconfig                |   1 +
 arch/arm/mach-shmobile/Makefile                    |   2 +-
 arch/arm/mach-shmobile/headsmp-apmu.S              |   2 -
 arch/arm64/boot/dts/renesas/r8a77965.dtsi          |   3 +
 arch/arm64/boot/dts/renesas/r8a77990.dtsi          |   2 +-
 arch/arm64/boot/dts/renesas/salvator-common.dtsi   |   4 +-
 arch/arm64/configs/defconfig                       |   2 +
 drivers/soc/renesas/Makefile                       |   1 +
 drivers/soc/renesas/r9a06g032-smp.c                |  96 +++++++++++++++++
 59 files changed, 399 insertions(+), 358 deletions(-)
 create mode 100644 arch/arm/boot/dts/r9a06g032-rzn1d400-db.dts
 create mode 100644 arch/arm/boot/dts/r9a06g032.dtsi
 create mode 100644 drivers/soc/renesas/r9a06g032-smp.c
Merging rockchip/for-next (588455ca08e4 Merge branch 'v4.19-clk/next' into for-next)
$ git merge rockchip/for-next
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/arm/rockchip.txt |    9 +
 .../bindings/clock/rockchip,px30-cru.txt           |   65 ++
 arch/arm/boot/dts/rk3036-evb.dts                   |   40 +-
 arch/arm/boot/dts/rk3036-kylin.dts                 |   40 +-
 arch/arm/boot/dts/rk3036.dtsi                      |   40 +-
 arch/arm/boot/dts/rk3066a-bqcurie2.dts             |   39 +-
 arch/arm/boot/dts/rk3066a-marsboard.dts            |   39 +-
 arch/arm/boot/dts/rk3066a-mk808.dts                |   39 +-
 arch/arm/boot/dts/rk3066a-rayeager.dts             |   39 +-
 arch/arm/boot/dts/rk3066a.dtsi                     |   39 +-
 arch/arm/boot/dts/rk3188-px3-evb.dts               |   39 +-
 arch/arm/boot/dts/rk3188-radxarock.dts             |   39 +-
 arch/arm/boot/dts/rk3188.dtsi                      |   39 +-
 arch/arm/boot/dts/rk3228-evb.dts                   |   40 +-
 arch/arm/boot/dts/rk3229-evb.dts                   |   40 +-
 arch/arm/boot/dts/rk3229.dtsi                      |   39 +-
 arch/arm/boot/dts/rk322x.dtsi                      |   43 +-
 arch/arm/boot/dts/rk3288-evb-act8846.dts           |   40 +-
 arch/arm/boot/dts/rk3288-evb-rk808.dts             |   40 +-
 arch/arm/boot/dts/rk3288-evb.dtsi                  |   42 +-
 arch/arm/boot/dts/rk3288-fennec.dts                |   40 +-
 arch/arm/boot/dts/rk3288-firefly-beta.dts          |   39 +-
 arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi  |   39 +-
 arch/arm/boot/dts/rk3288-firefly-reload.dts        |   39 +-
 arch/arm/boot/dts/rk3288-firefly.dts               |   39 +-
 arch/arm/boot/dts/rk3288-firefly.dtsi              |   39 +-
 arch/arm/boot/dts/rk3288-miqi.dts                  |   39 +-
 arch/arm/boot/dts/rk3288-phycore-rdk.dts           |   39 +-
 arch/arm/boot/dts/rk3288-phycore-som.dtsi          |   39 +-
 arch/arm/boot/dts/rk3288-popmetal.dts              |   39 +-
 arch/arm/boot/dts/rk3288-r89.dts                   |   39 +-
 arch/arm/boot/dts/rk3288-rock2-som.dtsi            |   40 +-
 arch/arm/boot/dts/rk3288-rock2-square.dts          |   40 +-
 arch/arm/boot/dts/rk3288-tinker.dts                |   39 +-
 arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi  |    5 +-
 arch/arm/boot/dts/rk3288-veyron-brain.dts          |   39 +-
 arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi    |   41 +-
 arch/arm/boot/dts/rk3288-veyron-jaq.dts            |   39 +-
 arch/arm/boot/dts/rk3288-veyron-jerry.dts          |   39 +-
 arch/arm/boot/dts/rk3288-veyron-mickey.dts         |   39 +-
 arch/arm/boot/dts/rk3288-veyron-minnie.dts         |   39 +-
 arch/arm/boot/dts/rk3288-veyron-pinky.dts          |   39 +-
 arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi         |   39 +-
 arch/arm/boot/dts/rk3288-veyron-speedy.dts         |   39 +-
 arch/arm/boot/dts/rk3288-veyron.dtsi               |   75 +-
 arch/arm/boot/dts/rk3288-vyasa.dts                 |   39 +-
 arch/arm/boot/dts/rk3288.dtsi                      |  122 ++-
 arch/arm/boot/dts/rk3xxx.dtsi                      |   39 +-
 arch/arm/boot/dts/rv1108-evb.dts                   |   40 +-
 arch/arm/boot/dts/rv1108.dtsi                      |   40 +-
 arch/arm64/boot/dts/rockchip/Makefile              |    1 +
 arch/arm64/boot/dts/rockchip/rk3328-evb.dts        |   39 +-
 arch/arm64/boot/dts/rockchip/rk3328-rock64.dts     |   39 +-
 arch/arm64/boot/dts/rockchip/rk3328.dtsi           |   44 +-
 .../arm64/boot/dts/rockchip/rk3368-evb-act8846.dts |   39 +-
 arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi       |   39 +-
 arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts    |   39 +-
 .../boot/dts/rockchip/rk3368-orion-r68-meta.dts    |   39 +-
 arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts    |   39 +-
 arch/arm64/boot/dts/rockchip/rk3368-r88.dts        |   39 +-
 arch/arm64/boot/dts/rockchip/rk3368.dtsi           |   47 +-
 arch/arm64/boot/dts/rockchip/rk3399-evb.dts        |   39 +-
 arch/arm64/boot/dts/rockchip/rk3399-firefly.dts    |   42 +-
 arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts    |   79 ++
 .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi   |  397 ++++++++
 arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts  |   86 +-
 arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi       |  367 +------
 arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi   |   39 +-
 arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi       |   39 +-
 .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts |   39 +-
 arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi      |   40 +-
 .../dts/rockchip/rk3399-sapphire-excavator.dts     |   41 +-
 arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi  |   44 +-
 arch/arm64/boot/dts/rockchip/rk3399.dtsi           |  153 ++-
 drivers/clk/rockchip/Makefile                      |    2 +
 drivers/clk/rockchip/clk-half-divider.c            |  227 +++++
 drivers/clk/rockchip/clk-px30.c                    | 1039 ++++++++++++++++++++
 drivers/clk/rockchip/clk-rk3399.c                  |    2 +-
 drivers/clk/rockchip/clk.c                         |   10 +
 drivers/clk/rockchip/clk.h                         |  126 ++-
 include/dt-bindings/clock/px30-cru.h               |  389 ++++++++
 81 files changed, 2625 insertions(+), 3031 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/clock/rockchip,px30-cru.txt
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi
 create mode 100644 drivers/clk/rockchip/clk-half-divider.c
 create mode 100644 drivers/clk/rockchip/clk-px30.c
 create mode 100644 include/dt-bindings/clock/px30-cru.h
Merging samsung/for-next (bebc6082da0a Linux 4.14)
$ git merge samsung/for-next
Already up to date.
Merging samsung-krzk/for-next (ea01929db236 Merge branch 'next/dt' into for-next)
$ git merge samsung-krzk/for-next
Removing arch/arm64/boot/dts/exynos/exynos7-tmu-sensor-conf.dtsi
Removing arch/arm64/boot/dts/exynos/exynos5433-tmu-sensor-conf.dtsi
Removing arch/arm64/boot/dts/exynos/exynos5433-tmu-g3d-sensor-conf.dtsi
Removing arch/arm/boot/dts/exynos5420-tmu-sensor-conf.dtsi
Removing arch/arm/boot/dts/exynos4412-tmu-sensor-conf.dtsi
Auto-merging arch/arm/boot/dts/Makefile
Auto-merging Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt
Removing Documentation/devicetree/bindings/arm/insignal-boards.txt
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/arm/insignal-boards.txt    |   8 -
 .../bindings/arm/samsung/samsung-boards.txt        |   5 +-
 arch/arm/boot/dts/Makefile                         |   2 +
 arch/arm/boot/dts/exynos3250.dtsi                  |  18 +-
 arch/arm/boot/dts/exynos4.dtsi                     |   2 +-
 arch/arm/boot/dts/exynos4210.dtsi                  |  13 +
 arch/arm/boot/dts/exynos4412-tmu-sensor-conf.dtsi  |  20 -
 arch/arm/boot/dts/exynos4412.dtsi                  |   9 +
 arch/arm/boot/dts/exynos5250.dtsi                  |  25 +-
 arch/arm/boot/dts/exynos5410.dtsi                  |   8 +-
 arch/arm/boot/dts/exynos5420-cpus.dtsi             |   6 +
 arch/arm/boot/dts/exynos5420-tmu-sensor-conf.dtsi  |  21 --
 arch/arm/boot/dts/exynos5420.dtsi                  |  10 +-
 arch/arm/boot/dts/exynos5422-cpus.dtsi             |   8 +-
 arch/arm/boot/dts/s5pv210-aries.dtsi               | 419 +++++++++++++++++++++
 arch/arm/boot/dts/s5pv210-fascinate4g.dts          |  45 +++
 arch/arm/boot/dts/s5pv210-galaxys.dts              |  77 ++++
 arch/arm/boot/dts/s5pv210-pinctrl.dtsi             |   2 +
 arch/arm/configs/s5pv210_defconfig                 |  49 ++-
 arch/arm/mach-s3c24xx/include/mach/s3c2412.h       |   2 +-
 .../dts/exynos/exynos5433-tmu-g3d-sensor-conf.dtsi |  20 -
 .../dts/exynos/exynos5433-tmu-sensor-conf.dtsi     |  19 -
 arch/arm64/boot/dts/exynos/exynos5433.dtsi         |  14 +-
 .../boot/dts/exynos/exynos7-tmu-sensor-conf.dtsi   |  21 --
 arch/arm64/boot/dts/exynos/exynos7.dtsi            |   2 +-
 25 files changed, 690 insertions(+), 135 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/arm/insignal-boards.txt
 delete mode 100644 arch/arm/boot/dts/exynos4412-tmu-sensor-conf.dtsi
 delete mode 100644 arch/arm/boot/dts/exynos5420-tmu-sensor-conf.dtsi
 create mode 100644 arch/arm/boot/dts/s5pv210-aries.dtsi
 create mode 100644 arch/arm/boot/dts/s5pv210-fascinate4g.dts
 create mode 100644 arch/arm/boot/dts/s5pv210-galaxys.dts
 delete mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tmu-g3d-sensor-conf.dtsi
 delete mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tmu-sensor-conf.dtsi
 delete mode 100644 arch/arm64/boot/dts/exynos/exynos7-tmu-sensor-conf.dtsi
Merging sunxi/sunxi/for-next (40dfebc4e943 Merge branch 'sunxi/h3-h5-for-4.19' into sunxi/for-next)
$ git merge sunxi/sunxi/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/bus/sun50i-de2-bus.txt     |  37 +++
 .../devicetree/bindings/clock/sun8i-de2.txt        |   1 +
 .../devicetree/bindings/sram/sunxi-sram.txt        |   3 +-
 arch/arm/boot/dts/sun6i-a31.dtsi                   |  30 +++
 arch/arm/boot/dts/sun7i-a20.dtsi                   |  13 +
 arch/arm/boot/dts/sun8i-a33.dtsi                   |   9 +
 .../boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts  |   8 +
 arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts       |   8 +
 arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts   |   8 +
 arch/arm/boot/dts/sun8i-h3-beelink-x2.dts          |   7 +
 arch/arm/boot/dts/sun8i-h3.dtsi                    |   9 +
 arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts  |  45 ++++
 arch/arm/boot/dts/sun8i-r40.dtsi                   | 268 +++++++++++++++++++
 arch/arm64/boot/dts/allwinner/Makefile             |   2 +
 .../dts/allwinner/sun50i-a64-amarula-relic.dts     | 219 ++++++++++++++++
 .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts |   4 +
 .../boot/dts/allwinner/sun50i-a64-nanopi-a64.dts   |   4 +
 .../boot/dts/allwinner/sun50i-a64-olinuxino.dts    |   4 +
 .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts |   4 +
 .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts |   4 +
 .../boot/dts/allwinner/sun50i-a64-pinebook.dts     | 285 +++++++++++++++++++++
 .../dts/allwinner/sun50i-a64-sopine-baseboard.dts  |   4 +
 .../boot/dts/allwinner/sun50i-a64-sopine.dtsi      |  15 ++
 .../boot/dts/allwinner/sun50i-a64-teres-i.dts      |   7 +-
 arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi      | 111 +++++++-
 .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts  |  12 +
 .../boot/dts/allwinner/sun50i-h6-pine-h64.dts      |  19 ++
 drivers/bus/Kconfig                                |  10 +
 drivers/bus/Makefile                               |   1 +
 drivers/bus/sun50i-de2.c                           |  48 ++++
 drivers/clk/sunxi-ng/ccu-sun8i-de2.c               |  11 +-
 drivers/clk/sunxi-ng/ccu-sun8i-r40.c               |  58 +++--
 drivers/clk/sunxi-ng/ccu-sun8i-r40.h               |   8 +-
 drivers/soc/sunxi/sunxi_sram.c                     |  61 ++++-
 include/dt-bindings/clock/sun8i-r40-ccu.h          |   4 +
 35 files changed, 1294 insertions(+), 47 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/bus/sun50i-de2-bus.txt
 create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts
 create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
 create mode 100644 drivers/bus/sun50i-de2.c
Merging tegra/for-next (83fbebec33c3 Merge branch for-4.19/arm64/dt into for-next)
$ git merge tegra/for-next
Auto-merging Documentation/devicetree/bindings/arm/cpus.txt
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/arm/cpus.txt |   1 +
 arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi |  22 ++++-
 arch/arm64/boot/dts/nvidia/tegra194.dtsi       | 106 +++++++++++++++++++++++++
 3 files changed, 127 insertions(+), 2 deletions(-)
Merging arm64/for-next/core (bedbeec65c6c arm64: mm: Export __flush_icache_range() to modules)
$ git merge arm64/for-next/core
Merge made by the 'recursive' strategy.
 arch/arm/include/asm/kvm_emulate.h       |  14 ++--
 arch/arm64/Kconfig                       |  11 +++
 arch/arm64/include/asm/Kbuild            |   1 +
 arch/arm64/include/asm/barrier.h         |  13 ++++
 arch/arm64/include/asm/cache.h           |   4 ++
 arch/arm64/include/asm/cacheflush.h      |  27 ++++++-
 arch/arm64/include/asm/cpucaps.h         |   3 +-
 arch/arm64/include/asm/insn.h            |   2 -
 arch/arm64/include/asm/kvm_emulate.h     |  10 +--
 arch/arm64/include/asm/numa.h            |   4 ++
 arch/arm64/include/asm/processor.h       |   6 +-
 arch/arm64/include/asm/ptrace.h          |  79 ++++++++++++++-------
 arch/arm64/include/asm/spinlock.h        | 117 +------------------------------
 arch/arm64/include/asm/spinlock_types.h  |  17 +----
 arch/arm64/include/asm/tlbflush.h        |   7 ++
 arch/arm64/include/asm/topology.h        |   4 +-
 arch/arm64/kernel/armv8_deprecated.c     |  24 +++----
 arch/arm64/kernel/cpu-reset.h            |   9 +--
 arch/arm64/kernel/cpu_errata.c           |  27 ++++---
 arch/arm64/kernel/cpufeature.c           |   4 +-
 arch/arm64/kernel/insn.c                 |  70 +-----------------
 arch/arm64/kernel/machine_kexec.c        |   3 +-
 arch/arm64/kernel/process.c              |  20 +++---
 arch/arm64/kernel/ptrace.c               |  34 +++++----
 arch/arm64/kernel/signal32.c             |  18 +++--
 arch/arm64/kernel/smp.c                  |   5 ++
 arch/arm64/kernel/stacktrace.c           |   3 +
 arch/arm64/kernel/topology.c             |  58 ++++++++++-----
 arch/arm64/kvm/guest.c                   |  14 ++--
 arch/arm64/kvm/hyp/vgic-v2-cpuif-proxy.c |   2 +-
 arch/arm64/kvm/regmap.c                  |  22 +++---
 arch/arm64/kvm/reset.c                   |   4 +-
 arch/arm64/mm/cache.S                    |   4 +-
 arch/arm64/mm/flush.c                    |   2 +-
 arch/arm64/mm/mmu.c                      |  48 +++++++++++--
 arch/arm64/mm/numa.c                     |  29 +++++---
 arch/arm64/mm/ptdump_debugfs.c           |  13 +---
 arch/x86/mm/pgtable.c                    |  61 +++++++++++++---
 include/asm-generic/pgtable.h            |   8 +--
 lib/ioremap.c                            |   4 +-
 virt/kvm/arm/aarch32.c                   |  20 +++---
 41 files changed, 432 insertions(+), 393 deletions(-)
Merging clk/clk-next (6f6b17edb33c Merge branch 'clk-imx-critical' into clk-next)
$ git merge clk/clk-next
Auto-merging Documentation/devicetree/bindings/clock/at91-clock.txt
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/clock/at91-clock.txt       |  35 +
 .../devicetree/bindings/clock/maxim,max9485.txt    |  59 ++
 .../bindings/clock/renesas,r9a06g032-sysctrl.txt   |  43 +
 arch/arm/mach-at91/Kconfig                         |   4 +
 drivers/clk/Kconfig                                |   6 +
 drivers/clk/Makefile                               |   1 +
 drivers/clk/at91/Makefile                          |   1 +
 drivers/clk/at91/clk-i2s-mux.c                     | 116 +++
 drivers/clk/clk-aspeed.c                           |  19 +-
 drivers/clk/clk-max9485.c                          | 387 +++++++++
 drivers/clk/clk-si514.c                            |  38 +-
 drivers/clk/clk-si544.c                            |  38 +-
 drivers/clk/clk.c                                  | 218 ++++-
 drivers/clk/clkdev.c                               |   3 -
 drivers/clk/imx/clk-imx51-imx53.c                  |  44 +-
 drivers/clk/imx/clk-imx6q.c                        |   2 +-
 drivers/clk/imx/clk-imx6sll.c                      |   6 +
 drivers/clk/imx/clk-imx6ul.c                       |  28 +-
 drivers/clk/ingenic/jz4740-cgu.c                   |   4 +-
 drivers/clk/meson/clk-audio-divider.c              |   2 +-
 drivers/clk/meson/gxbb.c                           |   1 +
 drivers/clk/pxa/clk-pxa25x.c                       |   6 +-
 drivers/clk/pxa/clk-pxa27x.c                       |   7 +-
 drivers/clk/pxa/clk-pxa3xx.c                       |   7 +-
 drivers/clk/qcom/gcc-ipq806x.c                     |   3 -
 drivers/clk/qcom/gcc-mdm9615.c                     |   2 -
 drivers/clk/qcom/gcc-msm8660.c                     |   5 -
 drivers/clk/qcom/gcc-msm8960.c                     |   5 -
 drivers/clk/qcom/gcc-msm8996.c                     |   1 +
 drivers/clk/qcom/gcc-sdm845.c                      |  43 +-
 drivers/clk/qcom/mmcc-msm8996.c                    |   1 +
 drivers/clk/renesas/Kconfig                        |   6 +
 drivers/clk/renesas/Makefile                       |   1 +
 drivers/clk/renesas/r8a7795-cpg-mssr.c             |   2 +
 drivers/clk/renesas/r9a06g032-clocks.c             | 893 +++++++++++++++++++++
 drivers/clk/socfpga/clk-s10.c                      |   9 +-
 include/dt-bindings/clock/aspeed-clock.h           |   2 +-
 include/dt-bindings/clock/imx6sll-clock.h          |   9 +-
 include/dt-bindings/clock/imx6ul-clock.h           |   8 +-
 include/dt-bindings/clock/maxim,max9485.h          |  18 +
 include/dt-bindings/clock/pxa-clock.h              |   3 +-
 include/dt-bindings/clock/qcom,gcc-sdm845.h        |   2 +
 include/dt-bindings/clock/r9a06g032-sysctrl.h      | 148 ++++
 include/linux/clk-provider.h                       |  26 +
 include/linux/clk.h                                |  33 +
 include/trace/events/clk.h                         |  36 +
 46 files changed, 2230 insertions(+), 101 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/clock/maxim,max9485.txt
 create mode 100644 Documentation/devicetree/bindings/clock/renesas,r9a06g032-sysctrl.txt
 create mode 100644 drivers/clk/at91/clk-i2s-mux.c
 create mode 100644 drivers/clk/clk-max9485.c
 create mode 100644 drivers/clk/renesas/r9a06g032-clocks.c
 create mode 100644 include/dt-bindings/clock/maxim,max9485.h
 create mode 100644 include/dt-bindings/clock/r9a06g032-sysctrl.h
Merging clk-samsung/for-next (e8cf870f253b clk: samsung: simplify getting .drvdata)
$ git merge clk-samsung/for-next
Merge made by the 'recursive' strategy.
Merging c6x/for-linux-next (31b02fe54206 c6x: switch to NO_BOOTMEM)
$ git merge c6x/for-linux-next
Merge made by the 'recursive' strategy.
 arch/c6x/Kconfig        |  1 +
 arch/c6x/kernel/setup.c | 26 +-------------------------
 2 files changed, 2 insertions(+), 25 deletions(-)
Merging m68k/for-next (b2137956430d m68k: Use generic dma_noncoherent_ops)
$ git merge m68k/for-next
Removing arch/m68k/include/asm/dma-mapping.h
Merge made by the 'recursive' strategy.
 arch/m68k/Kconfig                   |  2 ++
 arch/m68k/include/asm/Kbuild        |  1 +
 arch/m68k/include/asm/dma-mapping.h | 12 -------
 arch/m68k/include/asm/macintosh.h   |  1 -
 arch/m68k/kernel/dma.c              | 68 +++++--------------------------------
 arch/m68k/mac/config.c              | 19 +----------
 drivers/nubus/bus.c                 |  3 ++
 7 files changed, 15 insertions(+), 91 deletions(-)
 delete mode 100644 arch/m68k/include/asm/dma-mapping.h
Merging m68knommu/for-next (109f5e551b18 m68knommu: Fix typos in Coldfire 5272 DMA debug code)
$ git merge m68knommu/for-next
Merge made by the 'recursive' strategy.
 arch/m68k/coldfire/clk.c    | 29 +++++++++++++++++++++++++++++
 arch/m68k/include/asm/dma.h |  4 ++--
 2 files changed, 31 insertions(+), 2 deletions(-)
Merging microblaze/next (45df561a7ae2 microblaze: consolidate GPIO reset handling)
$ git merge microblaze/next
Already up to date.
Merging mips/mips-next (cfe1824411ad MIPS: Octeon: Simplify CIU register functions.)
$ git merge mips/mips-next
Removing arch/mips/mti-malta/malta-reset.c
Removing arch/mips/mti-malta/malta-pm.c
Removing arch/mips/mm/dma-default.c
Removing arch/mips/loongson64/common/dma-swiotlb.c
Auto-merging arch/mips/kernel/traps.c
Auto-merging arch/mips/kernel/process.c
CONFLICT (content): Merge conflict in arch/mips/kernel/process.c
Removing arch/mips/include/asm/mach-loongson64/dma-coherence.h
Removing arch/mips/include/asm/mach-jazz/dma-coherence.h
Removing arch/mips/include/asm/mach-ip32/dma-coherence.h
Removing arch/mips/include/asm/mach-ip27/dma-coherence.h
Removing arch/mips/include/asm/mach-generic/dma-coherence.h
Removing arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
Removing arch/mips/include/asm/mach-bmips/dma-coherence.h
Removing arch/mips/include/asm/mach-ath25/dma-coherence.h
Resolved 'arch/mips/kernel/process.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master e940e062c017] Merge remote-tracking branch 'mips/mips-next'
$ git diff -M --stat --summary HEAD^..
 arch/mips/Kconfig                                  |    35 +-
 arch/mips/Makefile                                 |    12 +-
 arch/mips/ar7/clock.c                              |    29 +
 arch/mips/ath25/Kconfig                            |     1 +
 arch/mips/ath25/board.c                            |     6 +-
 arch/mips/bmips/dma.c                              |    32 +-
 arch/mips/bmips/setup.c                            |     7 -
 arch/mips/boot/Makefile                            |    52 +-
 arch/mips/boot/ecoff.h                             |    61 +-
 arch/mips/boot/elf2ecoff.c                         |    31 +-
 arch/mips/cavium-octeon/dma-octeon.c               |   191 +-
 arch/mips/cavium-octeon/octeon-irq.c               |     2 +-
 arch/mips/cavium-octeon/octeon-platform.c          |     2 +-
 arch/mips/configs/malta_defconfig                  |     1 +
 arch/mips/configs/malta_kvm_defconfig              |     1 +
 arch/mips/configs/malta_kvm_guest_defconfig        |     1 +
 arch/mips/configs/malta_qemu_32r6_defconfig        |     1 +
 arch/mips/configs/maltaaprp_defconfig              |     1 +
 arch/mips/configs/maltasmvp_defconfig              |     1 +
 arch/mips/configs/maltasmvp_eva_defconfig          |     1 +
 arch/mips/configs/maltaup_defconfig                |     1 +
 arch/mips/configs/maltaup_xpa_defconfig            |     1 +
 arch/mips/generic/init.c                           |    13 -
 arch/mips/include/asm/bmips.h                      |    16 -
 arch/mips/include/asm/dma-coherence.h              |     6 +-
 arch/mips/include/asm/dma-direct.h                 |    17 +-
 arch/mips/include/asm/dma-mapping.h                |    21 +-
 arch/mips/include/asm/io.h                         |     4 +-
 arch/mips/include/asm/mach-ath25/dma-coherence.h   |    76 -
 arch/mips/include/asm/mach-bmips/dma-coherence.h   |    54 -
 .../include/asm/mach-cavium-octeon/dma-coherence.h |    79 -
 arch/mips/include/asm/mach-generic/dma-coherence.h |    73 -
 arch/mips/include/asm/mach-generic/kmalloc.h       |     3 +-
 arch/mips/include/asm/mach-ip27/dma-coherence.h    |    70 -
 arch/mips/include/asm/mach-ip32/dma-coherence.h    |    92 -
 arch/mips/include/asm/mach-jazz/dma-coherence.h    |    60 -
 .../include/asm/mach-loongson64/dma-coherence.h    |    93 -
 arch/mips/include/asm/mmu_context.h                |     2 -
 arch/mips/include/asm/octeon/cvmx-ciu-defs.h       | 10062 +------------------
 arch/mips/include/asm/octeon/pci-octeon.h          |     3 +
 arch/mips/jazz/jazzdma.c                           |   141 +-
 arch/mips/kernel/genex.S                           |    46 +
 arch/mips/kernel/idle.c                            |    12 +-
 arch/mips/kernel/process.c                         |    80 +-
 arch/mips/kernel/relocate_kernel.S                 |     4 +-
 arch/mips/kernel/setup.c                           |    24 +
 arch/mips/kernel/traps.c                           |     7 -
 arch/mips/lantiq/prom.c                            |     8 -
 arch/mips/loongson64/Kconfig                       |     5 -
 arch/mips/loongson64/common/Makefile               |     6 +-
 arch/mips/loongson64/common/dma-swiotlb.c          |   109 -
 arch/mips/loongson64/common/dma.c                  |    18 +
 arch/mips/loongson64/loongson-3/Makefile           |     2 +-
 arch/mips/loongson64/loongson-3/dma.c              |    25 +
 arch/mips/mm/Makefile                              |     4 +-
 arch/mips/mm/c-r4k.c                               |    12 +-
 arch/mips/mm/cache.c                               |     4 +-
 arch/mips/mm/dma-default.c                         |   404 -
 arch/mips/mm/dma-noncoherent.c                     |   208 +
 arch/mips/mm/dma-swiotlb.c                         |    61 +
 arch/mips/mm/page.c                                |    15 -
 arch/mips/mti-malta/Makefile                       |     2 -
 arch/mips/mti-malta/malta-pm.c                     |    96 -
 arch/mips/mti-malta/malta-reset.c                  |    30 -
 arch/mips/mti-malta/malta-setup.c                  |    39 +-
 arch/mips/netlogic/xlp/dt.c                        |    14 -
 arch/mips/pci/ops-bridge.c                         |     4 +-
 arch/mips/pci/pci-ar2315.c                         |    24 +
 arch/mips/pci/pci-ip27.c                           |    25 +-
 arch/mips/pci/pci-octeon.c                         |     4 -
 arch/mips/pci/pcie-octeon.c                        |     6 +-
 arch/mips/sgi-ip32/Makefile                        |     2 +-
 arch/mips/sgi-ip32/ip32-dma.c                      |    37 +
 arch/mips/sibyte/Kconfig                           |     1 -
 arch/mips/vr41xx/common/pmu.c                      |     3 +-
 include/linux/dma-noncoherent.h                    |     8 +
 kernel/dma/noncoherent.c                           |     8 +-
 77 files changed, 1040 insertions(+), 11672 deletions(-)
 delete mode 100644 arch/mips/include/asm/mach-ath25/dma-coherence.h
 delete mode 100644 arch/mips/include/asm/mach-bmips/dma-coherence.h
 delete mode 100644 arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
 delete mode 100644 arch/mips/include/asm/mach-generic/dma-coherence.h
 delete mode 100644 arch/mips/include/asm/mach-ip27/dma-coherence.h
 delete mode 100644 arch/mips/include/asm/mach-ip32/dma-coherence.h
 delete mode 100644 arch/mips/include/asm/mach-jazz/dma-coherence.h
 delete mode 100644 arch/mips/include/asm/mach-loongson64/dma-coherence.h
 delete mode 100644 arch/mips/loongson64/common/dma-swiotlb.c
 create mode 100644 arch/mips/loongson64/common/dma.c
 create mode 100644 arch/mips/loongson64/loongson-3/dma.c
 delete mode 100644 arch/mips/mm/dma-default.c
 create mode 100644 arch/mips/mm/dma-noncoherent.c
 create mode 100644 arch/mips/mm/dma-swiotlb.c
 delete mode 100644 arch/mips/mti-malta/malta-pm.c
 delete mode 100644 arch/mips/mti-malta/malta-reset.c
 create mode 100644 arch/mips/sgi-ip32/ip32-dma.c
Merging nds32/next (987553894f0c nds32: fix build error "relocation truncated to fit: R_NDS32_25_PCREL_RELA" when make allyesconfig)
$ git merge nds32/next
Merge made by the 'recursive' strategy.
 arch/nds32/Kconfig                  |  12 ++---
 arch/nds32/Makefile                 |   2 +
 arch/nds32/include/asm/cacheflush.h |   9 +++-
 arch/nds32/include/asm/futex.h      |   2 +-
 arch/nds32/kernel/setup.c           |   3 +-
 arch/nds32/mm/cacheflush.c          | 100 +++++++++++++++---------------------
 6 files changed, 58 insertions(+), 70 deletions(-)
Merging nios2/for-next (3d9644ef9a0f nios2: Use read_persistent_clock64() instead of read_persistent_clock())
$ git merge nios2/for-next
Already up to date.
Merging openrisc/for-next (ae15a41a6414 openrisc: entry: Fix delay slot exception detection)
$ git merge openrisc/for-next
Already up to date.
Merging parisc-hd/for-next (ce397d215ccd Linux 4.18-rc1)
$ git merge parisc-hd/for-next
Already up to date.
Merging powerpc/next (ff5bc793e47b powerpc/64s/radix: Fix missing ptesync in flush_cache_vmap)
$ git merge powerpc/next
Already up to date.
Merging fsl/next (c095ff93f901 powerpc/sysdev: change CPM GPIO to platform_device)
$ git merge fsl/next
Already up to date.
Merging risc-v/for-next (021c91791a5e Linux 4.18-rc3)
$ git merge risc-v/for-next
Already up to date.
Merging s390/features (6c8021503f72 s390/appldata: reuse generic proc handler functions)
$ git merge s390/features
Auto-merging init/Kconfig
Removing drivers/s390/crypto/ap_asm.h
Auto-merging drivers/s390/block/dasd.c
Auto-merging arch/s390/purgatory/Makefile
Auto-merging arch/s390/mm/pgalloc.c
Auto-merging arch/s390/boot/head.S
Auto-merging arch/s390/boot/compressed/vmlinux.scr.lds.S
Auto-merging arch/s390/boot/als.c
Auto-merging arch/s390/Kconfig
Merge made by the 'recursive' strategy.
 arch/s390/Kconfig                                  |   1 +
 arch/s390/Makefile                                 |  42 +--
 arch/s390/appldata/appldata_base.c                 | 122 ++++-----
 arch/s390/boot/Makefile                            |  45 +++-
 arch/s390/{kernel => boot}/als.c                   |  20 +-
 arch/s390/boot/compressed/.gitignore               |   1 +
 arch/s390/boot/compressed/Makefile                 |  55 ++--
 arch/s390/boot/compressed/head.S                   |   8 +-
 arch/s390/boot/compressed/misc.c                   |  37 ---
 arch/s390/boot/compressed/vmlinux.lds.S            |  15 +-
 .../compressed/{vmlinux.scr => vmlinux.scr.lds.S}  |   4 +
 arch/s390/boot/ebcdic.c                            |   2 +
 arch/s390/{kernel => boot}/head.S                  |  11 +-
 arch/s390/{kernel => boot}/head_kdump.S            |   0
 arch/s390/boot/mem.S                               |   2 +
 arch/s390/boot/sclp_early_core.c                   |   2 +
 arch/s390/hypfs/inode.c                            |   6 +-
 arch/s390/include/asm/ap.h                         | 284 +++++++++++++++++++--
 arch/s390/include/asm/lowcore.h                    |   2 +-
 arch/s390/include/asm/nospec-insn.h                |   4 +-
 arch/s390/include/asm/pci.h                        |   5 +
 arch/s390/include/asm/purgatory.h                  |   6 -
 arch/s390/include/asm/qdio.h                       |   1 -
 arch/s390/include/asm/sections.h                   |   2 -
 arch/s390/include/asm/setup.h                      |   4 +-
 arch/s390/kernel/Makefile                          |  24 +-
 arch/s390/kernel/early.c                           |  12 +
 arch/s390/kernel/entry.h                           |   1 -
 arch/s390/kernel/head64.S                          |  43 ++--
 arch/s390/kernel/perf_regs.c                       |   6 +-
 arch/s390/kernel/setup.c                           |   4 +-
 arch/s390/kernel/sysinfo.c                         |   4 +
 arch/s390/kernel/topology.c                        |  44 ++--
 arch/s390/kernel/vmlinux.lds.S                     |  13 +-
 arch/s390/mm/cmm.c                                 |  67 +++--
 arch/s390/mm/extmem.c                              |   4 +-
 arch/s390/mm/pgalloc.c                             |   2 +-
 arch/s390/pci/pci_debug.c                          |   8 +
 arch/s390/purgatory/Makefile                       |   9 +-
 arch/s390/purgatory/head.S                         |  45 ++--
 arch/s390/purgatory/purgatory.c                    |   9 -
 arch/s390/scripts/Makefile.chkbss                  |  11 +-
 arch/s390/tools/gen_opcode_table.c                 |   4 +-
 drivers/s390/block/dasd.c                          |  17 +-
 drivers/s390/block/dasd_alias.c                    |   2 +-
 drivers/s390/block/dasd_devmap.c                   |   2 +-
 drivers/s390/block/dasd_eer.c                      |   4 +-
 drivers/s390/block/scm_blk.c                       |   1 +
 drivers/s390/char/Makefile                         |   5 -
 drivers/s390/char/monwriter.c                      |   2 +-
 drivers/s390/char/sclp_async.c                     |  38 +--
 drivers/s390/char/tape_3590.c                      |   8 +-
 drivers/s390/char/tape_class.c                     |   4 +-
 drivers/s390/cio/qdio_main.c                       |   5 +-
 drivers/s390/crypto/ap_asm.h                       | 236 -----------------
 drivers/s390/crypto/ap_bus.c                       |  21 +-
 drivers/s390/crypto/ap_bus.h                       |   1 +
 drivers/s390/crypto/ap_card.c                      |   1 -
 drivers/s390/crypto/ap_queue.c                     |  20 --
 drivers/s390/crypto/zcrypt_card.c                  |  12 +
 drivers/s390/crypto/zcrypt_cca_key.h               |  20 +-
 drivers/s390/crypto/zcrypt_msgtype6.c              |  20 +-
 drivers/s390/crypto/zcrypt_queue.c                 |  12 +
 drivers/s390/scsi/zfcp_aux.c                       |   2 +-
 init/Kconfig                                       |  15 +-
 lib/raid6/s390vx.uc                                |  34 +--
 66 files changed, 712 insertions(+), 761 deletions(-)
 rename arch/s390/{kernel => boot}/als.c (83%)
 rename arch/s390/boot/compressed/{vmlinux.scr => vmlinux.scr.lds.S} (70%)
 create mode 100644 arch/s390/boot/ebcdic.c
 rename arch/s390/{kernel => boot}/head.S (98%)
 rename arch/s390/{kernel => boot}/head_kdump.S (100%)
 create mode 100644 arch/s390/boot/mem.S
 create mode 100644 arch/s390/boot/sclp_early_core.c
 delete mode 100644 drivers/s390/crypto/ap_asm.h
Merging sparc-next/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux)
$ git merge sparc-next/master
Already up to date.
Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM)
$ git merge sh/for-next
Already up to date.
Merging uml/linux-next (5ec9121195a4 um: Fix raw interface options)
$ git merge uml/linux-next
Already up to date.
Merging xtensa/xtensa-for-next (ae6063c83634 Merge branch 'xtensa-fixes' into xtensa-for-next)
$ git merge xtensa/xtensa-for-next
Auto-merging arch/xtensa/kernel/pci-dma.c
Merge made by the 'recursive' strategy.
 arch/xtensa/kernel/pci-dma.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
Merging fscrypt/master (e1cc40e5d42a fscrypt: log the crypto algorithm implementations)
$ git merge fscrypt/master
Already up to date.
Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues)
$ git merge befs/for-next
Merge made by the 'recursive' strategy.
 fs/befs/btree.c | 97 ++++++++++++++++++++++++++++++---------------------------
 1 file changed, 51 insertions(+), 46 deletions(-)
Merging btrfs/next (29dcea88779c Linux 4.17)
$ git merge btrfs/next
Already up to date.
Merging btrfs-kdave/for-next (fda94b4144b0 Merge branch 'for-next-next-v4.19-20180702' into for-next-20180702)
$ git merge btrfs-kdave/for-next
Merge made by the 'recursive' strategy.
 fs/btrfs/acl.c               |  13 +-
 fs/btrfs/backref.c           |   4 +-
 fs/btrfs/btrfs_inode.h       |   2 +-
 fs/btrfs/check-integrity.c   |   7 +-
 fs/btrfs/compression.c       |  21 +-
 fs/btrfs/ctree.c             |  53 +---
 fs/btrfs/ctree.h             |  61 ++--
 fs/btrfs/delayed-ref.c       |  43 ++-
 fs/btrfs/delayed-ref.h       |   6 +-
 fs/btrfs/dev-replace.c       |   8 +-
 fs/btrfs/disk-io.c           |  26 +-
 fs/btrfs/extent-tree.c       | 711 ++++++++++++++++++++-----------------------
 fs/btrfs/extent_io.c         | 146 ++++++++-
 fs/btrfs/file-item.c         |   2 +-
 fs/btrfs/file.c              |  74 +----
 fs/btrfs/free-space-cache.c  |  22 +-
 fs/btrfs/free-space-cache.h  |   3 +-
 fs/btrfs/inode-map.c         |  11 +-
 fs/btrfs/inode.c             |  42 +--
 fs/btrfs/ioctl.c             |  81 ++++-
 fs/btrfs/ordered-data.c      | 123 --------
 fs/btrfs/ordered-data.h      |  20 +-
 fs/btrfs/print-tree.c        |  39 +--
 fs/btrfs/props.c             |   2 +-
 fs/btrfs/reada.c             |   2 +-
 fs/btrfs/relocation.c        | 181 ++---------
 fs/btrfs/scrub.c             | 367 +---------------------
 fs/btrfs/send.c              |  17 +-
 fs/btrfs/super.c             |  49 +--
 fs/btrfs/transaction.c       |   2 +-
 fs/btrfs/transaction.h       |   2 +-
 fs/btrfs/tree-log.c          | 185 ++---------
 fs/btrfs/volumes.c           |  28 +-
 fs/btrfs/volumes.h           |   3 +-
 fs/btrfs/zstd.c              |  19 +-
 include/trace/events/btrfs.h |   3 +-
 include/uapi/linux/btrfs.h   |  26 ++
 37 files changed, 811 insertions(+), 1593 deletions(-)
Merging ceph/master (8b8f53af1ed9 ceph: fix dentry leak in splice_dentry())
$ git merge ceph/master
Already up to date.
Merging cifs/for-next (3ab0f9756d9d smb3: snapshot mounts are read-only and make sure info is displayable about the mount)
$ git merge cifs/for-next
Merge made by the 'recursive' strategy.
 Documentation/filesystems/cifs/CHANGES | 1072 +-------------------------------
 fs/cifs/Kconfig                        |   50 +-
 fs/cifs/cache.c                        |    6 +-
 fs/cifs/cifs_debug.c                   |   33 +-
 fs/cifs/cifsencrypt.c                  |   12 +-
 fs/cifs/cifsfs.c                       |   31 +-
 fs/cifs/cifsglob.h                     |   14 +-
 fs/cifs/cifsproto.h                    |    6 +-
 fs/cifs/cifssmb.c                      |   12 +-
 fs/cifs/connect.c                      |   28 +-
 fs/cifs/fscache.c                      |   12 +-
 fs/cifs/fscache.h                      |    8 +-
 fs/cifs/inode.c                        |   36 +-
 fs/cifs/netmisc.c                      |   19 +-
 fs/cifs/smb2misc.c                     |   13 +-
 fs/cifs/smb2ops.c                      |   48 +-
 fs/cifs/smb2pdu.c                      |  203 +++---
 fs/cifs/smb2pdu.h                      |   12 +
 fs/cifs/smb2proto.h                    |    5 +-
 fs/cifs/smb2transport.c                |    4 -
 fs/cifs/transport.c                    |    4 -
 21 files changed, 340 insertions(+), 1288 deletions(-)
Merging configfs/for-next (1823342a1f2b configfs: replace strncpy with memcpy)
$ git merge configfs/for-next
Merge made by the 'recursive' strategy.
 fs/configfs/item.c    | 24 ++++--------------------
 fs/configfs/symlink.c |  2 +-
 2 files changed, 5 insertions(+), 21 deletions(-)
Merging ecryptfs/next (5dcea554d5ce eCryptfs: fix a couple type promotion bugs)
$ git merge ecryptfs/next
Merge made by the 'recursive' strategy.
 fs/ecryptfs/crypto.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
Merging ext3/for_next (6aee47d7f61e Pull in fsnotify cleanups from Amir and new inotify IN_MASK_CREATE flag support.)
$ git merge ext3/for_next
Merge made by the 'recursive' strategy.
 fs/ext2/inode.c                    |   2 +-
 fs/ext2/super.c                    |   7 +--
 fs/notify/fanotify/fanotify_user.c |  99 +++++++++++++----------------------
 fs/notify/fdinfo.c                 |   8 +--
 fs/notify/fsnotify.h               |  16 +++++-
 fs/notify/inotify/inotify_user.c   |   9 +++-
 fs/notify/mark.c                   | 103 ++++++++++++++++++++-----------------
 fs/udf/ialloc.c                    |   2 +-
 fs/udf/inode.c                     |  45 ++++++----------
 fs/udf/super.c                     |   8 +--
 fs/udf/udf_i.h                     |   2 +-
 fs/udf/udf_sb.h                    |   2 +-
 fs/udf/udfdecl.h                   |   4 +-
 fs/udf/udftime.c                   |   6 +--
 include/linux/fsnotify_backend.h   |  40 +++++++++-----
 include/linux/inotify.h            |   2 +-
 include/uapi/linux/inotify.h       |   1 +
 kernel/audit_tree.c                |  17 +++---
 18 files changed, 190 insertions(+), 183 deletions(-)
Merging ext4/dev (9a4bd84ed7c6 ext4: check superblock mapped prior to committing)
$ git merge ext4/dev
Merge made by the 'recursive' strategy.
Merging f2fs/dev (92a3afc764ea f2fs: do checkpoint in kill_sb)
$ git merge f2fs/dev
Merge made by the 'recursive' strategy.
 fs/f2fs/data.c  |  7 +++----
 fs/f2fs/node.c  |  7 +++++++
 fs/f2fs/super.c | 16 +++++++++++++---
 3 files changed, 23 insertions(+), 7 deletions(-)
Merging fuse/for-next (44ce5c2e921f fs: fuse: Adding new return type vm_fault_t)
$ 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 (bd646104ac5a jfs: use time64_t for otime)
$ git merge jfs/jfs-next
Merge made by the 'recursive' strategy.
 fs/jfs/jfs_incore.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging nfs/linux-next (7b0df92ac121 pNFS/flexfiles: Process writeback resends from nfsiod context as well)
$ git merge nfs/linux-next
Already up to date.
Merging nfs-anna/linux-next (ffbfa2ce88f1 sunrpc: Fix latency trace point crashes)
$ git merge nfs-anna/linux-next
Merge made by the 'recursive' strategy.
Merging nfsd/nfsd-next (8163496e78db nfsd: don't advertise a SCSI layout for an unsupported request_queue)
$ git merge nfsd/nfsd-next
Merge made by the 'recursive' strategy.
 fs/nfsd/netns.h       |  1 +
 fs/nfsd/nfs4layouts.c | 11 ++---------
 fs/nfsd/nfs4proc.c    | 18 ++++++++++++++----
 fs/nfsd/nfs4state.c   | 51 ++++++++++++++++++++++++++++++++++++++++-----------
 fs/nfsd/nfs4xdr.c     | 39 ++++++++++++++++++++++++++++++++++++---
 fs/nfsd/nfsctl.c      |  5 +++--
 fs/nfsd/nfsd.h        |  1 +
 include/linux/nfs4.h  |  8 ++++++++
 8 files changed, 105 insertions(+), 29 deletions(-)
Merging orangefs/for-next (b1116bc03c00 orangefs: use sparse annotations for holding locks across function calls.)
$ git merge orangefs/for-next
Already up to date.
Merging overlayfs/overlayfs-next (6137aef754d1 ovl: Enable metadata only feature)
$ git merge overlayfs/overlayfs-next
Auto-merging include/linux/fs.h
Auto-merging fs/inode.c
Auto-merging fs/btrfs/ioctl.c
Auto-merging fs/btrfs/ctree.h
Auto-merging Documentation/filesystems/vfs.txt
Auto-merging Documentation/filesystems/Locking
Merge made by the 'recursive' strategy.
 Documentation/filesystems/Locking       |   3 +-
 Documentation/filesystems/overlayfs.txt |  90 ++++--
 Documentation/filesystems/vfs.txt       |  16 +-
 fs/btrfs/ctree.h                        |   5 +-
 fs/btrfs/ioctl.c                        |  11 +-
 fs/file_table.c                         |  13 +-
 fs/inode.c                              |  46 +--
 fs/internal.h                           |  17 +-
 fs/ioctl.c                              |   1 +
 fs/locks.c                              |  20 +-
 fs/namei.c                              |   2 +-
 fs/namespace.c                          |  69 +----
 fs/ocfs2/file.c                         |  17 +-
 fs/open.c                               |  85 +++---
 fs/overlayfs/Kconfig                    |  19 ++
 fs/overlayfs/Makefile                   |   4 +-
 fs/overlayfs/copy_up.c                  | 190 ++++++++----
 fs/overlayfs/dir.c                      | 105 +++++--
 fs/overlayfs/export.c                   |   3 +
 fs/overlayfs/file.c                     | 511 ++++++++++++++++++++++++++++++++
 fs/overlayfs/inode.c                    | 175 +++++++----
 fs/overlayfs/namei.c                    | 195 +++++++-----
 fs/overlayfs/overlayfs.h                |  47 ++-
 fs/overlayfs/ovl_entry.h                |   6 +-
 fs/overlayfs/super.c                    | 103 ++++---
 fs/overlayfs/util.c                     | 252 +++++++++++++++-
 fs/read_write.c                         |  94 +++---
 fs/xattr.c                              |   9 +-
 fs/xfs/xfs_file.c                       |  29 +-
 include/linux/dcache.h                  |  15 +-
 include/linux/fs.h                      |  29 +-
 include/linux/fsnotify.h                |  14 +-
 32 files changed, 1599 insertions(+), 596 deletions(-)
 create mode 100644 fs/overlayfs/file.c
Merging ubifs/linux-next (f5a926dd5298 mtd: ubi: Update ubi-media.h to dual license)
$ git merge ubifs/linux-next
Already up to date.
Merging xfs/for-next (d8cb5e423789 xfs: fix fdblocks accounting w/ RMAPBT per-AG reservation)
$ git merge xfs/for-next
Already up to date.
Merging file-locks/locks-next (1cf8e5de4055 fs/lock: show locks taken by processes from another pidns)
$ git merge file-locks/locks-next
Auto-merging fs/locks.c
Merge made by the 'recursive' strategy.
 fs/locks.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
Merging vfs/for-next (6c06e521993d Merge branch 'fixes' into for-next)
$ git merge vfs/for-next
Auto-merging security/smack/smack_lsm.c
Auto-merging security/selinux/selinuxfs.c
Auto-merging net/socket.c
Auto-merging kernel/trace/trace.c
Auto-merging init/Kconfig
Auto-merging include/linux/syscalls.h
Auto-merging include/linux/fs.h
CONFLICT (content): Merge conflict in include/linux/fs.h
Auto-merging include/linux/dcache.h
Auto-merging fs/udf/super.c
Auto-merging fs/pipe.c
Auto-merging fs/overlayfs/super.c
Auto-merging fs/nfsd/nfsctl.c
Auto-merging fs/namespace.c
Auto-merging fs/internal.h
Auto-merging fs/file_table.c
Auto-merging fs/f2fs/super.c
Auto-merging fs/ext4/super.c
Auto-merging fs/ext2/super.c
Auto-merging fs/cifs/cifsfs.c
Auto-merging fs/btrfs/super.c
Auto-merging fs/autofs/init.c
Auto-merging fs/aio.c
Auto-merging drivers/usb/gadget/function/f_fs.c
Auto-merging drivers/misc/ibmasm/ibmasmfs.c
Auto-merging drivers/gpu/drm/drm_drv.c
Auto-merging drivers/dax/super.c
Auto-merging arch/s390/hypfs/inode.c
Resolved 'include/linux/fs.h' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 45a35ff9a44a] Merge remote-tracking branch 'vfs/for-next'
$ git diff -M --stat --summary HEAD^..
 Documentation/filesystems/mount_api.txt   | 439 ++++++++++++++++++
 arch/arc/kernel/setup.c                   |   1 +
 arch/arm/kernel/atags_parse.c             |   1 +
 arch/ia64/kernel/perfmon.c                |   3 +-
 arch/powerpc/platforms/cell/spufs/inode.c |   6 +-
 arch/s390/hypfs/inode.c                   |   7 +-
 arch/sh/kernel/setup.c                    |   1 +
 arch/sparc/kernel/setup_32.c              |   1 +
 arch/sparc/kernel/setup_64.c              |   1 +
 arch/x86/entry/syscalls/syscall_32.tbl    |   6 +
 arch/x86/entry/syscalls/syscall_64.tbl    |   6 +
 arch/x86/kernel/cpu/intel_rdt.h           |  24 +
 arch/x86/kernel/cpu/intel_rdt_rdtgroup.c  | 151 ++++---
 arch/x86/kernel/setup.c                   |   1 +
 drivers/base/devtmpfs.c                   |   7 +-
 drivers/dax/super.c                       |   2 +-
 drivers/gpu/drm/drm_drv.c                 |   3 +-
 drivers/gpu/drm/i915/i915_gemfs.c         |   2 +-
 drivers/infiniband/hw/qib/qib_fs.c        |   7 +-
 drivers/misc/cxl/api.c                    |   3 +-
 drivers/misc/ibmasm/ibmasmfs.c            |  11 +-
 drivers/mtd/mtdsuper.c                    |  26 +-
 drivers/oprofile/oprofilefs.c             |   8 +-
 drivers/scsi/cxlflash/ocxl_hw.c           |   2 +-
 drivers/usb/gadget/function/f_fs.c        |   7 +-
 drivers/usb/gadget/legacy/inode.c         |   7 +-
 drivers/virtio/virtio_balloon.c           |   2 +-
 drivers/xen/xenfs/super.c                 |   7 +-
 fs/9p/vfs_super.c                         |   2 +-
 fs/Makefile                               |   5 +-
 fs/adfs/super.c                           |   9 +-
 fs/affs/super.c                           |  13 +-
 fs/afs/internal.h                         |   9 +-
 fs/afs/mntpt.c                            | 147 +++---
 fs/afs/super.c                            | 536 ++++++++++++++--------
 fs/afs/volume.c                           |   4 +-
 fs/aio.c                                  |   3 +-
 fs/anon_inodes.c                          |   3 +-
 fs/autofs/autofs_i.h                      |   2 +-
 fs/autofs/init.c                          |   4 +-
 fs/autofs/inode.c                         |   3 +-
 fs/befs/linuxvfs.c                        |  11 +-
 fs/bfs/inode.c                            |   8 +-
 fs/binfmt_misc.c                          |   7 +-
 fs/block_dev.c                            |   2 +-
 fs/btrfs/super.c                          |  30 +-
 fs/btrfs/tests/btrfs-tests.c              |   2 +-
 fs/ceph/super.c                           |   3 +-
 fs/cifs/cifs_dfs_ref.c                    |   3 +-
 fs/cifs/cifsfs.c                          |  18 +-
 fs/coda/inode.c                           |  11 +-
 fs/configfs/mount.c                       |   7 +-
 fs/cramfs/inode.c                         |  17 +-
 fs/dcache.c                               |  27 --
 fs/debugfs/inode.c                        |  14 +-
 fs/devpts/inode.c                         |  10 +-
 fs/ecryptfs/main.c                        |   2 +-
 fs/efivarfs/super.c                       |   9 +-
 fs/efs/super.c                            |  14 +-
 fs/exofs/super.c                          |   7 +-
 fs/ext2/super.c                           |  14 +-
 fs/ext4/super.c                           |  16 +-
 fs/f2fs/super.c                           |  13 +-
 fs/fat/inode.c                            |   3 +-
 fs/fat/namei_msdos.c                      |   8 +-
 fs/fat/namei_vfat.c                       |   8 +-
 fs/file_table.c                           |   9 +-
 fs/freevxfs/vxfs_super.c                  |  12 +-
 fs/fs_context.c                           | 691 ++++++++++++++++++++++++++++
 fs/fsopen.c                               | 332 ++++++++++++++
 fs/fuse/control.c                         |   9 +-
 fs/fuse/inode.c                           |  16 +-
 fs/gfs2/ops_fstype.c                      |   6 +-
 fs/gfs2/super.c                           |   4 +-
 fs/hfs/super.c                            |  12 +-
 fs/hfsplus/super.c                        |  12 +-
 fs/hostfs/hostfs_kern.c                   |   7 +-
 fs/hpfs/super.c                           |  11 +-
 fs/hugetlbfs/inode.c                      | 339 ++++++++------
 fs/internal.h                             |   6 +-
 fs/isofs/inode.c                          |  11 +-
 fs/jffs2/super.c                          |  10 +-
 fs/jfs/super.c                            |  11 +-
 fs/kernfs/mount.c                         |  88 ++--
 fs/libfs.c                                |  17 +-
 fs/minix/inode.c                          |  14 +-
 fs/namespace.c                            | 729 +++++++++++++++++++++++-------
 fs/nfs/internal.h                         |   4 +-
 fs/nfs/namespace.c                        |   3 +-
 fs/nfs/nfs4namespace.c                    |   3 +-
 fs/nfs/nfs4super.c                        |  27 +-
 fs/nfs/super.c                            |  22 +-
 fs/nfsd/nfsctl.c                          |   8 +-
 fs/nilfs2/super.c                         |  10 +-
 fs/nsfs.c                                 |   3 +-
 fs/ntfs/super.c                           |  13 +-
 fs/ocfs2/dlmfs/dlmfs.c                    |   5 +-
 fs/ocfs2/super.c                          |  14 +-
 fs/omfs/inode.c                           |   9 +-
 fs/openpromfs/inode.c                     |  11 +-
 fs/orangefs/orangefs-kernel.h             |   2 +-
 fs/orangefs/super.c                       |   5 +-
 fs/overlayfs/super.c                      |  11 +-
 fs/pipe.c                                 |   3 +-
 fs/pnode.c                                |   1 +
 fs/proc/inode.c                           |  50 +-
 fs/proc/internal.h                        |   6 +-
 fs/proc/root.c                            | 212 ++++++---
 fs/pstore/inode.c                         |  10 +-
 fs/qnx4/inode.c                           |  14 +-
 fs/qnx6/inode.c                           |  14 +-
 fs/ramfs/inode.c                          |   6 +-
 fs/reiserfs/super.c                       |  14 +-
 fs/romfs/super.c                          |  13 +-
 fs/squashfs/super.c                       |  12 +-
 fs/statfs.c                               | 470 +++++++++++++++++++
 fs/super.c                                | 402 ++++++++++++----
 fs/sysfs/mount.c                          |  64 ++-
 fs/sysv/inode.c                           |   3 +-
 fs/sysv/super.c                           |  16 +-
 fs/tracefs/inode.c                        |  10 +-
 fs/ubifs/super.c                          |   5 +-
 fs/udf/super.c                            |  16 +-
 fs/ufs/super.c                            |  11 +-
 fs/xfs/xfs_super.c                        |  10 +-
 include/linux/cgroup.h                    |   3 +-
 include/linux/dcache.h                    |   2 -
 include/linux/debugfs.h                   |   8 +-
 include/linux/fs.h                        |  49 +-
 include/linux/fs_context.h                | 178 ++++++++
 include/linux/fsinfo.h                    |  40 ++
 include/linux/kernfs.h                    |  39 +-
 include/linux/lsm_hooks.h                 |  88 +++-
 include/linux/module.h                    |   6 +
 include/linux/mount.h                     |   8 +-
 include/linux/mtd/super.h                 |   4 +-
 include/linux/ramfs.h                     |   4 +-
 include/linux/security.h                  |  74 ++-
 include/linux/shmem_fs.h                  |   3 +-
 include/linux/syscalls.h                  |  11 +
 include/uapi/linux/fcntl.h                |   2 +
 include/uapi/linux/fs.h                   |  68 +--
 include/uapi/linux/fsinfo.h               | 237 ++++++++++
 include/uapi/linux/mount.h                |  75 +++
 init/Kconfig                              |  10 -
 init/do_mounts.c                          |   5 +-
 init/do_mounts_initrd.c                   |   1 +
 ipc/mqueue.c                              | 120 ++++-
 kernel/bpf/inode.c                        |   7 +-
 kernel/cgroup/cgroup-internal.h           |  49 +-
 kernel/cgroup/cgroup-v1.c                 | 302 ++++++-------
 kernel/cgroup/cgroup.c                    | 226 +++++----
 kernel/cgroup/cpuset.c                    |  67 ++-
 kernel/trace/trace.c                      |   7 +-
 mm/shmem.c                                |  10 +-
 mm/zsmalloc.c                             |   3 +-
 net/socket.c                              |   3 +-
 net/sunrpc/rpc_pipe.c                     |   7 +-
 samples/statx/Makefile                    |   5 +-
 samples/statx/test-fsinfo.c               | 539 ++++++++++++++++++++++
 security/apparmor/apparmorfs.c            |   8 +-
 security/apparmor/include/mount.h         |  11 +-
 security/apparmor/lsm.c                   |  84 +++-
 security/apparmor/mount.c                 |  47 ++
 security/inode.c                          |   7 +-
 security/security.c                       |  70 ++-
 security/selinux/hooks.c                  | 294 +++++++++++-
 security/selinux/selinuxfs.c              |   8 +-
 security/smack/smack_lsm.c                | 344 ++++++++++++--
 security/smack/smackfs.c                  |   9 +-
 security/tomoyo/common.h                  |   3 +
 security/tomoyo/mount.c                   |  46 ++
 security/tomoyo/tomoyo.c                  |  19 +-
 173 files changed, 7036 insertions(+), 1778 deletions(-)
 create mode 100644 Documentation/filesystems/mount_api.txt
 create mode 100644 fs/fs_context.c
 create mode 100644 fs/fsopen.c
 create mode 100644 include/linux/fs_context.h
 create mode 100644 include/linux/fsinfo.h
 create mode 100644 include/uapi/linux/fsinfo.h
 create mode 100644 include/uapi/linux/mount.h
 create mode 100644 samples/statx/test-fsinfo.c
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 (ce041c43f222 lib/test_printf.c: accept "ptrval" as valid result for plain 'p' tests)
$ git merge printk/for-next
Merge made by the 'recursive' strategy.
 lib/test_printf.c | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)
Merging pci/next (ce397d215ccd Linux 4.18-rc1)
$ git merge pci/next
Already up to date.
Merging pstore/for-next/pstore (e698aaf37f9f pstore: fix crypto dependencies without compression)
$ git merge pstore/for-next/pstore
Already up to date.
Merging hid/for-next (0bd89960cb03 Merge branch 'for-4.18/upstream-fixes_v2' into for-next)
$ git merge hid/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/input/hid-over-i2c.txt     |   3 +-
 drivers/hid/hid-core.c                             |   5 +-
 drivers/hid/hid-debug.c                            |   8 +-
 drivers/hid/hid-ntrig.c                            |   2 +
 drivers/hid/hid-redragon.c                         |  26 +-
 drivers/hid/hid-wiimote-core.c                     |  14 +
 drivers/hid/hid-wiimote-modules.c                  | 440 +++++++++++++++++++++
 drivers/hid/hid-wiimote.h                          |   3 +
 drivers/hid/i2c-hid/i2c-hid.c                      |  57 ++-
 drivers/hid/usbhid/hid-core.c                      |   7 +-
 drivers/hid/wacom_sys.c                            | 105 ++---
 drivers/hid/wacom_wac.c                            |  30 +-
 include/linux/hid.h                                |   3 +-
 include/linux/platform_data/i2c-hid.h              |   7 +-
 14 files changed, 583 insertions(+), 127 deletions(-)
Merging i2c/i2c/for-next (5fa8578ef7cd Merge branch 'i2c/for-4.19' into i2c/for-next)
$ git merge i2c/i2c/for-next
Merge made by the 'recursive' strategy.
 Documentation/i2c/busses/i2c-i801          |  11 +-
 Documentation/i2c/gpio-fault-injection     |  49 ++++++--
 drivers/char/tpm/tpm_i2c_infineon.c        |   8 +-
 drivers/i2c/busses/Kconfig                 |  11 +-
 drivers/i2c/busses/i2c-brcmstb.c           |   8 +-
 drivers/i2c/busses/i2c-davinci.c           |   4 +-
 drivers/i2c/busses/i2c-designware-common.c |  76 ++++++++++++
 drivers/i2c/busses/i2c-designware-core.h   |   2 +
 drivers/i2c/busses/i2c-designware-master.c | 191 +++++++++++++++++------------
 drivers/i2c/busses/i2c-designware-slave.c  |  47 ++-----
 drivers/i2c/busses/i2c-gpio.c              |  97 ++++++++++-----
 drivers/i2c/busses/i2c-i801.c              |   4 +
 drivers/i2c/busses/i2c-s3c2410.c           |   4 +-
 drivers/i2c/busses/i2c-sprd.c              |   8 +-
 drivers/i2c/busses/i2c-tegra.c             |  90 +++++++++++---
 drivers/i2c/i2c-core-slave.c               |   8 +-
 drivers/i2c/i2c-core-smbus.c               |  28 +++--
 drivers/i2c/i2c-mux.c                      |   4 +-
 drivers/i2c/muxes/i2c-mux-mlxcpld.c        |  28 +----
 drivers/i2c/muxes/i2c-mux-pca9541.c        |  75 +++--------
 drivers/i2c/muxes/i2c-mux-pca954x.c        |  27 +---
 drivers/iio/temperature/mlx90614.c         |   4 +-
 drivers/input/touchscreen/rohm_bu21023.c   |   4 +-
 drivers/media/dvb-frontends/af9013.c       |   8 +-
 drivers/media/dvb-frontends/drxk_hard.c    |   4 +-
 drivers/media/dvb-frontends/rtl2830.c      |  12 +-
 drivers/media/dvb-frontends/tda1004x.c     |   6 +-
 drivers/media/tuners/tda18271-common.c     |   8 +-
 drivers/mfd/88pm860x-i2c.c                 |   8 +-
 include/linux/i2c.h                        |  23 ++--
 30 files changed, 486 insertions(+), 371 deletions(-)
Merging dmi/master (7f73745fec52 firmware: dmi: Add access to the SKU ID string)
$ git merge dmi/master
Merge made by the 'recursive' strategy.
Merging hwmon-staging/hwmon-next (48c87a0ccc3f hwmon: Add NPCM7xx PWM and Fan driver)
$ git merge hwmon-staging/hwmon-next
Auto-merging drivers/hwmon/Makefile
Auto-merging drivers/hwmon/Kconfig
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/hwmon/npcm750-pwm-fan.txt  |   84 ++
 Documentation/hwmon/max34440                       |   16 +-
 Documentation/hwmon/mlxreg-fan                     |   60 ++
 Documentation/hwmon/npcm750-pwm-fan                |   22 +
 Documentation/hwmon/sysfs-interface                |   48 +
 drivers/hwmon/Kconfig                              |   22 +
 drivers/hwmon/Makefile                             |    2 +
 drivers/hwmon/emc1403.c                            |    2 +
 drivers/hwmon/mlxreg-fan.c                         |  489 +++++++++
 drivers/hwmon/nct6775.c                            |    6 +-
 drivers/hwmon/nct7904.c                            |   68 +-
 drivers/hwmon/npcm750-pwm-fan.c                    | 1057 ++++++++++++++++++++
 drivers/hwmon/pmbus/Kconfig                        |    2 +-
 drivers/hwmon/pmbus/max34440.c                     |   93 +-
 14 files changed, 1926 insertions(+), 45 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/hwmon/npcm750-pwm-fan.txt
 create mode 100644 Documentation/hwmon/mlxreg-fan
 create mode 100644 Documentation/hwmon/npcm750-pwm-fan
 create mode 100644 drivers/hwmon/mlxreg-fan.c
 create mode 100644 drivers/hwmon/npcm750-pwm-fan.c
Merging jc_docs/docs-next (ea272257ccba docs: histogram.txt: convert it to ReST file format)
$ git merge jc_docs/docs-next
Auto-merging MAINTAINERS
Auto-merging Documentation/trace/histogram.rst
Merge made by the 'recursive' strategy.
 Documentation/admin-guide/README.rst               |    2 +
 Documentation/core-api/idr.rst                     |    2 +
 Documentation/dev-tools/kselftest.rst              |    5 +
 Documentation/devicetree/bindings/leds/common.txt  |    2 +-
 Documentation/doc-guide/kernel-doc.rst             |    9 +-
 Documentation/doc-guide/parse-headers.rst          |    4 +-
 Documentation/doc-guide/sphinx.rst                 |    2 +-
 Documentation/index.rst                            |   26 +-
 Documentation/kernel-hacking/index.rst             |    2 +
 Documentation/nommu-mmap.txt                       |    2 +-
 Documentation/process/2.Process.rst                |    2 +-
 Documentation/process/howto.rst                    |    2 +-
 Documentation/sphinx/kerneldoc.py                  |   10 +-
 Documentation/sphinx/parse-headers.pl              |    2 +-
 Documentation/sysctl/vm.txt                        |   13 +
 Documentation/trace/events.rst                     |    2 +-
 .../trace/{histogram.txt => histogram.rst}         | 1250 ++++++++++----------
 Documentation/trace/index.rst                      |    1 +
 Documentation/translations/index.rst               |   13 +
 .../translations/it_IT/disclaimer-ita.rst          |   13 +
 .../translations/it_IT/doc-guide/index.rst         |   24 +
 .../translations/it_IT/doc-guide/kernel-doc.rst    |  554 +++++++++
 .../translations/it_IT/doc-guide/parse-headers.rst |  196 +++
 .../translations/it_IT/doc-guide/sphinx.rst        |  457 +++++++
 Documentation/translations/it_IT/index.rst         |  117 ++
 Documentation/translations/zh_CN/oops-tracing.txt  |    4 +-
 MAINTAINERS                                        |    8 +-
 include/linux/gpio.h                               |    2 +-
 kernel/trace/Kconfig                               |    2 +-
 scripts/documentation-file-ref-check               |    6 +
 30 files changed, 2073 insertions(+), 661 deletions(-)
 rename Documentation/trace/{histogram.txt => histogram.rst} (73%)
 create mode 100644 Documentation/translations/index.rst
 create mode 100644 Documentation/translations/it_IT/disclaimer-ita.rst
 create mode 100644 Documentation/translations/it_IT/doc-guide/index.rst
 create mode 100644 Documentation/translations/it_IT/doc-guide/kernel-doc.rst
 create mode 100644 Documentation/translations/it_IT/doc-guide/parse-headers.rst
 create mode 100644 Documentation/translations/it_IT/doc-guide/sphinx.rst
 create mode 100644 Documentation/translations/it_IT/index.rst
Merging v4l-dvb/master (666e994aa227 media: platform: s5p-mfc: simplify getting .drvdata)
$ git merge v4l-dvb/master
Removing drivers/media/pci/cx25821/cx25821-video-upstream.h
Removing drivers/media/pci/cx25821/cx25821-video-upstream.c
Removing drivers/media/pci/cx25821/cx25821-audio-upstream.h
Removing drivers/media/pci/cx25821/cx25821-audio-upstream.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/media/i2c/ak7375.txt       |    8 +
 .../bindings/media/i2c/dongwoon,dw9807.txt         |    9 +
 .../devicetree/bindings/media/i2c/nokia,smia.txt   |    3 +
 .../devicetree/bindings/media/i2c/ov5640.txt       |    5 +
 .../devicetree/bindings/media/nvidia,tegra-vde.txt |   11 +-
 .../devicetree/bindings/media/rcar_vin.txt         |   25 +-
 .../devicetree/bindings/media/video-interfaces.txt |    4 +
 .../media/uapi/mediactl/media-ioc-device-info.rst  |   48 +-
 .../uapi/mediactl/media-ioc-enum-entities.rst      |   83 +-
 .../media/uapi/mediactl/media-ioc-enum-links.rst   |   70 +-
 .../media/uapi/mediactl/media-ioc-g-topology.rst   |  204 +--
 Documentation/media/uapi/mediactl/media-types.rst  |  499 ++-----
 Documentation/media/uapi/v4l/extended-controls.rst |   48 +-
 Documentation/media/uapi/v4l/subdev-formats.rst    |   15 +-
 MAINTAINERS                                        |   26 +
 arch/sh/boards/mach-ap325rxa/setup.c               |  282 ++--
 arch/sh/boards/mach-kfr2r09/setup.c                |  217 ++-
 arch/sh/boards/mach-migor/setup.c                  |    7 +-
 arch/sh/boards/mach-se/7724/setup.c                |  120 +-
 arch/sh/kernel/cpu/sh4a/clock-sh7723.c             |    2 +-
 drivers/media/dvb-core/dvbdev.c                    |   18 +-
 drivers/media/i2c/Kconfig                          |   31 +
 drivers/media/i2c/Makefile                         |    3 +
 drivers/media/i2c/adv748x/adv748x-csi2.c           |    2 +-
 drivers/media/i2c/adv7604.c                        |    7 +-
 drivers/media/i2c/ak7375.c                         |  292 ++++
 drivers/media/i2c/cx25840/cx25840-core.h           |   33 +-
 drivers/media/i2c/dw9807.c                         |  329 +++++
 drivers/media/i2c/imx258.c                         |    8 +
 drivers/media/i2c/imx274.c                         |  194 ++-
 drivers/media/i2c/lm3560.c                         |    3 +-
 drivers/media/i2c/ov5640.c                         |  163 ++-
 drivers/media/i2c/ov772x.c                         |  353 +++--
 drivers/media/i2c/rj54n1cb0c.c                     | 1437 ++++++++++++++++++++
 drivers/media/i2c/smiapp/smiapp-core.c             |   16 +
 drivers/media/i2c/soc_camera/ov772x.c              |    2 +-
 drivers/media/i2c/tc358743.c                       |    5 +-
 drivers/media/i2c/tvp5150.c                        |    2 +-
 drivers/media/media-device.c                       |   13 +-
 drivers/media/pci/bt8xx/bttv-driver.c              |    2 +-
 drivers/media/pci/cx18/cx18-driver.c               |    2 -
 drivers/media/pci/cx25821/cx25821-audio-upstream.c |  679 ---------
 drivers/media/pci/cx25821/cx25821-audio-upstream.h |   58 -
 drivers/media/pci/cx25821/cx25821-video-upstream.c |  673 ---------
 drivers/media/pci/cx25821/cx25821-video-upstream.h |  135 --
 drivers/media/pci/cx25821/cx25821.h                |   12 -
 drivers/media/pci/cx88/cx88-alsa.c                 |    7 +-
 drivers/media/pci/ivtv/ivtv-i2c.c                  |    1 +
 drivers/media/pci/sta2x11/sta2x11_vip.c            |    6 +
 drivers/media/platform/Kconfig                     |    2 +-
 drivers/media/platform/atmel/atmel-isi.c           |   27 +-
 drivers/media/platform/cadence/Kconfig             |    2 +
 drivers/media/platform/cadence/cdns-csi2rx.c       |    1 +
 drivers/media/platform/cadence/cdns-csi2tx.c       |    1 +
 drivers/media/platform/coda/coda-bit.c             |   38 +-
 drivers/media/platform/coda/coda-common.c          |  144 +-
 drivers/media/platform/coda/coda.h                 |    2 +
 drivers/media/platform/coda/coda_regs.h            |    1 +
 drivers/media/platform/exynos4-is/media-dev.c      |    6 +-
 drivers/media/platform/exynos4-is/mipi-csis.c      |    6 +-
 drivers/media/platform/fsl-viu.c                   |   38 +-
 drivers/media/platform/m2m-deinterlace.c           |   25 +-
 drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c       |   20 +-
 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c |   23 +-
 drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c |   16 -
 drivers/media/platform/mtk-vpu/mtk_vpu.c           |    2 +-
 drivers/media/platform/mx2_emmaprp.c               |   21 +-
 drivers/media/platform/omap/Kconfig                |    1 +
 drivers/media/platform/omap3isp/isp.c              |    6 +-
 drivers/media/platform/qcom/venus/vdec.c           |    2 -
 drivers/media/platform/qcom/venus/vdec_ctrls.c     |   10 +-
 drivers/media/platform/qcom/venus/venc.c           |    6 +-
 drivers/media/platform/qcom/venus/venc_ctrls.c     |   10 +-
 drivers/media/platform/rcar-vin/rcar-core.c        |  313 +++--
 drivers/media/platform/rcar-vin/rcar-dma.c         |   52 +-
 drivers/media/platform/rcar-vin/rcar-v4l2.c        |   12 +-
 drivers/media/platform/rcar-vin/rcar-vin.h         |   31 +-
 drivers/media/platform/rcar_jpu.c                  |    6 -
 drivers/media/platform/renesas-ceu.c               |   91 +-
 drivers/media/platform/rockchip/rga/rga-buf.c      |   45 +-
 drivers/media/platform/rockchip/rga/rga.c          |   14 +-
 drivers/media/platform/rockchip/rga/rga.h          |    2 -
 drivers/media/platform/s3c-camif/camif-capture.c   |    2 +
 drivers/media/platform/s5p-g2d/g2d.c               |    3 +-
 drivers/media/platform/s5p-mfc/s5p_mfc.c           |    6 +-
 drivers/media/platform/s5p-mfc/s5p_mfc_enc.c       |   15 +-
 drivers/media/platform/sti/delta/delta-v4l2.c      |   18 -
 drivers/media/platform/stm32/stm32-dcmi.c          |  259 ++--
 drivers/media/platform/ti-vpe/vpe.c                |   20 -
 drivers/media/platform/vim2m.c                     |   42 +-
 drivers/media/platform/vivid/vivid-ctrls.c         |    2 +-
 drivers/media/tuners/tuner-simple.c                |    5 +-
 drivers/media/usb/cx231xx/Kconfig                  |    2 +-
 drivers/media/usb/stk1160/stk1160-v4l.c            |    2 +-
 drivers/media/usb/tm6000/tm6000-dvb.c              |    5 +
 drivers/media/v4l2-core/v4l2-ctrls.c               |   38 +-
 drivers/media/v4l2-core/v4l2-dev.c                 |   16 +-
 drivers/media/v4l2-core/v4l2-device.c              |    3 +-
 drivers/media/v4l2-core/v4l2-ioctl.c               |  122 +-
 drivers/media/v4l2-core/v4l2-mem2mem.c             |  191 ++-
 drivers/staging/media/bcm2048/radio-bcm2048.c      |    2 +-
 drivers/staging/media/davinci_vpfe/vpfe_video.c    |    6 +-
 drivers/staging/media/davinci_vpfe/vpfe_video.h    |    2 +-
 drivers/staging/media/imx/imx-ic-prpencvf.c        |    5 +
 drivers/staging/media/imx/imx-media-capture.c      |   38 +-
 drivers/staging/media/imx/imx-media-csi.c          |  112 +-
 drivers/staging/media/imx/imx-media-utils.c        |    1 +
 drivers/staging/media/imx/imx-media.h              |    2 +
 .../vc04_services/bcm2835-camera/bcm2835-camera.c  |   24 +-
 include/media/i2c/lm3560.h                         |    1 +
 include/media/v4l2-common.h                        |    2 +-
 include/media/v4l2-ioctl.h                         |   15 +-
 include/media/v4l2-mem2mem.h                       |   25 +-
 include/uapi/linux/media.h                         |    2 +-
 include/uapi/linux/v4l2-controls.h                 |   20 +-
 115 files changed, 4544 insertions(+), 3612 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/media/i2c/ak7375.txt
 create mode 100644 Documentation/devicetree/bindings/media/i2c/dongwoon,dw9807.txt
 create mode 100644 drivers/media/i2c/ak7375.c
 create mode 100644 drivers/media/i2c/dw9807.c
 create mode 100644 drivers/media/i2c/rj54n1cb0c.c
 delete mode 100644 drivers/media/pci/cx25821/cx25821-audio-upstream.c
 delete mode 100644 drivers/media/pci/cx25821/cx25821-audio-upstream.h
 delete mode 100644 drivers/media/pci/cx25821/cx25821-video-upstream.c
 delete mode 100644 drivers/media/pci/cx25821/cx25821-video-upstream.h
Merging v4l-dvb-next/master (f10379aad39e media: include/video/omapfb_dss.h: use IS_ENABLED())
$ git merge v4l-dvb-next/master
Already up to date.
Merging fbdev/fbdev-for-next (34db50e55656 efifb: Copy the ACPI BGRT boot graphics to the framebuffer)
$ git merge fbdev/fbdev-for-next
Merge made by the 'recursive' strategy.
 Documentation/fb/fbcon.txt                         |   7 ++
 drivers/firmware/efi/efi-bgrt.c                    |   2 +-
 drivers/video/console/Kconfig                      |  11 ++
 drivers/video/console/dummycon.c                   |  69 ++++++++--
 drivers/video/fbdev/core/fbcon.c                   |  83 ++++++++++++
 drivers/video/fbdev/efifb.c                        | 140 +++++++++++++++++++++
 drivers/video/fbdev/goldfishfb.c                   |  14 ++-
 .../omap2/omapfb/displays/encoder-tpd12s015.c      |  12 +-
 drivers/video/fbdev/simplefb.c                     |   2 +-
 include/linux/console.h                            |   5 +
 kernel/printk/printk.c                             |   1 +
 11 files changed, 331 insertions(+), 15 deletions(-)
Merging pm/linux-next (89518e8f7daf Merge branch 'acpi-battery' into linux-next)
$ git merge pm/linux-next
Merge made by the 'recursive' strategy.
 drivers/acpi/button.c           |  13 +-
 drivers/cpufreq/imx6q-cpufreq.c |  21 +++
 drivers/cpufreq/intel_pstate.c  |  15 +-
 drivers/cpuidle/cpuidle-arm.c   |   3 +-
 drivers/powercap/Kconfig        |  10 ++
 drivers/powercap/Makefile       |   1 +
 drivers/powercap/idle_inject.c  | 356 ++++++++++++++++++++++++++++++++++++++++
 drivers/thermal/imx_thermal.c   |  28 +++-
 include/linux/idle_inject.h     |  29 ++++
 kernel/power/swap.c             |   4 +-
 10 files changed, 458 insertions(+), 22 deletions(-)
 create mode 100644 drivers/powercap/idle_inject.c
 create mode 100644 include/linux/idle_inject.h
Merging cpupower/cpupower (ce397d215ccd Linux 4.18-rc1)
$ git merge cpupower/cpupower
Already up to date.
Merging idle/next (8a5776a5f498 Linux 4.14-rc4)
$ git merge idle/next
Already up to date.
Merging opp/opp/linux-next (c5c2a97b3ac7 PM / OPP: Update voltage in case freq == old_freq)
$ git merge opp/opp/linux-next
Already up to date.
Merging thermal/next (e9ed3ee61aa6 Merge branches 'thermal-core' and 'thermal-intel' into next)
$ git merge thermal/next
Already up to date.
Merging thermal-soc/next (1d32d387967c thermal: ti-soc-thermal: remove dead code)
$ git merge thermal-soc/next
Auto-merging drivers/thermal/qcom/tsens-v2.c
Auto-merging drivers/thermal/imx_thermal.c
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/thermal/qcom-tsens.txt     |   2 +
 drivers/thermal/armada_thermal.c                   |  81 +++--
 drivers/thermal/imx_thermal.c                      |   5 +-
 drivers/thermal/qcom/Makefile                      |   2 +-
 drivers/thermal/qcom/{tsens-8996.c => tsens-v2.c}  |  30 +-
 drivers/thermal/qcom/tsens.c                       |   6 +
 drivers/thermal/qcom/tsens.h                       |   7 +-
 drivers/thermal/ti-soc-thermal/dra752-bandgap.h    |  68 ----
 .../thermal/ti-soc-thermal/dra752-thermal-data.c   |  65 ----
 .../thermal/ti-soc-thermal/omap3-thermal-data.c    |   6 -
 .../thermal/ti-soc-thermal/omap4-thermal-data.c    |  10 -
 drivers/thermal/ti-soc-thermal/omap4xxx-bandgap.h  |  10 -
 .../thermal/ti-soc-thermal/omap5-thermal-data.c    |  46 +--
 drivers/thermal/ti-soc-thermal/omap5xxx-bandgap.h  |  41 ---
 drivers/thermal/ti-soc-thermal/ti-bandgap.c        | 370 ---------------------
 drivers/thermal/ti-soc-thermal/ti-bandgap.h        |  43 +--
 16 files changed, 88 insertions(+), 704 deletions(-)
 rename drivers/thermal/qcom/{tsens-8996.c => tsens-v2.c} (66%)
Merging ieee1394/for-next (188775181bc0 firewire-ohci: work around oversized DMA reads on JMicron controllers)
$ git merge ieee1394/for-next
Already up to date.
Merging dlm/next (da3627c30d22 dlm: remove O_NONBLOCK flag in sctp_connect_to_sock)
$ git merge dlm/next
Already up to date.
Merging swiotlb/linux-next (4855c92dbb7b xen-swiotlb: fix the check condition for xen_swiotlb_free_coherent)
$ git merge swiotlb/linux-next
Already up to date.
Merging rdma/for-next (422e3d37ed7e RDMA/uverbs: Combine MIN_SZ_OR_ZERO with UVERBS_ATTR_STRUCT)
$ git merge rdma/for-next
Auto-merging include/rdma/ib_verbs.h
Auto-merging include/linux/mlx5/mlx5_ifc.h
Auto-merging fs/cifs/smbdirect.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/core/cmd.c
Auto-merging drivers/infiniband/hw/qedr/verbs.c
Auto-merging drivers/infiniband/hw/mlx5/main.c
Auto-merging drivers/infiniband/hw/hfi1/rc.c
Auto-merging drivers/infiniband/core/verbs.c
Auto-merging drivers/infiniband/core/uverbs_main.c
Auto-merging drivers/infiniband/core/uverbs_cmd.c
CONFLICT (content): Merge conflict in drivers/infiniband/core/uverbs_cmd.c
Auto-merging MAINTAINERS
Resolved 'drivers/infiniband/core/uverbs_cmd.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 6ba5768e00e0] Merge remote-tracking branch 'rdma/for-next'
$ git diff -M --stat --summary HEAD^..
 MAINTAINERS                                        |   15 +-
 drivers/infiniband/core/addr.c                     |   12 +-
 drivers/infiniband/core/cache.c                    |  748 ++++++++-----
 drivers/infiniband/core/cm.c                       |  128 ++-
 drivers/infiniband/core/cma.c                      |  142 +--
 drivers/infiniband/core/device.c                   |   21 +-
 drivers/infiniband/core/mad.c                      |   99 +-
 drivers/infiniband/core/mad_priv.h                 |    7 +-
 drivers/infiniband/core/multicast.c                |   40 +-
 drivers/infiniband/core/nldev.c                    |   16 +-
 drivers/infiniband/core/rdma_core.c                |  159 ++-
 drivers/infiniband/core/rdma_core.h                |   12 +-
 drivers/infiniband/core/rw.c                       |    2 +-
 drivers/infiniband/core/sa_query.c                 |   80 +-
 drivers/infiniband/core/sysfs.c                    |   66 +-
 drivers/infiniband/core/umem.c                     |    2 +-
 drivers/infiniband/core/user_mad.c                 |    1 +
 drivers/infiniband/core/uverbs.h                   |    4 +-
 drivers/infiniband/core/uverbs_cmd.c               |   48 +-
 drivers/infiniband/core/uverbs_ioctl.c             |  153 ++-
 drivers/infiniband/core/uverbs_ioctl_merge.c       |   10 +-
 drivers/infiniband/core/uverbs_main.c              |   22 +-
 drivers/infiniband/core/uverbs_marshall.c          |    2 -
 drivers/infiniband/core/uverbs_std_types.c         |  156 +--
 .../infiniband/core/uverbs_std_types_counters.c    |   61 +-
 drivers/infiniband/core/uverbs_std_types_cq.c      |   89 +-
 drivers/infiniband/core/uverbs_std_types_dm.c      |   45 +-
 .../infiniband/core/uverbs_std_types_flow_action.c |  144 +--
 drivers/infiniband/core/uverbs_std_types_mr.c      |   62 +-
 drivers/infiniband/core/verbs.c                    |  512 ++++++---
 drivers/infiniband/hw/bnxt_re/ib_verbs.c           |  102 +-
 drivers/infiniband/hw/bnxt_re/ib_verbs.h           |    3 +-
 drivers/infiniband/hw/bnxt_re/qplib_fp.c           |   12 +-
 drivers/infiniband/hw/bnxt_re/qplib_sp.c           |    4 +-
 drivers/infiniband/hw/cxgb3/iwch_provider.c        |    3 +-
 drivers/infiniband/hw/cxgb4/cm.c                   |    3 -
 drivers/infiniband/hw/cxgb4/provider.c             |    3 +-
 drivers/infiniband/hw/hfi1/chip.c                  |  205 ++--
 drivers/infiniband/hw/hfi1/chip.h                  |   30 +
 drivers/infiniband/hw/hfi1/driver.c                |   63 +-
 drivers/infiniband/hw/hfi1/file_ops.c              |   10 +-
 drivers/infiniband/hw/hfi1/hfi.h                   |  243 ++---
 drivers/infiniband/hw/hfi1/init.c                  |   44 +-
 drivers/infiniband/hw/hfi1/pcie.c                  |   19 +-
 drivers/infiniband/hw/hfi1/pio.c                   |   14 +-
 drivers/infiniband/hw/hfi1/qp.c                    |    6 +-
 drivers/infiniband/hw/hfi1/qp.h                    |   24 +-
 drivers/infiniband/hw/hfi1/rc.c                    |    6 +-
 drivers/infiniband/hw/hfi1/ruc.c                   |   14 +-
 drivers/infiniband/hw/hfi1/sdma.c                  |   10 +-
 drivers/infiniband/hw/hfi1/verbs.c                 |    7 +-
 drivers/infiniband/hw/hfi1/vnic_main.c             |   12 +-
 drivers/infiniband/hw/hns/hns_roce_ah.c            |   19 +-
 drivers/infiniband/hw/hns/hns_roce_device.h        |    2 +-
 drivers/infiniband/hw/hns/hns_roce_hw_v1.c         |    2 +-
 drivers/infiniband/hw/hns/hns_roce_hw_v2.c         |    5 +-
 drivers/infiniband/hw/hns/hns_roce_main.c          |    9 +-
 drivers/infiniband/hw/i40iw/i40iw_hw.c             |   83 +-
 drivers/infiniband/hw/i40iw/i40iw_verbs.c          |    5 +-
 drivers/infiniband/hw/mlx4/ah.c                    |   70 +-
 drivers/infiniband/hw/mlx4/mad.c                   |   22 +-
 drivers/infiniband/hw/mlx4/main.c                  |   38 +-
 drivers/infiniband/hw/mlx4/mlx4_ib.h               |    8 +-
 drivers/infiniband/hw/mlx4/qp.c                    |  186 +++-
 drivers/infiniband/hw/mlx5/Makefile                |    1 +
 drivers/infiniband/hw/mlx5/ah.c                    |   11 +-
 drivers/infiniband/hw/mlx5/cmd.c                   |   27 +
 drivers/infiniband/hw/mlx5/cmd.h                   |    2 +
 drivers/infiniband/hw/mlx5/devx.c                  | 1123 ++++++++++++++++++++
 drivers/infiniband/hw/mlx5/main.c                  |  229 ++--
 drivers/infiniband/hw/mlx5/mlx5_ib.h               |   28 +-
 drivers/infiniband/hw/mlx5/qp.c                    |  172 ++-
 drivers/infiniband/hw/mthca/mthca_av.c             |    5 +-
 drivers/infiniband/hw/mthca/mthca_provider.c       |    5 +-
 drivers/infiniband/hw/nes/nes_verbs.c              |    3 +-
 drivers/infiniband/hw/ocrdma/ocrdma_ah.c           |   24 +-
 drivers/infiniband/hw/ocrdma/ocrdma_hw.c           |   21 +-
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c        |    3 +-
 drivers/infiniband/hw/qedr/qedr_roce_cm.c          |   25 +-
 drivers/infiniband/hw/qedr/verbs.c                 |   28 +-
 drivers/infiniband/hw/qib/qib_verbs.c              |    3 +-
 drivers/infiniband/hw/usnic/usnic_ib_verbs.c       |    2 +-
 drivers/infiniband/hw/usnic/usnic_uiom.c           |   40 +-
 drivers/infiniband/hw/usnic/usnic_uiom.h           |    5 +-
 drivers/infiniband/hw/vmw_pvrdma/pvrdma.h          |    5 -
 drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c     |   49 +-
 drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c    |    3 +-
 drivers/infiniband/sw/rdmavt/ah.c                  |    4 +-
 drivers/infiniband/sw/rdmavt/qp.c                  |   11 +-
 drivers/infiniband/sw/rxe/rxe.c                    |    3 +-
 drivers/infiniband/sw/rxe/rxe_av.c                 |   30 +-
 drivers/infiniband/sw/rxe/rxe_loc.h                |    5 +-
 drivers/infiniband/sw/rxe/rxe_net.c                |   67 +-
 drivers/infiniband/sw/rxe/rxe_param.h              |    2 +-
 drivers/infiniband/sw/rxe/rxe_qp.c                 |   31 +-
 drivers/infiniband/sw/rxe/rxe_recv.c               |   15 +-
 drivers/infiniband/sw/rxe/rxe_resp.c               |    5 +
 drivers/infiniband/sw/rxe/rxe_verbs.c              |   31 +-
 drivers/infiniband/ulp/ipoib/ipoib_cm.c            |    4 +-
 drivers/infiniband/ulp/ipoib/ipoib_ib.c            |    3 +-
 drivers/infiniband/ulp/ipoib/ipoib_main.c          |    8 +-
 drivers/infiniband/ulp/ipoib/ipoib_verbs.c         |    2 +-
 drivers/infiniband/ulp/iser/iscsi_iser.c           |   12 +-
 drivers/infiniband/ulp/isert/ib_isert.c            |    5 +-
 drivers/infiniband/ulp/srp/ib_srp.c                |    5 +-
 drivers/infiniband/ulp/srpt/ib_srpt.c              |   21 +-
 drivers/infiniband/ulp/srpt/ib_srpt.h              |    4 +-
 drivers/net/ethernet/mellanox/mlx5/core/cmd.c      |   21 +-
 .../net/ethernet/mellanox/mlx5/core/mlx5_core.h    |    6 +
 drivers/net/ethernet/mellanox/mlx5/core/mr.c       |   17 -
 drivers/nvme/target/rdma.c                         |    2 +-
 fs/cifs/smbdirect.c                                |   13 +-
 include/linux/idr.h                                |   11 +
 include/linux/mlx5/device.h                        |    3 +
 include/linux/mlx5/driver.h                        |    2 -
 include/linux/mlx5/mlx5_ifc.h                      |   86 +-
 include/rdma/ib_addr.h                             |    2 +
 include/rdma/ib_cache.h                            |   58 +-
 include/rdma/ib_cm.h                               |    3 +
 include/rdma/ib_sa.h                               |   49 +-
 include/rdma/ib_verbs.h                            |   96 +-
 include/rdma/opa_addr.h                            |    2 +-
 include/rdma/rdmavt_qp.h                           |   30 +-
 include/rdma/uverbs_ioctl.h                        |  307 +++---
 include/rdma/uverbs_named_ioctl.h                  |  106 +-
 include/rdma/uverbs_std_types.h                    |    2 -
 include/rdma/uverbs_types.h                        |   11 +-
 include/uapi/rdma/ib_user_ioctl_cmds.h             |    7 +-
 include/uapi/rdma/mlx5-abi.h                       |    6 +-
 include/uapi/rdma/mlx5_user_ioctl_cmds.h           |   73 ++
 net/rds/ib.c                                       |    2 +-
 net/smc/smc_core.c                                 |   20 +-
 net/smc/smc_ib.c                                   |   25 +-
 net/sunrpc/xprtrdma/svc_rdma_transport.c           |    2 +-
 net/sunrpc/xprtrdma/verbs.c                        |    2 +-
 135 files changed, 4745 insertions(+), 2445 deletions(-)
 create mode 100644 drivers/infiniband/hw/mlx5/devx.c
Merging net-next/master (c47078d6a33f tcp: remove redundant SOCK_DONE checks)
$ git merge net-next/master
Auto-merging net/wireless/nl80211.c
Auto-merging net/tls/tls_sw.c
Auto-merging net/tipc/node.c
Auto-merging net/smc/smc_ib.c
CONFLICT (content): Merge conflict in net/smc/smc_ib.c
Auto-merging net/smc/smc_core.c
Auto-merging net/smc/af_smc.c
Auto-merging net/sched/act_tunnel_key.c
CONFLICT (content): Merge conflict in net/sched/act_tunnel_key.c
Auto-merging net/sched/act_csum.c
CONFLICT (content): Merge conflict in net/sched/act_csum.c
Auto-merging net/mac80211/util.c
Auto-merging net/mac80211/rx.c
Auto-merging net/ipv6/ipv6_sockglue.c
Auto-merging net/ipv4/tcp.c
Auto-merging net/ipv4/inet_fragment.c
Auto-merging net/core/filter.c
Auto-merging lib/rhashtable.c
Auto-merging include/net/tcp.h
Auto-merging include/net/ipv6.h
Auto-merging include/net/cfg80211.h
Auto-merging drivers/net/wireless/realtek/rtlwifi/base.c
Auto-merging drivers/net/ethernet/renesas/sh_eth.c
Auto-merging drivers/net/ethernet/realtek/r8169.c
Removing drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_api.h
Removing drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_api.c
Auto-merging drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
Auto-merging drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
Auto-merging drivers/net/ethernet/cavium/liquidio/lio_main.c
Auto-merging drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
Auto-merging drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c
Auto-merging drivers/net/ethernet/aquantia/atlantic/aq_nic.c
Auto-merging drivers/net/ethernet/aquantia/atlantic/aq_hw.h
CONFLICT (content): Merge conflict in drivers/net/ethernet/aquantia/atlantic/aq_hw.h
Auto-merging arch/arm64/boot/dts/freescale/qoriq-fman3-0.dtsi
Auto-merging MAINTAINERS
Auto-merging Documentation/devicetree/bindings/net/fsl-fman.txt
Recorded preimage for 'drivers/net/ethernet/aquantia/atlantic/aq_hw.h'
Recorded preimage for 'net/sched/act_csum.c'
Recorded preimage for 'net/sched/act_tunnel_key.c'
Resolved 'net/smc/smc_ib.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
Recorded resolution for 'drivers/net/ethernet/aquantia/atlantic/aq_hw.h'.
Recorded resolution for 'net/sched/act_csum.c'.
Recorded resolution for 'net/sched/act_tunnel_key.c'.
[master cc2507e8dd47] Merge remote-tracking branch 'net-next/master'
$ git diff -M --stat --summary HEAD^..
 Documentation/ABI/stable/sysfs-class-rfkill        |    6 +-
 Documentation/ABI/testing/sysfs-class-net-queues   |   11 +
 .../bindings/net/dsa/vitesse,vsc73xx.txt           |   81 ++
 Documentation/devicetree/bindings/net/fsl-fman.txt |   25 +-
 .../devicetree/bindings/net/rockchip-dwmac.txt     |    1 +
 .../devicetree/bindings/ptp/ptp-qoriq.txt          |   15 +-
 .../devicetree/bindings/vendor-prefixes.txt        |    1 +
 Documentation/networking/ip-sysctl.txt             |   10 +-
 Documentation/networking/scaling.txt               |   61 +-
 Documentation/rfkill.txt                           |   18 +-
 MAINTAINERS                                        |    5 +
 arch/alpha/include/uapi/asm/socket.h               |    3 +
 arch/arm64/boot/dts/freescale/qoriq-fman3-0.dtsi   |   14 +-
 arch/ia64/include/uapi/asm/socket.h                |    3 +
 arch/mips/include/uapi/asm/socket.h                |    3 +
 arch/parisc/include/uapi/asm/socket.h              |    3 +
 arch/powerpc/boot/dts/fsl/qoriq-fman-0.dtsi        |   14 +-
 arch/powerpc/boot/dts/fsl/qoriq-fman-1.dtsi        |   14 +-
 arch/powerpc/boot/dts/fsl/qoriq-fman3-0.dtsi       |   14 +-
 arch/powerpc/boot/dts/fsl/qoriq-fman3-1.dtsi       |   14 +-
 arch/powerpc/boot/dts/fsl/qoriq-fman3l-0.dtsi      |   14 +-
 arch/s390/include/uapi/asm/socket.h                |    3 +
 arch/sparc/include/uapi/asm/socket.h               |    3 +
 arch/xtensa/include/uapi/asm/socket.h              |    3 +
 drivers/atm/zatm.c                                 |    2 -
 drivers/connector/connector.c                      |    3 +-
 drivers/isdn/capi/capi.c                           |    5 +-
 drivers/isdn/capi/capidrv.c                        |    3 +-
 drivers/isdn/gigaset/bas-gigaset.c                 |   29 +-
 drivers/isdn/hardware/mISDN/avmfritz.c             |    1 +
 drivers/isdn/hardware/mISDN/hfcpci.c               |    1 +
 drivers/isdn/hardware/mISDN/hfcsusb.c              |   36 +-
 drivers/isdn/hardware/mISDN/mISDNinfineon.c        |    1 +
 drivers/isdn/hardware/mISDN/mISDNisar.c            |    4 +
 drivers/isdn/hisax/avm_pci.c                       |    1 +
 drivers/isdn/hisax/callc.c                         |    1 +
 drivers/isdn/hisax/config.c                        |    1 +
 drivers/isdn/hisax/gazel.c                         |    4 +
 drivers/isdn/hisax/hfc_usb.c                       |   10 +-
 drivers/isdn/hisax/isar.c                          |    2 +
 drivers/isdn/hisax/l3_1tr6.c                       |    1 +
 drivers/isdn/hisax/l3dss1.c                        |    1 +
 drivers/isdn/hisax/st5481_usb.c                    |   11 +-
 drivers/isdn/hysdn/hysdn_boot.c                    |    2 +
 drivers/isdn/i4l/isdn_tty.c                        |    4 +-
 drivers/isdn/i4l/isdn_v110.c                       |    9 +
 drivers/isdn/mISDN/stack.c                         |    1 +
 drivers/net/dsa/Kconfig                            |   11 +
 drivers/net/dsa/Makefile                           |    1 +
 drivers/net/dsa/bcm_sf2.c                          |    7 +-
 drivers/net/dsa/vitesse-vsc73xx.c                  | 1365 ++++++++++++++++++++
 drivers/net/ethernet/Makefile                      |    7 +-
 drivers/net/ethernet/alteon/acenic.c               |    5 +-
 .../net/ethernet/aquantia/atlantic/aq_ethtool.c    |  117 ++
 drivers/net/ethernet/aquantia/atlantic/aq_hw.h     |   20 +-
 drivers/net/ethernet/aquantia/atlantic/aq_nic.c    |   12 +-
 .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c  |   47 +-
 .../aquantia/atlantic/hw_atl/hw_atl_a0_internal.h  |    8 +
 .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c  |   51 +-
 .../aquantia/atlantic/hw_atl/hw_atl_b0_internal.h  |    8 +
 .../aquantia/atlantic/hw_atl/hw_atl_utils.c        |   52 +-
 .../aquantia/atlantic/hw_atl/hw_atl_utils.h        |   35 +
 .../aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c   |   69 +-
 drivers/net/ethernet/aquantia/atlantic/ver.h       |    4 +-
 drivers/net/ethernet/atheros/alx/main.c            |    2 -
 drivers/net/ethernet/aurora/Kconfig                |    1 +
 drivers/net/ethernet/aurora/nb8800.c               |    2 -
 drivers/net/ethernet/broadcom/bgmac.c              |    2 -
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c   |    3 +
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c   |    4 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c     |    4 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c  |    1 +
 drivers/net/ethernet/broadcom/bnxt/bnxt.c          |    4 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c  |  121 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h  |   15 +
 drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h      |   13 +
 drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c       |   16 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c      |   11 +-
 drivers/net/ethernet/broadcom/cnic.c               |    5 +-
 drivers/net/ethernet/broadcom/tg3.c                |   14 +
 drivers/net/ethernet/cadence/Kconfig               |    6 +-
 drivers/net/ethernet/cavium/liquidio/lio_main.c    |   31 +-
 .../net/ethernet/cavium/liquidio/octeon_device.h   |    9 +
 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h         |   32 +-
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c |   39 +
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c |   42 +
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c    |  140 +-
 .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c   |    8 +
 drivers/net/ethernet/chelsio/cxgb4/sched.c         |    3 +
 drivers/net/ethernet/chelsio/cxgb4/sge.c           |  372 +++++-
 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c         |   51 +
 drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h |    1 +
 drivers/net/ethernet/cortina/gemini.c              |    2 +-
 drivers/net/ethernet/freescale/dpaa/dpaa_eth.c     |   88 +-
 drivers/net/ethernet/freescale/dpaa/dpaa_eth.h     |    3 +
 drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c |   39 +
 drivers/net/ethernet/freescale/fec_ptp.c           |    2 -
 drivers/net/ethernet/freescale/fman/fman.c         |    3 +-
 drivers/net/ethernet/freescale/fman/fman.h         |    1 +
 drivers/net/ethernet/freescale/fman/fman_dtsec.c   |   27 +
 drivers/net/ethernet/freescale/fman/fman_dtsec.h   |    1 +
 drivers/net/ethernet/freescale/fman/fman_memac.c   |    5 +
 drivers/net/ethernet/freescale/fman/fman_memac.h   |    1 +
 drivers/net/ethernet/freescale/fman/fman_port.c    |   12 +
 drivers/net/ethernet/freescale/fman/fman_port.h    |    2 +
 drivers/net/ethernet/freescale/fman/fman_tgec.c    |   21 +
 drivers/net/ethernet/freescale/fman/fman_tgec.h    |    1 +
 drivers/net/ethernet/freescale/fman/mac.c          |    3 +
 drivers/net/ethernet/freescale/fman/mac.h          |    1 +
 drivers/net/ethernet/freescale/gianfar_ethtool.c   |    2 -
 drivers/net/ethernet/freescale/ucc_geth.c          |    9 +-
 drivers/net/ethernet/hisilicon/Kconfig             |   15 +-
 drivers/net/ethernet/hisilicon/hip04_eth.c         |    2 +-
 drivers/net/ethernet/hisilicon/hns3/hnae3.c        |   46 +-
 drivers/net/ethernet/hisilicon/hns3/hnae3.h        |   18 +-
 drivers/net/ethernet/hisilicon/hns3/hns3_enet.c    |  342 +++--
 drivers/net/ethernet/hisilicon/hns3/hns3_enet.h    |    9 +-
 drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c |    2 +
 .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c |   85 +-
 .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h |    3 +-
 .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c    |  393 +++---
 .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h    |    2 +-
 .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c |   24 +-
 .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c    |   38 +-
 .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c  |   17 +-
 .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h  |    7 +-
 .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c   |   26 +-
 .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c  |   97 +-
 .../ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c   |    5 +-
 drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c   |    3 -
 drivers/net/ethernet/intel/i40e/i40e_main.c        |    6 +-
 drivers/net/ethernet/intel/i40evf/i40evf_main.c    |    4 +-
 drivers/net/ethernet/intel/igb/e1000_defines.h     |   16 +
 drivers/net/ethernet/intel/igb/igb.h               |    1 +
 drivers/net/ethernet/intel/igb/igb_main.c          |  260 +++-
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c      |    2 +-
 drivers/net/ethernet/marvell/mvpp2/mvpp2.h         |   58 +-
 drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c    |   43 +-
 drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c     |  155 +--
 drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.h     |   41 +-
 drivers/net/ethernet/mellanox/mlx4/catas.c         |    2 +-
 drivers/net/ethernet/mellanox/mlx4/main.c          |  161 ++-
 drivers/net/ethernet/mellanox/mlx4/mlx4.h          |    3 +-
 drivers/net/ethernet/mellanox/mlx5/core/Makefile   |    4 +-
 drivers/net/ethernet/mellanox/mlx5/core/en.h       |    1 -
 .../mellanox/mlx5/core/en_accel/en_accel.h         |   11 +-
 .../ethernet/mellanox/mlx5/core/en_accel/rxtx.c    |  109 ++
 .../ethernet/mellanox/mlx5/core/en_accel/rxtx.h    |   14 +
 drivers/net/ethernet/mellanox/mlx5/core/en_main.c  |   59 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_rep.c   |    5 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_rx.c    |   11 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_stats.c |   34 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_stats.h |   25 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_tx.c    |   17 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c  |    9 +-
 drivers/net/ethernet/mellanox/mlx5/core/wq.h       |    5 +
 .../mellanox/mlxsw/core_acl_flex_actions.c         |   28 +-
 .../mellanox/mlxsw/core_acl_flex_actions.h         |    3 +-
 .../ethernet/mellanox/mlxsw/core_acl_flex_keys.h   |   42 +-
 drivers/net/ethernet/mellanox/mlxsw/reg.h          |   11 +-
 drivers/net/ethernet/mellanox/mlxsw/spectrum.c     |   16 +-
 drivers/net/ethernet/mellanox/mlxsw/spectrum.h     |    4 +
 drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c |    6 +-
 .../mellanox/mlxsw/spectrum_acl_flex_actions.c     |    4 +-
 .../mellanox/mlxsw/spectrum_acl_flex_keys.h        |   39 +-
 .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c    |   31 +-
 .../net/ethernet/mellanox/mlxsw/spectrum_flower.c  |   69 +-
 .../net/ethernet/mellanox/mlxsw/spectrum_router.c  |   40 +-
 .../net/ethernet/mellanox/mlxsw/spectrum_router.h  |    3 +
 .../ethernet/mellanox/mlxsw/spectrum_switchdev.c   |   47 +-
 drivers/net/ethernet/micrel/ksz884x.c              |    3 -
 drivers/net/ethernet/microchip/lan743x_main.c      |    2 +-
 drivers/net/ethernet/mscc/ocelot.c                 |  445 ++++++-
 drivers/net/ethernet/mscc/ocelot.h                 |    2 +-
 drivers/net/ethernet/netronome/nfp/bpf/jit.c       |    5 +-
 drivers/net/ethernet/netronome/nfp/bpf/main.c      |    2 +-
 drivers/net/ethernet/netronome/nfp/flower/action.c |  108 +-
 drivers/net/ethernet/netronome/nfp/flower/cmsg.h   |    4 +-
 .../net/ethernet/netronome/nfp/flower/lag_conf.c   |    5 +-
 .../net/ethernet/netronome/nfp/flower/offload.c    |    6 +-
 .../net/ethernet/netronome/nfp/nfp_net_common.c    |   29 +-
 .../net/ethernet/netronome/nfp/nfp_net_ethtool.c   |   58 +-
 .../ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c  |   16 +-
 .../net/ethernet/netronome/nfp/nfpcore/nfp_cpp.h   |    4 +-
 .../ethernet/netronome/nfp/nfpcore/nfp_cppcore.c   |   22 +-
 drivers/net/ethernet/oki-semi/pch_gbe/Makefile     |    2 +-
 drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h    |   40 -
 .../net/ethernet/oki-semi/pch_gbe/pch_gbe_api.c    |  262 ----
 .../net/ethernet/oki-semi/pch_gbe/pch_gbe_api.h    |   35 -
 .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c    |   19 +-
 .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c   |  193 +--
 .../net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.c    |    2 +-
 .../net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.h    |    2 -
 drivers/net/ethernet/packetengines/Kconfig         |    6 +-
 drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c |   10 +-
 .../net/ethernet/qlogic/netxen/netxen_nic_main.c   |    4 +-
 drivers/net/ethernet/qlogic/qed/qed_dcbx.c         |    2 -
 .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c   |    2 +-
 drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c    |    2 +-
 drivers/net/ethernet/realtek/r8169.c               |  367 ++----
 drivers/net/ethernet/renesas/sh_eth.c              |   12 +-
 drivers/net/ethernet/renesas/sh_eth.h              |    8 +-
 drivers/net/ethernet/sfc/Makefile                  |    2 +
 drivers/net/ethernet/sfc/ef10_sriov.c              |    5 +-
 drivers/net/ethernet/sfc/efx.c                     |   12 +
 drivers/net/ethernet/sfc/net_driver.h              |    3 +
 drivers/net/ethernet/sfc/rx.c                      |    7 +-
 drivers/net/ethernet/smsc/epic100.c                |    2 -
 drivers/net/ethernet/socionext/netsec.c            |    2 -
 drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c     |   69 +
 drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c   |   15 +
 drivers/net/ethernet/stmicro/stmmac/hwif.h         |    8 +
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  |    4 +-
 drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c    |   60 +
 drivers/net/ethernet/sun/niu.c                     |   16 -
 drivers/net/ethernet/tehuti/tehuti.c               |    2 -
 drivers/net/ethernet/ti/cpsw.c                     |   39 +-
 drivers/net/ethernet/ti/netcp_core.c               |    4 +-
 drivers/net/ethernet/xilinx/xilinx_emaclite.c      |  112 +-
 drivers/net/fjes/fjes_main.c                       |    8 +-
 drivers/net/geneve.c                               |   17 +-
 drivers/net/hamradio/6pack.c                       |    5 +-
 drivers/net/netdevsim/Makefile                     |    4 +
 drivers/net/netdevsim/ipsec.c                      |  297 +++++
 drivers/net/netdevsim/netdev.c                     |    9 +-
 drivers/net/netdevsim/netdevsim.h                  |   41 +
 drivers/net/ntb_netdev.c                           |    2 +-
 drivers/net/phy/Kconfig                            |    3 +-
 drivers/net/phy/dp83tc811.c                        |   46 +-
 drivers/net/phy/fixed_phy.c                        |    7 +-
 drivers/net/phy/mdio-mux-gpio.c                    |   22 +-
 drivers/net/phy/realtek.c                          |   48 +
 drivers/net/phy/vitesse.c                          |  175 +++
 drivers/net/phy/xilinx_gmii2rgmii.c                |   20 +-
 drivers/net/usb/asix_devices.c                     |   38 +-
 drivers/net/usb/catc.c                             |    1 +
 drivers/net/usb/cdc-phonet.c                       |    6 +-
 drivers/net/usb/hso.c                              |   35 +-
 drivers/net/usb/kaweth.c                           |    8 +-
 drivers/net/usb/lan78xx.c                          |    2 +-
 drivers/net/usb/r8152.c                            |   12 +-
 drivers/net/usb/rtl8150.c                          |    5 +-
 drivers/net/vxlan.c                                |  140 +-
 drivers/net/wan/farsync.c                          |    2 -
 drivers/net/wan/lmc/lmc_main.c                     |    2 -
 drivers/net/wireless/ath/ath9k/hw.c                |    2 +-
 drivers/net/wireless/realtek/rtlwifi/base.c        |    2 +-
 drivers/ptp/Kconfig                                |    2 +-
 drivers/ptp/ptp_qoriq.c                            |  104 +-
 drivers/s390/net/Kconfig                           |   10 +
 drivers/s390/net/Makefile                          |    3 +
 drivers/s390/net/ism.h                             |  221 ++++
 drivers/s390/net/ism_drv.c                         |  623 +++++++++
 drivers/staging/rtl8188eu/include/wifi.h           |    1 -
 drivers/staging/rtl8712/wifi.h                     |    1 -
 drivers/staging/rtl8723bs/include/wifi.h           |    1 -
 drivers/staging/rtlwifi/base.c                     |    2 +-
 drivers/vhost/net.c                                |   95 +-
 include/linux/cpumask.h                            |   11 +-
 include/linux/etherdevice.h                        |    3 +-
 include/linux/fsl/ptp_qoriq.h                      |   38 +-
 include/linux/ieee80211.h                          |  437 ++++++-
 include/linux/ipc.h                                |    2 +-
 include/linux/ipc_namespace.h                      |    2 +-
 include/linux/list.h                               |   30 +
 include/linux/mroute_base.h                        |    2 +-
 include/linux/netdevice.h                          |  145 ++-
 include/linux/netfilter.h                          |   22 +
 include/linux/openvswitch.h                        |    5 +
 include/linux/rfkill.h                             |   20 +-
 include/linux/rhashtable-types.h                   |  137 ++
 include/linux/rhashtable.h                         |  164 +--
 include/linux/sctp.h                               |    7 +
 include/linux/skbuff.h                             |    3 +-
 include/linux/tcp.h                                |    1 +
 include/linux/udp.h                                |    4 +-
 include/net/act_api.h                              |   28 +-
 include/net/busy_poll.h                            |    1 +
 include/net/cfg80211.h                             |  106 +-
 include/net/devlink.h                              |  148 +++
 include/net/flow_dissector.h                       |    4 +-
 include/net/ieee80211_radiotap.h                   |  123 ++
 include/net/inet_common.h                          |    2 +-
 include/net/inet_frag.h                            |    2 +-
 include/net/inet_sock.h                            |    1 +
 include/net/ip.h                                   |   27 +-
 include/net/ip_tunnels.h                           |    8 +-
 include/net/ipv6.h                                 |   28 +-
 include/net/mac80211.h                             |   64 +-
 include/net/netfilter/nf_flow_table.h              |    2 +-
 include/net/netfilter/nf_log.h                     |    3 +-
 include/net/netns/hash.h                           |    7 +-
 include/net/pkt_cls.h                              |   18 +-
 include/net/pkt_sched.h                            |    7 +
 include/net/sch_generic.h                          |   21 +
 include/net/sctp/structs.h                         |   12 +-
 include/net/seg6.h                                 |    2 +-
 include/net/seg6_hmac.h                            |    2 +-
 include/net/smc.h                                  |   65 +
 include/net/sock.h                                 |   69 +-
 include/net/tc_act/tc_pedit.h                      |    1 +
 include/net/tcp.h                                  |   13 +-
 include/net/transp_v6.h                            |    3 +-
 include/net/udp.h                                  |    4 +-
 include/net/udp_tunnel.h                           |    6 +-
 include/trace/events/net.h                         |    7 +
 include/trace/events/sock.h                        |   30 +-
 include/uapi/asm-generic/socket.h                  |    3 +
 include/uapi/linux/devlink.h                       |   24 +
 include/uapi/linux/errqueue.h                      |    4 +
 include/uapi/linux/ila.h                           |    1 +
 include/uapi/linux/net_tstamp.h                    |   18 +
 include/uapi/linux/nl80211.h                       |  102 +-
 include/uapi/linux/openvswitch.h                   |    3 +
 include/uapi/linux/pkt_cls.h                       |    4 +
 include/uapi/linux/pkt_sched.h                     |   21 +
 include/uapi/linux/sctp.h                          |    5 +
 include/uapi/linux/smc_diag.h                      |   10 +
 include/uapi/linux/snmp.h                          |    2 +
 include/uapi/linux/tc_act/tc_pedit.h               |    9 +-
 include/uapi/linux/tc_act/tc_skbedit.h             |    2 +
 include/uapi/linux/tc_act/tc_tunnel_key.h          |   26 +
 include/uapi/linux/tipc_netlink.h                  |   14 +
 ipc/msg.c                                          |    1 +
 ipc/sem.c                                          |    1 +
 ipc/shm.c                                          |    1 +
 ipc/util.c                                         |    1 +
 lib/nlattr.c                                       |    4 +-
 lib/rhashtable.c                                   |   58 +-
 lib/test_rhashtable.c                              |    8 +-
 net/8021q/vlan.c                                   |   13 +-
 net/batman-adv/bridge_loop_avoidance.c             |    2 +-
 net/core/dev.c                                     |  595 ++++++---
 net/core/devlink.c                                 |  675 ++++++++++
 net/core/filter.c                                  |    3 +-
 net/core/flow_dissector.c                          |   34 +-
 net/core/neighbour.c                               |    3 +-
 net/core/net-sysfs.c                               |   87 +-
 net/core/rtnetlink.c                               |    9 +-
 net/core/skbuff.c                                  |    7 +-
 net/core/sock.c                                    |   47 +-
 net/core/xdp.c                                     |    4 +-
 net/decnet/dn_nsp_in.c                             |    1 +
 net/dsa/slave.c                                    |    2 +-
 net/ethernet/eth.c                                 |   12 +-
 net/ipv4/af_inet.c                                 |   13 +-
 net/ipv4/esp4_offload.c                            |    4 +-
 net/ipv4/fou.c                                     |   20 +-
 net/ipv4/gre_offload.c                             |    8 +-
 net/ipv4/icmp.c                                    |    9 +-
 net/ipv4/inet_fragment.c                           |    1 +
 net/ipv4/ip_gre.c                                  |    2 +
 net/ipv4/ip_input.c                                |  141 +-
 net/ipv4/ip_output.c                               |   22 +-
 net/ipv4/ipmr.c                                    |    1 +
 net/ipv4/ipmr_base.c                               |    1 +
 net/ipv4/netfilter/nf_log_ipv4.c                   |    8 +-
 net/ipv4/ping.c                                    |   10 +-
 net/ipv4/proc.c                                    |    2 +
 net/ipv4/raw.c                                     |   11 +-
 net/ipv4/tcp.c                                     |   17 +-
 net/ipv4/tcp_bbr.c                                 |    6 +-
 net/ipv4/tcp_input.c                               |   33 +-
 net/ipv4/tcp_minisocks.c                           |  223 ++--
 net/ipv4/tcp_offload.c                             |   14 +-
 net/ipv4/tcp_output.c                              |   14 -
 net/ipv4/udp.c                                     |   11 +-
 net/ipv4/udp_offload.c                             |   13 +-
 net/ipv6/af_inet6.c                                |    1 +
 net/ipv6/datagram.c                                |    4 +-
 net/ipv6/esp6_offload.c                            |    4 +-
 net/ipv6/icmp.c                                    |   14 +-
 net/ipv6/ila/Makefile                              |    2 +-
 net/ipv6/ila/ila.h                                 |   27 +-
 net/ipv6/ila/ila_common.c                          |   30 -
 net/ipv6/ila/ila_main.c                            |  121 ++
 net/ipv6/ila/ila_xlat.c                            |  291 +++--
 net/ipv6/ip6_flowlabel.c                           |    3 +-
 net/ipv6/ip6_gre.c                                 |    2 +
 net/ipv6/ip6_input.c                               |  131 +-
 net/ipv6/ip6_offload.c                             |   16 +-
 net/ipv6/ip6_output.c                              |   38 +-
 net/ipv6/ip6mr.c                                   |    1 +
 net/ipv6/ipv6_sockglue.c                           |    3 +-
 net/ipv6/netfilter/nf_log_ipv6.c                   |    8 +-
 net/ipv6/ping.c                                    |    7 +-
 net/ipv6/raw.c                                     |   18 +-
 net/ipv6/seg6.c                                    |    1 +
 net/ipv6/seg6_hmac.c                               |    1 +
 net/ipv6/tcpv6_offload.c                           |    4 +-
 net/ipv6/udp.c                                     |   13 +-
 net/ipv6/udp_offload.c                             |    4 +-
 net/l2tp/l2tp_core.c                               |   15 +-
 net/l2tp/l2tp_core.h                               |   12 -
 net/l2tp/l2tp_debugfs.c                            |    3 -
 net/l2tp/l2tp_ip6.c                                |   10 +-
 net/l2tp/l2tp_ppp.c                                |  180 +--
 net/mac80211/Makefile                              |    1 +
 net/mac80211/agg-rx.c                              |   10 +-
 net/mac80211/agg-tx.c                              |   19 +-
 net/mac80211/cfg.c                                 |    7 +-
 net/mac80211/ethtool.c                             |    6 +-
 net/mac80211/he.c                                  |   55 +
 net/mac80211/ht.c                                  |    2 +-
 net/mac80211/ieee80211_i.h                         |   47 +-
 net/mac80211/main.c                                |   36 +-
 net/mac80211/mlme.c                                |  312 ++++-
 net/mac80211/offchannel.c                          |    2 +-
 net/mac80211/rx.c                                  |  129 +-
 net/mac80211/scan.c                                |   56 +-
 net/mac80211/sta_info.c                            |  101 +-
 net/mac80211/sta_info.h                            |   20 +-
 net/mac80211/trace.h                               |    2 +-
 net/mac80211/tx.c                                  |   21 +-
 net/mac80211/util.c                                |  159 ++-
 net/netfilter/nf_conntrack_broadcast.c             |    2 +-
 net/netfilter/nf_log_common.c                      |    5 +-
 net/netfilter/nf_nat_core.c                        |    6 +-
 net/netfilter/nf_tables_api.c                      |    1 +
 net/netfilter/nft_meta.c                           |    9 +-
 net/netfilter/nft_socket.c                         |    5 +-
 net/netfilter/xt_cgroup.c                          |    6 +-
 net/netfilter/xt_owner.c                           |    2 +-
 net/netfilter/xt_recent.c                          |    3 +-
 net/netfilter/xt_socket.c                          |    8 +
 net/openvswitch/actions.c                          |   33 +
 net/openvswitch/flow_netlink.c                     |   80 +-
 net/packet/af_packet.c                             |    9 +-
 net/sched/Kconfig                                  |   11 +
 net/sched/Makefile                                 |    1 +
 net/sched/act_api.c                                |  415 ++++--
 net/sched/act_bpf.c                                |   34 +-
 net/sched/act_connmark.c                           |   29 +-
 net/sched/act_csum.c                               |   34 +-
 net/sched/act_gact.c                               |   31 +-
 net/sched/act_ife.c                                |   31 +-
 net/sched/act_ipt.c                                |   44 +-
 net/sched/act_mirred.c                             |   38 +-
 net/sched/act_nat.c                                |   30 +-
 net/sched/act_pedit.c                              |  111 +-
 net/sched/act_police.c                             |   31 +-
 net/sched/act_sample.c                             |   34 +-
 net/sched/act_simple.c                             |   31 +-
 net/sched/act_skbedit.c                            |   72 +-
 net/sched/act_skbmod.c                             |   34 +-
 net/sched/act_tunnel_key.c                         |  275 +++-
 net/sched/act_vlan.c                               |   40 +-
 net/sched/cls_api.c                                |  104 +-
 net/sched/cls_bpf.c                                |   39 +
 net/sched/cls_flower.c                             |  114 +-
 net/sched/cls_matchall.c                           |   32 +
 net/sched/cls_u32.c                                |  111 ++
 net/sched/sch_api.c                                |   11 +-
 net/sched/sch_etf.c                                |  484 +++++++
 net/sched/sch_htb.c                                |   13 -
 net/sched/sch_netem.c                              |   73 +-
 net/sctp/associola.c                               |   15 +
 net/sctp/input.c                                   |    1 +
 net/sctp/ipv6.c                                    |   20 +-
 net/sctp/protocol.c                                |   16 +-
 net/sctp/socket.c                                  |  245 +++-
 net/smc/Makefile                                   |    2 +-
 net/smc/af_smc.c                                   |  228 +++-
 net/smc/smc.h                                      |    7 +-
 net/smc/smc_cdc.c                                  |   86 +-
 net/smc/smc_cdc.h                                  |   43 +-
 net/smc/smc_clc.c                                  |  193 ++-
 net/smc/smc_clc.h                                  |   81 +-
 net/smc/smc_core.c                                 |  285 +++-
 net/smc/smc_core.h                                 |   72 +-
 net/smc/smc_diag.c                                 |   18 +-
 net/smc/smc_ib.c                                   |  142 +-
 net/smc/smc_ib.h                                   |    4 +-
 net/smc/smc_ism.c                                  |  314 +++++
 net/smc/smc_ism.h                                  |   48 +
 net/smc/smc_pnet.c                                 |  157 ++-
 net/smc/smc_pnet.h                                 |   16 +
 net/smc/smc_rx.c                                   |    2 +-
 net/smc/smc_tx.c                                   |  205 ++-
 net/smc/smc_tx.h                                   |    2 +
 net/strparser/strparser.c                          |   26 +-
 net/tipc/bearer.c                                  |    1 +
 net/tipc/group.c                                   |   32 +
 net/tipc/group.h                                   |    1 +
 net/tipc/link.c                                    |   44 +-
 net/tipc/msg.c                                     |   35 +-
 net/tipc/node.c                                    |   74 +-
 net/tipc/socket.c                                  |    5 +
 net/tls/tls_sw.c                                   |   13 +-
 net/wireless/core.c                                |   21 +-
 net/wireless/core.h                                |    2 +-
 net/wireless/nl80211.c                             |  194 ++-
 net/wireless/sysfs.c                               |    4 +-
 net/wireless/util.c                                |   87 +-
 net/wireless/wext-compat.c                         |   10 +-
 samples/bpf/Makefile                               |    4 +
 samples/bpf/xdp_rxq_info_kern.c                    |   43 +
 samples/bpf/xdp_rxq_info_user.c                    |   45 +-
 samples/bpf/xdp_sample_pkts_kern.c                 |   66 +
 samples/bpf/xdp_sample_pkts_user.c                 |  169 +++
 tools/bpf/bpftool/Makefile                         |    2 +-
 tools/bpf/bpftool/bash-completion/bpftool          |   32 +-
 tools/bpf/bpftool/common.c                         |    2 -
 tools/bpf/bpftool/main.c                           |    4 +-
 tools/bpf/bpftool/main.h                           |    2 -
 tools/bpf/bpftool/map.c                            |    2 -
 tools/bpf/bpftool/prog.c                           |    4 +-
 tools/lib/bpf/libbpf.c                             |   49 +-
 tools/lib/bpf/libbpf.h                             |    2 +
 tools/testing/selftests/bpf/test_sock_addr.c       |   37 +-
 tools/testing/selftests/bpf/trace_helpers.c        |   48 +-
 tools/testing/selftests/bpf/trace_helpers.h        |    4 +
 .../selftests/drivers/net/mlxsw/mirror_gre.sh      |  217 ++++
 .../drivers/net/mlxsw/mirror_gre_scale.sh          |  197 +++
 .../selftests/drivers/net/mlxsw/router_scale.sh    |  167 +++
 .../net/mlxsw/spectrum/devlink_lib_spectrum.sh     |  119 ++
 .../net/mlxsw/spectrum/devlink_resources.sh        |  117 ++
 .../drivers/net/mlxsw/spectrum/mirror_gre_scale.sh |   13 +
 .../drivers/net/mlxsw/spectrum/resource_scale.sh   |   55 +
 .../drivers/net/mlxsw/spectrum/router_scale.sh     |   18 +
 .../drivers/net/mlxsw/spectrum/tc_flower_scale.sh  |   19 +
 .../selftests/drivers/net/mlxsw/tc_flower_scale.sh |  134 ++
 tools/testing/selftests/net/forwarding/README      |    2 +
 .../net/forwarding/bridge_port_isolation.sh        |  151 +++
 .../selftests/net/forwarding/devlink_lib.sh        |  108 ++
 .../selftests/net/forwarding/gre_multipath.sh      |  354 +++++
 tools/testing/selftests/net/forwarding/lib.sh      |  173 ++-
 .../net/forwarding/mirror_gre_bridge_1d.sh         |  132 ++
 .../net/forwarding/mirror_gre_bridge_1d_vlan.sh    |    6 +-
 .../net/forwarding/mirror_gre_bridge_1q.sh         |  126 ++
 .../selftests/net/forwarding/mirror_gre_changes.sh |   11 +-
 .../selftests/net/forwarding/mirror_gre_lib.sh     |    4 +-
 .../net/forwarding/mirror_gre_topo_lib.sh          |    2 +-
 .../net/forwarding/mirror_gre_vlan_bridge_1q.sh    |   15 +-
 .../selftests/net/forwarding/router_bridge.sh      |  113 ++
 .../selftests/net/forwarding/router_bridge_vlan.sh |  132 ++
 .../selftests/net/forwarding/router_multipath.sh   |   39 -
 tools/testing/selftests/net/ip6_gre_headroom.sh    |   65 +
 tools/testing/selftests/net/rtnetlink.sh           |  128 +-
 .../tc-testing/tc-tests/actions/csum.json          |   24 +
 .../tc-testing/tc-tests/actions/tunnel_key.json    |  749 +++++++++++
 541 files changed, 20566 insertions(+), 4824 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/net/dsa/vitesse,vsc73xx.txt
 create mode 100644 drivers/net/dsa/vitesse-vsc73xx.c
 create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/rxtx.c
 create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/rxtx.h
 delete mode 100644 drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_api.c
 delete mode 100644 drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_api.h
 create mode 100644 drivers/net/netdevsim/ipsec.c
 create mode 100644 drivers/s390/net/ism.h
 create mode 100644 drivers/s390/net/ism_drv.c
 create mode 100644 include/linux/rhashtable-types.h
 create mode 100644 net/ipv6/ila/ila_main.c
 create mode 100644 net/mac80211/he.c
 create mode 100644 net/sched/sch_etf.c
 create mode 100644 net/smc/smc_ism.c
 create mode 100644 net/smc/smc_ism.h
 create mode 100644 samples/bpf/xdp_sample_pkts_kern.c
 create mode 100644 samples/bpf/xdp_sample_pkts_user.c
 create mode 100755 tools/testing/selftests/drivers/net/mlxsw/mirror_gre.sh
 create mode 100644 tools/testing/selftests/drivers/net/mlxsw/mirror_gre_scale.sh
 create mode 100644 tools/testing/selftests/drivers/net/mlxsw/router_scale.sh
 create mode 100644 tools/testing/selftests/drivers/net/mlxsw/spectrum/devlink_lib_spectrum.sh
 create mode 100755 tools/testing/selftests/drivers/net/mlxsw/spectrum/devlink_resources.sh
 create mode 100644 tools/testing/selftests/drivers/net/mlxsw/spectrum/mirror_gre_scale.sh
 create mode 100755 tools/testing/selftests/drivers/net/mlxsw/spectrum/resource_scale.sh
 create mode 100644 tools/testing/selftests/drivers/net/mlxsw/spectrum/router_scale.sh
 create mode 100644 tools/testing/selftests/drivers/net/mlxsw/spectrum/tc_flower_scale.sh
 create mode 100644 tools/testing/selftests/drivers/net/mlxsw/tc_flower_scale.sh
 create mode 100755 tools/testing/selftests/net/forwarding/bridge_port_isolation.sh
 create mode 100644 tools/testing/selftests/net/forwarding/devlink_lib.sh
 create mode 100755 tools/testing/selftests/net/forwarding/gre_multipath.sh
 create mode 100755 tools/testing/selftests/net/forwarding/mirror_gre_bridge_1d.sh
 create mode 100755 tools/testing/selftests/net/forwarding/mirror_gre_bridge_1q.sh
 create mode 100755 tools/testing/selftests/net/forwarding/router_bridge.sh
 create mode 100755 tools/testing/selftests/net/forwarding/router_bridge_vlan.sh
 create mode 100755 tools/testing/selftests/net/ip6_gre_headroom.sh
 create mode 100644 tools/testing/selftests/tc-testing/tc-tests/actions/tunnel_key.json
Merging bpf-next/master (d90c936fb318 Merge branch 'bpf-nfp-mul-div-support')
$ git merge bpf-next/master
Merge made by the 'recursive' strategy.
 drivers/net/ethernet/netronome/nfp/bpf/jit.c       | 249 ++++++++++++++++++++-
 drivers/net/ethernet/netronome/nfp/bpf/main.h      |  43 ++--
 drivers/net/ethernet/netronome/nfp/bpf/offload.c   |   6 +-
 drivers/net/ethernet/netronome/nfp/bpf/verifier.c  |  85 ++++++-
 drivers/net/ethernet/netronome/nfp/nfp_asm.h       |  28 +++
 include/linux/reciprocal_div.h                     |  68 ++++++
 lib/reciprocal_div.c                               |  41 ++++
 tools/bpf/bpftool/Documentation/bpftool-cgroup.rst |  12 +-
 tools/bpf/bpftool/bash-completion/bpftool          |   6 +-
 tools/bpf/bpftool/cgroup.c                         | 170 +++++++++++++-
 10 files changed, 664 insertions(+), 44 deletions(-)
Merging ipsec-next/master (e4db5b61c572 xfrm: policy: remove pcpu policy cache)
$ git merge ipsec-next/master
Auto-merging net/xfrm/xfrm_user.c
Auto-merging net/xfrm/xfrm_policy.c
Auto-merging net/key/af_key.c
Merge made by the 'recursive' strategy.
 include/net/flow.h           |   9 +
 include/net/xfrm.h           |  55 ++-
 include/uapi/linux/if_link.h |  10 +
 include/uapi/linux/xfrm.h    |   5 +-
 net/core/pktgen.c            |   2 +-
 net/key/af_key.c             |   6 +-
 net/xfrm/Kconfig             |   8 +
 net/xfrm/Makefile            |   1 +
 net/xfrm/xfrm_device.c       |  13 +-
 net/xfrm/xfrm_input.c        |   5 +
 net/xfrm/xfrm_interface.c    | 972 +++++++++++++++++++++++++++++++++++++++++++
 net/xfrm/xfrm_output.c       |   3 +-
 net/xfrm/xfrm_policy.c       | 205 +++------
 net/xfrm/xfrm_state.c        |  24 +-
 net/xfrm/xfrm_user.c         |  94 ++++-
 15 files changed, 1222 insertions(+), 190 deletions(-)
 create mode 100644 net/xfrm/xfrm_interface.c
Merging mlx5-next/mlx5-next (b183ee27f5fb net/mlx5: Add hardware definitions for dump_fill_mkey)
$ git merge mlx5-next/mlx5-next
Already up to date.
Merging netfilter-next/master (66c524acfb51 netfilter: conntrack: remove l3proto abstraction)
$ git merge netfilter-next/master
Auto-merging net/netfilter/nf_nat_core.c
Auto-merging net/netfilter/nf_conntrack_proto_icmpv6.c
Auto-merging net/netfilter/nf_conntrack_proto_icmp.c
Removing net/netfilter/nf_conntrack_l3proto_generic.c
Auto-merging net/netfilter/nf_conntrack_helper.c
Removing net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
Removing net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
Removing include/net/netfilter/nf_conntrack_l3proto.h
Merge made by the 'recursive' strategy.
 include/linux/netfilter_ipv4.h                     |  11 -
 include/linux/netfilter_ipv6.h                     |   5 -
 include/net/netfilter/ipv4/nf_conntrack_ipv4.h     |   3 -
 include/net/netfilter/nf_conntrack.h               |   5 +
 include/net/netfilter/nf_conntrack_core.h          |  15 +-
 include/net/netfilter/nf_conntrack_l3proto.h       |  84 --
 include/net/netfilter/nf_conntrack_l4proto.h       |  14 +-
 include/net/netfilter/nf_conntrack_timeout.h       |  18 +-
 include/net/netfilter/nf_tproxy.h                  |   8 +
 net/bridge/netfilter/nft_reject_bridge.c           |   3 +-
 net/ipv4/netfilter.c                               |  53 --
 net/ipv4/netfilter/Kconfig                         |  22 +-
 net/ipv4/netfilter/Makefile                        |   6 -
 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c     | 472 ------------
 net/ipv6/netfilter.c                               |  62 --
 net/ipv6/netfilter/Kconfig                         |  20 +-
 net/ipv6/netfilter/Makefile                        |   6 -
 net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c     | 460 -----------
 net/ipv6/netfilter/nf_defrag_ipv6_hooks.c          |   1 -
 net/netfilter/Kconfig                              |  12 +-
 net/netfilter/Makefile                             |   7 +-
 net/netfilter/nf_conntrack_core.c                  | 219 ++++--
 net/netfilter/nf_conntrack_expect.c                |   1 -
 net/netfilter/nf_conntrack_helper.c                |   1 -
 net/netfilter/nf_conntrack_l3proto_generic.c       |  66 --
 net/netfilter/nf_conntrack_netlink.c               |  96 ++-
 net/netfilter/nf_conntrack_proto.c                 | 845 +++++++++++++++------
 net/netfilter/nf_conntrack_proto_dccp.c            |  44 +-
 net/netfilter/nf_conntrack_proto_generic.c         |  32 +-
 net/netfilter/nf_conntrack_proto_gre.c             |  24 +-
 net/{ipv4 => }/netfilter/nf_conntrack_proto_icmp.c |  19 +-
 .../netfilter/nf_conntrack_proto_icmpv6.c          |  17 +-
 net/netfilter/nf_conntrack_proto_sctp.c            |  46 +-
 net/netfilter/nf_conntrack_proto_tcp.c             |  52 +-
 net/netfilter/nf_conntrack_proto_udp.c             |  55 +-
 net/netfilter/nf_conntrack_standalone.c            |  28 +-
 net/netfilter/nf_flow_table_core.c                 |  13 +-
 net/netfilter/nf_nat_core.c                        |   8 -
 net/netfilter/nfnetlink_cttimeout.c                |  13 +-
 net/netfilter/utils.c                              | 131 +++-
 net/netfilter/xt_TPROXY.c                          |   9 -
 net/openvswitch/conntrack.c                        |  17 +-
 42 files changed, 1116 insertions(+), 1907 deletions(-)
 delete mode 100644 include/net/netfilter/nf_conntrack_l3proto.h
 delete mode 100644 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
 delete mode 100644 net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
 delete mode 100644 net/netfilter/nf_conntrack_l3proto_generic.c
 rename net/{ipv4 => }/netfilter/nf_conntrack_proto_icmp.c (96%)
 rename net/{ipv6 => }/netfilter/nf_conntrack_proto_icmpv6.c (96%)
Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings)
$ git merge nfc-next/master
Auto-merging drivers/nfc/fdp/i2c.c
Merge made by the 'recursive' strategy.
 drivers/nfc/fdp/fdp.c      | 35 +++++------------------------------
 drivers/nfc/fdp/i2c.c      | 26 +++++++++++++-------------
 drivers/nfc/st21nfca/dep.c |  3 ++-
 drivers/nfc/st21nfca/se.c  |  5 +++--
 drivers/nfc/st95hf/core.c  |  7 ++-----
 net/nfc/hci/core.c         | 10 ++++++++++
 net/nfc/netlink.c          |  6 ++++--
 7 files changed, 39 insertions(+), 53 deletions(-)
Merging ipvs-next/master (e523452ac0e0 netfilter: nf_tables: remove unused variables)
$ git merge ipvs-next/master
Already up to date.
Merging wireless-drivers-next/master (4a07ed51cae1 mt76x2: debugfs: add sw pulse statistics to dfs debugfs)
$ git merge wireless-drivers-next/master
Auto-merging lib/Makefile
Auto-merging drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
Auto-merging drivers/net/wireless/ath/ath10k/mac.c
Merge made by the 'recursive' strategy.
 drivers/net/wireless/ath/ath10k/Kconfig            |  24 +-
 drivers/net/wireless/ath/ath10k/ce.c               |   2 +-
 drivers/net/wireless/ath/ath10k/ce.h               |  42 ++
 drivers/net/wireless/ath/ath10k/core.c             |  19 +-
 drivers/net/wireless/ath/ath10k/core.h             |   3 +-
 drivers/net/wireless/ath/ath10k/debug.c            |  21 +-
 drivers/net/wireless/ath/ath10k/htt_tx.c           |   4 +-
 drivers/net/wireless/ath/ath10k/hw.h               |   3 +
 drivers/net/wireless/ath/ath10k/mac.c              |   7 +-
 drivers/net/wireless/ath/ath10k/pci.h              |  42 --
 drivers/net/wireless/ath/ath10k/snoc.c             |  47 +-
 drivers/net/wireless/ath/ath10k/snoc.h             |   1 -
 drivers/net/wireless/ath/ath10k/spectral.c         |   2 +-
 drivers/net/wireless/ath/ath10k/wmi.c              |  14 +-
 drivers/net/wireless/ath/ath5k/pcu.c               |   1 +
 drivers/net/wireless/ath/ath6kl/cfg80211.c         |  17 +-
 drivers/net/wireless/ath/ath6kl/sdio.c             |   1 +
 drivers/net/wireless/ath/ath9k/ar5008_phy.c        |   2 +
 drivers/net/wireless/ath/ath9k/ar9002_phy.c        |   1 +
 drivers/net/wireless/ath/ath9k/debug.c             |   2 +-
 drivers/net/wireless/ath/ath9k/main.c              |   1 +
 drivers/net/wireless/ath/wil6210/cfg80211.c        |  18 +-
 drivers/net/wireless/atmel/atmel.c                 |  14 +-
 .../broadcom/brcm80211/brcmfmac/cfg80211.c         |  40 +-
 .../wireless/broadcom/brcm80211/brcmfmac/core.c    |  25 +
 .../wireless/broadcom/brcm80211/brcmfmac/core.h    |   2 +
 .../wireless/broadcom/brcm80211/brcmfmac/feature.c |   2 +
 .../wireless/broadcom/brcm80211/brcmfmac/feature.h |   6 +-
 .../broadcom/brcm80211/brcmfmac/fwil_types.h       |  43 +-
 .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c  |  18 +
 .../broadcom/brcm80211/brcmsmac/phy/phy_cmn.c      |   2 +-
 .../broadcom/brcm80211/brcmsmac/phy/phy_n.c        |   2 +-
 .../broadcom/brcm80211/brcmsmac/phy/phy_qmath.c    |   2 +-
 drivers/net/wireless/intel/ipw2x00/ipw2100.c       |  18 +-
 drivers/net/wireless/intel/ipw2x00/ipw2100.h       |  12 +-
 drivers/net/wireless/intel/ipw2x00/ipw2200.c       |   6 +-
 drivers/net/wireless/intel/ipw2x00/ipw2200.h       |   6 +-
 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c  |   6 +-
 drivers/net/wireless/marvell/libertas/cfg.c        |  12 +-
 drivers/net/wireless/marvell/libertas/dev.h        |   1 +
 drivers/net/wireless/marvell/libertas/if_sdio.c    |  30 +-
 drivers/net/wireless/marvell/libertas/if_usb.c     |   7 +-
 drivers/net/wireless/marvell/libertas_tf/if_usb.c  |   8 +-
 drivers/net/wireless/marvell/mwifiex/cfg80211.c    |  14 +-
 drivers/net/wireless/marvell/mwifiex/uap_txrx.c    |  52 +-
 drivers/net/wireless/mediatek/mt76/mt76.h          |  12 +
 drivers/net/wireless/mediatek/mt76/mt76x2.h        |  16 +-
 .../net/wireless/mediatek/mt76/mt76x2_debugfs.c    |  22 +
 drivers/net/wireless/mediatek/mt76/mt76x2_dfs.c    | 377 ++++++++++++++-
 drivers/net/wireless/mediatek/mt76/mt76x2_dfs.h    |  64 +++
 drivers/net/wireless/mediatek/mt76/mt76x2_mac.c    |  39 +-
 drivers/net/wireless/mediatek/mt76/mt76x2_main.c   |   7 +-
 drivers/net/wireless/mediatek/mt76/mt76x2_phy.c    | 107 ++++-
 drivers/net/wireless/mediatek/mt76/mt76x2_tx.c     |  33 ++
 drivers/net/wireless/quantenna/qtnfmac/cfg80211.c  |   3 +
 drivers/net/wireless/quantenna/qtnfmac/commands.c  |  57 ++-
 drivers/net/wireless/quantenna/qtnfmac/core.c      |  25 +
 drivers/net/wireless/quantenna/qtnfmac/qlink.h     |  20 +
 drivers/net/wireless/rndis_wlan.c                  |   6 +-
 drivers/net/wireless/ti/wl18xx/debugfs.c           |  29 +-
 drivers/net/wireless/ti/wlcore/acx.c               |   1 -
 drivers/net/wireless/ti/wlcore/cmd.c               |  10 +
 drivers/net/wireless/ti/wlcore/debugfs.c           |  90 ++--
 drivers/net/wireless/ti/wlcore/main.c              | 528 ++++++++++++++-------
 drivers/net/wireless/ti/wlcore/ps.c                | 146 ------
 drivers/net/wireless/ti/wlcore/ps.h                |   3 -
 drivers/net/wireless/ti/wlcore/scan.c              |  13 +-
 drivers/net/wireless/ti/wlcore/sysfs.c             |  13 +-
 drivers/net/wireless/ti/wlcore/testmode.c          |  20 +-
 drivers/net/wireless/ti/wlcore/tx.c                |  10 +-
 drivers/net/wireless/ti/wlcore/vendor_cmd.c        |  30 +-
 drivers/net/wireless/ti/wlcore/wlcore.h            |   1 -
 drivers/net/wireless/ti/wlcore/wlcore_i.h          |   1 -
 drivers/net/wireless/zydas/zd1211rw/zd_chip.c      |   2 +-
 drivers/net/wireless/zydas/zd1211rw/zd_usb.c       |  21 +-
 include/linux/bitfield.h                           |   7 +-
 lib/Kconfig.debug                                  |   7 +
 lib/Makefile                                       |   1 +
 lib/test_bitfield.c                                | 168 +++++++
 79 files changed, 1787 insertions(+), 704 deletions(-)
 create mode 100644 lib/test_bitfield.c
Merging bluetooth/master (4d94f95d30c8 Bluetooth: Use extended LE Connection if supported)
$ git merge bluetooth/master
Removing include/linux/platform_data/bt-nokia-h4p.h
Merge made by the 'recursive' strategy.
 drivers/bluetooth/btusb.c                  |  21 +-
 include/linux/platform_data/bt-nokia-h4p.h |  38 ----
 include/net/bluetooth/hci.h                |  94 ++++++++
 include/net/bluetooth/hci_core.h           |   8 +
 net/6lowpan/iphc.c                         |   1 +
 net/bluetooth/hci_conn.c                   |  72 +++++--
 net/bluetooth/hci_core.c                   |  30 +++
 net/bluetooth/hci_debugfs.c                |  19 ++
 net/bluetooth/hci_event.c                  | 330 +++++++++++++++++++++++------
 net/bluetooth/hci_request.c                | 138 ++++++++----
 10 files changed, 584 insertions(+), 167 deletions(-)
 delete mode 100644 include/linux/platform_data/bt-nokia-h4p.h
Merging mac80211-next/master (1a84d7fdb5fc Merge branch 'mlxsw-Add-resource-scale-tests')
$ git merge mac80211-next/master
Already up to date.
Merging gfs2/for-next (5db0147b887e Merge branch 'iomap-write' into linux-gfs2/for-next)
$ git merge gfs2/for-next
Auto-merging fs/internal.h
Auto-merging fs/gfs2/super.c
Merge made by the 'recursive' strategy.
 fs/buffer.c           |  76 +++++-----
 fs/gfs2/acl.c         |   6 +-
 fs/gfs2/aops.c        | 331 ++--------------------------------------
 fs/gfs2/aops.h        |  19 +++
 fs/gfs2/bmap.c        | 408 ++++++++++++++++++++++++++++++++++++++++----------
 fs/gfs2/file.c        | 164 ++++++++++++++++++--
 fs/gfs2/incore.h      |   2 -
 fs/gfs2/log.c         |  28 +++-
 fs/gfs2/lops.c        |   2 +-
 fs/gfs2/meta_io.c     |   4 +-
 fs/gfs2/rgrp.c        |  78 +++++++---
 fs/gfs2/super.c       |   1 -
 fs/gfs2/trace_gfs2.h  |   3 +-
 fs/gfs2/trans.h       |   6 +-
 fs/gfs2/util.c        |  38 ++---
 fs/gfs2/util.h        |  10 +-
 fs/internal.h         |   2 +
 fs/iomap.c            |  86 ++++++++---
 include/linux/iomap.h |  11 ++
 19 files changed, 756 insertions(+), 519 deletions(-)
 create mode 100644 fs/gfs2/aops.h
Merging mtd/mtd/next (fb60e87dc4aa mtd: nftl: remove redundant variable nb_erases)
$ git merge mtd/mtd/next
Auto-merging lib/Makefile
Auto-merging drivers/mtd/chips/cfi_cmdset_0002.c
Merge made by the 'recursive' strategy.
 .../bindings/mtd/partitions/brcm,trx.txt           | 37 ++++++++++++++++++++++
 drivers/mtd/chips/cfi_cmdset_0002.c                |  2 --
 drivers/mtd/chips/gen_probe.c                      |  7 ++--
 drivers/mtd/maps/gpio-addr-flash.c                 |  3 ++
 drivers/mtd/nftlmount.c                            |  3 +-
 drivers/mtd/parsers/parser_trx.c                   |  7 ++++
 lib/Makefile                                       |  1 +
 lib/bch.c                                          | 23 +++++++++-----
 8 files changed, 69 insertions(+), 14 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mtd/partitions/brcm,trx.txt
Merging nand/nand/next (77ff5ce6be5b mtd: rawnand: marvell: set reg_clk to NULL if it can't be obtained)
$ git merge nand/nand/next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/mtd/denali-nand.txt        |    5 +
 Documentation/devicetree/bindings/mtd/nand.txt     |    6 +-
 .../bindings/mtd/nvidia-tegra20-nand.txt           |   64 +
 .../devicetree/bindings/mtd/qcom_nandc.txt         |    7 +-
 Documentation/devicetree/bindings/mtd/spi-nand.txt |    5 +
 MAINTAINERS                                        |    7 +
 arch/arm/mach-pxa/balloon3.c                       |    1 -
 arch/arm/mach-pxa/em-x270.c                        |    1 -
 drivers/bcma/Kconfig                               |    3 +-
 drivers/mtd/nand/Kconfig                           |    1 +
 drivers/mtd/nand/Makefile                          |    1 +
 drivers/mtd/nand/raw/Kconfig                       |   49 +-
 drivers/mtd/nand/raw/Makefile                      |    1 +
 drivers/mtd/nand/raw/atmel/nand-controller.c       |    7 +-
 drivers/mtd/nand/raw/cafe_nand.c                   |    8 -
 drivers/mtd/nand/raw/denali.c                      |   79 +-
 drivers/mtd/nand/raw/denali.h                      |    1 +
 drivers/mtd/nand/raw/denali_dt.c                   |   70 +-
 drivers/mtd/nand/raw/denali_pci.c                  |    1 +
 drivers/mtd/nand/raw/diskonchip.c                  |    4 +-
 drivers/mtd/nand/raw/docg4.c                       |   22 +-
 drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c          |   15 +-
 drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c         |   20 +-
 drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h         |   11 +-
 drivers/mtd/nand/raw/marvell_nand.c                |   91 +-
 drivers/mtd/nand/raw/mxc_nand.c                    |   21 +-
 drivers/mtd/nand/raw/nand_base.c                   |   94 +-
 drivers/mtd/nand/raw/nand_bbt.c                    |   10 +-
 drivers/mtd/nand/raw/nand_hynix.c                  |   13 +
 drivers/mtd/nand/raw/nand_micron.c                 |  239 +++-
 drivers/mtd/nand/raw/nandsim.c                     |    2 +-
 drivers/mtd/nand/raw/orion_nand.c                  |    3 -
 drivers/mtd/nand/raw/plat_nand.c                   |    2 -
 drivers/mtd/nand/raw/qcom_nandc.c                  |  486 +++++---
 drivers/mtd/nand/raw/sharpsl.c                     |    5 +-
 drivers/mtd/nand/raw/tegra_nand.c                  | 1232 ++++++++++++++++++++
 drivers/mtd/nand/spi/Kconfig                       |    7 +
 drivers/mtd/nand/spi/Makefile                      |    3 +
 drivers/mtd/nand/spi/core.c                        | 1155 ++++++++++++++++++
 drivers/mtd/nand/spi/macronix.c                    |  144 +++
 drivers/mtd/nand/spi/micron.c                      |  133 +++
 drivers/mtd/nand/spi/winbond.c                     |  141 +++
 include/linux/mtd/rawnand.h                        |   44 +-
 include/linux/mtd/spinand.h                        |  421 +++++++
 include/linux/platform_data/mtd-orion_nand.h       |    1 -
 include/linux/spi/spi-mem.h                        |    4 +-
 46 files changed, 4189 insertions(+), 451 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mtd/nvidia-tegra20-nand.txt
 create mode 100644 Documentation/devicetree/bindings/mtd/spi-nand.txt
 create mode 100644 drivers/mtd/nand/raw/tegra_nand.c
 create mode 100644 drivers/mtd/nand/spi/Kconfig
 create mode 100644 drivers/mtd/nand/spi/Makefile
 create mode 100644 drivers/mtd/nand/spi/core.c
 create mode 100644 drivers/mtd/nand/spi/macronix.c
 create mode 100644 drivers/mtd/nand/spi/micron.c
 create mode 100644 drivers/mtd/nand/spi/winbond.c
 create mode 100644 include/linux/mtd/spinand.h
Merging spi-nor/spi-nor/next (a3804084ddf0 mtd: spi-nor: stm32-quadspi: replace "%p" with "%pK")
$ git merge spi-nor/spi-nor/next
Merge made by the 'recursive' strategy.
 drivers/mtd/devices/m25p80.c        |  5 +----
 drivers/mtd/spi-nor/atmel-quadspi.c | 21 +++++++++++++++++++++
 drivers/mtd/spi-nor/nxp-spifi.c     |  1 +
 drivers/mtd/spi-nor/stm32-quadspi.c |  6 +++---
 4 files changed, 26 insertions(+), 7 deletions(-)
Merging crypto/master (5c324a2ffa06 crypto: ccree - rate limit debug print)
$ git merge crypto/master
Auto-merging security/keys/dh.c
Removing include/crypto/vmac.h
Auto-merging crypto/sha3_generic.c
Auto-merging crypto/morus640.c
Auto-merging arch/arm64/crypto/aes-glue.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 Documentation/crypto/api-samples.rst               |   2 +-
 .../bindings/crypto/inside-secure-safexcel.txt     |  15 +-
 MAINTAINERS                                        |   2 +-
 arch/arm/crypto/ghash-ce-glue.c                    |   5 +-
 arch/arm/crypto/sha1-ce-glue.c                     |   1 -
 arch/arm/crypto/sha1_glue.c                        |   1 -
 arch/arm/crypto/sha1_neon_glue.c                   |   1 -
 arch/arm/crypto/sha2-ce-glue.c                     |   2 -
 arch/arm/crypto/sha256_glue.c                      |   2 -
 arch/arm/crypto/sha256_neon_glue.c                 |   2 -
 arch/arm/crypto/sha512-glue.c                      |   2 -
 arch/arm/crypto/sha512-neon-glue.c                 |   2 -
 arch/arm64/crypto/aes-glue.c                       |   3 -
 arch/arm64/crypto/ghash-ce-glue.c                  |   1 -
 arch/arm64/crypto/sha1-ce-glue.c                   |   1 -
 arch/arm64/crypto/sha2-ce-glue.c                   |   2 -
 arch/arm64/crypto/sha256-glue.c                    |   4 -
 arch/arm64/crypto/sha3-ce-glue.c                   |   4 -
 arch/arm64/crypto/sha512-ce-glue.c                 |   2 -
 arch/arm64/crypto/sha512-glue.c                    |   2 -
 arch/arm64/crypto/sm3-ce-glue.c                    |   1 -
 arch/mips/cavium-octeon/crypto/octeon-md5.c        |   1 -
 arch/mips/cavium-octeon/crypto/octeon-sha1.c       |   1 -
 arch/mips/cavium-octeon/crypto/octeon-sha256.c     |   2 -
 arch/mips/cavium-octeon/crypto/octeon-sha512.c     |   2 -
 arch/powerpc/crypto/md5-glue.c                     |   1 -
 arch/powerpc/crypto/sha1-spe-glue.c                |   1 -
 arch/powerpc/crypto/sha1.c                         |   1 -
 arch/powerpc/crypto/sha256-spe-glue.c              |   2 -
 arch/s390/crypto/aes_s390.c                        |   1 -
 arch/s390/crypto/ghash_s390.c                      |   1 -
 arch/s390/crypto/sha1_s390.c                       |   1 -
 arch/s390/crypto/sha256_s390.c                     |   2 -
 arch/s390/crypto/sha512_s390.c                     |   2 -
 arch/sparc/crypto/md5_glue.c                       |   1 -
 arch/sparc/crypto/sha1_glue.c                      |   1 -
 arch/sparc/crypto/sha256_glue.c                    |   2 -
 arch/sparc/crypto/sha512_glue.c                    |   2 -
 arch/x86/crypto/ghash-clmulni-intel_glue.c         |   6 +-
 arch/x86/crypto/poly1305_glue.c                    |   1 -
 arch/x86/crypto/sha1-mb/sha1_mb.c                  |  17 +-
 arch/x86/crypto/sha1_ssse3_glue.c                  |   4 -
 arch/x86/crypto/sha256-mb/sha256_mb.c              |  18 +-
 .../crypto/sha256-mb/sha256_mb_mgr_flush_avx2.S    |   2 +-
 arch/x86/crypto/sha256_ssse3_glue.c                |   8 -
 arch/x86/crypto/sha512-mb/sha512_mb.c              |  18 +-
 arch/x86/crypto/sha512_ssse3_glue.c                |   6 -
 crypto/ablkcipher.c                                |   2 +
 crypto/aegis128.c                                  |   1 -
 crypto/aegis128l.c                                 |   3 +-
 crypto/aegis256.c                                  |   1 -
 crypto/blkcipher.c                                 |   1 +
 crypto/crypto_null.c                               |   1 -
 crypto/dh.c                                        |  66 ++-
 crypto/dh_helper.c                                 |  15 +-
 crypto/ecc.c                                       |  42 +-
 crypto/ecc_curve_defs.h                            |  22 +-
 crypto/ghash-generic.c                             |   1 -
 crypto/md4.c                                       |   1 -
 crypto/md5.c                                       |   1 -
 crypto/morus1280.c                                 |   1 -
 crypto/morus640.c                                  |   1 -
 crypto/poly1305_generic.c                          |   1 -
 crypto/rmd128.c                                    |   1 -
 crypto/rmd160.c                                    |   1 -
 crypto/rmd256.c                                    |   1 -
 crypto/rmd320.c                                    |   1 -
 crypto/sha1_generic.c                              |   2 +-
 crypto/sha256_generic.c                            |   4 +-
 crypto/sha3_generic.c                              |   4 -
 crypto/sha512_generic.c                            |  26 +-
 crypto/skcipher.c                                  |   1 -
 crypto/sm3_generic.c                               |   1 -
 crypto/tcrypt.c                                    |   2 +-
 crypto/testmgr.c                                   |  59 ++-
 crypto/testmgr.h                                   | 217 +++++---
 crypto/tgr192.c                                    |   3 -
 crypto/vmac.c                                      | 444 ++++++++---------
 crypto/wp512.c                                     |   3 -
 drivers/crypto/Kconfig                             |   2 +
 drivers/crypto/amcc/crypto4xx_core.c               |  18 +-
 drivers/crypto/atmel-ecc.c                         |  35 +-
 drivers/crypto/atmel-sha.c                         |   4 +-
 drivers/crypto/axis/artpec6_crypto.c               |  28 +-
 drivers/crypto/bcm/cipher.c                        |   8 +-
 drivers/crypto/caam/caamhash.c                     |   3 +-
 drivers/crypto/cavium/cpt/cptvf_algs.c             |   2 +-
 drivers/crypto/ccp/ccp-crypto-aes-cmac.c           |   3 +-
 drivers/crypto/ccp/ccp-crypto-sha.c                |   3 +-
 drivers/crypto/ccree/cc_cipher.c                   | 140 ++++--
 drivers/crypto/ccree/cc_driver.c                   |   4 +-
 drivers/crypto/ccree/cc_hash.c                     |  85 +---
 drivers/crypto/chelsio/chcr_algo.c                 |   7 +-
 drivers/crypto/inside-secure/safexcel.c            | 469 +++++++++++------
 drivers/crypto/inside-secure/safexcel.h            | 196 +++++---
 drivers/crypto/inside-secure/safexcel_cipher.c     | 487 ++++++++++++++----
 drivers/crypto/inside-secure/safexcel_hash.c       | 555 ++++++++++++++++++---
 drivers/crypto/inside-secure/safexcel_ring.c       |  58 ++-
 drivers/crypto/marvell/hash.c                      |   3 +-
 drivers/crypto/n2_core.c                           |   3 +-
 drivers/crypto/nx/nx-aes-xcbc.c                    |   1 -
 drivers/crypto/nx/nx-sha256.c                      |   1 -
 drivers/crypto/nx/nx-sha512.c                      |   1 -
 drivers/crypto/omap-sham.c                         |  36 +-
 drivers/crypto/padlock-sha.c                       |   8 +-
 drivers/crypto/qce/sha.c                           |   3 +-
 drivers/crypto/s5p-sss.c                           |   9 +-
 drivers/crypto/sahara.c                            |   6 +-
 drivers/crypto/stm32/stm32-cryp.c                  |  62 +++
 drivers/crypto/stm32/stm32-hash.c                  |  95 +++-
 drivers/crypto/stm32/stm32_crc32.c                 |  62 +++
 drivers/crypto/sunxi-ss/sun4i-ss-core.c            |  20 +-
 drivers/crypto/talitos.c                           |  37 +-
 drivers/crypto/ux500/hash/hash_core.c              |  15 +-
 drivers/crypto/virtio/virtio_crypto_algs.c         | 112 +++--
 drivers/crypto/virtio/virtio_crypto_common.h       |  25 +-
 drivers/crypto/virtio/virtio_crypto_core.c         |  29 ++
 drivers/crypto/virtio/virtio_crypto_mgr.c          |  81 ++-
 drivers/crypto/vmx/ghash.c                         |   2 +-
 drivers/staging/skein/skein_generic.c              |   3 -
 include/crypto/dh.h                                |   4 +
 include/crypto/sha.h                               |   4 +
 include/crypto/vmac.h                              |  63 ---
 security/keys/dh.c                                 |   2 +-
 124 files changed, 2580 insertions(+), 1305 deletions(-)
 delete mode 100644 include/crypto/vmac.h
Merging drm/drm-next (4da1d4c751c9 Merge commit 'refs/for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-next)
$ git merge drm/drm-next
Auto-merging drivers/gpu/drm/i915/i915_vma.c
Auto-merging drivers/gpu/drm/i915/i915_gem.c
Auto-merging drivers/gpu/drm/i915/gvt/gtt.c
Auto-merging drivers/gpu/drm/i915/gvt/display.c
Auto-merging drivers/gpu/drm/exynos/exynos_drm_plane.c
Removing drivers/gpu/drm/amd/powerplay/inc/pp_power_source.h
Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/display/ilitek,ili9341.txt |   27 +
 .../bindings/display/panel/auo,g070vvn01.txt       |   29 +
 .../bindings/display/panel/ilitek,ili9881c.txt     |   20 +
 .../bindings/display/panel/innolux,tv123wam.txt    |   20 +
 .../bindings/display/sunxi/sun4i-drm.txt           |   60 +-
 .../devicetree/bindings/vendor-prefixes.txt        |    1 +
 Documentation/driver-api/dma-buf.rst               |    6 +
 Documentation/gpu/amdgpu.rst                       |  117 +
 Documentation/gpu/drivers.rst                      |    1 +
 Documentation/gpu/drm-kms.rst                      |   15 +
 Documentation/gpu/drm-mm.rst                       |   20 +
 Documentation/gpu/kms-properties.csv               |    1 +
 Documentation/locking/ww-mutex-design.txt          |   65 +-
 drivers/dma-buf/dma-buf.c                          |   56 +-
 drivers/dma-buf/dma-fence-array.c                  |    1 -
 drivers/dma-buf/dma-fence.c                        |  167 +-
 drivers/dma-buf/reservation.c                      |    2 +-
 drivers/dma-buf/sw_sync.c                          |    1 -
 drivers/gpu/drm/Makefile                           |    2 +-
 drivers/gpu/drm/amd/amdgpu/ObjectID.h              |    8 +
 drivers/gpu/drm/amd/amdgpu/amdgpu.h                |    2 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c   |    2 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c             |   11 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c            |   14 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         |   19 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h            |    2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c            |   12 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c          |    1 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c            |    6 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h            |   15 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c             |    3 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c            |  202 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c            |   34 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c             |  204 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c         |  311 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c             |   66 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c          |  124 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c      |    7 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c           |    2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h           |    4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c            |    2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c            |   61 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c            |  128 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h            |    4 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c             |  274 +-
 drivers/gpu/drm/amd/amdgpu/atom.c                  |    2 +-
 drivers/gpu/drm/amd/amdgpu/ci_dpm.c                |   12 +-
 drivers/gpu/drm/amd/amdgpu/cik.c                   |    8 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c              |  217 +-
 drivers/gpu/drm/amd/amdgpu/kv_dpm.c                |    2 +-
 drivers/gpu/drm/amd/amdgpu/si_dpm.c                |    4 +-
 drivers/gpu/drm/amd/amdgpu/soc15d.h                |   23 +
 drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c              |  457 +++
 drivers/gpu/drm/amd/display/Kconfig                |   11 +-
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  |   15 +-
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h  |    5 +-
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c  |   28 +
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c |    8 -
 .../gpu/drm/amd/display/dc/basics/log_helpers.c    |    2 +
 drivers/gpu/drm/amd/display/dc/basics/logger.c     |   83 +-
 drivers/gpu/drm/amd/display/dc/core/dc.c           |   19 +-
 drivers/gpu/drm/amd/display/dc/core/dc_link.c      |   40 +-
 drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c   |   34 +-
 drivers/gpu/drm/amd/display/dc/core/dc_resource.c  |  422 ++-
 drivers/gpu/drm/amd/display/dc/core/dc_sink.c      |    4 +
 drivers/gpu/drm/amd/display/dc/core/dc_surface.c   |   11 +
 drivers/gpu/drm/amd/display/dc/dc.h                |   19 +-
 drivers/gpu/drm/amd/display/dc/dc_ddc_types.h      |   61 +-
 drivers/gpu/drm/amd/display/dc/dc_dp_types.h       |    5 +-
 drivers/gpu/drm/amd/display/dc/dc_hw_types.h       |   34 +-
 drivers/gpu/drm/amd/display/dc/dc_stream.h         |    8 +-
 drivers/gpu/drm/amd/display/dc/dc_types.h          |   21 +-
 .../drm/amd/display/dc/dce/dce_stream_encoder.c    |    5 -
 .../drm/amd/display/dc/dce110/dce110_compressor.c  |    4 +-
 .../amd/display/dc/dce110/dce110_hw_sequencer.c    |  291 +-
 .../amd/display/dc/dce110/dce110_hw_sequencer.h    |    4 +
 .../drm/amd/display/dc/dce110/dce110_resource.c    |    7 +-
 .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c  |   26 +-
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c  |   32 +
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h  |    4 +
 .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c  |    4 +-
 .../amd/display/dc/dcn10/dcn10_stream_encoder.c    |   88 +-
 drivers/gpu/drm/amd/display/dc/dm_services.h       |    5 +-
 drivers/gpu/drm/amd/display/dc/i2caux/aux_engine.c |   16 +
 drivers/gpu/drm/amd/display/dc/i2caux/aux_engine.h |   41 +-
 .../display/dc/i2caux/dce110/aux_engine_dce110.c   |   56 +-
 drivers/gpu/drm/amd/display/dc/i2caux/engine.h     |   18 +-
 drivers/gpu/drm/amd/display/dc/inc/core_types.h    |    1 +
 .../drm/amd/display/dc/inc/hw/timing_generator.h   |    3 +
 drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h  |    8 +-
 drivers/gpu/drm/amd/display/dc/inc/resource.h      |    1 +
 .../drm/amd/display/include/ddc_service_types.h    |    3 +-
 drivers/gpu/drm/amd/display/include/fixed31_32.h   |    7 +
 .../gpu/drm/amd/display/include/logger_interface.h |    2 +
 .../drm/amd/display/modules/color/color_gamma.c    |  137 +
 drivers/gpu/drm/amd/display/modules/stats/stats.c  |    4 +-
 .../drm/amd/include/asic_reg/vcn/vcn_1_0_offset.h  |   20 +
 drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c        |    6 +-
 .../amd/powerplay/hwmgr/smu7_clockpowergating.c    |   54 -
 .../amd/powerplay/hwmgr/smu7_clockpowergating.h    |    1 -
 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c   |  133 +-
 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.h   |    1 -
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c |   84 +-
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h |    1 -
 drivers/gpu/drm/amd/powerplay/inc/hwmgr.h          |    2 -
 .../gpu/drm/amd/powerplay/inc/pp_power_source.h    |   36 -
 drivers/gpu/drm/amd/powerplay/inc/smumgr.h         |    2 -
 drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c   |  119 +-
 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c |   74 -
 .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c  |   10 -
 .../drm/amd/powerplay/smumgr/polaris10_smumgr.c    |   86 -
 .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c    |   80 -
 .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c    |   85 -
 drivers/gpu/drm/arc/arcpgu_crtc.c                  |    5 +-
 drivers/gpu/drm/arm/Makefile                       |    1 +
 drivers/gpu/drm/arm/hdlcd_crtc.c                   |    2 +-
 drivers/gpu/drm/arm/malidp_crtc.c                  |   10 +
 drivers/gpu/drm/arm/malidp_drv.c                   |  177 +-
 drivers/gpu/drm/arm/malidp_drv.h                   |   26 +
 drivers/gpu/drm/arm/malidp_hw.c                    |  297 +-
 drivers/gpu/drm/arm/malidp_hw.h                    |   40 +-
 drivers/gpu/drm/arm/malidp_mw.c                    |  250 ++
 drivers/gpu/drm/arm/malidp_mw.h                    |   14 +
 drivers/gpu/drm/arm/malidp_regs.h                  |   24 +-
 drivers/gpu/drm/armada/armada_fb.c                 |   23 +-
 drivers/gpu/drm/armada/armada_fb.h                 |    3 +-
 drivers/gpu/drm/armada/armada_gem.c                |    2 -
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c       |    1 +
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c    |   19 +-
 drivers/gpu/drm/bridge/Kconfig                     |    4 +-
 drivers/gpu/drm/bridge/cdns-dsi.c                  |    4 +-
 drivers/gpu/drm/cirrus/cirrus_drv.h                |   10 +-
 drivers/gpu/drm/cirrus/cirrus_fbdev.c              |   20 +-
 drivers/gpu/drm/cirrus/cirrus_main.c               |   43 +-
 drivers/gpu/drm/cirrus/cirrus_mode.c               |   12 +-
 drivers/gpu/drm/drm_atomic.c                       |  405 ++-
 drivers/gpu/drm/drm_atomic_helper.c                |   65 +-
 drivers/gpu/drm/drm_connector.c                    |  119 +-
 drivers/gpu/drm/drm_crtc.c                         |   46 +-
 drivers/gpu/drm/drm_crtc_internal.h                |   22 +-
 drivers/gpu/drm/drm_dumb_buffers.c                 |   29 +-
 drivers/gpu/drm/drm_edid.c                         |  279 +-
 drivers/gpu/drm/drm_fb_helper.c                    |    9 +-
 drivers/gpu/drm/drm_file.c                         |  303 +-
 drivers/gpu/drm/drm_framebuffer.c                  |   49 +-
 drivers/gpu/drm/drm_gem_framebuffer_helper.c       |    2 +-
 drivers/gpu/drm/drm_global.c                       |    2 +-
 drivers/gpu/drm/drm_internal.h                     |    2 +
 drivers/gpu/drm/drm_ioctl.c                        |   11 +-
 drivers/gpu/drm/drm_mm.c                           |   91 +-
 drivers/gpu/drm/drm_mode_config.c                  |    5 +
 drivers/gpu/drm/drm_modes.c                        |    2 +-
 drivers/gpu/drm/drm_of.c                           |    9 +-
 drivers/gpu/drm/drm_panel.c                        |   16 +
 drivers/gpu/drm/drm_plane.c                        |   41 +-
 drivers/gpu/drm/drm_plane_helper.c                 |   12 +-
 drivers/gpu/drm/drm_prime.c                        |   34 +-
 drivers/gpu/drm/drm_simple_kms_helper.c            |    4 +-
 drivers/gpu/drm/drm_syncobj.c                      |    1 -
 drivers/gpu/drm/drm_vm.c                           |   10 +-
 drivers/gpu/drm/drm_vma_manager.c                  |    1 +
 drivers/gpu/drm/drm_writeback.c                    |  350 ++
 drivers/gpu/drm/etnaviv/etnaviv_gpu.c              |    7 -
 drivers/gpu/drm/exynos/exynos_drm_plane.c          |    2 -
 drivers/gpu/drm/gma500/accel_2d.c                  |    2 +-
 drivers/gpu/drm/gma500/framebuffer.c               |   62 +-
 drivers/gpu/drm/gma500/framebuffer.h               |    1 -
 drivers/gpu/drm/gma500/gem.c                       |    2 +-
 drivers/gpu/drm/gma500/gma_display.c               |   18 +-
 drivers/gpu/drm/gma500/gtt.h                       |    2 +
 drivers/gpu/drm/gma500/mdfld_intel_display.c       |    3 +-
 drivers/gpu/drm/gma500/oaktrail_crtc.c             |    3 +-
 drivers/gpu/drm/gma500/psb_intel_sdvo.c            |   11 +-
 drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c    |    1 -
 drivers/gpu/drm/i2c/tda998x_drv.c                  |   13 +-
 drivers/gpu/drm/i810/i810_dma.c                    |    2 +-
 drivers/gpu/drm/i915/dvo_ch7017.c                  |   20 +-
 drivers/gpu/drm/i915/dvo_ch7xxx.c                  |   22 +-
 drivers/gpu/drm/i915/dvo_ivch.c                    |   26 +-
 drivers/gpu/drm/i915/dvo_ns2501.c                  |   44 +-
 drivers/gpu/drm/i915/dvo_sil164.c                  |   10 +-
 drivers/gpu/drm/i915/dvo_tfp410.c                  |   16 +-
 drivers/gpu/drm/i915/gvt/aperture_gm.c             |    2 +-
 drivers/gpu/drm/i915/gvt/cmd_parser.c              |   43 +-
 drivers/gpu/drm/i915/gvt/display.c                 |   62 +-
 drivers/gpu/drm/i915/gvt/dmabuf.c                  |   26 +-
 drivers/gpu/drm/i915/gvt/edid.c                    |   20 +-
 drivers/gpu/drm/i915/gvt/execlist.h                |   13 +-
 drivers/gpu/drm/i915/gvt/fb_decoder.c              |   27 +-
 drivers/gpu/drm/i915/gvt/firmware.c                |    2 +-
 drivers/gpu/drm/i915/gvt/gtt.c                     |   11 +-
 drivers/gpu/drm/i915/gvt/gvt.c                     |   27 +-
 drivers/gpu/drm/i915/gvt/gvt.h                     |   20 +-
 drivers/gpu/drm/i915/gvt/handlers.c                |  399 ++-
 drivers/gpu/drm/i915/gvt/interrupt.c               |   17 +-
 drivers/gpu/drm/i915/gvt/mmio.c                    |   12 +-
 drivers/gpu/drm/i915/gvt/mmio.h                    |   11 +-
 drivers/gpu/drm/i915/gvt/mmio_context.c            |   22 +-
 drivers/gpu/drm/i915/gvt/mmio_context.h            |    2 +-
 drivers/gpu/drm/i915/gvt/page_track.c              |    5 +-
 drivers/gpu/drm/i915/gvt/sched_policy.c            |   36 +-
 drivers/gpu/drm/i915/gvt/scheduler.c               |  202 +-
 drivers/gpu/drm/i915/gvt/scheduler.h               |    1 -
 drivers/gpu/drm/i915/gvt/vgpu.c                    |   56 +-
 drivers/gpu/drm/i915/i915_debugfs.c                |  132 +-
 drivers/gpu/drm/i915/i915_drv.c                    |  131 +-
 drivers/gpu/drm/i915/i915_drv.h                    |   52 +-
 drivers/gpu/drm/i915/i915_gem.c                    |  443 +--
 drivers/gpu/drm/i915/i915_gem.h                    |   16 +
 drivers/gpu/drm/i915/i915_gem_context.c            |  166 +-
 drivers/gpu/drm/i915/i915_gem_context.h            |   28 +-
 drivers/gpu/drm/i915/i915_gem_dmabuf.c             |   11 -
 drivers/gpu/drm/i915/i915_gem_execbuffer.c         |   20 +-
 drivers/gpu/drm/i915/i915_gem_gtt.c                |  990 +++---
 drivers/gpu/drm/i915/i915_gem_gtt.h                |   65 +-
 drivers/gpu/drm/i915/i915_gem_render_state.c       |    2 +-
 drivers/gpu/drm/i915/i915_gem_shrinker.c           |    2 +-
 drivers/gpu/drm/i915/i915_gem_stolen.c             |    6 +-
 drivers/gpu/drm/i915/i915_gpu_error.c              |   44 +-
 drivers/gpu/drm/i915/i915_gpu_error.h              |    2 +-
 drivers/gpu/drm/i915/i915_irq.c                    |  175 +-
 drivers/gpu/drm/i915/i915_params.c                 |    3 -
 drivers/gpu/drm/i915/i915_params.h                 |    1 -
 drivers/gpu/drm/i915/i915_pci.c                    |    7 +-
 drivers/gpu/drm/i915/i915_perf.c                   |  140 +-
 drivers/gpu/drm/i915/i915_pmu.c                    |   67 +-
 drivers/gpu/drm/i915/i915_pmu.h                    |    8 +
 drivers/gpu/drm/i915/i915_pvinfo.h                 |    6 +-
 drivers/gpu/drm/i915/i915_reg.h                    | 3429 ++++++++++----------
 drivers/gpu/drm/i915/i915_request.c                |   65 +-
 drivers/gpu/drm/i915/i915_request.h                |   11 +-
 drivers/gpu/drm/i915/i915_trace.h                  |  148 +-
 drivers/gpu/drm/i915/i915_vgpu.c                   |    8 +-
 drivers/gpu/drm/i915/i915_vgpu.h                   |    6 +
 drivers/gpu/drm/i915/i915_vma.c                    |  121 +-
 drivers/gpu/drm/i915/i915_vma.h                    |   10 +-
 drivers/gpu/drm/i915/intel_acpi.c                  |   27 +-
 drivers/gpu/drm/i915/intel_atomic.c                |    7 +-
 drivers/gpu/drm/i915/intel_atomic_plane.c          |   18 +-
 drivers/gpu/drm/i915/intel_audio.c                 |   48 +-
 drivers/gpu/drm/i915/intel_bios.c                  |  129 +-
 drivers/gpu/drm/i915/intel_breadcrumbs.c           |    5 +-
 drivers/gpu/drm/i915/intel_cdclk.c                 |   56 +-
 drivers/gpu/drm/i915/intel_crt.c                   |   55 +-
 drivers/gpu/drm/i915/intel_ddi.c                   |  123 +-
 drivers/gpu/drm/i915/intel_display.c               |  685 ++--
 drivers/gpu/drm/i915/intel_display.h               |   18 +-
 drivers/gpu/drm/i915/intel_dp.c                    |  263 +-
 drivers/gpu/drm/i915/intel_dp_aux_backlight.c      |   12 +-
 drivers/gpu/drm/i915/intel_dp_link_training.c      |   39 +-
 drivers/gpu/drm/i915/intel_dpll_mgr.c              |   96 +-
 drivers/gpu/drm/i915/intel_dpll_mgr.h              |   16 +-
 drivers/gpu/drm/i915/intel_drv.h                   |   34 +-
 drivers/gpu/drm/i915/intel_dsi.c                   |    8 +-
 drivers/gpu/drm/i915/intel_dvo.c                   |   15 +-
 drivers/gpu/drm/i915/intel_engine_cs.c             |  245 +-
 drivers/gpu/drm/i915/intel_fbdev.c                 |    9 +-
 drivers/gpu/drm/i915/intel_frontbuffer.c           |    2 -
 drivers/gpu/drm/i915/intel_guc.c                   |  123 +-
 drivers/gpu/drm/i915/intel_guc_fwif.h              |   20 +-
 drivers/gpu/drm/i915/intel_guc_log.c               |   70 +-
 drivers/gpu/drm/i915/intel_guc_log.h               |   26 +-
 drivers/gpu/drm/i915/intel_guc_submission.c        |   76 +-
 drivers/gpu/drm/i915/intel_gvt.c                   |    2 +
 drivers/gpu/drm/i915/intel_hangcheck.c             |   17 +-
 drivers/gpu/drm/i915/intel_hdmi.c                  |  140 +-
 drivers/gpu/drm/i915/intel_i2c.c                   |   14 +-
 drivers/gpu/drm/i915/intel_lrc.c                   |  470 ++-
 drivers/gpu/drm/i915/intel_lrc.h                   |    7 -
 drivers/gpu/drm/i915/intel_lspcon.c                |    2 +-
 drivers/gpu/drm/i915/intel_lvds.c                  |   66 +-
 drivers/gpu/drm/i915/intel_opregion.c              |   31 +-
 drivers/gpu/drm/i915/intel_opregion.h              |    1 +
 drivers/gpu/drm/i915/intel_panel.c                 |    8 +-
 drivers/gpu/drm/i915/intel_psr.c                   |  411 +--
 drivers/gpu/drm/i915/intel_ringbuffer.c            |  391 ++-
 drivers/gpu/drm/i915/intel_ringbuffer.h            |   61 +-
 drivers/gpu/drm/i915/intel_runtime_pm.c            |    2 +
 drivers/gpu/drm/i915/intel_sdvo.c                  |   38 +-
 drivers/gpu/drm/i915/intel_sprite.c                |  271 +-
 drivers/gpu/drm/i915/intel_tv.c                    |   20 +-
 drivers/gpu/drm/i915/intel_uc.c                    |  131 +-
 drivers/gpu/drm/i915/intel_uncore.c                |   28 +-
 drivers/gpu/drm/i915/intel_uncore.h                |   22 +-
 drivers/gpu/drm/i915/intel_vbt_defs.h              |   14 +-
 drivers/gpu/drm/i915/intel_workarounds.c           |  170 +-
 drivers/gpu/drm/i915/selftests/huge_pages.c        |   52 +-
 .../gpu/drm/i915/selftests/i915_gem_coherency.c    |    4 +-
 drivers/gpu/drm/i915/selftests/i915_gem_context.c  |  154 +-
 drivers/gpu/drm/i915/selftests/i915_gem_evict.c    |   34 +-
 drivers/gpu/drm/i915/selftests/i915_gem_gtt.c      |  128 +-
 drivers/gpu/drm/i915/selftests/i915_gem_object.c   |    6 +-
 .../gpu/drm/i915/selftests/i915_mock_selftests.h   |    1 +
 drivers/gpu/drm/i915/selftests/i915_request.c      |   11 +-
 drivers/gpu/drm/i915/selftests/i915_vma.c          |   31 +-
 drivers/gpu/drm/i915/selftests/intel_hangcheck.c   |   69 +-
 drivers/gpu/drm/i915/selftests/intel_lrc.c         |    4 +-
 drivers/gpu/drm/i915/selftests/intel_workarounds.c |    4 +-
 drivers/gpu/drm/i915/selftests/mock_context.c      |    7 +
 drivers/gpu/drm/i915/selftests/mock_dmabuf.c       |   14 -
 drivers/gpu/drm/i915/selftests/mock_engine.c       |   47 +-
 drivers/gpu/drm/i915/selftests/mock_gem_device.c   |   17 +-
 drivers/gpu/drm/i915/selftests/mock_gtt.c          |   68 +-
 drivers/gpu/drm/imx/ipuv3-crtc.c                   |    2 +-
 drivers/gpu/drm/mediatek/mtk_drm_fb.c              |   76 +-
 drivers/gpu/drm/mediatek/mtk_drm_fb.h              |    1 -
 drivers/gpu/drm/mediatek/mtk_drm_plane.c           |    7 +-
 drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c          |    3 +-
 drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c         |    4 +-
 drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c          |    1 -
 drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c         |    6 +-
 drivers/gpu/drm/msm/msm_fb.c                       |   54 +-
 drivers/gpu/drm/nouveau/nouveau_ttm.c              |    3 +-
 .../drm/omapdrm/displays/panel-sony-acx565akm.c    |    2 +-
 .../drm/omapdrm/displays/panel-tpo-td028ttec1.c    |    2 +-
 drivers/gpu/drm/omapdrm/dss/core.c                 |    4 +-
 drivers/gpu/drm/omapdrm/dss/dispc.c                |    2 +-
 drivers/gpu/drm/omapdrm/dss/display.c              |    2 +-
 drivers/gpu/drm/omapdrm/dss/dpi.c                  |    2 +-
 drivers/gpu/drm/omapdrm/dss/dsi.c                  |    2 +-
 drivers/gpu/drm/omapdrm/dss/dss.c                  |    2 +-
 drivers/gpu/drm/omapdrm/dss/dss.h                  |    5 +-
 drivers/gpu/drm/omapdrm/dss/pll.c                  |   73 +-
 drivers/gpu/drm/omapdrm/dss/sdi.c                  |    2 +-
 drivers/gpu/drm/omapdrm/dss/venc.c                 |    2 +-
 drivers/gpu/drm/omapdrm/dss/video-pll.c            |    1 +
 drivers/gpu/drm/omapdrm/omap_debugfs.c             |    9 +-
 drivers/gpu/drm/omapdrm/omap_drv.c                 |    4 +-
 drivers/gpu/drm/omapdrm/omap_drv.h                 |    2 +-
 drivers/gpu/drm/omapdrm/omap_fb.c                  |  109 +-
 drivers/gpu/drm/omapdrm/omap_fb.h                  |    2 -
 drivers/gpu/drm/omapdrm/omap_fbdev.c               |    8 +-
 drivers/gpu/drm/omapdrm/omap_gem.c                 |  286 +-
 drivers/gpu/drm/omapdrm/omap_gem.h                 |    3 +-
 drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c          |   19 -
 drivers/gpu/drm/panel/Kconfig                      |    9 +
 drivers/gpu/drm/panel/Makefile                     |    1 +
 drivers/gpu/drm/panel/panel-ilitek-ili9881c.c      |  503 +++
 drivers/gpu/drm/panel/panel-innolux-p079zca.c      |    1 -
 drivers/gpu/drm/panel/panel-jdi-lt070me05000.c     |    1 -
 drivers/gpu/drm/panel/panel-lvds.c                 |    1 -
 drivers/gpu/drm/panel/panel-orisetech-otm8009a.c   |   58 +-
 .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c   |    1 -
 drivers/gpu/drm/panel/panel-seiko-43wvf1g.c        |    1 -
 drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c    |    1 -
 drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c    |    1 -
 drivers/gpu/drm/panel/panel-simple.c               |   65 +-
 drivers/gpu/drm/panel/panel-sitronix-st7789v.c     |    1 -
 drivers/gpu/drm/pl111/Makefile                     |    1 +
 drivers/gpu/drm/pl111/pl111_display.c              |   54 +-
 drivers/gpu/drm/pl111/pl111_drm.h                  |    5 +
 drivers/gpu/drm/pl111/pl111_drv.c                  |   44 +-
 drivers/gpu/drm/pl111/pl111_nomadik.c              |   36 +
 drivers/gpu/drm/pl111/pl111_nomadik.h              |   18 +
 drivers/gpu/drm/qxl/qxl_release.c                  |    7 -
 drivers/gpu/drm/radeon/radeon_ttm.c                |    8 +-
 drivers/gpu/drm/rockchip/cdn-dp-reg.c              |   16 +-
 drivers/gpu/drm/rockchip/rockchip_drm_fb.c         |   86 +-
 drivers/gpu/drm/rockchip/rockchip_drm_fb.h         |    3 -
 drivers/gpu/drm/rockchip/rockchip_drm_vop.c        |   75 +-
 drivers/gpu/drm/rockchip/rockchip_drm_vop.h        |   23 +-
 drivers/gpu/drm/rockchip/rockchip_lvds.c           |    6 +-
 drivers/gpu/drm/savage/savage_state.c              |    2 +-
 drivers/gpu/drm/scheduler/gpu_scheduler.c          |  281 +-
 drivers/gpu/drm/scheduler/sched_fence.c            |   11 -
 drivers/gpu/drm/selftests/drm_mm_selftests.h       |    2 +
 drivers/gpu/drm/selftests/test-drm_mm.c            |   71 +
 drivers/gpu/drm/sti/sti_cursor.c                   |    2 +-
 drivers/gpu/drm/sti/sti_gdp.c                      |    8 +-
 drivers/gpu/drm/sti/sti_hqvdp.c                    |    2 +-
 drivers/gpu/drm/sun4i/Makefile                     |    2 +-
 drivers/gpu/drm/sun4i/sun4i_crtc.c                 |    2 +-
 drivers/gpu/drm/sun4i/sun4i_drv.c                  |  121 +-
 drivers/gpu/drm/sun4i/sun4i_lvds.c                 |    2 +-
 drivers/gpu/drm/sun4i/sun4i_rgb.c                  |    2 +-
 drivers/gpu/drm/sun4i/sun4i_tcon.c                 |   66 +-
 drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c             |    4 +-
 drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c              |   46 +-
 drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h              |    8 +-
 drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c             |   54 +-
 drivers/gpu/drm/sun4i/sun8i_hdmi_phy_clk.c         |   90 +-
 drivers/gpu/drm/sun4i/sun8i_mixer.c                |   24 +
 drivers/gpu/drm/sun4i/sun8i_tcon_top.c             |  300 ++
 drivers/gpu/drm/sun4i/sun8i_tcon_top.h             |   40 +
 drivers/gpu/drm/tegra/gem.c                        |   14 -
 drivers/gpu/drm/tinydrm/Kconfig                    |   10 +
 drivers/gpu/drm/tinydrm/Makefile                   |    1 +
 drivers/gpu/drm/tinydrm/ili9341.c                  |  233 ++
 drivers/gpu/drm/ttm/ttm_bo_vm.c                    |   45 +-
 drivers/gpu/drm/udl/udl_dmabuf.c                   |   18 -
 drivers/gpu/drm/udl/udl_drv.h                      |    3 +-
 drivers/gpu/drm/udl/udl_gem.c                      |   15 +-
 drivers/gpu/drm/v3d/v3d_drv.h                      |    6 +-
 drivers/gpu/drm/v3d/v3d_fence.c                    |   13 +-
 drivers/gpu/drm/v3d/v3d_gem.c                      |   11 +-
 drivers/gpu/drm/v3d/v3d_irq.c                      |    3 -
 drivers/gpu/drm/v3d/v3d_sched.c                    |    4 +-
 drivers/gpu/drm/vc4/vc4_bo.c                       |    2 +-
 drivers/gpu/drm/vc4/vc4_crtc.c                     |    9 +-
 drivers/gpu/drm/vc4/vc4_drv.h                      |    3 +-
 drivers/gpu/drm/vc4/vc4_dsi.c                      |   42 +-
 drivers/gpu/drm/vc4/vc4_fence.c                    |    8 -
 drivers/gpu/drm/vc4/vc4_plane.c                    |   98 +-
 drivers/gpu/drm/vc4/vc4_regs.h                     |    6 +
 drivers/gpu/drm/vgem/vgem_drv.c                    |    7 +-
 drivers/gpu/drm/virtio/virtgpu_display.c           |   32 +-
 drivers/gpu/drm/virtio/virtgpu_drv.h               |    1 -
 drivers/gpu/drm/virtio/virtgpu_fb.c                |    8 +-
 drivers/gpu/drm/virtio/virtgpu_fence.c             |    7 -
 drivers/gpu/drm/virtio/virtgpu_plane.c             |    4 +-
 drivers/gpu/drm/vmwgfx/Kconfig                     |    1 +
 .../gpu/drm/vmwgfx/device_include/svga3d_caps.h    |    3 +-
 drivers/gpu/drm/vmwgfx/device_include/svga3d_cmd.h |    3 +-
 .../gpu/drm/vmwgfx/device_include/svga3d_devcaps.h |    3 +-
 drivers/gpu/drm/vmwgfx/device_include/svga3d_dx.h  |    3 +-
 .../gpu/drm/vmwgfx/device_include/svga3d_limits.h  |    3 +-
 drivers/gpu/drm/vmwgfx/device_include/svga3d_reg.h |    3 +-
 .../drm/vmwgfx/device_include/svga3d_surfacedefs.h |    4 +-
 .../gpu/drm/vmwgfx/device_include/svga3d_types.h   |    3 +-
 .../gpu/drm/vmwgfx/device_include/svga_escape.h    |    3 +-
 .../gpu/drm/vmwgfx/device_include/svga_overlay.h   |    3 +-
 drivers/gpu/drm/vmwgfx/device_include/svga_reg.h   |    3 +-
 drivers/gpu/drm/vmwgfx/device_include/svga_types.h |    3 +-
 .../drm/vmwgfx/device_include/vmware_pack_begin.h  |   25 +-
 .../drm/vmwgfx/device_include/vmware_pack_end.h    |   25 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_binding.c            |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_binding.h            |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_blit.c               |    3 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c             |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c             |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c         |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_context.c            |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c            |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c             |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c                |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.h                |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c            |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_fb.c                 |   25 -
 drivers/gpu/drm/vmwgfx/vmwgfx_fence.c              |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_fence.h              |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c               |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c                |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c      |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c              |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_irq.c                |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c                |   28 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.h                |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c                |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_marker.c             |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_mob.c                |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_msg.c                |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_msg.h                |   35 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c            |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_prime.c              |   18 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_reg.h                |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_resource.c           |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_resource_priv.h      |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c               |    6 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_shader.c             |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_simple_resource.c    |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_so.c                 |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_so.h                 |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c               |    9 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_surface.c            |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c           |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_va.c                 |    4 +-
 drivers/gpu/drm/xen/xen_drm_front.c                |    2 +-
 drivers/gpu/drm/xen/xen_drm_front.h                |    4 +-
 drivers/gpu/drm/xen/xen_drm_front_shbuf.c          |    2 +-
 drivers/gpu/drm/zte/zx_plane.c                     |    2 +-
 .../media/common/videobuf2/videobuf2-dma-contig.c  |    3 +-
 drivers/media/common/videobuf2/videobuf2-dma-sg.c  |    3 +-
 drivers/media/common/videobuf2/videobuf2-vmalloc.c |    3 +-
 drivers/staging/android/ion/ion.c                  |    6 +-
 drivers/tee/tee_shm.c                              |    6 -
 include/drm/drmP.h                                 |   23 +-
 include/drm/drm_atomic.h                           |   14 +-
 include/drm/drm_bridge.h                           |   48 +-
 include/drm/drm_connector.h                        |   38 +-
 include/drm/drm_crtc.h                             |   15 +-
 include/drm/drm_encoder.h                          |   16 +-
 include/drm/drm_file.h                             |    7 +
 include/drm/drm_mm.h                               |   34 +-
 include/drm/drm_mode_config.h                      |   36 +-
 include/drm/drm_modeset_helper_vtables.h           |   11 +
 include/drm/drm_of.h                               |    8 +
 include/drm/drm_panel.h                            |    1 +
 include/drm/drm_plane.h                            |   23 +-
 include/drm/drm_plane_helper.h                     |    6 +-
 include/drm/drm_prime.h                            |    6 +-
 include/drm/drm_writeback.h                        |  130 +
 include/drm/gpu_scheduler.h                        |  158 +-
 include/drm/i915_pciids.h                          |   37 +-
 include/dt-bindings/clock/sun8i-tcon-top.h         |   11 +
 include/linux/dma-buf.h                            |   21 +-
 include/linux/dma-fence.h                          |   32 +-
 include/linux/ww_mutex.h                           |   45 +-
 include/uapi/drm/amdgpu_drm.h                      |   26 +-
 include/uapi/drm/drm.h                             |    9 +
 include/uapi/drm/drm_fourcc.h                      |   80 +
 include/uapi/drm/drm_mode.h                        |    8 +
 kernel/locking/locktorture.c                       |    2 +-
 kernel/locking/mutex.c                             |  345 +-
 kernel/locking/test-ww_mutex.c                     |    2 +-
 lib/locking-selftest.c                             |    2 +-
 505 files changed, 17011 insertions(+), 8973 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/display/ilitek,ili9341.txt
 create mode 100644 Documentation/devicetree/bindings/display/panel/auo,g070vvn01.txt
 create mode 100644 Documentation/devicetree/bindings/display/panel/ilitek,ili9881c.txt
 create mode 100644 Documentation/devicetree/bindings/display/panel/innolux,tv123wam.txt
 create mode 100644 Documentation/gpu/amdgpu.rst
 delete mode 100644 drivers/gpu/drm/amd/powerplay/inc/pp_power_source.h
 create mode 100644 drivers/gpu/drm/arm/malidp_mw.c
 create mode 100644 drivers/gpu/drm/arm/malidp_mw.h
 create mode 100644 drivers/gpu/drm/drm_writeback.c
 create mode 100644 drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
 create mode 100644 drivers/gpu/drm/pl111/pl111_nomadik.c
 create mode 100644 drivers/gpu/drm/pl111/pl111_nomadik.h
 create mode 100644 drivers/gpu/drm/sun4i/sun8i_tcon_top.c
 create mode 100644 drivers/gpu/drm/sun4i/sun8i_tcon_top.h
 create mode 100644 drivers/gpu/drm/tinydrm/ili9341.c
 create mode 100644 include/drm/drm_writeback.h
 create mode 100644 include/dt-bindings/clock/sun8i-tcon-top.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 (890fd185d530 drm/i915: Replace nested subclassing with explicit subclasses)
$ git merge drm-intel/for-linux-next
Auto-merging drivers/gpu/drm/i915/vlv_dsi_pll.c
Auto-merging drivers/gpu/drm/i915/vlv_dsi.c
Auto-merging drivers/gpu/drm/i915/intel_sprite.c
Auto-merging drivers/gpu/drm/i915/intel_sdvo.c
Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c
Auto-merging drivers/gpu/drm/i915/intel_lrc.c
Auto-merging drivers/gpu/drm/i915/intel_drv.h
Auto-merging drivers/gpu/drm/i915/intel_dpll_mgr.c
Auto-merging drivers/gpu/drm/i915/intel_display.h
Auto-merging drivers/gpu/drm/i915/intel_display.c
Auto-merging drivers/gpu/drm/i915/i915_vma.c
Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c
Auto-merging drivers/gpu/drm/i915/i915_gem.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/i915/i915_drv.c
Auto-merging drivers/gpu/drm/i915/Kconfig.debug
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/i915/Kconfig.debug                 |  12 +
 drivers/gpu/drm/i915/Makefile                      |   7 +-
 drivers/gpu/drm/i915/gvt/scheduler.c               |   6 +-
 drivers/gpu/drm/i915/i915_debugfs.c                |  84 ++--
 drivers/gpu/drm/i915/i915_drv.c                    |   6 +
 drivers/gpu/drm/i915/i915_drv.h                    |  43 +-
 drivers/gpu/drm/i915/i915_gem.c                    |  50 +-
 drivers/gpu/drm/i915/i915_gem.h                    |   5 +
 drivers/gpu/drm/i915/i915_gem_context.c            |   8 +-
 drivers/gpu/drm/i915/i915_gem_execbuffer.c         |  95 +---
 drivers/gpu/drm/i915/i915_gem_gtt.c                | 226 +++++----
 drivers/gpu/drm/i915/i915_gem_gtt.h                |  11 +-
 drivers/gpu/drm/i915/i915_gem_object.h             |  13 +-
 drivers/gpu/drm/i915/i915_gem_render_state.c       |   2 +-
 drivers/gpu/drm/i915/i915_gem_stolen.c             |   1 +
 drivers/gpu/drm/i915/i915_gpu_error.c              |  14 +-
 drivers/gpu/drm/i915/i915_gpu_error.h              |   2 +-
 drivers/gpu/drm/i915/i915_irq.c                    | 418 +++++++++++++----
 drivers/gpu/drm/i915/i915_reg.h                    | 238 +++++++++-
 drivers/gpu/drm/i915/i915_request.c                |  29 +-
 drivers/gpu/drm/i915/i915_request.h                |   3 +
 drivers/gpu/drm/i915/i915_timeline.h               |   2 +
 drivers/gpu/drm/i915/i915_vma.c                    | 256 ++++++++--
 drivers/gpu/drm/i915/i915_vma.h                    |  43 +-
 drivers/gpu/drm/i915/icl_dsi.c                     | 127 +++++
 drivers/gpu/drm/i915/intel_breadcrumbs.c           |  11 +-
 drivers/gpu/drm/i915/intel_cdclk.c                 |   5 +
 drivers/gpu/drm/i915/intel_ddi.c                   |  54 ++-
 drivers/gpu/drm/i915/intel_device_info.c           |   2 +
 drivers/gpu/drm/i915/intel_device_info.h           |   1 +
 drivers/gpu/drm/i915/intel_display.c               |  70 ++-
 drivers/gpu/drm/i915/intel_display.h               |   4 +
 drivers/gpu/drm/i915/intel_dp.c                    |  24 +-
 drivers/gpu/drm/i915/intel_dp_mst.c                |   2 +-
 drivers/gpu/drm/i915/intel_dpll_mgr.c              | 109 ++++-
 drivers/gpu/drm/i915/intel_dpll_mgr.h              |   2 +
 drivers/gpu/drm/i915/intel_drv.h                   |  13 +-
 drivers/gpu/drm/i915/intel_dsi.h                   |  34 +-
 drivers/gpu/drm/i915/intel_dsi_vbt.c               |   2 +-
 drivers/gpu/drm/i915/intel_engine_cs.c             |  34 +-
 drivers/gpu/drm/i915/intel_fbc.c                   | 129 +-----
 drivers/gpu/drm/i915/intel_guc.c                   |  53 ++-
 drivers/gpu/drm/i915/intel_guc.h                   |   5 +-
 drivers/gpu/drm/i915/intel_huc.c                   |   8 +
 drivers/gpu/drm/i915/intel_huc.h                   |   6 +
 drivers/gpu/drm/i915/intel_lrc.c                   | 515 +++++++++++----------
 drivers/gpu/drm/i915/intel_pipe_crc.c              | 445 ------------------
 drivers/gpu/drm/i915/intel_psr.c                   | 223 +++++----
 drivers/gpu/drm/i915/intel_ringbuffer.c            |   7 +-
 drivers/gpu/drm/i915/intel_ringbuffer.h            |  40 +-
 drivers/gpu/drm/i915/intel_runtime_pm.c            | 331 ++++++++++++-
 drivers/gpu/drm/i915/intel_sdvo.c                  |  11 +-
 drivers/gpu/drm/i915/intel_sprite.c                |  20 +-
 drivers/gpu/drm/i915/intel_uc.c                    |  34 +-
 drivers/gpu/drm/i915/selftests/huge_pages.c        |  24 +-
 .../gpu/drm/i915/selftests/i915_gem_coherency.c    |  43 +-
 drivers/gpu/drm/i915/selftests/i915_gem_context.c  |  34 +-
 drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c   |   2 +-
 drivers/gpu/drm/i915/selftests/i915_gem_evict.c    |   5 +-
 drivers/gpu/drm/i915/selftests/i915_gem_gtt.c      |  63 ++-
 drivers/gpu/drm/i915/selftests/i915_gem_object.c   |  27 +-
 drivers/gpu/drm/i915/selftests/i915_request.c      |  19 +-
 drivers/gpu/drm/i915/selftests/i915_vma.c          |   2 +-
 drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c |   2 +-
 drivers/gpu/drm/i915/selftests/intel_hangcheck.c   |  20 +-
 drivers/gpu/drm/i915/selftests/intel_lrc.c         |  14 +-
 drivers/gpu/drm/i915/selftests/intel_workarounds.c |  12 +-
 drivers/gpu/drm/i915/selftests/mock_engine.c       |   2 +
 drivers/gpu/drm/i915/selftests/mock_gem_device.c   |   3 +-
 drivers/gpu/drm/i915/selftests/mock_gtt.c          |  11 +-
 drivers/gpu/drm/i915/{intel_dsi.c => vlv_dsi.c}    | 109 +++--
 .../drm/i915/{intel_dsi_pll.c => vlv_dsi_pll.c}    |  98 +---
 72 files changed, 2613 insertions(+), 1772 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/icl_dsi.c
 rename drivers/gpu/drm/i915/{intel_dsi.c => vlv_dsi.c} (97%)
 rename drivers/gpu/drm/i915/{intel_dsi_pll.c => vlv_dsi_pll.c} (84%)
Merging drm-tegra/drm/tegra/for-next (6134534ca24f drm/tegra: Add kerneldoc for UAPI)
$ git merge drm-tegra/drm/tegra/for-next
Already up to date.
Merging drm-misc/for-linux-next (008095e065a8 drm/vc4: Add support for the transposer block)
$ git merge drm-misc/for-linux-next
Auto-merging drivers/gpu/drm/i915/intel_dp_mst.c
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/display/brcm,bcm-vc4.txt   |   6 +
 Documentation/gpu/v3d.rst                          |  28 ++
 drivers/gpu/drm/Kconfig                            |  10 +
 drivers/gpu/drm/Makefile                           |   1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c     |  81 +---
 drivers/gpu/drm/amd/amdgpu/dce_virtual.c           |  15 +-
 drivers/gpu/drm/drm_atomic.c                       |   5 +-
 drivers/gpu/drm/drm_atomic_helper.c                |  49 ++-
 drivers/gpu/drm/drm_connector.c                    |  44 +-
 drivers/gpu/drm/drm_debugfs_crc.c                  |   9 +-
 drivers/gpu/drm/drm_fb_helper.c                    |  34 +-
 drivers/gpu/drm/drm_probe_helper.c                 |  10 +-
 drivers/gpu/drm/drm_writeback.c                    |  11 +-
 drivers/gpu/drm/i915/intel_dp_mst.c                |  10 -
 drivers/gpu/drm/msm/dsi/dsi_manager.c              |   8 +-
 drivers/gpu/drm/nouveau/nouveau_connector.c        |  23 +-
 drivers/gpu/drm/radeon/radeon_connectors.c         |  90 ++--
 drivers/gpu/drm/stm/ltdc.c                         |  21 +-
 drivers/gpu/drm/stm/ltdc.h                         |   1 +
 drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c             | 107 +++--
 drivers/gpu/drm/tilcdc/tilcdc_external.c           |   9 +-
 drivers/gpu/drm/v3d/v3d_bo.c                       |  28 +-
 drivers/gpu/drm/v3d/v3d_drv.h                      |   5 +-
 drivers/gpu/drm/v3d/v3d_fence.c                    |  12 -
 drivers/gpu/drm/v3d/v3d_regs.h                     |   1 +
 drivers/gpu/drm/v3d/v3d_sched.c                    |  22 +-
 drivers/gpu/drm/vc4/Makefile                       |   1 +
 drivers/gpu/drm/vc4/vc4_crtc.c                     | 138 ++++--
 drivers/gpu/drm/vc4/vc4_debugfs.c                  |   1 +
 drivers/gpu/drm/vc4/vc4_drv.c                      |   1 +
 drivers/gpu/drm/vc4/vc4_drv.h                      |   7 +
 drivers/gpu/drm/vc4/vc4_kms.c                      |  11 +-
 drivers/gpu/drm/vc4/vc4_txp.c                      | 477 +++++++++++++++++++++
 drivers/gpu/drm/vkms/Makefile                      |   3 +
 drivers/gpu/drm/vkms/vkms_crtc.c                   |  35 ++
 drivers/gpu/drm/vkms/vkms_drv.c                    | 139 ++++++
 drivers/gpu/drm/vkms/vkms_drv.h                    |  31 ++
 drivers/gpu/drm/vkms/vkms_output.c                 |  91 ++++
 drivers/gpu/drm/vkms/vkms_plane.c                  |  46 ++
 include/drm/drm_atomic_helper.h                    |   1 +
 include/drm/drm_connector.h                        |  16 +
 include/drm/drm_crtc.h                             |  23 +
 include/drm/drm_debugfs_crc.h                      |   3 +-
 include/drm/drm_modeset_helper_vtables.h           |   6 +-
 include/drm/drm_writeback.h                        |   6 +
 45 files changed, 1336 insertions(+), 340 deletions(-)
 create mode 100644 Documentation/gpu/v3d.rst
 create mode 100644 drivers/gpu/drm/vc4/vc4_txp.c
 create mode 100644 drivers/gpu/drm/vkms/Makefile
 create mode 100644 drivers/gpu/drm/vkms/vkms_crtc.c
 create mode 100644 drivers/gpu/drm/vkms/vkms_drv.c
 create mode 100644 drivers/gpu/drm/vkms/vkms_drv.h
 create mode 100644 drivers/gpu/drm/vkms/vkms_output.c
 create mode 100644 drivers/gpu/drm/vkms/vkms_plane.c
Merging drm-msm/msm-next (944e333cf9f8 drm/msm/mdp5: fix missing CTL flush)
$ git merge drm-msm/msm-next
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/msm/adreno/adreno_device.c   | 14 +++++++++++++-
 drivers/gpu/drm/msm/adreno/adreno_gpu.c      |  3 ++-
 drivers/gpu/drm/msm/adreno/adreno_gpu.h      |  1 +
 drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c | 12 +++++++++++-
 drivers/gpu/drm/msm/msm_drv.c                |  9 +++++++++
 drivers/gpu/drm/msm/msm_drv.h                |  1 +
 6 files changed, 37 insertions(+), 3 deletions(-)
Merging hdlcd/for-upstream/hdlcd (f73e8b825315 drm/arm: Replace instances of drm_dev_unref with drm_dev_put.)
$ git merge hdlcd/for-upstream/hdlcd
Already up to date.
Merging mali-dp/for-upstream/mali-dp (e368fc75c190 drm/arm/malidp: Added the late system pm functions)
$ 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
Already up to date!
Merge made by the 'recursive' strategy.
Merging imx-drm/imx-drm/next (518665524272 gpu: ipu-csi: Check for field type alternate)
$ git merge imx-drm/imx-drm/next
Auto-merging drivers/gpu/drm/imx/ipuv3-crtc.c
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/imx/imx-drm.h    |  1 -
 drivers/gpu/drm/imx/imx-ldb.c    |  9 ++++++---
 drivers/gpu/drm/imx/ipuv3-crtc.c |  1 -
 drivers/gpu/ipu-v3/ipu-csi.c     | 37 ++++++++++++++++++++++++++++++-------
 4 files changed, 36 insertions(+), 12 deletions(-)
Merging etnaviv/etnaviv/next (f6ffbd4fc1a1 drm/etnaviv: replace license text with SPDX tags)
$ git merge etnaviv/etnaviv/next
Already up to date.
Merging kconfig/for-next (bebc6082da0a Linux 4.14)
$ git merge kconfig/for-next
Already up to date.
Merging regmap/for-next (7daf201d7fe8 Linux 4.18-rc2)
$ git merge regmap/for-next
Already up to date.
Merging sound/for-next (d64c5cf8e89d ALSA: pcm: Allow drivers to set R/W wait time.)
$ git merge sound/for-next
Auto-merging sound/pci/hda/patch_realtek.c
Auto-merging sound/pci/hda/patch_hdmi.c
Auto-merging sound/pci/hda/hda_codec.h
Auto-merging sound/pci/hda/hda_codec.c
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/sound/ac97-bus.txt         |   32 +
 Documentation/sound/alsa-configuration.rst         |    2 +-
 Documentation/sound/cards/multisound.sh            | 1139 ++++++++++++++++++++
 Documentation/sound/hd-audio/models.rst            |  264 ++++-
 include/sound/hdaudio.h                            |   56 +
 include/sound/hdaudio_ext.h                        |  123 +--
 include/sound/pcm.h                                |    1 +
 sound/ac97/bus.c                                   |   26 +
 sound/aoa/core/gpio-feature.c                      |    4 +-
 sound/core/pcm.c                                   |    7 +-
 sound/core/pcm_lib.c                               |   24 +-
 sound/core/pcm_local.h                             |    2 +
 sound/core/pcm_native.c                            |   10 +-
 sound/firewire/motu/motu-protocol-v2.c             |   64 +-
 sound/firewire/motu/motu-protocol-v3.c             |   19 +-
 sound/firewire/motu/motu.c                         |   19 +
 sound/firewire/motu/motu.h                         |    5 +-
 sound/hda/ext/hdac_ext_bus.c                       |   80 +-
 sound/hda/ext/hdac_ext_controller.c                |   64 +-
 sound/hda/ext/hdac_ext_stream.c                    |  104 +-
 sound/isa/Kconfig                                  |    2 +-
 sound/pci/ctxfi/ctmixer.c                          |   15 +-
 sound/pci/hda/dell_wmi_helper.c                    |  116 +-
 sound/pci/hda/hda_codec.c                          |   93 +-
 sound/pci/hda/hda_codec.h                          |    6 +-
 sound/pci/hda/hda_generic.c                        |  144 ++-
 sound/pci/hda/hda_generic.h                        |   16 +
 sound/pci/hda/hda_intel.c                          |    3 +-
 sound/pci/hda/patch_analog.c                       |    4 +-
 sound/pci/hda/patch_cirrus.c                       |   29 +-
 sound/pci/hda/patch_conexant.c                     |  100 +-
 sound/pci/hda/patch_hdmi.c                         |    4 +-
 sound/pci/hda/patch_realtek.c                      |  852 ++++++++-------
 sound/pci/hda/patch_sigmatel.c                     |   31 +-
 sound/pci/hda/patch_via.c                          |  294 +++--
 sound/pci/hda/thinkpad_helper.c                    |   27 +-
 sound/pci/ice1712/prodigy_hifi.c                   |   21 +-
 sound/soc/codecs/hdac_hdmi.c                       |  416 ++++---
 sound/soc/intel/skylake/skl-messages.c             |   50 +-
 sound/soc/intel/skylake/skl-nhlt.c                 |    8 +-
 sound/soc/intel/skylake/skl-pcm.c                  |  112 +-
 sound/soc/intel/skylake/skl-topology.c             |   20 +-
 sound/soc/intel/skylake/skl-topology.h             |    6 +-
 sound/soc/intel/skylake/skl.c                      |  190 ++--
 sound/soc/intel/skylake/skl.h                      |    7 +-
 sound/usb/caiaq/audio.c                            |    5 +-
 sound/usb/line6/toneport.c                         |    5 +-
 sound/usb/midi.c                                   |    5 +-
 sound/x86/intel_hdmi_audio.c                       |    2 +-
 49 files changed, 3052 insertions(+), 1576 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/sound/ac97-bus.txt
 create mode 100755 Documentation/sound/cards/multisound.sh
Merging sound-asoc/for-next (8cf0db51d3f4 Merge branch 'asoc-4.19' into asoc-next)
$ git merge sound-asoc/for-next
Auto-merging sound/soc/intel/skylake/skl.c
Auto-merging sound/soc/intel/skylake/skl-topology.h
Auto-merging sound/soc/intel/skylake/skl-topology.c
Auto-merging sound/soc/intel/skylake/skl-pcm.c
Auto-merging sound/soc/codecs/simple-amplifier.c
Removing sound/arm/pxa2xx-pcm.h
Removing sound/arm/pxa2xx-pcm.c
Auto-merging drivers/mtd/nand/raw/marvell_nand.c
Removing Documentation/devicetree/bindings/sound/mrvl,pxa2xx-pcm.txt
Removing Documentation/devicetree/bindings/sound/dioo,dio2125.txt
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/sound/atmel-i2s.txt        |   11 +-
 .../devicetree/bindings/sound/audio-graph-card.txt |    2 +
 .../devicetree/bindings/sound/dioo,dio2125.txt     |   12 -
 .../devicetree/bindings/sound/everest,es7134.txt   |    7 +-
 .../devicetree/bindings/sound/everest,es7241.txt   |   28 +
 .../bindings/sound/marvell,pxa2xx-ac97.txt         |   27 +
 .../devicetree/bindings/sound/mrvl,pxa-ssp.txt     |    8 +
 .../devicetree/bindings/sound/mrvl,pxa2xx-pcm.txt  |   15 -
 .../devicetree/bindings/sound/qcom,q6adm.txt       |    6 +
 .../devicetree/bindings/sound/qcom,q6afe.txt       |    6 +
 .../devicetree/bindings/sound/qcom,q6asm.txt       |    6 +
 Documentation/devicetree/bindings/sound/rt5682.txt |   50 +
 .../devicetree/bindings/sound/simple-amplifier.txt |   12 +
 .../devicetree/bindings/sound/tas571x.txt          |    1 +
 arch/arm/mach-pxa/devices.c                        |  148 +-
 arch/arm/mach-pxa/devices.h                        |    6 +-
 arch/arm/mach-pxa/pxa25x.c                         |   38 +-
 arch/arm/mach-pxa/pxa27x.c                         |   39 +-
 arch/arm/mach-pxa/pxa3xx.c                         |   41 +-
 arch/arm/plat-pxa/ssp.c                            |   47 -
 drivers/ata/pata_pxa.c                             |   10 +-
 drivers/dma/pxa_dma.c                              |   15 +-
 drivers/media/platform/pxa_camera.c                |   22 +-
 drivers/mmc/host/pxamci.c                          |   29 +-
 drivers/mtd/nand/raw/marvell_nand.c                |   17 +-
 include/linux/dma/pxa-dma.h                        |    9 +
 include/linux/platform_data/mmp_dma.h              |    4 +
 include/linux/pxa2xx_ssp.h                         |   10 +-
 include/sound/ac97/codec.h                         |    8 +-
 include/sound/ac97/compat.h                        |    9 +-
 include/sound/ac97/controller.h                    |    8 +-
 include/sound/ac97/regs.h                          |   20 +-
 include/sound/ac97_codec.h                         |   25 +-
 include/sound/compress_driver.h                    |   21 +-
 include/sound/dmaengine_pcm.h                      |   14 +-
 include/sound/pxa2xx-lib.h                         |   13 +-
 include/sound/rt5682.h                             |   40 +
 include/sound/simple_card.h                        |    7 +-
 include/sound/simple_card_utils.h                  |   23 +-
 include/sound/soc-acpi-intel-match.h               |   19 +-
 include/sound/soc-acpi.h                           |   13 +-
 include/sound/soc-dai.h                            |    7 +-
 include/sound/soc-dapm.h                           |   11 +-
 include/sound/soc-dpcm.h                           |    7 +-
 include/sound/soc-topology.h                       |   37 +-
 include/sound/soc.h                                |   26 +-
 sound/arm/Kconfig                                  |    5 -
 sound/arm/Makefile                                 |    3 -
 sound/arm/pxa2xx-ac97-lib.c                        |   12 +
 sound/arm/pxa2xx-ac97.c                            |  124 +-
 sound/arm/pxa2xx-pcm-lib.c                         |   75 +-
 sound/arm/pxa2xx-pcm.c                             |  129 -
 sound/arm/pxa2xx-pcm.h                             |   27 -
 sound/soc/amd/acp-da7219-max98357a.c               |   66 +-
 sound/soc/amd/acp-pcm-dma.c                        |  133 +-
 sound/soc/amd/acp.h                                |   12 +-
 sound/soc/atmel/atmel-i2s.c                        |   46 +-
 sound/soc/codecs/Kconfig                           |   25 +-
 sound/soc/codecs/Makefile                          |    8 +-
 sound/soc/codecs/ak4458.c                          |    2 +-
 sound/soc/codecs/ak5558.c                          |    4 +-
 sound/soc/codecs/cx20442.c                         |   23 +-
 sound/soc/codecs/es7134.c                          |  227 +-
 sound/soc/codecs/es7241.c                          |  322 +++
 sound/soc/codecs/nau8824.c                         |    2 +-
 sound/soc/codecs/nau8825.c                         |    2 +-
 sound/soc/codecs/pcm1789.c                         |    3 +-
 sound/soc/codecs/rt1305.c                          |   15 +-
 sound/soc/codecs/rt5682.c                          | 2681 ++++++++++++++++++++
 sound/soc/codecs/rt5682.h                          | 1324 ++++++++++
 sound/soc/codecs/{dio2125.c => simple-amplifier.c} |   42 +-
 sound/soc/codecs/tas571x.c                         |  110 +
 sound/soc/codecs/tas571x.h                         |   16 +
 sound/soc/codecs/tscs42xx.c                        |   37 +-
 sound/soc/codecs/tscs42xx.h                        |    8 +
 sound/soc/codecs/wm_adsp.c                         |   29 +-
 sound/soc/davinci/davinci-mcasp.c                  |   16 +-
 sound/soc/fsl/fsl_spdif.c                          |    2 +-
 sound/soc/generic/audio-graph-card.c               |   41 +-
 sound/soc/generic/audio-graph-scu-card.c           |   25 +-
 sound/soc/generic/simple-card-utils.c              |   74 +-
 sound/soc/generic/simple-card.c                    |  106 +-
 sound/soc/generic/simple-scu-card.c                |   21 +-
 sound/soc/intel/boards/bxt_da7219_max98357a.c      |    4 +-
 sound/soc/intel/boards/bytcr_rt5640.c              |   32 +-
 sound/soc/intel/boards/bytcr_rt5651.c              |  128 +-
 sound/soc/intel/boards/kbl_da7219_max98357a.c      |    1 +
 sound/soc/intel/common/Makefile                    |    6 +-
 sound/soc/intel/common/soc-acpi-intel-bxt-match.c  |   59 +
 sound/soc/intel/common/soc-acpi-intel-byt-match.c  |   40 +-
 sound/soc/intel/common/soc-acpi-intel-cht-match.c  |   56 +-
 sound/soc/intel/common/soc-acpi-intel-cnl-match.c  |   32 +
 sound/soc/intel/common/soc-acpi-intel-glk-match.c  |   41 +
 .../intel/common/soc-acpi-intel-hsw-bdw-match.c    |   16 +-
 sound/soc/intel/common/soc-acpi-intel-kbl-match.c  |   91 +
 sound/soc/intel/common/soc-acpi-intel-skl-match.c  |   47 +
 sound/soc/intel/skylake/skl-pcm.c                  |    7 +-
 sound/soc/intel/skylake/skl-topology.c             |    5 +-
 sound/soc/intel/skylake/skl-topology.h             |    5 +-
 sound/soc/intel/skylake/skl.c                      |  170 +-
 .../soc/mediatek/common/mtk-afe-platform-driver.c  |   64 +-
 sound/soc/mediatek/common/mtk-base-afe.h           |    6 +-
 sound/soc/mediatek/mt6797/mt6797-afe-common.h      |    1 +
 sound/soc/mediatek/mt6797/mt6797-afe-pcm.c         |   65 +-
 sound/soc/mediatek/mt6797/mt6797-dai-adda.c        |   20 +-
 sound/soc/mediatek/mt6797/mt6797-dai-hostless.c    |   16 +-
 sound/soc/mediatek/mt6797/mt6797-dai-pcm.c         |   19 +-
 sound/soc/omap/omap-abe-twl6040.c                  |    2 +-
 sound/soc/pxa/Kconfig                              |    5 +-
 sound/soc/pxa/pxa-ssp.c                            |  181 +-
 sound/soc/pxa/pxa2xx-ac97.c                        |   47 +-
 sound/soc/pxa/pxa2xx-i2s.c                         |    9 +-
 sound/soc/pxa/pxa2xx-pcm.c                         |   73 -
 sound/soc/qcom/apq8096.c                           |    2 +-
 sound/soc/qcom/lpass-platform.c                    |    2 +-
 sound/soc/qcom/qdsp6/q6adm.c                       |   16 +-
 sound/soc/qcom/qdsp6/q6afe-dai.c                   |  183 +-
 sound/soc/qcom/qdsp6/q6afe.c                       |   43 +-
 sound/soc/qcom/qdsp6/q6asm-dai.c                   |    7 +
 sound/soc/qcom/qdsp6/q6asm.c                       |   17 +-
 sound/soc/qcom/qdsp6/q6routing.c                   |   37 +-
 sound/soc/rockchip/Makefile                        |    3 +-
 sound/soc/rockchip/rockchip_i2s.c                  |    3 +-
 sound/soc/rockchip/rockchip_pcm.c                  |   45 +
 sound/soc/rockchip/rockchip_pcm.h                  |   14 +
 sound/soc/rockchip/rockchip_rt5645.c               |   27 +-
 sound/soc/sh/dma-sh7760.c                          |   26 +-
 sound/soc/sh/fsi.c                                 |   22 +-
 sound/soc/sh/hac.c                                 |   20 +-
 sound/soc/sh/migor.c                               |   14 +-
 sound/soc/sh/rcar/Makefile                         |    1 +
 sound/soc/sh/rcar/adg.c                            |   15 +-
 sound/soc/sh/rcar/cmd.c                            |   19 +-
 sound/soc/sh/rcar/core.c                           |   35 +-
 sound/soc/sh/rcar/ctu.c                            |   15 +-
 sound/soc/sh/rcar/dma.c                            |   17 +-
 sound/soc/sh/rcar/dvc.c                            |   16 +-
 sound/soc/sh/rcar/gen.c                            |   16 +-
 sound/soc/sh/rcar/mix.c                            |   14 +-
 sound/soc/sh/rcar/rsnd.h                           |   17 +-
 sound/soc/sh/rcar/src.c                            |   16 +-
 sound/soc/sh/rcar/ssi.c                            |   22 +-
 sound/soc/sh/rcar/ssiu.c                           |   15 +-
 sound/soc/sh/sh7760-ac97.c                         |   14 +-
 sound/soc/sh/siu.h                                 |   26 +-
 sound/soc/sh/siu_dai.c                             |   26 +-
 sound/soc/sh/siu_pcm.c                             |   27 +-
 sound/soc/sh/ssi.c                                 |   21 +-
 sound/soc/soc-ac97.c                               |   29 +-
 sound/soc/soc-acpi.c                               |   20 +-
 sound/soc/soc-compress.c                           |   24 +-
 sound/soc/soc-core.c                               |  142 +-
 sound/soc/soc-dapm.c                               |   42 +-
 sound/soc/soc-devres.c                             |   15 +-
 sound/soc/soc-generic-dmaengine-pcm.c              |   19 +-
 sound/soc/soc-io.c                                 |   19 +-
 sound/soc/soc-jack.c                               |   19 +-
 sound/soc/soc-ops.c                                |   29 +-
 sound/soc/soc-pcm.c                                |  381 +--
 sound/soc/soc-topology.c                           |   91 +-
 sound/soc/soc-utils.c                              |   22 +-
 sound/soc/sti/uniperif_player.c                    |    6 +-
 sound/soc/sti/uniperif_reader.c                    |    2 +-
 sound/soc/stm/Kconfig                              |    1 +
 sound/soc/stm/stm32_sai_sub.c                      |  146 +-
 sound/soc/tegra/tegra_rt5677.c                     |   17 +-
 sound/soc/uniphier/aio-cpu.c                       |    5 -
 167 files changed, 7523 insertions(+), 2298 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/sound/dioo,dio2125.txt
 create mode 100644 Documentation/devicetree/bindings/sound/everest,es7241.txt
 create mode 100644 Documentation/devicetree/bindings/sound/marvell,pxa2xx-ac97.txt
 delete mode 100644 Documentation/devicetree/bindings/sound/mrvl,pxa2xx-pcm.txt
 create mode 100644 Documentation/devicetree/bindings/sound/rt5682.txt
 create mode 100644 Documentation/devicetree/bindings/sound/simple-amplifier.txt
 create mode 100644 include/sound/rt5682.h
 delete mode 100644 sound/arm/pxa2xx-pcm.c
 delete mode 100644 sound/arm/pxa2xx-pcm.h
 create mode 100644 sound/soc/codecs/es7241.c
 create mode 100644 sound/soc/codecs/rt5682.c
 create mode 100644 sound/soc/codecs/rt5682.h
 rename sound/soc/codecs/{dio2125.c => simple-amplifier.c} (68%)
 create mode 100644 sound/soc/intel/common/soc-acpi-intel-bxt-match.c
 create mode 100644 sound/soc/intel/common/soc-acpi-intel-cnl-match.c
 create mode 100644 sound/soc/intel/common/soc-acpi-intel-glk-match.c
 create mode 100644 sound/soc/intel/common/soc-acpi-intel-kbl-match.c
 create mode 100644 sound/soc/intel/common/soc-acpi-intel-skl-match.c
 create mode 100644 sound/soc/rockchip/rockchip_pcm.c
 create mode 100644 sound/soc/rockchip/rockchip_pcm.h
Merging modules/modules-next (f314dfea16a0 modsign: log module name in the event of an error)
$ git merge modules/modules-next
Auto-merging include/linux/module.h
Merge made by the 'recursive' strategy.
 include/linux/module.h   |   4 +-
 kernel/module-internal.h |  25 ++++++++-
 kernel/module.c          | 137 ++++++++++++++++++++++-------------------------
 kernel/module_signing.c  |  12 +++--
 4 files changed, 97 insertions(+), 81 deletions(-)
Merging input/next (381a2c6fb9c5 Input: iforce - use GFP_KERNEL in iforce_get_id_packet())
$ git merge input/next
Auto-merging include/xen/interface/io/kbdif.h
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/input/keys.txt   |   8 +
 .../bindings/input/touchscreen/bu21029.txt         |  35 ++
 .../devicetree/bindings/input/touchscreen/eeti.txt |  30 ++
 drivers/input/joystick/iforce/iforce-packets.c     |   2 +-
 drivers/input/keyboard/cros_ec_keyb.c              |  69 +--
 drivers/input/keyboard/imx_keypad.c                |  12 +-
 drivers/input/keyboard/snvs_pwrkey.c               |  15 +-
 drivers/input/misc/xen-kbdfront.c                  | 183 ++++----
 drivers/input/serio/i8042.c                        |   3 +
 drivers/input/touchscreen/Kconfig                  |  12 +
 drivers/input/touchscreen/Makefile                 |   1 +
 drivers/input/touchscreen/bu21029_ts.c             | 484 +++++++++++++++++++++
 drivers/input/touchscreen/eeti_ts.c                |  37 +-
 drivers/input/touchscreen/fsl-imx25-tcq.c          |  21 +-
 drivers/input/touchscreen/imx6ul_tsc.c             |  14 +-
 include/xen/interface/io/displif.h                 |   8 +
 include/xen/interface/io/kbdif.h                   |  78 +++-
 include/xen/interface/io/sndif.h                   |  10 +-
 18 files changed, 816 insertions(+), 206 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/input/keys.txt
 create mode 100644 Documentation/devicetree/bindings/input/touchscreen/bu21029.txt
 create mode 100644 Documentation/devicetree/bindings/input/touchscreen/eeti.txt
 create mode 100644 drivers/input/touchscreen/bu21029_ts.c
Merging block/for-next (28313cee1d4f Merge branch 'for-4.18/block' into for-next)
$ git merge block/for-next
Already up to date!
Merge made by the 'recursive' strategy.
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 (d284f8248c72 dm writecache: support optional offset for start of device)
$ git merge device-mapper/for-next
Merge made by the 'recursive' strategy.
 Documentation/device-mapper/writecache.txt |  2 ++
 drivers/md/dm-writecache.c                 | 43 ++++++++++++++++++++----------
 2 files changed, 31 insertions(+), 14 deletions(-)
Merging pcmcia/pcmcia-next (c3a5307873d4 pcmcia: Use module_pcmcia_driver for scsi drivers)
$ git merge pcmcia/pcmcia-next
Merge made by the 'recursive' strategy.
 drivers/char/pcmcia/cm4040_cs.c    |  2 +-
 drivers/scsi/pcmcia/aha152x_stub.c | 14 +-------------
 drivers/scsi/pcmcia/nsp_cs.c       | 15 +--------------
 drivers/scsi/pcmcia/nsp_cs.h       |  4 ----
 drivers/scsi/pcmcia/qlogic_stub.c  | 13 +------------
 drivers/scsi/pcmcia/sym53c500_cs.c | 16 +---------------
 6 files changed, 5 insertions(+), 59 deletions(-)
Merging mmc/next (bc2ded7a0f21 mmc: sdhci: do not try to use 3.3V signaling if not supported)
$ git merge mmc/next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/mmc/arasan,sdhci.txt       |   2 +
 Documentation/devicetree/bindings/mmc/pxa-mmc.txt  |   6 +-
 .../devicetree/bindings/mmc/sdhci-msm.txt          |   7 +-
 drivers/mmc/core/core.c                            |  48 +-
 drivers/mmc/core/core.h                            |   2 -
 drivers/mmc/core/mmc.c                             |  10 +
 drivers/mmc/core/mmc_ops.c                         |   2 +-
 drivers/mmc/core/sdio.c                            |   1 -
 drivers/mmc/host/dw_mmc-exynos.c                   |  33 +-
 drivers/mmc/host/pxamci.c                          | 211 ++++-----
 drivers/mmc/host/renesas_sdhi_core.c               | 127 ++++-
 drivers/mmc/host/renesas_sdhi_internal_dmac.c      |  20 +-
 drivers/mmc/host/renesas_sdhi_sys_dmac.c           |  17 +-
 drivers/mmc/host/sdhci-esdhc-imx.c                 |  45 +-
 drivers/mmc/host/sdhci-msm.c                       | 510 ++++++++++++++++-----
 drivers/mmc/host/sdhci-of-arasan.c                 |  16 +
 drivers/mmc/host/sdhci-of-esdhc.c                  |  91 ++--
 drivers/mmc/host/sdhci-pci-core.c                  |   2 +
 drivers/mmc/host/sdhci-pci.h                       |   2 +
 drivers/mmc/host/sdhci-tegra.c                     |  15 +-
 drivers/mmc/host/sdhci-xenon-phy.c                 |   1 +
 drivers/mmc/host/sdhci.c                           |   9 +-
 drivers/mmc/host/tmio_mmc.h                        |   6 +
 drivers/mmc/host/tmio_mmc_core.c                   |  47 +-
 include/linux/mfd/tmio.h                           |   3 +
 include/linux/mmc/host.h                           |  10 +-
 include/linux/mmc/mmc.h                            |   2 +-
 include/linux/platform_data/mmc-esdhc-imx.h        |   2 -
 28 files changed, 840 insertions(+), 407 deletions(-)
Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlapping memcpy)
$ git merge kgdb/kgdb-next
Already up to date.
Merging md/for-next (ebc7709f6500 md/r5cache: remove redundant pointer bio)
$ git merge md/for-next
Merge made by the 'recursive' strategy.
 drivers/md/md-cluster.c  | 47 +++++++++++++++++++++++++++++++++++------------
 drivers/md/md.c          | 17 +++++++++++++++++
 drivers/md/md.h          |  1 +
 drivers/md/raid5-cache.c |  2 --
 4 files changed, 53 insertions(+), 14 deletions(-)
Merging mfd/for-mfd-next (94901112b48c mfd: ti_am335x_tscadc: Fix struct clk memory leak)
$ git merge mfd/for-mfd-next
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/mfd/tps65910.txt |  2 +-
 drivers/mfd/arizona-core.c                         | 34 +++++++++++++++++-----
 drivers/mfd/dln2.c                                 | 10 ++-----
 drivers/mfd/intel-lpss-pci.c                       | 13 +++++++++
 drivers/mfd/kempld-core.c                          | 15 +++++-----
 drivers/mfd/ti_am335x_tscadc.c                     |  3 +-
 drivers/mfd/wm8994-core.c                          |  9 +++---
 7 files changed, 57 insertions(+), 29 deletions(-)
Merging backlight/for-backlight-next (30000d80b506 backlight: Remove obsolete comment for ->state)
$ git merge backlight/for-backlight-next
Merge made by the 'recursive' strategy.
 .../bindings/leds/backlight/pwm-backlight.txt      |  34 ++-
 drivers/video/backlight/pwm_bl.c                   | 232 +++++++++++++++++++--
 include/linux/backlight.h                          |   1 -
 3 files changed, 246 insertions(+), 21 deletions(-)
Merging battery/for-next (7914c67667a0 dt-bindings: power: reset: qcom: Add resin binding)
$ git merge battery/for-next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../bindings/input/qcom,pm8941-pwrkey.txt          |   1 +
 .../devicetree/bindings/power/reset/qcom,pon.txt   |  45 ++
 .../bindings/power/supply/sbs_sbs-battery.txt      |  12 +-
 MAINTAINERS                                        |   7 +
 drivers/mfd/cros_ec_dev.c                          |  16 +
 drivers/power/reset/Kconfig                        |  11 +
 drivers/power/reset/Makefile                       |   1 +
 drivers/power/reset/qcom-pon.c                     |  91 +++
 drivers/power/reset/zx-reboot.c                    |   1 +
 drivers/power/supply/Kconfig                       |  21 +
 drivers/power/supply/Makefile                      |   2 +
 drivers/power/supply/ab8500_fg.c                   |  14 +-
 drivers/power/supply/adp5061.c                     | 745 +++++++++++++++++++++
 drivers/power/supply/cros_usbpd-charger.c          | 544 +++++++++++++++
 drivers/power/supply/max1721x_battery.c            |   2 +-
 drivers/power/supply/sbs-battery.c                 |  67 +-
 drivers/power/supply/tps65217_charger.c            |  22 +-
 include/linux/mfd/cros_ec_commands.h               | 132 +++-
 18 files changed, 1687 insertions(+), 47 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/power/reset/qcom,pon.txt
 create mode 100644 drivers/power/reset/qcom-pon.c
 create mode 100644 drivers/power/supply/adp5061.c
 create mode 100644 drivers/power/supply/cros_usbpd-charger.c
Merging regulator/for-next (e6ae70ab2ab0 Merge branch 'regulator-4.19' into regulator-next)
$ git merge regulator/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/regulator/pfuze100.txt     | 77 ++++++++++++++++++-
 .../bindings/regulator/rohm,bd71837-regulator.txt  |  8 --
 drivers/base/core.c                                | 30 ++++++++
 drivers/regulator/Kconfig                          |  4 +-
 drivers/regulator/bd71837-regulator.c              | 39 ++++------
 drivers/regulator/core.c                           | 44 +++++++----
 drivers/regulator/pfuze100-regulator.c             | 86 ++++++++++++++++++----
 include/linux/device.h                             |  1 +
 include/linux/regulator/driver.h                   |  4 +-
 include/linux/regulator/pfuze100.h                 | 11 +++
 10 files changed, 237 insertions(+), 67 deletions(-)
Merging security/next-testing (12aaa9cfc578 Merge branch 'next-general' into next-testing)
$ git merge security/next-testing
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS | 5 -----
 1 file changed, 5 deletions(-)
Merging apparmor/apparmor-next (338d0be437ef apparmor: fix ptrace read check)
$ git merge apparmor/apparmor-next
Already up to date.
Merging integrity/next-integrity (ac14e8eb4890 evm: Allow non-SHA1 digital signatures)
$ git merge integrity/next-integrity
Merge made by the 'recursive' strategy.
 crypto/api.c                         |  2 +-
 include/linux/crypto.h               |  5 ++++
 include/uapi/linux/audit.h           |  1 +
 security/integrity/evm/Kconfig       |  1 +
 security/integrity/evm/evm.h         | 10 ++++++--
 security/integrity/evm/evm_crypto.c  | 50 +++++++++++++++++++-----------------
 security/integrity/evm/evm_main.c    | 19 +++++++++-----
 security/integrity/iint.c            |  9 ++++---
 security/integrity/ima/Kconfig       |  1 +
 security/integrity/ima/ima_policy.c  |  9 ++++---
 security/integrity/integrity.h       | 15 +++++++++++
 security/integrity/integrity_audit.c |  6 +----
 12 files changed, 84 insertions(+), 44 deletions(-)
Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent tainting)
$ git merge keys/keys-next
Already up to date.
Merging selinux/next (67b0b4e4988f selinux: Cleanup printk logging in netnode)
$ git merge selinux/next
Auto-merging security/selinux/selinuxfs.c
Auto-merging security/selinux/hooks.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                       |  1 +
 security/selinux/avc.c            |  2 +-
 security/selinux/hooks.c          | 68 ++++++++++++++---------------
 security/selinux/netif.c          | 11 ++---
 security/selinux/netlink.c        |  2 +-
 security/selinux/netnode.c        |  5 +--
 security/selinux/netport.c        |  5 +--
 security/selinux/selinuxfs.c      | 10 ++---
 security/selinux/ss/avtab.c       | 51 +++++++++++-----------
 security/selinux/ss/conditional.c | 16 +++----
 security/selinux/ss/ebitmap.c     | 15 +++----
 security/selinux/ss/policydb.c    | 91 ++++++++++++++++++++-------------------
 security/selinux/ss/services.c    | 71 +++++++++++++++---------------
 security/selinux/ss/sidtab.c      |  5 +--
 14 files changed, 173 insertions(+), 180 deletions(-)
Merging tpmdd/next (5e19351a8ae3 ima: Get rid of ima_used_chip and use ima_tpm_chip != NULL instead)
$ git merge tpmdd/next
Merge made by the 'recursive' strategy.
 drivers/char/tpm/tpm-chip.c         |  68 +++++++---
 drivers/char/tpm/tpm-interface.c    |  72 +++++++---
 drivers/char/tpm/tpm.h              |  31 +++--
 drivers/char/tpm/tpm2-cmd.c         | 258 +++++++++++++++---------------------
 drivers/char/tpm/tpm2-space.c       |  12 +-
 drivers/char/tpm/tpm_crb.c          | 101 ++++----------
 drivers/char/tpm/tpm_tis_core.c     |   2 +
 drivers/char/tpm/tpm_tis_core.h     |   1 +
 drivers/char/tpm/tpm_tis_spi.c      |   9 +-
 drivers/char/tpm/tpm_vtpm_proxy.c   |   2 +-
 include/linux/tpm.h                 |   7 +
 security/integrity/ima/ima.h        |   2 +-
 security/integrity/ima/ima_crypto.c |   4 +-
 security/integrity/ima/ima_init.c   |  16 +--
 security/integrity/ima/ima_queue.c  |   4 +-
 15 files changed, 285 insertions(+), 304 deletions(-)
Merging watchdog/master (16a7eec2fcd0 watchdog: da9063: remove duplicated timeout_to_sel calls)
$ git merge watchdog/master
Already up to date.
Merging iommu/next (9494874609c3 Merge branches 'arm/shmobile', 'arm/renesas', 'arm/msm', 'x86/amd', 'x86/vt-d' and 'core' into next)
$ git merge iommu/next
Removing include/linux/platform_data/sh_ipmmu.h
Auto-merging drivers/iommu/intel-iommu.c
Auto-merging drivers/iommu/Kconfig
Merge made by the 'recursive' strategy.
 .../bindings/iommu/renesas,ipmmu-vmsa.txt          |  3 +
 arch/x86/include/asm/irq_remapping.h               |  5 ++
 drivers/iommu/Kconfig                              | 22 ++++++++
 drivers/iommu/Makefile                             |  2 +
 drivers/iommu/amd_iommu.c                          | 25 ++++++--
 drivers/iommu/amd_iommu_debugfs.c                  | 33 +++++++++++
 drivers/iommu/amd_iommu_init.c                     | 57 +++++++++++++------
 drivers/iommu/amd_iommu_proto.h                    |  6 ++
 drivers/iommu/amd_iommu_types.h                    | 22 ++++++--
 drivers/iommu/dmar.c                               |  6 +-
 drivers/iommu/intel-iommu.c                        | 18 +++++-
 drivers/iommu/intel-svm.c                          |  2 +-
 drivers/iommu/iommu-debugfs.c                      | 66 ++++++++++++++++++++++
 drivers/iommu/iommu.c                              |  2 +
 drivers/iommu/ipmmu-vmsa.c                         | 38 ++++++++++---
 drivers/iommu/msm_iommu.c                          | 16 ++----
 include/linux/dmar.h                               |  5 --
 include/linux/intel-iommu.h                        |  8 ++-
 include/linux/iommu.h                              |  7 +++
 include/linux/platform_data/sh_ipmmu.h             | 18 ------
 20 files changed, 283 insertions(+), 78 deletions(-)
 create mode 100644 drivers/iommu/amd_iommu_debugfs.c
 create mode 100644 drivers/iommu/iommu-debugfs.c
 delete mode 100644 include/linux/platform_data/sh_ipmmu.h
Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15)
$ git merge dwmw2-iommu/master
Already up to date.
Merging vfio/next (c1abca96b252 samples: mbochs: add DMA_SHARED_BUFFER dependency)
$ git merge vfio/next
Already up to date.
Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment)
$ git merge trivial/for-next
Already up to date.
Merging audit/next (c72051d5778a audit: use ktime_get_coarse_ts64() for time access)
$ git merge audit/next
Auto-merging kernel/audit_tree.c
Auto-merging include/uapi/linux/audit.h
Auto-merging include/net/xfrm.h
Merge made by the 'recursive' strategy.
 drivers/tty/tty_audit.c      |  2 +-
 include/linux/audit.h        |  5 ++++-
 include/linux/cred.h         | 15 ++++++++++-----
 include/net/xfrm.h           |  2 +-
 include/uapi/linux/audit.h   |  3 ++-
 kernel/audit.c               |  7 ++-----
 kernel/audit_tree.c          |  2 ++
 kernel/audit_watch.c         | 29 +++++++++++++++--------------
 kernel/auditfilter.c         | 17 ++++++++++-------
 kernel/auditsc.c             | 14 +++++++-------
 net/netfilter/xt_AUDIT.c     |  2 +-
 net/netlabel/netlabel_user.c |  2 +-
 12 files changed, 56 insertions(+), 44 deletions(-)
Merging devicetree/for-next (f1f517b8f555 dt-bindings: gpio: pca953x: Document interrupts, update example)
$ git merge devicetree/for-next
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Auto-merging Documentation/devicetree/bindings/gpio/gpio-pca953x.txt
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/gpio/gpio-pca953x.txt | 3 +++
 Documentation/devicetree/bindings/vendor-prefixes.txt   | 1 +
 drivers/of/address.c                                    | 6 ++++--
 3 files changed, 8 insertions(+), 2 deletions(-)
Merging mailbox/mailbox-for-next (f83d1cfc8bcd mailbox/drivers/hisi: Consolidate the Kconfig for the MAILBOX)
$ git merge mailbox/mailbox-for-next
Already up to date.
Merging spi/for-next (dd24a748f625 Merge branch 'spi-4.19' into spi-next)
$ git merge spi/for-next
Removing include/linux/spi/adi_spi3.h
Merge made by the 'recursive' strategy.
 drivers/spi/spi-fsl-dspi.c   | 470 +++++++++++++++++++++++--------------------
 drivers/spi/spi-pxa2xx.c     |   4 +
 include/linux/spi/adi_spi3.h | 254 -----------------------
 3 files changed, 254 insertions(+), 474 deletions(-)
 delete mode 100644 include/linux/spi/adi_spi3.h
Merging tip/auto-latest (6347b9d397e8 Merge branch 'x86/hyperv')
$ git merge tip/auto-latest
Auto-merging lib/Kconfig.debug
Auto-merging kernel/bpf/syscall.c
Auto-merging include/linux/syscalls.h
Auto-merging include/linux/cpuhotplug.h
Auto-merging drivers/infiniband/core/rdma_core.c
Removing arch/x86/platform/intel-mid/mrfld.c
Removing arch/x86/platform/intel-mid/mfld.c
Removing arch/x86/platform/intel-mid/intel_mid_weak_decls.h
Auto-merging arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
Auto-merging arch/x86/kernel/cpu/intel_rdt.h
Auto-merging arch/x86/crypto/morus640-sse2-asm.S
Auto-merging arch/x86/crypto/morus1280-sse2-asm.S
Auto-merging arch/x86/crypto/morus1280-avx2-asm.S
Auto-merging arch/x86/crypto/aegis256-aesni-asm.S
Auto-merging arch/x86/crypto/aegis128l-aesni-asm.S
Auto-merging arch/x86/crypto/aegis128-aesni-asm.S
Removing arch/ia64/kernel/jprobes.S
Removing arch/arm64/lib/bitops.S
Merge made by the 'recursive' strategy.
 Documentation/kprobes.txt                          |   35 +-
 Documentation/x86/intel_rdt_ui.txt                 |  380 ++++-
 Documentation/x86/x86_64/boot-options.txt          |    4 +
 arch/alpha/include/asm/atomic.h                    |   56 +-
 arch/arc/include/asm/atomic.h                      |   86 +-
 arch/arc/include/asm/kprobes.h                     |    2 -
 arch/arc/kernel/kprobes.c                          |   50 +-
 arch/arm/include/asm/atomic.h                      |   55 +-
 arch/arm/include/asm/hw_breakpoint.h               |    7 +-
 arch/arm/include/asm/kprobes.h                     |    2 -
 arch/arm/include/asm/probes.h                      |    1 -
 arch/arm/kernel/hw_breakpoint.c                    |   78 +-
 arch/arm/probes/kprobes/core.c                     |  139 +-
 arch/arm/probes/kprobes/test-core.c                |    1 -
 arch/arm64/include/asm/atomic.h                    |   47 +-
 arch/arm64/include/asm/bitops.h                    |   21 +-
 arch/arm64/include/asm/hw_breakpoint.h             |    7 +-
 arch/arm64/include/asm/kprobes.h                   |    1 -
 arch/arm64/kernel/hw_breakpoint.c                  |   86 +-
 arch/arm64/kernel/probes/kprobes.c                 |   88 +-
 arch/arm64/lib/Makefile                            |    2 +-
 arch/arm64/lib/bitops.S                            |   76 -
 arch/h8300/include/asm/atomic.h                    |   19 +-
 arch/hexagon/include/asm/atomic.h                  |   18 +-
 arch/ia64/include/asm/atomic.h                     |   81 --
 arch/ia64/include/asm/kprobes.h                    |    2 -
 arch/ia64/include/uapi/asm/break.h                 |    1 -
 arch/ia64/kernel/Makefile                          |    2 +-
 arch/ia64/kernel/jprobes.S                         |   90 --
 arch/ia64/kernel/kprobes.c                         |   93 +-
 arch/m68k/include/asm/atomic.h                     |   24 +-
 arch/m68k/include/asm/bitops.h                     |    6 +-
 arch/mips/include/asm/atomic.h                     |  172 ---
 arch/mips/include/asm/kprobes.h                    |   13 -
 arch/mips/kernel/kprobes.c                         |   70 +-
 arch/mips/kvm/mips.c                               |    4 +-
 arch/openrisc/include/asm/atomic.h                 |    4 +-
 arch/openrisc/include/asm/cmpxchg.h                |    3 +-
 arch/parisc/include/asm/atomic.h                   |  107 --
 arch/powerpc/include/asm/atomic.h                  |   52 +-
 arch/powerpc/include/asm/hw_breakpoint.h           |    7 +-
 arch/powerpc/include/asm/kprobes.h                 |   12 -
 arch/powerpc/kernel/hw_breakpoint.c                |   47 +-
 arch/powerpc/kernel/kprobes-ftrace.c               |   72 +-
 arch/powerpc/kernel/kprobes.c                      |   92 +-
 arch/powerpc/kernel/trace/ftrace_64_mprofile.S     |   39 +-
 arch/powerpc/kvm/book3s_hv.c                       |    6 +-
 arch/riscv/include/asm/atomic.h                    |  149 +-
 arch/s390/include/asm/atomic.h                     |   65 -
 arch/s390/include/asm/kprobes.h                    |    2 -
 arch/s390/kernel/kprobes.c                         |   86 +-
 arch/s390/kvm/interrupt.c                          |    2 +-
 arch/sh/include/asm/atomic.h                       |   35 -
 arch/sh/include/asm/cmpxchg-xchg.h                 |    3 +-
 arch/sh/include/asm/hw_breakpoint.h                |    8 +-
 arch/sh/include/asm/kprobes.h                      |    4 -
 arch/sh/kernel/hw_breakpoint.c                     |   53 +-
 arch/sh/kernel/kprobes.c                           |   72 +-
 arch/sparc/include/asm/atomic_32.h                 |   24 +-
 arch/sparc/include/asm/atomic_64.h                 |   65 +-
 arch/sparc/include/asm/kprobes.h                   |    1 -
 arch/sparc/kernel/kprobes.c                        |   65 +-
 arch/sparc/lib/atomic32.c                          |    4 +-
 arch/x86/Kconfig                                   |    2 +-
 arch/x86/boot/compressed/kaslr.c                   |   96 +-
 arch/x86/crypto/aegis128-aesni-asm.S               |    2 +-
 arch/x86/crypto/aegis128l-aesni-asm.S              |    2 +-
 arch/x86/crypto/aegis256-aesni-asm.S               |    2 +-
 arch/x86/crypto/aesni-intel_asm.S                  |    8 +-
 arch/x86/crypto/aesni-intel_avx-x86_64.S           |    4 +-
 arch/x86/crypto/morus1280-avx2-asm.S               |    2 +-
 arch/x86/crypto/morus1280-sse2-asm.S               |    2 +-
 arch/x86/crypto/morus640-sse2-asm.S                |    2 +-
 arch/x86/crypto/sha1_ssse3_asm.S                   |    2 +-
 arch/x86/entry/entry_64.S                          |    5 +-
 arch/x86/entry/vdso/Makefile                       |    4 +-
 arch/x86/events/intel/lbr.c                        |   56 +-
 arch/x86/events/perf_event.h                       |    5 +
 arch/x86/hyperv/hv_apic.c                          |   59 +-
 arch/x86/hyperv/mmu.c                              |   73 +-
 arch/x86/include/asm/atomic.h                      |   30 +-
 arch/x86/include/asm/atomic64_32.h                 |   61 +-
 arch/x86/include/asm/atomic64_64.h                 |   48 +-
 arch/x86/include/asm/hw_breakpoint.h               |    7 +-
 arch/x86/include/asm/intel-family.h                |   13 +
 arch/x86/include/asm/intel-mid.h                   |   43 -
 arch/x86/include/asm/kprobes.h                     |    5 +-
 arch/x86/include/asm/mshyperv.h                    |   34 +
 arch/x86/include/asm/orc_types.h                   |    2 +
 arch/x86/include/asm/percpu.h                      |    7 +-
 arch/x86/include/asm/refcount.h                    |    1 +
 arch/x86/include/asm/trace/hyperv.h                |   15 +
 arch/x86/include/asm/unwind_hints.h                |   16 +-
 arch/x86/kernel/apic/vector.c                      |   17 +-
 arch/x86/kernel/cpu/Makefile                       |    4 +-
 arch/x86/kernel/cpu/intel_rdt.c                    |   11 +
 arch/x86/kernel/cpu/intel_rdt.h                    |  152 +-
 arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c        |  129 +-
 arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c        | 1523 ++++++++++++++++++++
 arch/x86/kernel/cpu/intel_rdt_pseudo_lock_event.h  |   43 +
 arch/x86/kernel/cpu/intel_rdt_rdtgroup.c           |  798 +++++++++-
 arch/x86/kernel/cpu/mcheck/mce.c                   |  202 +--
 arch/x86/kernel/head_64.S                          |    2 +-
 arch/x86/kernel/hw_breakpoint.c                    |  131 +-
 arch/x86/kernel/kprobes/common.h                   |   10 -
 arch/x86/kernel/kprobes/core.c                     |  124 +-
 arch/x86/kernel/kprobes/ftrace.c                   |   49 +-
 arch/x86/kernel/kprobes/opt.c                      |    1 -
 arch/x86/kernel/kvm.c                              |    4 +-
 arch/x86/kernel/paravirt_patch_64.c                |    2 +-
 arch/x86/kernel/stacktrace.c                       |   42 +-
 arch/x86/kernel/tsc_msr.c                          |   96 +-
 arch/x86/kernel/unwind_orc.c                       |   52 +-
 arch/x86/kvm/lapic.c                               |    2 +-
 arch/x86/lib/memcpy_64.S                           |    2 +-
 arch/x86/mm/numa_emulation.c                       |  107 +-
 arch/x86/platform/intel-mid/Makefile               |    2 +-
 arch/x86/platform/intel-mid/intel-mid.c            |   23 +-
 arch/x86/platform/intel-mid/intel_mid_weak_decls.h |   18 -
 arch/x86/platform/intel-mid/mfld.c                 |   70 -
 arch/x86/platform/intel-mid/mrfld.c                |  105 --
 arch/x86/power/hibernate_asm_64.S                  |    2 +-
 arch/x86/um/vdso/.gitignore                        |    1 -
 arch/x86/um/vdso/Makefile                          |   16 -
 arch/xtensa/include/asm/atomic.h                   |   98 --
 arch/xtensa/include/asm/hw_breakpoint.h            |    7 +-
 arch/xtensa/kernel/hw_breakpoint.c                 |   40 +-
 drivers/block/rbd.c                                |    2 +-
 drivers/infiniband/core/rdma_core.c                |    2 +-
 fs/afs/rxrpc.c                                     |    2 +-
 fs/timerfd.c                                       |    8 +-
 include/asm-generic/atomic-instrumented.h          |   71 +-
 include/asm-generic/atomic.h                       |   33 -
 include/asm-generic/atomic64.h                     |   15 +-
 include/asm-generic/bitops/atomic.h                |  188 +--
 include/asm-generic/bitops/lock.h                  |   68 +-
 include/linux/atomic.h                             |  415 ++++--
 include/linux/bitops.h                             |   22 +-
 include/linux/bits.h                               |   26 +
 include/linux/compat.h                             |    9 -
 include/linux/compat_time.h                        |    9 +
 include/linux/cpuhotplug.h                         |    1 +
 include/linux/kprobes.h                            |   53 -
 include/linux/nmi.h                                |    5 +
 include/linux/posix-timers.h                       |    4 +-
 include/linux/refcount.h                           |    7 +-
 include/linux/smpboot.h                            |   15 +-
 include/linux/swait.h                              |   36 +-
 include/linux/syscalls.h                           |   10 +-
 include/linux/time.h                               |    4 +-
 include/linux/time64.h                             |    1 +
 include/uapi/linux/time.h                          |    7 +
 kernel/bpf/syscall.c                               |    4 +-
 kernel/compat.c                                    |   29 -
 kernel/cpu.c                                       |    5 +
 kernel/events/core.c                               |    4 +-
 kernel/events/hw_breakpoint.c                      |   92 +-
 kernel/fail_function.c                             |    3 -
 kernel/irq/irqdesc.c                               |   13 +-
 kernel/irq/manage.c                                |   44 +-
 kernel/irq/proc.c                                  |   22 +-
 kernel/kprobes.c                                   |  167 +--
 kernel/kthread.c                                   |    6 +-
 kernel/power/suspend.c                             |    4 +-
 kernel/rcu/srcutiny.c                              |    4 +-
 kernel/rcu/tree.c                                  |    8 +-
 kernel/rcu/tree_exp.h                              |    4 +-
 kernel/rcu/tree_plugin.h                           |   12 +-
 kernel/sched/debug.c                               |   31 +-
 kernel/sched/fair.c                                |    1 -
 kernel/sched/swait.c                               |   32 +-
 kernel/smpboot.c                                   |   54 +-
 kernel/sys.c                                       |    4 +-
 kernel/test_kprobes.c                              |   94 --
 kernel/time/alarmtimer.c                           |    7 +-
 kernel/time/ntp.c                                  |    6 +-
 kernel/time/posix-cpu-timers.c                     |    2 +-
 kernel/time/posix-stubs.c                          |    2 +-
 kernel/time/posix-timers.c                         |   55 +-
 kernel/time/posix-timers.h                         |    2 +-
 kernel/time/time.c                                 |   31 +-
 kernel/time/timekeeping.c                          |    2 +-
 kernel/trace/trace_kprobe.c                        |   11 +-
 kernel/watchdog.c                                  |  137 +-
 lib/Kconfig.debug                                  |    2 +-
 lib/atomic64.c                                     |   14 +-
 lib/refcount.c                                     |    2 +
 net/atm/pppoatm.c                                  |    2 +-
 net/rxrpc/call_object.c                            |    2 +-
 net/rxrpc/conn_object.c                            |    4 +-
 net/rxrpc/local_object.c                           |    2 +-
 net/rxrpc/peer_object.c                            |    2 +-
 tools/objtool/arch/x86/include/asm/orc_types.h     |    2 +
 tools/objtool/check.c                              |    1 +
 tools/objtool/check.h                              |    2 +-
 tools/objtool/orc_dump.c                           |    3 +-
 tools/objtool/orc_gen.c                            |    2 +
 virt/kvm/arm/arm.c                                 |    4 +-
 virt/kvm/arm/psci.c                                |    2 +-
 virt/kvm/async_pf.c                                |    2 +-
 virt/kvm/kvm_main.c                                |    4 +-
 201 files changed, 5009 insertions(+), 4339 deletions(-)
 delete mode 100644 arch/arm64/lib/bitops.S
 delete mode 100644 arch/ia64/kernel/jprobes.S
 create mode 100644 arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c
 create mode 100644 arch/x86/kernel/cpu/intel_rdt_pseudo_lock_event.h
 delete mode 100644 arch/x86/platform/intel-mid/intel_mid_weak_decls.h
 delete mode 100644 arch/x86/platform/intel-mid/mfld.c
 delete mode 100644 arch/x86/platform/intel-mid/mrfld.c
 create mode 100644 include/linux/bits.h
Merging clockevents/clockevents/next (6bd9549d8a7d clocksource/drivers/arc_timer: Add comments about locking while read GFRC)
$ 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 (6c974d4dfafe EDAC, i7core: Fix memleaks and use-after-free on probe and remove)
$ git merge edac-amd/for-next
Merge made by the 'recursive' strategy.
 drivers/edac/altera_edac.c   |  3 ++-
 drivers/edac/edac_mc_sysfs.c |  6 +++---
 drivers/edac/i7core_edac.c   | 22 +++++++++++++++-------
 3 files changed, 20 insertions(+), 11 deletions(-)
Merging irqchip/irq/irqchip-next (6a88c221acba ARM: dts: stm32: Add exti support to stm32mp157 pinctrl)
$ git merge irqchip/irq/irqchip-next
Already up to date.
Merging ftrace/for-next (a9235b544a0a ring-buffer: Fix typo in comment)
$ git merge ftrace/for-next
Already up to date.
Merging rcu/rcu/next (bd917f682b45 Merge branches 'fixes1.2018.06.26a' and 'torture1.2018.06.26a' into HEAD)
$ git merge rcu/rcu/next
Removing tools/testing/selftests/rcutorture/configs/rcu/TREE08-T.boot
Auto-merging kernel/rcu/tree_plugin.h
CONFLICT (content): Merge conflict in kernel/rcu/tree_plugin.h
Auto-merging kernel/rcu/tree_exp.h
Auto-merging kernel/rcu/tree.c
Auto-merging kernel/locking/locktorture.c
Auto-merging MAINTAINERS
Auto-merging Documentation/admin-guide/kernel-parameters.txt
Resolved 'kernel/rcu/tree_plugin.h' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 30a81fd815d2] Merge remote-tracking branch 'rcu/rcu/next'
$ git diff -M --stat --summary HEAD^..
 .../Design/Data-Structures/Data-Structures.html    |  118 +--
 .../Memory-Ordering/Tree-RCU-Memory-Ordering.html  |   22 +-
 .../Design/Memory-Ordering/TreeRCU-gp-cleanup.svg  |  123 +--
 .../Design/Memory-Ordering/TreeRCU-gp-init-1.svg   |   16 +-
 .../Design/Memory-Ordering/TreeRCU-gp-init-3.svg   |   56 +-
 .../RCU/Design/Memory-Ordering/TreeRCU-gp.svg      |  237 ++---
 .../RCU/Design/Memory-Ordering/TreeRCU-qs.svg      |   12 +-
 Documentation/RCU/stallwarn.txt                    |   24 +-
 Documentation/RCU/whatisRCU.txt                    |   18 +-
 Documentation/admin-guide/kernel-parameters.txt    |    4 +-
 MAINTAINERS                                        |    9 +-
 include/linux/rculist.h                            |   19 +-
 include/linux/rcupdate.h                           |   20 +-
 include/linux/rcutiny.h                            |    2 +-
 include/linux/srcu.h                               |   17 +
 include/linux/torture.h                            |    4 +-
 include/trace/events/rcu.h                         |  112 ++-
 kernel/locking/locktorture.c                       |    5 +-
 kernel/rcu/rcu.h                                   |  126 ++-
 kernel/rcu/rcuperf.c                               |   57 +-
 kernel/rcu/rcutorture.c                            |  462 ++++++---
 kernel/rcu/srcutree.c                              |   39 +-
 kernel/rcu/tiny.c                                  |    4 +-
 kernel/rcu/tree.c                                  | 1017 +++++++++++---------
 kernel/rcu/tree.h                                  |   71 +-
 kernel/rcu/tree_exp.h                              |   14 +-
 kernel/rcu/tree_plugin.h                           |  176 ++--
 kernel/rcu/update.c                                |   45 +-
 kernel/torture.c                                   |   15 +-
 .../testing/selftests/rcutorture/bin/configinit.sh |   26 +-
 .../testing/selftests/rcutorture/bin/kvm-build.sh  |   11 +-
 .../selftests/rcutorture/bin/kvm-recheck-rcu.sh    |    1 +
 .../selftests/rcutorture/bin/kvm-recheck.sh        |    1 +
 .../selftests/rcutorture/bin/kvm-test-1-run.sh     |    5 +-
 tools/testing/selftests/rcutorture/bin/kvm.sh      |    2 +-
 .../selftests/rcutorture/bin/parse-console.sh      |    7 +
 .../selftests/rcutorture/configs/rcu/TREE03.boot   |    4 +-
 .../selftests/rcutorture/configs/rcu/TREE08-T.boot |    1 -
 .../rcutorture/configs/rcu/ver_functions.sh        |    2 +-
 39 files changed, 1695 insertions(+), 1209 deletions(-)
 delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE08-T.boot
Merging kvm/linux-next (6f0d349d922b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge kvm/linux-next
Already up to date.
Merging kvm-arm/next (e25028c8ded0 KVM: arm/arm64: Bump VGIC_V3_MAX_CPUS to 512)
$ git merge kvm-arm/next
Already up to date.
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 (ce397d215ccd Linux 4.18-rc1)
$ git merge kvm-ppc/kvm-ppc-next
Already up to date.
Merging kvms390/next (2c8180e885c1 KVM: s390: vsie: simplify < 8k address checks)
$ git merge kvms390/next
Already up to date.
Merging xen-tip/linux-next (eef04c7b3786 xen: Remove unnecessary BUG_ON from __unbind_from_irq())
$ git merge xen-tip/linux-next
Already up to date.
Merging percpu/for-next (b3a5d1119944 percpu_ref: Update doc to dissuade users from depending on internal RCU grace periods)
$ git merge percpu/for-next
Already up to date.
Merging workqueues/for-next (66448bc274ca workqueue: move function definitions within CONFIG_SMP block)
$ git merge workqueues/for-next
Already up to date.
Merging drivers-x86/for-next (eca4c4e47eb0 platform/x86: asus-wireless: Fix uninitialized symbol usage)
$ git merge drivers-x86/for-next
Auto-merging drivers/platform/x86/touchscreen_dmi.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 Documentation/ABI/stable/sysfs-driver-mlxreg-io    |  77 +++
 MAINTAINERS                                        |   2 +-
 drivers/platform/mellanox/Kconfig                  |  11 +
 drivers/platform/mellanox/Makefile                 |   1 +
 drivers/platform/mellanox/mlxreg-io.c              | 245 ++++++++
 drivers/platform/x86/Kconfig                       |  16 +-
 drivers/platform/x86/Makefile                      |   2 +-
 drivers/platform/x86/asus-wireless.c               |  24 +-
 drivers/platform/x86/asus-wmi.c                    |  34 +-
 drivers/platform/x86/dell-smbios-base.c            |  35 +-
 drivers/platform/x86/dell-smbios-smm.c             |   4 +-
 drivers/platform/x86/dell-smbios-wmi.c             |   2 +-
 drivers/platform/x86/ideapad-laptop.c              |   4 +-
 drivers/platform/x86/intel-hid.c                   | 178 +++++-
 drivers/platform/x86/intel-vbtn.c                  |   5 +
 drivers/platform/x86/intel_pmc_core.c              | 120 ++++
 drivers/platform/x86/intel_pmc_core.h              |   6 +
 drivers/platform/x86/mlx-platform.c                | 175 +++++-
 drivers/platform/x86/thinkpad_acpi.c               |   4 +-
 drivers/platform/x86/toshiba_acpi.c                |  30 +-
 .../x86/{silead_dmi.c => touchscreen_dmi.c}        | 625 ++++++++++++---------
 drivers/platform/x86/wmi.c                         |   9 +-
 22 files changed, 1267 insertions(+), 342 deletions(-)
 create mode 100644 Documentation/ABI/stable/sysfs-driver-mlxreg-io
 create mode 100644 drivers/platform/mellanox/mlxreg-io.c
 rename drivers/platform/x86/{silead_dmi.c => touchscreen_dmi.c} (73%)
Merging chrome-platform/for-next (c474e9f2be99 platform/chrome: chromeos_tbmc - fix SPDX identifier)
$ git merge chrome-platform/for-next
Merge made by the 'recursive' strategy.
 drivers/platform/chrome/chromeos_tbmc.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
Merging hsi/for-next (ce397d215ccd Linux 4.18-rc1)
$ git merge hsi/for-next
Already up to date.
Merging leds/for-next (6f7b0bad8839 usb: simplify usbport trigger)
$ git merge leds/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/leds/leds-lm3692x.txt      |   5 +-
 .../devicetree/bindings/leds/leds-lt3593.txt       |  32 ++++
 drivers/leds/Kconfig                               |   5 +-
 drivers/leds/led-triggers.c                        |  39 ++++-
 drivers/leds/leds-apu.c                            |  44 ++++-
 drivers/leds/leds-lm3692x.c                        | 181 ++++++++++++++------
 drivers/leds/leds-lt3593.c                         | 190 ++++++++++++---------
 drivers/leds/leds-max8997.c                        |   2 +-
 drivers/leds/trigger/Kconfig                       |  15 +-
 drivers/leds/trigger/ledtrig-activity.c            |  51 +++---
 drivers/leds/trigger/ledtrig-backlight.c           |  64 +++----
 drivers/leds/trigger/ledtrig-camera.c              |   3 +-
 drivers/leds/trigger/ledtrig-default-on.c          |  20 +--
 drivers/leds/trigger/ledtrig-gpio.c                |  92 +++-------
 drivers/leds/trigger/ledtrig-heartbeat.c           |  49 +++---
 drivers/leds/trigger/ledtrig-netdev.c              | 101 ++++-------
 drivers/leds/trigger/ledtrig-oneshot.c             |  91 +++-------
 drivers/leds/trigger/ledtrig-timer.c               |  58 ++-----
 drivers/leds/trigger/ledtrig-transient.c           | 102 ++++-------
 drivers/net/can/Kconfig                            |   6 +
 drivers/tty/vt/keyboard.c                          |   4 +-
 drivers/usb/core/ledtrig-usbport.c                 |  34 ++--
 include/linux/leds.h                               |  36 +++-
 net/bluetooth/leds.c                               |   6 +-
 net/mac80211/led.c                                 |  20 ++-
 net/rfkill/core.c                                  |   4 +-
 26 files changed, 638 insertions(+), 616 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/leds/leds-lt3593.txt
Merging ipmi/for-next (46f2277e45fe ipmi:dmi: Ignore IPMI SMBIOS entries with a zero base address)
$ git merge ipmi/for-next
Merge made by the 'recursive' strategy.
 drivers/acpi/acpi_ipmi.c             |  4 +--
 drivers/char/ipmi/ipmi_bt_sm.c       | 64 ++++++++++++++++-----------------
 drivers/char/ipmi/ipmi_devintf.c     | 11 +++---
 drivers/char/ipmi/ipmi_dmi.c         | 23 +++++++-----
 drivers/char/ipmi/ipmi_kcs_sm.c      |  4 +--
 drivers/char/ipmi/ipmi_msghandler.c  | 51 +++++++++++++-------------
 drivers/char/ipmi/ipmi_powernv.c     |  4 +--
 drivers/char/ipmi/ipmi_poweroff.c    | 67 ++++++++++++++++------------------
 drivers/char/ipmi/ipmi_si_hardcode.c |  9 ++---
 drivers/char/ipmi/ipmi_si_hotmod.c   | 17 ++++-----
 drivers/char/ipmi/ipmi_si_intf.c     | 28 +++++++--------
 drivers/char/ipmi/ipmi_si_mem_io.c   |  2 +-
 drivers/char/ipmi/ipmi_si_pci.c      | 21 +++++------
 drivers/char/ipmi/ipmi_si_platform.c | 20 ++++++-----
 drivers/char/ipmi/ipmi_smic_sm.c     | 26 ++++++--------
 drivers/char/ipmi/ipmi_ssif.c        | 69 +++++++++++++++++-------------------
 drivers/char/ipmi/ipmi_watchdog.c    | 52 +++++++++++++--------------
 drivers/hwmon/ibmaem.c               |  2 +-
 drivers/hwmon/ibmpex.c               |  2 +-
 include/linux/ipmi.h                 |  2 +-
 include/linux/ipmi_smi.h             |  2 +-
 include/linux/pci_ids.h              |  4 +++
 22 files changed, 234 insertions(+), 250 deletions(-)
Merging driver-core/driver-core-next (28af109a57d1 driver core: add a debugfs entry to show deferred devices)
$ git merge driver-core/driver-core-next
Auto-merging include/linux/device.h
Auto-merging drivers/base/core.c
Merge made by the 'recursive' strategy.
 .../driver-api/firmware/fallback-mechanisms.rst    |   7 +-
 drivers/base/cacheinfo.c                           |  24 ++---
 drivers/base/core.c                                |  12 +--
 drivers/base/dd.c                                  |  79 ++++++++++------
 drivers/base/init.c                                |   2 +-
 fs/kernfs/symlink.c                                |   2 +-
 fs/sysfs/group.c                                   |  29 ++++--
 include/linux/device.h                             | 105 ++++++++++++---------
 lib/kobject.c                                      |   2 +-
 9 files changed, 157 insertions(+), 105 deletions(-)
Merging usb/usb-next (5f9810730cf4 usb: host: xhci-rcar: Add a condition check about PLL active)
$ git merge usb/usb-next
Auto-merging drivers/usb/typec/tcpm.c
Auto-merging drivers/usb/typec/tcpci.c
Removing drivers/staging/typec/TODO
Removing drivers/staging/typec/Makefile
Removing drivers/staging/typec/Kconfig
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 Documentation/ABI/obsolete/sysfs-class-typec       |  48 ++
 Documentation/ABI/testing/sysfs-bus-typec          |  51 ++
 Documentation/ABI/testing/sysfs-class-typec        |  62 +--
 .../ABI/testing/sysfs-driver-typec-displayport     |  49 ++
 .../bindings/connector/usb-connector.txt           |  44 ++
 .../devicetree/bindings/usb/npcm7xx-usb.txt        |  18 +
 .../devicetree/bindings/usb/typec-tcpci.txt        |  49 ++
 Documentation/driver-api/usb/typec_bus.rst         | 136 +++++
 MAINTAINERS                                        |  11 +-
 drivers/nfc/nfcmrvl/usb.c                          |   5 +-
 drivers/staging/Kconfig                            |   2 -
 drivers/staging/Makefile                           |   1 -
 drivers/staging/typec/Kconfig                      |  23 -
 drivers/staging/typec/Makefile                     |   2 -
 drivers/staging/typec/TODO                         |   5 -
 drivers/usb/class/cdc-acm.c                        |  40 +-
 drivers/usb/class/cdc-wdm.c                        |  47 +-
 drivers/usb/class/usblp.c                          |  10 +-
 drivers/usb/core/devio.c                           |   5 +-
 drivers/usb/core/hub.c                             |  42 ++
 drivers/usb/core/message.c                         |   9 +-
 drivers/usb/host/Kconfig                           |   8 +
 drivers/usb/host/Makefile                          |   1 +
 drivers/usb/host/ehci-hcd.c                        |   1 +
 drivers/usb/host/ehci-hub.c                        |   8 +
 drivers/usb/host/ehci-npcm7xx.c                    | 212 ++++++++
 drivers/usb/host/xhci-hub.c                        |  11 +
 drivers/usb/host/xhci-plat.c                       |   1 +
 drivers/usb/host/xhci-rcar.c                       |  43 +-
 drivers/usb/host/xhci.c                            |   1 +
 drivers/usb/host/xhci.h                            |   2 +
 drivers/usb/misc/adutux.c                          |  10 +-
 drivers/usb/misc/appledisplay.c                    |   1 +
 drivers/usb/misc/iowarrior.c                       |   5 -
 drivers/usb/misc/ldusb.c                           |   7 +-
 drivers/usb/misc/legousbtower.c                    |   5 +-
 drivers/usb/misc/usbtest.c                         |  10 +-
 drivers/usb/mon/mon_bin.c                          |   8 +-
 drivers/usb/musb/musb_dsps.c                       |   2 +-
 drivers/usb/musb/musb_host.c                       |   1 +
 drivers/usb/renesas_usbhs/mod_gadget.c             |   1 +
 drivers/usb/typec/Kconfig                          |  18 +
 drivers/usb/typec/Makefile                         |   5 +-
 drivers/usb/typec/altmodes/Kconfig                 |  14 +
 drivers/usb/typec/altmodes/Makefile                |   2 +
 drivers/usb/typec/altmodes/displayport.c           | 580 +++++++++++++++++++++
 drivers/usb/typec/bus.c                            | 402 ++++++++++++++
 drivers/usb/typec/bus.h                            |  38 ++
 drivers/usb/typec/class.c                          | 544 +++++++++++++------
 drivers/usb/typec/fusb302/fusb302.c                |  12 -
 drivers/usb/typec/mux.c                            |   6 +-
 drivers/usb/typec/mux/pi3usb30532.c                |  13 +-
 drivers/{staging => usb}/typec/tcpci.c             |  66 ++-
 drivers/{staging => usb}/typec/tcpci.h             |   0
 drivers/{staging => usb}/typec/tcpci_rt1711h.c     |   0
 drivers/usb/typec/tcpm.c                           | 330 +++++++++---
 drivers/usb/typec/tps6598x.c                       |  11 +-
 drivers/usb/usb-skeleton.c                         |  10 +-
 drivers/usb/wusbcore/security.c                    |   2 +-
 drivers/usb/wusbcore/wa-xfer.c                     |   8 +-
 drivers/uwb/hwa-rc.c                               |   1 +
 include/dt-bindings/usb/pd.h                       |  62 +++
 include/linux/mod_devicetable.h                    |  15 +
 include/linux/usb/hcd.h                            |   1 +
 include/linux/usb/pd.h                             |   1 +
 include/linux/usb/tcpm.h                           |  11 +-
 include/linux/usb/typec.h                          |  55 +-
 include/linux/usb/typec_altmode.h                  | 160 ++++++
 include/linux/usb/typec_dp.h                       |  95 ++++
 include/linux/usb/typec_mux.h                      |   2 +-
 scripts/mod/devicetable-offsets.c                  |   4 +
 scripts/mod/file2alias.c                           |  13 +
 72 files changed, 2961 insertions(+), 517 deletions(-)
 create mode 100644 Documentation/ABI/obsolete/sysfs-class-typec
 create mode 100644 Documentation/ABI/testing/sysfs-bus-typec
 create mode 100644 Documentation/ABI/testing/sysfs-driver-typec-displayport
 create mode 100644 Documentation/devicetree/bindings/usb/npcm7xx-usb.txt
 create mode 100644 Documentation/devicetree/bindings/usb/typec-tcpci.txt
 create mode 100644 Documentation/driver-api/usb/typec_bus.rst
 delete mode 100644 drivers/staging/typec/Kconfig
 delete mode 100644 drivers/staging/typec/Makefile
 delete mode 100644 drivers/staging/typec/TODO
 create mode 100644 drivers/usb/host/ehci-npcm7xx.c
 create mode 100644 drivers/usb/typec/altmodes/Kconfig
 create mode 100644 drivers/usb/typec/altmodes/Makefile
 create mode 100644 drivers/usb/typec/altmodes/displayport.c
 create mode 100644 drivers/usb/typec/bus.c
 create mode 100644 drivers/usb/typec/bus.h
 rename drivers/{staging => usb}/typec/tcpci.c (92%)
 rename drivers/{staging => usb}/typec/tcpci.h (100%)
 rename drivers/{staging => usb}/typec/tcpci_rt1711h.c (100%)
 create mode 100644 include/dt-bindings/usb/pd.h
 create mode 100644 include/linux/usb/typec_altmode.h
 create mode 100644 include/linux/usb/typec_dp.h
Merging usb-gadget/next (47265c067c0d usb: dwc2: gadget: Fix coverity issue)
$ git merge usb-gadget/next
Already up to date.
Merging usb-serial/usb-next (af846a6f6de2 USB: serial: kobil_sct: add missing version error handling)
$ git merge usb-serial/usb-next
Auto-merging drivers/usb/serial/mos7840.c
Merge made by the 'recursive' strategy.
 drivers/usb/serial/cyberjack.c        | 17 ++++++++++-------
 drivers/usb/serial/digi_acceleport.c  | 35 +++++++++++++++++++----------------
 drivers/usb/serial/io_edgeport.c      | 17 +++++++++++------
 drivers/usb/serial/io_ti.c            |  5 +++--
 drivers/usb/serial/ir-usb.c           |  2 +-
 drivers/usb/serial/kobil_sct.c        | 24 ++++++++++++++++++------
 drivers/usb/serial/mos7720.c          |  5 +++--
 drivers/usb/serial/mos7840.c          |  5 +++--
 drivers/usb/serial/quatech2.c         |  7 ++++---
 drivers/usb/serial/sierra.c           | 13 +++++++------
 drivers/usb/serial/ssu100.c           |  2 +-
 drivers/usb/serial/symbolserial.c     |  5 +++--
 drivers/usb/serial/ti_usb_3410_5052.c |  9 +++++----
 drivers/usb/serial/usb_wwan.c         |  5 +++--
 14 files changed, 91 insertions(+), 60 deletions(-)
Merging usb-chipidea-next/ci-for-usb-next (ba0ab35a81de usb: chipidea: tegra: Use aligned DMA on Tegra114/124)
$ git merge usb-chipidea-next/ci-for-usb-next
Merge made by the 'recursive' strategy.
 drivers/usb/chipidea/ci_hdrc_tegra.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Merging phy-next/next (ce397d215ccd Linux 4.18-rc1)
$ git merge phy-next/next
Already up to date.
Merging tty/tty-next (16777ecd1b54 kbd: complete dead keys definitions)
$ git merge tty/tty-next
Auto-merging drivers/tty/vt/keyboard.c
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/arm/mediatek.txt |   4 +
 .../interrupt-controller/mediatek,sysirq.txt       |   1 +
 .../devicetree/bindings/serial/fsl-imx-uart.txt    |   6 +-
 .../devicetree/bindings/serial/mtk-uart.txt        |   1 +
 .../devicetree/bindings/serial/omap_serial.txt     |   1 +
 drivers/parport/parport_serial.c                   |   9 +
 drivers/s390/char/keyboard.c                       |  30 +-
 drivers/tty/serdev/core.c                          |  33 ++-
 drivers/tty/serial/8250/8250_dw.c                  |  25 +-
 drivers/tty/serial/8250/8250_exar.c                |  38 ++-
 drivers/tty/serial/8250/8250_omap.c                |   1 +
 drivers/tty/serial/8250/8250_port.c                |   8 +-
 drivers/tty/serial/8250/serial_cs.c                |   6 +-
 drivers/tty/serial/imx.c                           |   5 +-
 drivers/tty/serial/max310x.c                       |  14 +-
 drivers/tty/serial/pxa.c                           |   3 +-
 drivers/tty/serial/sh-sci.c                        |  97 +++----
 drivers/tty/serial/xilinx_uartps.c                 |  23 +-
 drivers/tty/tty_io.c                               |  19 +-
 drivers/tty/tty_ldsem.c                            |  82 +++---
 drivers/tty/vt/keyboard.c                          |  30 +-
 drivers/tty/vt/vc_screen.c                         |  90 +++++-
 drivers/tty/vt/vt.c                                | 308 ++++++++++++++++++++-
 include/linux/console_struct.h                     |   2 +
 include/linux/selection.h                          |   5 +
 include/linux/tty_ldisc.h                          |   4 +-
 include/uapi/linux/keyboard.h                      |  23 +-
 27 files changed, 675 insertions(+), 193 deletions(-)
Merging char-misc/char-misc-next (81b18bce48af Drivers: HV: Send one page worth of kmsg dump over Hyper-V during panic)
$ git merge char-misc/char-misc-next
Auto-merging drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c
Auto-merging drivers/nvmem/core.c
Auto-merging drivers/net/hyperv/netvsc_drv.c
Auto-merging drivers/misc/vmw_balloon.c
Auto-merging drivers/mfd/cros_ec_dev.c
Auto-merging drivers/crypto/ux500/hash/hash_core.c
Auto-merging drivers/crypto/stm32/stm32_crc32.c
Auto-merging arch/x86/include/asm/mshyperv.h
Auto-merging arch/x86/hyperv/hv_init.c
Auto-merging MAINTAINERS
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-class-gnss         |   15 +
 Documentation/ABI/testing/sysfs-class-mei          |   11 +
 Documentation/devicetree/bindings/gnss/gnss.txt    |   36 +
 .../devicetree/bindings/gnss/sirfstar.txt          |   45 +
 Documentation/devicetree/bindings/gnss/u-blox.txt  |   44 +
 .../bindings/slimbus/slim-ngd-qcom-ctrl.txt        |   84 ++
 .../devicetree/bindings/vendor-prefixes.txt        |    3 +
 Documentation/driver-api/fpga/fpga-mgr.rst         |   12 +-
 Documentation/driver-api/fpga/fpga-region.rst      |   12 +-
 Documentation/driver-api/fpga/intro.rst            |   14 +-
 Documentation/driver-api/slimbus.rst               |    5 +
 Documentation/sysctl/kernel.txt                    |   11 +
 Documentation/w1/slaves/w1_ds2438                  |    2 +-
 MAINTAINERS                                        |   11 +-
 arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts       |    1 +
 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts   |    1 +
 arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts         |    1 +
 arch/arm/mach-mmp/sram.c                           |    1 +
 arch/arm/plat-samsung/adc.c                        |    1 +
 arch/x86/hyperv/hv_init.c                          |   31 +-
 arch/x86/include/asm/hyperv-tlfs.h                 |   17 +-
 arch/x86/include/asm/mshyperv.h                    |   13 +-
 arch/x86/kernel/cpu/mshyperv.c                     |    6 +-
 drivers/Kconfig                                    |    2 +
 drivers/Makefile                                   |    1 +
 drivers/android/Kconfig                            |    2 +-
 drivers/ata/pata_imx.c                             |    1 +
 drivers/ata/pata_samsung_cf.c                      |    1 +
 drivers/auxdisplay/hd44780.c                       |    1 +
 drivers/char/hpet.c                                |    2 -
 drivers/char/hw_random/atmel-rng.c                 |    1 +
 drivers/char/hw_random/exynos-trng.c               |    1 +
 drivers/char/hw_random/imx-rngc.c                  |    1 +
 drivers/char/hw_random/powernv-rng.c               |    1 +
 drivers/char/mem.c                                 |    1 +
 drivers/char/pcmcia/cm4000_cs.c                    |    4 -
 drivers/crypto/mediatek/mtk-platform.c             |    1 +
 drivers/crypto/qce/core.c                          |    1 +
 drivers/crypto/stm32/stm32_crc32.c                 |    1 +
 drivers/crypto/ux500/cryp/cryp_core.c              |    1 +
 drivers/crypto/ux500/hash/hash_core.c              |    1 +
 drivers/devfreq/tegra-devfreq.c                    |    1 +
 drivers/dma/ep93xx_dma.c                           |    1 +
 drivers/dma/s3c24xx-dma.c                          |    1 +
 drivers/extcon/extcon-intel-cht-wc.c               |    1 +
 drivers/extcon/extcon-qcom-spmi-misc.c             |    1 +
 drivers/fsi/Kconfig                                |    7 +
 drivers/fsi/Makefile                               |    1 +
 drivers/fsi/fsi-master-gpio.c                      |  349 ++++-
 drivers/fsi/fsi-sbefifo.c                          | 1005 +++++++++++++
 drivers/fsi/fsi-scom.c                             |    8 -
 drivers/gnss/Kconfig                               |   43 +
 drivers/gnss/Makefile                              |   16 +
 drivers/gnss/core.c                                |  420 ++++++
 drivers/gnss/serial.c                              |  275 ++++
 drivers/gnss/serial.h                              |   47 +
 drivers/gnss/sirf.c                                |  408 ++++++
 drivers/gnss/ubx.c                                 |  153 ++
 drivers/gpu/drm/mediatek/mtk_cec.c                 |    1 +
 drivers/gpu/drm/sun4i/sun6i_drc.c                  |    1 +
 drivers/hid/hid-hyperv.c                           |    3 +
 drivers/hsi/controllers/omap_ssi_port.c            |    1 +
 drivers/hv/channel_mgmt.c                          |    4 +-
 drivers/hv/hv.c                                    |   30 +-
 drivers/hv/hv_balloon.c                            |    3 +
 drivers/hv/hv_util.c                               |    3 +
 drivers/hv/ring_buffer.c                           |   65 +-
 drivers/hv/vmbus_drv.c                             |  110 ++
 drivers/hwmon/max197.c                             |    1 +
 drivers/hwmon/mc13783-adc.c                        |    1 +
 drivers/input/serio/hyperv-keyboard.c              |    3 +
 drivers/ipack/carriers/tpci200.c                   |    7 +
 drivers/media/platform/coda/imx-vdoa.c             |    1 +
 drivers/media/platform/rcar-fcp.c                  |    1 +
 drivers/media/platform/vimc/vimc-capture.c         |    1 +
 drivers/media/platform/vimc/vimc-debayer.c         |    1 +
 drivers/media/platform/vimc/vimc-scaler.c          |    1 +
 drivers/media/platform/vimc/vimc-sensor.c          |    1 +
 drivers/memory/tegra/tegra186.c                    |    1 +
 drivers/mfd/atmel-hlcdc.c                          |    1 +
 drivers/mfd/cros_ec_dev.c                          |    1 +
 drivers/misc/cardreader/rtsx_pcr.c                 |   12 +-
 drivers/misc/eeprom/at25.c                         |    4 +
 drivers/misc/eeprom/idt_89hpesx.c                  |    4 +-
 drivers/misc/genwqe/card_debugfs.c                 |    4 -
 drivers/misc/genwqe/card_dev.c                     |    5 -
 drivers/misc/ibmvmc.c                              |    2 +-
 drivers/misc/mei/bus-fixup.c                       |   88 +-
 drivers/misc/mei/bus.c                             |   36 +-
 drivers/misc/mei/hw.h                              |    2 -
 drivers/misc/mei/main.c                            |   30 +-
 drivers/misc/mei/mei_dev.h                         |   27 +-
 drivers/misc/mic/cosm/cosm_main.h                  |    5 +-
 drivers/misc/mic/cosm/cosm_scif_server.c           |    6 +-
 drivers/misc/mic/cosm_client/cosm_scif_client.c    |    6 +-
 drivers/misc/mic/scif/scif_api.c                   |    1 +
 drivers/misc/sgi-xp/xpc_channel.c                  |    3 -
 drivers/misc/sgi-xp/xpc_partition.c                |    5 +-
 drivers/misc/sram.c                                |   18 +-
 drivers/misc/ti-st/Kconfig                         |    3 +-
 drivers/misc/ti-st/st_kim.c                        |    3 +-
 drivers/misc/tsl2550.c                             |    2 +-
 drivers/misc/vmw_balloon.c                         |  181 +--
 drivers/misc/vmw_vmci/vmci_queue_pair.c            |    9 +-
 drivers/mtd/nand/raw/brcmnand/brcmstb_nand.c       |    1 +
 drivers/net/ethernet/calxeda/xgmac.c               |    1 +
 drivers/net/ethernet/faraday/ftmac100.c            |    1 +
 drivers/net/hyperv/netvsc_drv.c                    |    3 +
 drivers/net/wireless/ath/ath9k/ahb.c               |    1 +
 drivers/net/wireless/ti/wl12xx/main.c              |    1 +
 drivers/net/wireless/ti/wl18xx/main.c              |    1 +
 drivers/nvmem/core.c                               |    2 -
 drivers/nvmem/lpc18xx_eeprom.c                     |    1 +
 drivers/nvmem/mtk-efuse.c                          |    1 +
 drivers/nvmem/qfprom.c                             |    1 +
 drivers/nvmem/rave-sp-eeprom.c                     |    6 +-
 drivers/nvmem/uniphier-efuse.c                     |    1 +
 drivers/perf/arm-ccn.c                             |    1 +
 drivers/pinctrl/intel/pinctrl-merrifield.c         |    1 +
 drivers/pinctrl/pinctrl-u300.c                     |    1 +
 drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c         |    1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c   |    1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c   |    1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c    |    1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c   |    1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c   |    1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c   |    1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c   |    1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c   |    1 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c   |    1 +
 drivers/platform/goldfish/goldfish_pipe.c          |    3 +-
 drivers/platform/x86/intel_bxtwc_tmu.c             |    1 +
 drivers/power/avs/smartreflex.c                    |    1 +
 drivers/power/reset/ltc2952-poweroff.c             |    1 +
 drivers/power/supply/max8998_charger.c             |    1 +
 drivers/power/supply/olpc_battery.c                |    1 +
 drivers/ptp/ptp_dte.c                              |    1 +
 drivers/regulator/tps65912-regulator.c             |    1 +
 drivers/reset/reset-ath79.c                        |    1 +
 drivers/reset/reset-axs10x.c                       |    1 +
 drivers/reset/reset-imx7.c                         |    1 +
 drivers/rtc/rtc-coh901331.c                        |    1 +
 drivers/rtc/rtc-cpcap.c                            |    1 +
 drivers/rtc/rtc-ftrtc010.c                         |    1 +
 drivers/rtc/rtc-mc13xxx.c                          |    1 +
 drivers/rtc/rtc-mxc_v2.c                           |    1 +
 drivers/rtc/rtc-r7301.c                            |    1 +
 drivers/rtc/rtc-sh.c                               |    1 +
 drivers/rtc/rtc-tegra.c                            |    1 +
 drivers/scsi/storvsc_drv.c                         |    3 +
 drivers/siox/siox-bus-gpio.c                       |    1 +
 drivers/siox/siox-core.c                           |   30 +-
 drivers/slimbus/Kconfig                            |   12 +-
 drivers/slimbus/Makefile                           |    5 +-
 drivers/slimbus/core.c                             |   41 +
 drivers/slimbus/messaging.c                        |   79 +-
 drivers/slimbus/qcom-ngd-ctrl.c                    | 1526 ++++++++++++++++++++
 drivers/slimbus/slimbus.h                          |  198 +++
 drivers/slimbus/stream.c                           |  477 ++++++
 drivers/tty/goldfish.c                             |    1 +
 drivers/tty/serial/8250/8250_em.c                  |    1 +
 drivers/tty/serial/sccnxp.c                        |    1 +
 drivers/usb/gadget/udc/fsl_mxc_udc.c               |    1 +
 drivers/video/fbdev/hyperv_fb.c                    |    6 +
 .../omap2/omapfb/displays/encoder-tpd12s015.c      |    1 +
 drivers/w1/masters/ds2482.c                        |    2 +-
 drivers/w1/masters/ds2490.c                        |   16 +-
 drivers/w1/masters/mxc_w1.c                        |    1 +
 drivers/watchdog/coh901327_wdt.c                   |    1 +
 drivers/watchdog/davinci_wdt.c                     |    1 +
 drivers/watchdog/imgpdc_wdt.c                      |    1 +
 drivers/watchdog/max63xx_wdt.c                     |    1 +
 drivers/watchdog/max77620_wdt.c                    |    1 +
 drivers/watchdog/moxart_wdt.c                      |    1 +
 drivers/watchdog/omap_wdt.c                        |    1 +
 drivers/watchdog/tangox_wdt.c                      |    1 +
 include/linux/fsi-sbefifo.h                        |   33 +
 include/linux/gnss.h                               |   75 +
 include/linux/hyperv.h                             |   31 +-
 include/linux/platform_device.h                    |    2 +-
 include/linux/slimbus.h                            |   60 +-
 include/trace/events/fsi_master_gpio.h             |   43 +
 scripts/ver_linux                                  |   14 +-
 tools/hv/hv_vss_daemon.c                           |   65 +-
 tools/hv/lsvmbus                                   |   12 +-
 185 files changed, 6194 insertions(+), 442 deletions(-)
 create mode 100644 Documentation/ABI/testing/sysfs-class-gnss
 create mode 100644 Documentation/devicetree/bindings/gnss/gnss.txt
 create mode 100644 Documentation/devicetree/bindings/gnss/sirfstar.txt
 create mode 100644 Documentation/devicetree/bindings/gnss/u-blox.txt
 create mode 100644 Documentation/devicetree/bindings/slimbus/slim-ngd-qcom-ctrl.txt
 create mode 100644 drivers/fsi/fsi-sbefifo.c
 create mode 100644 drivers/gnss/Kconfig
 create mode 100644 drivers/gnss/Makefile
 create mode 100644 drivers/gnss/core.c
 create mode 100644 drivers/gnss/serial.c
 create mode 100644 drivers/gnss/serial.h
 create mode 100644 drivers/gnss/sirf.c
 create mode 100644 drivers/gnss/ubx.c
 create mode 100644 drivers/slimbus/qcom-ngd-ctrl.c
 create mode 100644 drivers/slimbus/stream.c
 create mode 100644 include/linux/fsi-sbefifo.h
 create mode 100644 include/linux/gnss.h
Merging extcon/extcon-next (441492c2256c extcon: Release locking when sending the notification of connector state)
$ git merge extcon/extcon-next
Merge made by the 'recursive' strategy.
 drivers/extcon/extcon-intel-int3496.c |  2 +-
 drivers/extcon/extcon-usbc-cros-ec.c  | 22 ++++++----------------
 drivers/extcon/extcon.c               |  3 ++-
 3 files changed, 9 insertions(+), 18 deletions(-)
Merging staging/staging-next (cd50699fe1b5 MAINTAINERS: update two greybus sections)
$ git merge staging/staging-next
Removing drivers/staging/skein/threefish_block.c
Removing drivers/staging/skein/threefish_api.h
Removing drivers/staging/skein/threefish_api.c
Removing drivers/staging/skein/skein_iv.h
CONFLICT (modify/delete): drivers/staging/skein/skein_generic.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/skein/skein_generic.c left in tree.
Removing drivers/staging/skein/skein_block.h
Removing drivers/staging/skein/skein_block.c
Removing drivers/staging/skein/skein_base.h
Removing drivers/staging/skein/skein_base.c
Removing drivers/staging/skein/skein_api.h
Removing drivers/staging/skein/skein_api.c
Removing drivers/staging/skein/TODO
Removing drivers/staging/skein/Makefile
Removing drivers/staging/skein/Kconfig
Removing drivers/staging/rts5208/trace.h
Removing drivers/staging/rts5208/trace.c
Removing drivers/staging/rtl8723bs/include/rtw_br_ext.h
Removing drivers/staging/rtl8723bs/include/rtw_beamforming.h
Removing drivers/staging/rtl8723bs/include/rtl8192c_rf.h
Auto-merging drivers/staging/rtl8188eu/include/wifi.h
Removing drivers/staging/rtl8188eu/include/rtw_mp_phy_regdef.h
Removing drivers/staging/rtl8188eu/include/rtw_ioctl_rtl.h
Auto-merging drivers/staging/rtl8188eu/include/hal8188e_phy_reg.h
Auto-merging drivers/staging/rtl8188eu/include/hal8188e_phy_cfg.h
Removing drivers/staging/iio/gyro/adis16060_core.c
Removing drivers/staging/iio/gyro/Makefile
Removing drivers/staging/iio/gyro/Kconfig
Auto-merging drivers/staging/Makefile
Auto-merging drivers/staging/Kconfig
Auto-merging drivers/input/touchscreen/Makefile
Auto-merging drivers/input/touchscreen/Kconfig
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git rm -f drivers/staging/skein/skein_generic.c
drivers/staging/skein/skein_generic.c: needs merge
rm 'drivers/staging/skein/skein_generic.c'
$ git commit -v -a
[master c5b12b07342c] Merge remote-tracking branch 'staging/staging-next'
$ git diff -M --stat --summary HEAD^..
 Documentation/ABI/testing/sysfs-bus-iio            |   12 +
 .../bindings/iio/adc/at91-sama5d2_adc.txt          |    9 +
 .../input/touchscreen/resistive-adc-touch.txt      |   30 +
 .../bindings/input/touchscreen/touchscreen.txt     |    3 +
 MAINTAINERS                                        |   29 +-
 drivers/iio/adc/Kconfig                            |    3 +-
 drivers/iio/adc/at91-sama5d2_adc.c                 |  780 +-
 drivers/iio/counter/104-quad-8.c                   |   87 +-
 drivers/iio/dac/ad5686.c                           |    7 +
 drivers/iio/dac/ad5686.h                           |    1 +
 drivers/iio/dac/ad5696-i2c.c                       |    1 +
 drivers/iio/imu/inv_mpu6050/inv_mpu_core.c         |   31 +-
 drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h          |   36 +-
 drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c         |  143 +-
 drivers/iio/industrialio-core.c                    |   27 +-
 drivers/input/touchscreen/Kconfig                  |   13 +
 drivers/input/touchscreen/Makefile                 |    1 +
 drivers/input/touchscreen/resistive-adc-touch.c    |  204 +
 drivers/staging/Kconfig                            |    4 +-
 drivers/staging/Makefile                           |    2 +-
 drivers/staging/android/ashmem.c                   |   40 +-
 drivers/staging/android/vsoc.c                     |   11 +-
 drivers/staging/clocking-wizard/Kconfig            |    2 +-
 drivers/staging/comedi/comedi.h                    |    2 +-
 drivers/staging/comedi/comedi_compat32.h           |    2 +-
 drivers/staging/comedi/comedi_fops.c               |    2 +-
 drivers/staging/comedi/comedi_pci.h                |    2 +-
 drivers/staging/comedi/comedi_pcmcia.h             |    2 +-
 drivers/staging/comedi/comedidev.h                 |    4 +-
 drivers/staging/comedi/comedilib.h                 |    2 +-
 drivers/staging/comedi/drivers.c                   |   26 +-
 drivers/staging/comedi/drivers/amplc_dio200.h      |    6 +-
 .../staging/comedi/drivers/amplc_dio200_common.c   |    2 +-
 drivers/staging/comedi/drivers/amplc_pci230.c      |   12 +-
 drivers/staging/comedi/drivers/cb_pcimdda.c        |    4 +-
 drivers/staging/comedi/drivers/daqboard2000.c      |    2 +-
 drivers/staging/comedi/drivers/ni_mio_common.c     |    2 +-
 drivers/staging/fbtft/fbtft_device.c               |   10 +-
 drivers/staging/gasket/Kconfig                     |   23 +
 drivers/staging/gasket/Makefile                    |    9 +
 drivers/staging/gasket/TODO                        |   17 +
 drivers/staging/gasket/apex.h                      |   95 +
 drivers/staging/gasket/apex_driver.c               |  771 ++
 drivers/staging/gasket/gasket.h                    |  129 +
 drivers/staging/gasket/gasket_constants.h          |   56 +
 drivers/staging/gasket/gasket_core.c               | 2159 +++++
 drivers/staging/gasket/gasket_core.h               |  719 ++
 drivers/staging/gasket/gasket_interrupt.c          |  641 ++
 drivers/staging/gasket/gasket_interrupt.h          |  172 +
 drivers/staging/gasket/gasket_ioctl.c              |  449 ++
 drivers/staging/gasket/gasket_ioctl.h              |   35 +
 drivers/staging/gasket/gasket_logging.h            |   71 +
 drivers/staging/gasket/gasket_page_table.c         | 1771 +++++
 drivers/staging/gasket/gasket_page_table.h         |  265 +
 drivers/staging/gasket/gasket_sysfs.c              |  497 ++
 drivers/staging/gasket/gasket_sysfs.h              |  199 +
 drivers/staging/gdm724x/gdm_tty.c                  |   18 +-
 drivers/staging/goldfish/goldfish_audio.c          |   64 +-
 drivers/staging/iio/Kconfig                        |    1 -
 drivers/staging/iio/Makefile                       |    1 -
 drivers/staging/iio/accel/adis16203.c              |    6 +-
 drivers/staging/iio/accel/adis16240.c              |   11 +-
 drivers/staging/iio/adc/ad7606.h                   |    2 +-
 drivers/staging/iio/gyro/Kconfig                   |   16 -
 drivers/staging/iio/gyro/Makefile                  |    6 -
 drivers/staging/iio/gyro/adis16060_core.c          |  234 -
 drivers/staging/most/dim2/dim2.c                   |    2 +-
 drivers/staging/mt7621-dts/gbpc1.dts               |   24 +-
 drivers/staging/mt7621-dts/mt7621.dtsi             |  104 +-
 drivers/staging/mt7621-eth/mtk_eth_soc.c           |   16 +-
 drivers/staging/mt7621-gpio/Kconfig                |    8 +-
 drivers/staging/mt7621-gpio/gpio-mt7621.c          |  417 +-
 .../staging/mt7621-gpio/mediatek,mt7621-gpio.txt   |   59 +-
 drivers/staging/mt7621-mmc/dbg.c                   |   54 +-
 drivers/staging/mt7621-mmc/dbg.h                   |    6 -
 drivers/staging/mt7621-mmc/mt6575_sd.h             |  588 +-
 drivers/staging/mt7621-mmc/sd.c                    |  584 +-
 drivers/staging/mt7621-pci/pci-mt7621.c            |  119 +-
 drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c    |  180 +-
 drivers/staging/mt7621-spi/spi-mt7621.c            |  206 +-
 drivers/staging/pi433/pi433_if.c                   |   49 +-
 drivers/staging/pi433/pi433_if.h                   |    3 +-
 drivers/staging/pi433/rf69.c                       |  234 +-
 drivers/staging/pi433/rf69.h                       |   12 +-
 drivers/staging/pi433/rf69_enum.h                  |    3 +-
 drivers/staging/pi433/rf69_registers.h             |    3 +-
 drivers/staging/rtl8188eu/Makefile                 |    2 +-
 drivers/staging/rtl8188eu/core/rtw_ap.c            |   11 +-
 drivers/staging/rtl8188eu/core/rtw_cmd.c           |   12 +-
 drivers/staging/rtl8188eu/core/rtw_debug.c         |   10 +-
 drivers/staging/rtl8188eu/core/rtw_efuse.c         |   12 +-
 drivers/staging/rtl8188eu/core/rtw_ieee80211.c     |   24 +-
 drivers/staging/rtl8188eu/core/rtw_ioctl_set.c     |   10 +-
 drivers/staging/rtl8188eu/core/rtw_iol.c           |   11 +-
 drivers/staging/rtl8188eu/core/rtw_led.c           |   11 +-
 drivers/staging/rtl8188eu/core/rtw_mlme.c          |   10 +-
 drivers/staging/rtl8188eu/core/rtw_mlme_ext.c      |   11 +-
 drivers/staging/rtl8188eu/core/rtw_pwrctrl.c       |   10 +-
 drivers/staging/rtl8188eu/core/rtw_recv.c          |   14 +-
 drivers/staging/rtl8188eu/core/rtw_rf.c            |   10 +-
 drivers/staging/rtl8188eu/core/rtw_security.c      |   92 +-
 drivers/staging/rtl8188eu/core/rtw_sreset.c        |   10 +-
 drivers/staging/rtl8188eu/core/rtw_sta_mgt.c       |   32 +-
 drivers/staging/rtl8188eu/core/rtw_wlan_util.c     |   10 +-
 drivers/staging/rtl8188eu/core/rtw_xmit.c          |   13 +-
 drivers/staging/rtl8188eu/hal/bb_cfg.c             |   10 +-
 drivers/staging/rtl8188eu/hal/fw.c                 |   13 +-
 ...188ERateAdaptive.c => hal8188e_rate_adaptive.c} |    0
 drivers/staging/rtl8188eu/hal/hal_com.c            |   75 +-
 drivers/staging/rtl8188eu/hal/hal_intf.c           |   10 +-
 drivers/staging/rtl8188eu/hal/mac_cfg.c            |   18 +-
 drivers/staging/rtl8188eu/hal/odm.c                |   10 +-
 drivers/staging/rtl8188eu/hal/odm_HWConfig.c       |   10 +-
 drivers/staging/rtl8188eu/hal/odm_RTL8188E.c       |   10 +-
 drivers/staging/rtl8188eu/hal/phy.c                |   10 +-
 drivers/staging/rtl8188eu/hal/pwrseq.c             |   10 +-
 drivers/staging/rtl8188eu/hal/pwrseqcmd.c          |   10 +-
 drivers/staging/rtl8188eu/hal/rf.c                 |   10 +-
 drivers/staging/rtl8188eu/hal/rf_cfg.c             |   18 +-
 drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c       |   10 +-
 drivers/staging/rtl8188eu/hal/rtl8188e_dm.c        |   10 +-
 drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c  |   10 +-
 drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c    |   10 +-
 drivers/staging/rtl8188eu/hal/rtl8188e_xmit.c      |   10 +-
 drivers/staging/rtl8188eu/hal/rtl8188eu_led.c      |   10 +-
 drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c     |   10 +-
 drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c     |   10 +-
 drivers/staging/rtl8188eu/hal/usb_halinit.c        |   10 +-
 drivers/staging/rtl8188eu/include/HalVerDef.h      |   10 +-
 drivers/staging/rtl8188eu/include/basic_types.h    |   12 +-
 drivers/staging/rtl8188eu/include/drv_types.h      |   10 +-
 drivers/staging/rtl8188eu/include/fw.h             |   13 +-
 .../{Hal8188EPhyCfg.h => hal8188e_phy_cfg.h}       |   10 +-
 .../{Hal8188EPhyReg.h => hal8188e_phy_reg.h}       |   10 +-
 ...188ERateAdaptive.h => hal8188e_rate_adaptive.h} |    0
 drivers/staging/rtl8188eu/include/hal_com.h        |   10 +-
 drivers/staging/rtl8188eu/include/hal_intf.h       |   12 +-
 drivers/staging/rtl8188eu/include/ieee80211.h      |   10 +-
 drivers/staging/rtl8188eu/include/mlme_osdep.h     |   10 +-
 drivers/staging/rtl8188eu/include/mon.h            |   10 +-
 drivers/staging/rtl8188eu/include/mp_custom_oid.h  |   10 +-
 drivers/staging/rtl8188eu/include/odm.h            |   10 +-
 drivers/staging/rtl8188eu/include/odm_HWConfig.h   |   11 +-
 drivers/staging/rtl8188eu/include/odm_RTL8188E.h   |   10 +-
 .../staging/rtl8188eu/include/odm_RegDefine11N.h   |   10 +-
 drivers/staging/rtl8188eu/include/odm_debug.h      |   10 +-
 drivers/staging/rtl8188eu/include/odm_precomp.h    |   12 +-
 drivers/staging/rtl8188eu/include/odm_reg.h        |   10 +-
 drivers/staging/rtl8188eu/include/odm_types.h      |   10 +-
 drivers/staging/rtl8188eu/include/osdep_intf.h     |   10 +-
 drivers/staging/rtl8188eu/include/osdep_service.h  |   10 +-
 drivers/staging/rtl8188eu/include/pwrseq.h         |   11 +-
 drivers/staging/rtl8188eu/include/pwrseqcmd.h      |   10 +-
 drivers/staging/rtl8188eu/include/recv_osdep.h     |   10 +-
 drivers/staging/rtl8188eu/include/rtl8188e_cmd.h   |   10 +-
 drivers/staging/rtl8188eu/include/rtl8188e_dm.h    |   10 +-
 drivers/staging/rtl8188eu/include/rtl8188e_hal.h   |   14 +-
 drivers/staging/rtl8188eu/include/rtl8188e_led.h   |   10 +-
 drivers/staging/rtl8188eu/include/rtl8188e_recv.h  |   10 +-
 drivers/staging/rtl8188eu/include/rtl8188e_spec.h  |   10 +-
 drivers/staging/rtl8188eu/include/rtl8188e_xmit.h  |   10 +-
 drivers/staging/rtl8188eu/include/rtw_android.h    |   10 +-
 drivers/staging/rtl8188eu/include/rtw_ap.h         |   10 +-
 drivers/staging/rtl8188eu/include/rtw_cmd.h        |   10 +-
 drivers/staging/rtl8188eu/include/rtw_debug.h      |   10 +-
 drivers/staging/rtl8188eu/include/rtw_eeprom.h     |   10 +-
 drivers/staging/rtl8188eu/include/rtw_efuse.h      |   10 +-
 drivers/staging/rtl8188eu/include/rtw_event.h      |   10 +-
 drivers/staging/rtl8188eu/include/rtw_ht.h         |   10 +-
 drivers/staging/rtl8188eu/include/rtw_ioctl.h      |   10 +-
 drivers/staging/rtl8188eu/include/rtw_ioctl_rtl.h  |   74 -
 drivers/staging/rtl8188eu/include/rtw_ioctl_set.h  |   10 +-
 drivers/staging/rtl8188eu/include/rtw_iol.h        |   10 +-
 drivers/staging/rtl8188eu/include/rtw_led.h        |   11 +-
 drivers/staging/rtl8188eu/include/rtw_mlme.h       |   10 +-
 drivers/staging/rtl8188eu/include/rtw_mlme_ext.h   |   10 +-
 .../staging/rtl8188eu/include/rtw_mp_phy_regdef.h  | 1086 ---
 drivers/staging/rtl8188eu/include/rtw_pwrctrl.h    |   10 +-
 drivers/staging/rtl8188eu/include/rtw_qos.h        |   10 +-
 drivers/staging/rtl8188eu/include/rtw_recv.h       |   10 +-
 drivers/staging/rtl8188eu/include/rtw_rf.h         |   10 +-
 drivers/staging/rtl8188eu/include/rtw_security.h   |   10 +-
 drivers/staging/rtl8188eu/include/rtw_sreset.h     |   10 +-
 drivers/staging/rtl8188eu/include/rtw_xmit.h       |   10 +-
 drivers/staging/rtl8188eu/include/sta_info.h       |   10 +-
 drivers/staging/rtl8188eu/include/usb_ops_linux.h  |   10 +-
 drivers/staging/rtl8188eu/include/wifi.h           |   10 +-
 drivers/staging/rtl8188eu/include/wlan_bssdef.h    |   10 +-
 drivers/staging/rtl8188eu/include/xmit_osdep.h     |   10 +-
 drivers/staging/rtl8188eu/os_dep/ioctl_linux.c     |   10 +-
 drivers/staging/rtl8188eu/os_dep/mlme_linux.c      |   10 +-
 drivers/staging/rtl8188eu/os_dep/mon.c             |   10 +-
 drivers/staging/rtl8188eu/os_dep/os_intfs.c        |   10 +-
 drivers/staging/rtl8188eu/os_dep/osdep_service.c   |   10 +-
 drivers/staging/rtl8188eu/os_dep/recv_linux.c      |   21 +-
 drivers/staging/rtl8188eu/os_dep/rtw_android.c     |   10 +-
 drivers/staging/rtl8188eu/os_dep/usb_intf.c        |   10 +-
 drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c   |   10 +-
 drivers/staging/rtl8188eu/os_dep/xmit_linux.c      |   10 +-
 drivers/staging/rtl8192e/rtl819x_BAProc.c          |   22 +-
 drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c  |    2 -
 .../staging/rtl8192u/ieee80211/ieee80211_softmac.c |  258 +-
 .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c    |   71 +-
 drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h    |  117 -
 .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c    |  635 +-
 drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h   |   94 +-
 drivers/staging/rtl8192u/r8192U.h                  |    1 +
 drivers/staging/rtl8192u/r8192U_core.c             |   15 +-
 drivers/staging/rtl8192u/r8192U_dm.c               |    3 +-
 drivers/staging/rtl8723bs/core/rtw_btcoex.c        |   14 +-
 drivers/staging/rtl8723bs/core/rtw_efuse.c         |   18 +-
 drivers/staging/rtl8723bs/core/rtw_ieee80211.c     |   59 +-
 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c      |    6 +-
 drivers/staging/rtl8723bs/core/rtw_xmit.c          |    4 +-
 drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c     |    5 +-
 drivers/staging/rtl8723bs/hal/hal_com_phycfg.c     |  268 +-
 drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c    |    2 +-
 drivers/staging/rtl8723bs/include/hal_com_phycfg.h |    2 +-
 drivers/staging/rtl8723bs/include/rtl8192c_rf.h    |   28 -
 drivers/staging/rtl8723bs/include/rtl8723b_rf.h    |    1 -
 .../staging/rtl8723bs/include/rtw_beamforming.h    |  127 -
 drivers/staging/rtl8723bs/include/rtw_br_ext.h     |   55 -
 drivers/staging/rtl8723bs/include/xmit_osdep.h     |    2 -
 drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c  |   19 +-
 drivers/staging/rtl8723bs/os_dep/ioctl_linux.c     |    7 +-
 drivers/staging/rtl8723bs/os_dep/sdio_intf.c       |   19 +-
 drivers/staging/rtl8723bs/os_dep/xmit_linux.c      |    5 -
 drivers/staging/rtlwifi/halmac/rtl_halmac.c        |    2 +-
 drivers/staging/rtlwifi/phydm/phydm.c              |    2 +-
 drivers/staging/rtlwifi/rtl8822be/fw.c             |    2 +-
 drivers/staging/rtlwifi/rtl8822be/sw.c             |    2 +-
 drivers/staging/rts5208/Makefile                   |    2 +-
 drivers/staging/rts5208/ms.c                       |  337 -
 drivers/staging/rts5208/rtsx.c                     |   38 +-
 drivers/staging/rts5208/rtsx.h                     |   25 -
 drivers/staging/rts5208/rtsx_card.c                |   29 -
 drivers/staging/rts5208/rtsx_card.h                |    1 -
 drivers/staging/rts5208/rtsx_chip.c                |  140 -
 drivers/staging/rts5208/rtsx_chip.h                |   18 -
 drivers/staging/rts5208/rtsx_scsi.c                |  216 -
 drivers/staging/rts5208/rtsx_transport.c           |    1 -
 drivers/staging/rts5208/sd.c                       |  328 +-
 drivers/staging/rts5208/spi.c                      |   71 -
 drivers/staging/rts5208/trace.c                    |   27 -
 drivers/staging/rts5208/trace.h                    |   40 -
 drivers/staging/rts5208/xd.c                       |  112 -
 drivers/staging/skein/Kconfig                      |   16 -
 drivers/staging/skein/Makefile                     |   11 -
 drivers/staging/skein/TODO                         |    8 -
 drivers/staging/skein/skein_api.c                  |  231 -
 drivers/staging/skein/skein_api.h                  |  230 -
 drivers/staging/skein/skein_base.c                 |  870 ---
 drivers/staging/skein/skein_base.h                 |  336 -
 drivers/staging/skein/skein_block.c                |  469 --
 drivers/staging/skein/skein_block.h                |  347 -
 drivers/staging/skein/skein_generic.c              |  211 -
 drivers/staging/skein/skein_iv.h                   |  187 -
 drivers/staging/skein/threefish_api.c              |   78 -
 drivers/staging/skein/threefish_api.h              |  171 -
 drivers/staging/skein/threefish_block.c            | 8244 --------------------
 drivers/staging/speakup/kobjects.c                 |    4 +-
 drivers/staging/speakup/spk_types.h                |    2 +
 drivers/staging/speakup/synth.c                    |   40 +-
 drivers/staging/vboxvideo/TODO                     |    1 -
 drivers/staging/vboxvideo/vbox_drv.c               |   34 +-
 drivers/staging/vboxvideo/vbox_drv.h               |    2 +-
 drivers/staging/vboxvideo/vbox_main.c              |    2 +-
 .../interface/vchiq_arm/vchiq_debugfs.c            |    4 +-
 drivers/staging/wilc1000/TODO                      |    5 -
 drivers/staging/wilc1000/host_interface.c          | 1554 ++--
 drivers/staging/wilc1000/host_interface.h          |    7 +-
 drivers/staging/wilc1000/linux_wlan.c              |    2 +
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c  |   16 +-
 drivers/staging/wilc1000/wilc_wfi_netdevice.h      |    9 +-
 drivers/staging/wilc1000/wilc_wlan.c               |  144 +-
 drivers/staging/wilc1000/wilc_wlan.h               |    5 +-
 drivers/staging/wlan-ng/cfg80211.c                 |   44 +-
 drivers/staging/wlan-ng/p80211hdr.h                |   30 +-
 drivers/staging/wlan-ng/prism2fw.c                 |    7 +-
 drivers/staging/wlan-ng/prism2mgmt.c               |   41 +-
 drivers/staging/wlan-ng/prism2mib.c                |    8 +-
 include/dt-bindings/iio/adc/at91-sama5d2_adc.h     |   16 +
 include/uapi/linux/iio/types.h                     |    1 +
 tools/iio/iio_event_monitor.c                      |    2 +
 284 files changed, 12313 insertions(+), 19478 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/input/touchscreen/resistive-adc-touch.txt
 create mode 100644 drivers/input/touchscreen/resistive-adc-touch.c
 create mode 100644 drivers/staging/gasket/Kconfig
 create mode 100644 drivers/staging/gasket/Makefile
 create mode 100644 drivers/staging/gasket/TODO
 create mode 100644 drivers/staging/gasket/apex.h
 create mode 100644 drivers/staging/gasket/apex_driver.c
 create mode 100644 drivers/staging/gasket/gasket.h
 create mode 100644 drivers/staging/gasket/gasket_constants.h
 create mode 100644 drivers/staging/gasket/gasket_core.c
 create mode 100644 drivers/staging/gasket/gasket_core.h
 create mode 100644 drivers/staging/gasket/gasket_interrupt.c
 create mode 100644 drivers/staging/gasket/gasket_interrupt.h
 create mode 100644 drivers/staging/gasket/gasket_ioctl.c
 create mode 100644 drivers/staging/gasket/gasket_ioctl.h
 create mode 100644 drivers/staging/gasket/gasket_logging.h
 create mode 100644 drivers/staging/gasket/gasket_page_table.c
 create mode 100644 drivers/staging/gasket/gasket_page_table.h
 create mode 100644 drivers/staging/gasket/gasket_sysfs.c
 create mode 100644 drivers/staging/gasket/gasket_sysfs.h
 delete mode 100644 drivers/staging/iio/gyro/Kconfig
 delete mode 100644 drivers/staging/iio/gyro/Makefile
 delete mode 100644 drivers/staging/iio/gyro/adis16060_core.c
 rename drivers/staging/rtl8188eu/hal/{Hal8188ERateAdaptive.c => hal8188e_rate_adaptive.c} (100%)
 rename drivers/staging/rtl8188eu/include/{Hal8188EPhyCfg.h => hal8188e_phy_cfg.h} (92%)
 rename drivers/staging/rtl8188eu/include/{Hal8188EPhyReg.h => hal8188e_phy_reg.h} (98%)
 rename drivers/staging/rtl8188eu/include/{Hal8188ERateAdaptive.h => hal8188e_rate_adaptive.h} (100%)
 delete mode 100644 drivers/staging/rtl8188eu/include/rtw_ioctl_rtl.h
 delete mode 100644 drivers/staging/rtl8188eu/include/rtw_mp_phy_regdef.h
 delete mode 100644 drivers/staging/rtl8723bs/include/rtl8192c_rf.h
 delete mode 100644 drivers/staging/rtl8723bs/include/rtw_beamforming.h
 delete mode 100644 drivers/staging/rtl8723bs/include/rtw_br_ext.h
 delete mode 100644 drivers/staging/rts5208/trace.c
 delete mode 100644 drivers/staging/rts5208/trace.h
 delete mode 100644 drivers/staging/skein/Kconfig
 delete mode 100644 drivers/staging/skein/Makefile
 delete mode 100644 drivers/staging/skein/TODO
 delete mode 100644 drivers/staging/skein/skein_api.c
 delete mode 100644 drivers/staging/skein/skein_api.h
 delete mode 100644 drivers/staging/skein/skein_base.c
 delete mode 100644 drivers/staging/skein/skein_base.h
 delete mode 100644 drivers/staging/skein/skein_block.c
 delete mode 100644 drivers/staging/skein/skein_block.h
 delete mode 100644 drivers/staging/skein/skein_generic.c
 delete mode 100644 drivers/staging/skein/skein_iv.h
 delete mode 100644 drivers/staging/skein/threefish_api.c
 delete mode 100644 drivers/staging/skein/threefish_api.h
 delete mode 100644 drivers/staging/skein/threefish_block.c
 create mode 100644 include/dt-bindings/iio/adc/at91-sama5d2_adc.h
Merging mux/for-next (6a3d4baac84a mux: add mux_control_get_optional() API)
$ git merge mux/for-next
Merge made by the 'recursive' strategy.
 Documentation/driver-model/devres.txt |   1 +
 drivers/mux/core.c                    | 104 +++++++++++++++++++++++++++-------
 include/linux/mux/consumer.h          |   4 ++
 3 files changed, 89 insertions(+), 20 deletions(-)
Merging slave-dma/next (2078305949ee Merge branch 'topic/xilinx' into next)
$ git merge slave-dma/next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/dma/renesas,rcar-dmac.txt  |   1 +
 .../devicetree/bindings/dma/xilinx/xilinx_dma.txt  |   2 +
 crypto/async_tx/async_pq.c                         |  10 +-
 crypto/async_tx/raid6test.c                        |   4 +-
 drivers/dma/Kconfig                                |   1 +
 drivers/dma/imx-sdma.c                             | 474 ++++++++++++---------
 drivers/dma/ioat/dma.c                             |   6 +
 drivers/dma/sh/rcar-dmac.c                         |  77 +---
 drivers/dma/ste_dma40.c                            |  15 +-
 drivers/dma/xilinx/xilinx_dma.c                    |  22 +
 include/linux/dma/xilinx_dma.h                     |   2 +
 11 files changed, 362 insertions(+), 252 deletions(-)
Merging cgroup/for-next (d8742e229021 cgroup: css_set_lock should nest inside tasklist_lock)
$ git merge cgroup/for-next
Already up to date.
Merging scsi/for-next (dfb1f7cd4098 Merge branch 'misc' into for-next)
$ git merge scsi/for-next
CONFLICT (modify/delete): lib/percpu_ida.c deleted in scsi/for-next and modified in HEAD. Version HEAD of lib/percpu_ida.c left in tree.
Auto-merging lib/Makefile
Removing include/linux/percpu_ida.h
Auto-merging drivers/xen/xen-scsiback.c
Removing drivers/scsi/scsi_typedefs.h
Auto-merging drivers/scsi/scsi_transport_fc.c
Auto-merging drivers/scsi/cxlflash/ocxl_hw.c
Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.c
Automatic merge failed; fix conflicts and then commit the result.
$ git rm -f lib/percpu_ida.c
lib/percpu_ida.c: needs merge
rm 'lib/percpu_ida.c'
$ git commit -v -a
[master 39a051271761] Merge remote-tracking branch 'scsi/for-next'
$ git diff -M --stat --summary HEAD^..
 drivers/ata/libata-core.c                    |   3 +
 drivers/ata/libata.h                         |   2 -
 drivers/infiniband/ulp/srpt/ib_srpt.c        |   2 -
 drivers/scsi/3w-xxxx.c                       |   2 +-
 drivers/scsi/aacraid/rx.c                    |   2 +-
 drivers/scsi/aacraid/sa.c                    |   2 +-
 drivers/scsi/aacraid/src.c                   |   6 +-
 drivers/scsi/advansys.c                      |  10 +-
 drivers/scsi/aha152x.c                       |  71 +++--
 drivers/scsi/aha1740.c                       |   9 +-
 drivers/scsi/aha1740.h                       |   4 +-
 drivers/scsi/be2iscsi/be_cmds.c              |   2 +-
 drivers/scsi/be2iscsi/be_iscsi.c             |  15 +-
 drivers/scsi/be2iscsi/be_main.c              |  23 +-
 drivers/scsi/be2iscsi/be_mgmt.c              |  23 +-
 drivers/scsi/bnx2i/bnx2i_hwi.c               |   2 +
 drivers/scsi/ch.c                            |   2 +-
 drivers/scsi/cxlflash/ocxl_hw.c              |   5 +-
 drivers/scsi/cxlflash/superpipe.c            |   6 +-
 drivers/scsi/dc395x.c                        |   5 +-
 drivers/scsi/gdth.c                          |  67 ++--
 drivers/scsi/gdth.h                          |  10 +-
 drivers/scsi/gdth_proc.c                     |   2 +-
 drivers/scsi/hisi_sas/hisi_sas.h             |  10 +-
 drivers/scsi/hisi_sas/hisi_sas_main.c        | 214 ++++++-------
 drivers/scsi/hisi_sas/hisi_sas_v1_hw.c       |   3 +-
 drivers/scsi/hisi_sas/hisi_sas_v2_hw.c       |   3 +-
 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c       |  16 +-
 drivers/scsi/hosts.c                         |  32 ++
 drivers/scsi/ibmvscsi/ibmvfc.c               |   2 +-
 drivers/scsi/ibmvscsi/ibmvscsi.c             |   6 +-
 drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c     |   1 -
 drivers/scsi/imm.c                           |   2 +-
 drivers/scsi/ipr.c                           |  25 ++
 drivers/scsi/ipr.h                           |   7 +
 drivers/scsi/libiscsi_tcp.c                  |   2 +-
 drivers/scsi/libsas/sas_ata.c                |  47 +--
 drivers/scsi/libsas/sas_discover.c           |   2 +
 drivers/scsi/libsas/sas_scsi_host.c          |   4 +-
 drivers/scsi/lpfc/lpfc_attr.c                |  10 +-
 drivers/scsi/lpfc/lpfc_sli.c                 |   4 +-
 drivers/scsi/lpfc/lpfc_sli.h                 |   2 +-
 drivers/scsi/megaraid.c                      |  29 +-
 drivers/scsi/megaraid.h                      |  14 +-
 drivers/scsi/megaraid/megaraid_sas.h         |  33 +-
 drivers/scsi/megaraid/megaraid_sas_base.c    |  61 +++-
 drivers/scsi/megaraid/megaraid_sas_fusion.c  |  36 ++-
 drivers/scsi/mesh.c                          |   4 +-
 drivers/scsi/mpt3sas/mpt3sas_base.c          | 437 +++++++++++--------------
 drivers/scsi/mpt3sas/mpt3sas_base.h          |  30 +-
 drivers/scsi/mpt3sas/mpt3sas_config.c        |  81 +++--
 drivers/scsi/mpt3sas/mpt3sas_ctl.c           | 395 ++++++++++++-----------
 drivers/scsi/mpt3sas/mpt3sas_scsih.c         | 459 ++++++++++-----------------
 drivers/scsi/mpt3sas/mpt3sas_transport.c     |  62 ++--
 drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c  |  18 +-
 drivers/scsi/mpt3sas/mpt3sas_warpdrive.c     |   3 -
 drivers/scsi/nsp32_debug.c                   |   2 +-
 drivers/scsi/qedi/qedi_fw_api.c              |  30 +-
 drivers/scsi/qedi/qedi_main.c                |   2 +-
 drivers/scsi/qla2xxx/qla_inline.h            |   4 +-
 drivers/scsi/qla2xxx/qla_target.c            |  14 +-
 drivers/scsi/qla2xxx/tcm_qla2xxx.c           |  12 +-
 drivers/scsi/qlogicpti.c                     |   2 +-
 drivers/scsi/scsi.c                          |   4 +-
 drivers/scsi/scsi.h                          |   3 -
 drivers/scsi/scsi_error.c                    |   6 +-
 drivers/scsi/scsi_ioctl.c                    |   4 +-
 drivers/scsi/scsi_lib.c                      | 403 +++++++++++++----------
 drivers/scsi/scsi_scan.c                     |   2 +-
 drivers/scsi/scsi_sysfs.c                    |   2 +-
 drivers/scsi/scsi_transport_fc.c             |   4 +-
 drivers/scsi/scsi_transport_spi.c            |   2 +-
 drivers/scsi/scsi_typedefs.h                 |   2 -
 drivers/scsi/sd.c                            |  15 +-
 drivers/scsi/sd_zbc.c                        |   6 -
 drivers/scsi/sg.c                            |   7 +-
 drivers/scsi/smartpqi/smartpqi.h             |  12 +-
 drivers/scsi/smartpqi/smartpqi_init.c        | 160 ++++++----
 drivers/scsi/sym53c8xx_2/sym_glue.c          |   2 +-
 drivers/scsi/sym53c8xx_2/sym_glue.h          |   2 +-
 drivers/scsi/ufs/ufs-qcom.c                  |  21 +-
 drivers/scsi/ufs/ufshcd.c                    |  37 ++-
 drivers/scsi/ufs/ufshcd.h                    |   3 +
 drivers/target/iscsi/iscsi_target.c          |   2 -
 drivers/target/iscsi/iscsi_target_configfs.c |   7 +-
 drivers/target/iscsi/iscsi_target_login.c    |   2 +-
 drivers/target/iscsi/iscsi_target_tpg.c      |   3 +-
 drivers/target/iscsi/iscsi_target_util.c     |  39 ++-
 drivers/target/loopback/tcm_loop.c           |  11 +-
 drivers/target/sbp/sbp_target.c              |  13 +-
 drivers/target/target_core_configfs.c        |   4 +-
 drivers/target/target_core_device.c          |  47 +--
 drivers/target/target_core_fabric_configfs.c |   2 +-
 drivers/target/target_core_internal.h        |   2 +-
 drivers/target/target_core_sbc.c             |   7 +-
 drivers/target/target_core_tmr.c             |  30 +-
 drivers/target/target_core_transport.c       | 262 +++++++--------
 drivers/target/target_core_ua.c              |  43 ++-
 drivers/target/target_core_ua.h              |   3 +-
 drivers/target/target_core_user.c            | 218 +++++++++----
 drivers/target/target_core_xcopy.c           |   5 +-
 drivers/target/tcm_fc/tfc_cmd.c              |  10 +-
 drivers/target/tcm_fc/tfc_conf.c             |   5 +-
 drivers/usb/gadget/function/f_tcm.c          |  15 +-
 drivers/vhost/scsi.c                         |  12 +-
 drivers/xen/xen-scsiback.c                   |  13 +-
 include/linux/libata.h                       |   2 +
 include/linux/percpu_ida.h                   |  83 -----
 include/scsi/libsas.h                        |   2 +-
 include/scsi/scsi_host.h                     |   1 +
 include/target/iscsi/iscsi_target_core.h     |   1 +
 include/target/target_core_backend.h         |   2 -
 include/target/target_core_base.h            |  16 +-
 include/target/target_core_fabric.h          |   5 +-
 lib/Makefile                                 |   2 +-
 lib/klist.c                                  |  10 +-
 lib/percpu_ida.c                             | 370 ---------------------
 117 files changed, 2029 insertions(+), 2312 deletions(-)
 delete mode 100644 drivers/scsi/scsi_typedefs.h
 delete mode 100644 include/linux/percpu_ida.h
 delete mode 100644 lib/percpu_ida.c
Merging scsi-mkp/for-next (e936a38ac92d scsi: target: Remove se_dev_entry.ua_count)
$ git merge scsi-mkp/for-next
Already up to date.
Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker)
$ git merge target-updates/for-next
Already up to date.
Merging target-bva/for-next (60cc43fc8884 Linux 4.17-rc1)
$ git merge target-bva/for-next
Already up to date.
Merging libata/for-next (30f3cc35787d Merge branch 'for-4.18-fixes' into for-next)
$ git merge libata/for-next
Auto-merging include/linux/libata.h
Auto-merging drivers/ata/libata-core.c
Merge made by the 'recursive' strategy.
 drivers/ata/Kconfig            |  2 --
 drivers/ata/ahci.c             | 60 +++++++++++++++++++++++++++++++
 drivers/ata/ahci_mvebu.c       |  2 +-
 drivers/ata/ahci_platform.c    | 11 ++++--
 drivers/ata/libahci.c          |  9 +++--
 drivers/ata/libahci_platform.c | 82 +++++++++++++++++++++++++++++++++---------
 drivers/ata/libata-core.c      |  3 ++
 drivers/ata/libata-eh.c        | 41 +++++++++------------
 drivers/ata/libata-scsi.c      | 18 ++++++----
 drivers/ata/sata_fsl.c         |  9 +----
 drivers/ata/sata_nv.c          |  3 --
 include/linux/ahci_platform.h  |  2 ++
 include/linux/libata.h         | 24 +++++++++++++
 13 files changed, 200 insertions(+), 66 deletions(-)
Merging vhost/linux-next (2eb98105f8c7 virtio: update the comments for transport features)
$ git merge vhost/linux-next
Already up to date.
Merging rpmsg/for-next (a39440457e24 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
$ git merge rpmsg/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/remoteproc/qcom,q6v5.txt   |   7 +-
 drivers/hwspinlock/hwspinlock_core.c               | 223 +++++++-
 drivers/remoteproc/Kconfig                         |  22 +
 drivers/remoteproc/Makefile                        |   2 +
 drivers/remoteproc/qcom_adsp_pil.c                 | 156 +-----
 drivers/remoteproc/qcom_common.c                   |  26 +-
 drivers/remoteproc/qcom_q6v5.c                     | 243 +++++++++
 drivers/remoteproc/qcom_q6v5.h                     |  46 ++
 drivers/remoteproc/qcom_q6v5_pil.c                 | 157 +-----
 drivers/remoteproc/qcom_q6v5_wcss.c                | 601 +++++++++++++++++++++
 drivers/remoteproc/qcom_sysmon.c                   |   5 +-
 drivers/remoteproc/remoteproc_core.c               | 110 +++-
 drivers/rpmsg/qcom_smd.c                           |   1 +
 drivers/soc/qcom/mdt_loader.c                      |  87 ++-
 drivers/spi/spi-sprd-adi.c                         |  11 +-
 include/linux/hwspinlock.h                         |  37 +-
 include/linux/remoteproc.h                         |  19 +-
 include/linux/soc/qcom/mdt_loader.h                |   4 +
 18 files changed, 1400 insertions(+), 357 deletions(-)
 create mode 100644 drivers/remoteproc/qcom_q6v5.c
 create mode 100644 drivers/remoteproc/qcom_q6v5.h
 create mode 100644 drivers/remoteproc/qcom_q6v5_wcss.c
Merging gpio/for-next (39962a19d60e Merge branch 'devel' into for-next)
$ git merge gpio/for-next
Merge made by the 'recursive' strategy.
 .../bindings/gpio/nvidia,tegra186-gpio.txt         |   4 +
 .../devicetree/bindings/gpio/renesas,gpio-rcar.txt |   1 +
 drivers/gpio/gpio-aspeed.c                         | 426 ++++++++++++++++++---
 drivers/gpio/gpio-davinci.c                        |  70 ++--
 drivers/gpio/gpio-max732x.c                        |  12 +
 drivers/gpio/gpio-menz127.c                        |   4 +-
 drivers/gpio/gpio-pca953x.c                        |   2 +-
 drivers/gpio/gpio-rc5t583.c                        |   2 +-
 drivers/gpio/gpio-rcar.c                           |   2 +-
 drivers/gpio/gpio-rdc321x.c                        |   2 +-
 drivers/gpio/gpio-sa1100.c                         |   2 +-
 drivers/gpio/gpio-sch.c                            |  11 +-
 drivers/gpio/gpio-sch311x.c                        |  70 +++-
 drivers/gpio/gpio-spear-spics.c                    |   2 +-
 drivers/gpio/gpio-sta2x11.c                        |  41 +-
 drivers/gpio/gpio-stmpe.c                          |   2 +-
 drivers/gpio/gpio-stp-xway.c                       |  18 +-
 drivers/gpio/gpio-syscon.c                         |   2 +-
 drivers/gpio/gpio-tegra186.c                       |  74 ++++
 drivers/gpio/gpio-uniphier.c                       |   6 +-
 drivers/gpio/gpiolib-of.c                          |   3 +-
 drivers/gpio/gpiolib.c                             |  13 +
 drivers/w1/masters/Kconfig                         |   2 +-
 include/linux/gpio/aspeed.h                        |  15 +
 include/linux/gpio/consumer.h                      |   7 +
 include/linux/platform_data/gpio-davinci.h         |   3 +-
 26 files changed, 654 insertions(+), 142 deletions(-)
 create mode 100644 include/linux/gpio/aspeed.h
Merging pinctrl/for-next (14a5de9d9436 Merge branch 'devel' into for-next)
$ git merge pinctrl/for-next
Merge made by the 'recursive' strategy.
 .../bindings/pinctrl/actions,s900-pinctrl.txt      |  10 +
 .../bindings/pinctrl/qcom,apq8064-pinctrl.txt      |   6 +
 .../bindings/pinctrl/qcom,apq8084-pinctrl.txt      |   9 +
 .../bindings/pinctrl/qcom,ipq4019-pinctrl.txt      |   6 +
 .../bindings/pinctrl/qcom,ipq8064-pinctrl.txt      |   6 +
 .../bindings/pinctrl/qcom,ipq8074-pinctrl.txt      |   9 +
 .../bindings/pinctrl/qcom,mdm9615-pinctrl.txt      |   9 +
 .../bindings/pinctrl/qcom,msm8660-pinctrl.txt      |   6 +
 .../bindings/pinctrl/qcom,msm8916-pinctrl.txt      |   9 +
 .../bindings/pinctrl/qcom,msm8960-pinctrl.txt      |   9 +
 .../bindings/pinctrl/qcom,msm8974-pinctrl.txt      |   6 +
 .../bindings/pinctrl/qcom,msm8994-pinctrl.txt      |   9 +
 .../bindings/pinctrl/qcom,msm8996-pinctrl.txt      |   9 +
 .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt |   6 +-
 drivers/pinctrl/Kconfig                            |   8 +-
 drivers/pinctrl/actions/Kconfig                    |   1 +
 drivers/pinctrl/actions/pinctrl-owl.c              | 271 ++++++++++++-
 drivers/pinctrl/actions/pinctrl-owl.h              |  22 +-
 drivers/pinctrl/actions/pinctrl-s900.c             |  31 +-
 drivers/pinctrl/aspeed/pinctrl-aspeed.c            |   4 +-
 drivers/pinctrl/core.c                             |   1 -
 drivers/pinctrl/intel/Kconfig                      |   8 +
 drivers/pinctrl/intel/Makefile                     |   1 +
 drivers/pinctrl/intel/pinctrl-cedarfork.c          |  92 ++---
 drivers/pinctrl/intel/pinctrl-icelake.c            | 436 +++++++++++++++++++++
 drivers/pinctrl/mediatek/pinctrl-mt7622.c          |  48 ++-
 drivers/pinctrl/mvebu/pinctrl-armada-37xx.c        | 118 ++++++
 drivers/pinctrl/pinctrl-gemini.c                   |   2 +
 drivers/pinctrl/pinctrl-mcp23s08.c                 |   2 +-
 drivers/pinctrl/pinctrl-single.c                   |  36 +-
 drivers/pinctrl/pinmux.c                           |   1 -
 31 files changed, 1083 insertions(+), 108 deletions(-)
 create mode 100644 drivers/pinctrl/intel/pinctrl-icelake.c
Merging pinctrl-samsung/for-next (ce397d215ccd Linux 4.18-rc1)
$ git merge pinctrl-samsung/for-next
Already up to date.
Merging pwm/for-next (414c52b7899a pwm: stm32: Fix build warning with CONFIG_DMA_ENGINE disabled)
$ git merge pwm/for-next
Already up to date.
Merging userns/for-next (04035aa33a12 proc: Don't change mount options on remount failure.)
$ git merge userns/for-next
Auto-merging fs/proc/root.c
CONFLICT (content): Merge conflict in fs/proc/root.c
Auto-merging fs/proc/internal.h
CONFLICT (content): Merge conflict in fs/proc/internal.h
Auto-merging fs/proc/inode.c
CONFLICT (content): Merge conflict in fs/proc/inode.c
Auto-merging fs/proc/base.c
Resolved 'fs/proc/inode.c' using previous resolution.
Resolved 'fs/proc/internal.h' using previous resolution.
Resolved 'fs/proc/root.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master ebc6158c5aad] Merge remote-tracking branch 'userns/for-next'
$ git diff -M --stat --summary HEAD^..
 arch/um/drivers/mconsole_kern.c |  4 ++--
 fs/proc/base.c                  | 36 +++++++++++++++++++++++++-------
 fs/proc/root.c                  | 46 +++++++++++++----------------------------
 include/linux/pid_namespace.h   |  3 +--
 include/linux/proc_ns.h         |  7 ++-----
 kernel/pid.c                    |  8 -------
 kernel/pid_namespace.c          |  7 -------
 kernel/sysctl_binary.c          |  5 ++---
 8 files changed, 50 insertions(+), 66 deletions(-)
Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 menus)
$ git merge ktest/for-next
Already up to date.
Merging random/dev (bfe80ed3d7c7 vsprintf: add command line option debug_boot_weak_hash)
$ git merge random/dev
Auto-merging lib/vsprintf.c
Auto-merging drivers/char/random.c
Auto-merging Documentation/admin-guide/kernel-parameters.txt
Merge made by the 'recursive' strategy.
 Documentation/admin-guide/kernel-parameters.txt |  9 ++++++++
 drivers/char/random.c                           | 23 +++++++++++--------
 include/linux/random.h                          |  2 +-
 lib/vsprintf.c                                  | 30 ++++++++++++++++++++++++-
 4 files changed, 53 insertions(+), 11 deletions(-)
$ git am -3 ../patches/0001-random-fix-up-for-revert-of-poll_mask-changes.patch
Applying: random: fix up for revert of poll_mask changes
$ git reset HEAD^
Unstaged changes after reset:
M	drivers/char/random.c
$ git add -A .
$ git commit -v -a --amend
[master 4a08c4fee548] Merge remote-tracking branch 'random/dev'
 Date: Mon Jul 9 14:37:02 2018 +1000
Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr)
$ git merge aio/master
Already up to date.
Merging kselftest/next (eb83d5f7d07e selftests: sparc64: Add missing SPDX License Identifiers)
$ git merge kselftest/next
Already up to date.
Merging y2038/y2038 (e264abeaf9da pstore: Remove bogus format string definition)
$ git merge y2038/y2038
Already up to date.
Merging livepatching/for-next (d7ab8e67aa52 Merge branch 'for-4.18/upstream' into for-next)
$ git merge livepatching/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging coresight/next (2f21e5073887 coresight: catu: Plug in CATU as a backend for ETR buffer)
$ git merge coresight/next
Merge made by the 'recursive' strategy.
 .../ABI/testing/sysfs-bus-coresight-devices-tmc    |    8 +
 .../devicetree/bindings/arm/coresight.txt          |   58 +-
 drivers/hwtracing/coresight/Kconfig                |   11 +
 drivers/hwtracing/coresight/Makefile               |    1 +
 drivers/hwtracing/coresight/coresight-catu.c       |  577 +++++++++++
 drivers/hwtracing/coresight/coresight-catu.h       |  119 +++
 drivers/hwtracing/coresight/coresight-etb10.c      |   12 +-
 drivers/hwtracing/coresight/coresight-etm.h        |    3 -
 .../hwtracing/coresight/coresight-etm3x-sysfs.c    |   43 +-
 drivers/hwtracing/coresight/coresight-etm3x.c      |    4 +-
 .../hwtracing/coresight/coresight-etm4x-sysfs.c    |   47 +-
 drivers/hwtracing/coresight/coresight-etm4x.c      |   31 +-
 drivers/hwtracing/coresight/coresight-etm4x.h      |    3 -
 drivers/hwtracing/coresight/coresight-priv.h       |   10 +-
 drivers/hwtracing/coresight/coresight-tmc-etf.c    |   45 +-
 drivers/hwtracing/coresight/coresight-tmc-etr.c    | 1074 ++++++++++++++++++--
 drivers/hwtracing/coresight/coresight-tmc.c        |   83 +-
 drivers/hwtracing/coresight/coresight-tmc.h        |  113 +-
 drivers/hwtracing/coresight/coresight.c            |   53 +-
 include/linux/coresight.h                          |   68 +-
 20 files changed, 2131 insertions(+), 232 deletions(-)
 create mode 100644 drivers/hwtracing/coresight/coresight-catu.c
 create mode 100644 drivers/hwtracing/coresight/coresight-catu.h
Merging rtc/rtc-next (3cd7de001fb4 rtc: rtc-bq4802: add error handling for devm_ioremap)
$ git merge rtc/rtc-next
Merge made by the 'recursive' strategy.
 drivers/rtc/Kconfig        |  12 -
 drivers/rtc/rtc-bq4802.c   |   4 +
 drivers/rtc/rtc-ds1685.c   | 590 ---------------------------------------------
 drivers/rtc/rtc-stmp3xxx.c |  20 +-
 4 files changed, 20 insertions(+), 606 deletions(-)
Merging nvdimm/libnvdimm-for-next (7daf201d7fe8 Linux 4.18-rc2)
$ git merge nvdimm/libnvdimm-for-next
Already up to date.
Merging at24/at24/for-next (ce397d215ccd Linux 4.18-rc1)
$ git merge at24/at24/for-next
Already up to date.
Merging ntb/ntb-next (b1ce023ae8a2 ntb_netdev: fix sleep time mismatch)
$ git merge ntb/ntb-next
Auto-merging drivers/net/ntb_netdev.c
Merge made by the 'recursive' strategy.
 drivers/net/ntb_netdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging kspp/for-next/kspp (8cbd32d7bdbd Merge branch 'for-next/usercopy' into for-next/kspp)
$ git merge kspp/for-next/kspp
Auto-merging kernel/Makefile
Auto-merging include/linux/sched.h
Auto-merging fs/proc/base.c
Auto-merging arch/x86/entry/entry_64_compat.S
Auto-merging arch/x86/entry/entry_64.S
Auto-merging arch/x86/entry/entry_32.S
Auto-merging arch/x86/Kconfig
Merge made by the 'recursive' strategy.
 Documentation/security/self-protection.rst |  23 +-
 Documentation/x86/x86_64/mm.txt            |   2 +
 arch/Kconfig                               |  53 ++++
 arch/x86/Kconfig                           |   1 +
 arch/x86/entry/calling.h                   |  14 +
 arch/x86/entry/entry_32.S                  |   7 +
 arch/x86/entry/entry_64.S                  |   3 +
 arch/x86/entry/entry_64_compat.S           |   5 +
 arch/x86/kernel/dumpstack.c                |  31 ++
 drivers/misc/lkdtm/Makefile                |   2 +
 drivers/misc/lkdtm/core.c                  |   3 +
 drivers/misc/lkdtm/lkdtm.h                 |   5 +
 drivers/misc/lkdtm/stackleak.c             | 146 +++++++++
 fs/proc/base.c                             |  18 ++
 include/linux/sched.h                      |   5 +
 include/linux/stackleak.h                  |  27 ++
 kernel/Makefile                            |   4 +
 kernel/fork.c                              |   3 +
 kernel/stackleak.c                         |  96 ++++++
 scripts/Makefile.gcc-plugins               |   3 +
 scripts/gcc-plugins/gcc-common.h           |  26 +-
 scripts/gcc-plugins/stackleak_plugin.c     | 480 +++++++++++++++++++++++++++++
 security/Kconfig                           |   1 -
 23 files changed, 938 insertions(+), 20 deletions(-)
 create mode 100644 drivers/misc/lkdtm/stackleak.c
 create mode 100644 include/linux/stackleak.h
 create mode 100644 kernel/stackleak.c
 create mode 100644 scripts/gcc-plugins/stackleak_plugin.c
Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove)
$ git merge init_task/init_task
Already up to date.
Merging cisco/for-next (ce397d215ccd Linux 4.18-rc1)
$ git merge cisco/for-next
Already up to date.
Merging xarray/xarray (b9a7bc8683d0 radix tree: Remove radix_tree_clear_tags)
$ git merge xarray/xarray
Auto-merging mm/shmem.c
Auto-merging lib/Makefile
Auto-merging lib/Kconfig.debug
Auto-merging include/linux/fs.h
Auto-merging fs/inode.c
Auto-merging fs/gfs2/aops.c
Auto-merging fs/f2fs/node.c
Auto-merging fs/f2fs/data.c
Auto-merging fs/ext4/inode.c
Auto-merging fs/buffer.c
Auto-merging fs/btrfs/extent_io.c
Auto-merging fs/btrfs/compression.c
Auto-merging drivers/gpu/drm/i915/i915_gem.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .clang-format                                 |    1 -
 .mailmap                                      |    7 +
 Documentation/core-api/index.rst              |    1 +
 Documentation/core-api/xarray.rst             |  390 ++++++
 MAINTAINERS                                   |   17 +-
 arch/powerpc/include/asm/book3s/64/pgtable.h  |    4 +-
 arch/powerpc/include/asm/nohash/64/pgtable.h  |    4 +-
 drivers/gpu/drm/i915/i915_gem.c               |   17 +-
 fs/btrfs/compression.c                        |    6 +-
 fs/btrfs/extent_io.c                          |   12 +-
 fs/buffer.c                                   |   14 +-
 fs/dax.c                                      |  801 +++++------
 fs/ext4/inode.c                               |    2 +-
 fs/f2fs/data.c                                |    6 +-
 fs/f2fs/dir.c                                 |    2 +-
 fs/f2fs/f2fs.h                                |    2 +-
 fs/f2fs/inline.c                              |    2 +-
 fs/f2fs/node.c                                |    6 +-
 fs/fs-writeback.c                             |   25 +-
 fs/gfs2/aops.c                                |    2 +-
 fs/inode.c                                    |    2 +-
 fs/nfs/blocklayout/blocklayout.c              |    2 +-
 fs/nilfs2/btnode.c                            |   26 +-
 fs/nilfs2/page.c                              |   29 +-
 fs/proc/task_mmu.c                            |    2 +-
 include/linux/fs.h                            |   63 +-
 include/linux/pagemap.h                       |   10 +-
 include/linux/pagevec.h                       |    8 +-
 include/linux/radix-tree.h                    |  136 +-
 include/linux/swap.h                          |   22 +-
 include/linux/swapops.h                       |   19 +-
 include/linux/xarray.h                        | 1044 ++++++++++++++-
 lib/Kconfig.debug                             |    3 +
 lib/Makefile                                  |    3 +-
 lib/idr.c                                     |   70 +-
 lib/radix-tree.c                              |  592 ++------
 lib/test_xarray.c                             |  710 ++++++++++
 lib/xarray.c                                  | 1782 +++++++++++++++++++++++++
 mm/filemap.c                                  |  724 +++++-----
 mm/huge_memory.c                              |   17 +-
 mm/khugepaged.c                               |  177 +--
 mm/madvise.c                                  |    2 +-
 mm/memcontrol.c                               |    2 +-
 mm/memfd.c                                    |  105 +-
 mm/migrate.c                                  |   48 +-
 mm/mincore.c                                  |    2 +-
 mm/page-writeback.c                           |   72 +-
 mm/readahead.c                                |   10 +-
 mm/shmem.c                                    |  198 ++-
 mm/swap.c                                     |    6 +-
 mm/swap_state.c                               |  119 +-
 mm/truncate.c                                 |   27 +-
 mm/vmscan.c                                   |   10 +-
 mm/workingset.c                               |   70 +-
 tools/include/asm-generic/bitops.h            |    1 +
 tools/include/asm-generic/bitops/atomic.h     |    9 -
 tools/include/asm-generic/bitops/non-atomic.h |  109 ++
 tools/include/linux/bitmap.h                  |    1 +
 tools/include/linux/kernel.h                  |    1 +
 tools/include/linux/spinlock.h                |   12 +-
 tools/testing/radix-tree/.gitignore           |    1 +
 tools/testing/radix-tree/Makefile             |   16 +-
 tools/testing/radix-tree/benchmark.c          |   91 --
 tools/testing/radix-tree/bitmap.c             |   23 +
 tools/testing/radix-tree/idr-test.c           |   69 +-
 tools/testing/radix-tree/linux/bug.h          |    1 +
 tools/testing/radix-tree/linux/kconfig.h      |    1 +
 tools/testing/radix-tree/linux/kernel.h       |    5 +
 tools/testing/radix-tree/linux/lockdep.h      |   11 +
 tools/testing/radix-tree/linux/radix-tree.h   |    1 -
 tools/testing/radix-tree/linux/rcupdate.h     |    2 +
 tools/testing/radix-tree/linux/xarray.h       |    2 +
 tools/testing/radix-tree/main.c               |   21 +-
 tools/testing/radix-tree/multiorder.c         |  272 +---
 tools/testing/radix-tree/regression1.c        |   58 +-
 tools/testing/radix-tree/regression3.c        |   23 -
 tools/testing/radix-tree/tag_check.c          |   29 -
 tools/testing/radix-tree/test.c               |    8 +-
 tools/testing/radix-tree/test.h               |    1 +
 tools/testing/radix-tree/xarray.c             |   35 +
 80 files changed, 5559 insertions(+), 2677 deletions(-)
 create mode 100644 Documentation/core-api/xarray.rst
 create mode 100644 lib/test_xarray.c
 create mode 100644 lib/xarray.c
 create mode 100644 tools/include/asm-generic/bitops/non-atomic.h
 create mode 100644 tools/testing/radix-tree/bitmap.c
 create mode 100644 tools/testing/radix-tree/linux/kconfig.h
 create mode 100644 tools/testing/radix-tree/linux/lockdep.h
 create mode 100644 tools/testing/radix-tree/linux/xarray.h
 create mode 100644 tools/testing/radix-tree/xarray.c
Merging fsi/master (6b293258cded fsi: scom: Major overhaul)
$ git merge fsi/master
Merge made by the 'recursive' strategy.
 drivers/fsi/fsi-core.c       |  23 ++-
 drivers/fsi/fsi-master-hub.c |   5 +-
 drivers/fsi/fsi-sbefifo.c    |   7 +-
 drivers/fsi/fsi-scom.c       | 433 ++++++++++++++++++++++++++++++++++++++++---
 include/uapi/linux/fsi.h     |  58 ++++++
 5 files changed, 490 insertions(+), 36 deletions(-)
 create mode 100644 include/uapi/linux/fsi.h
Merging siox/siox/next (6334d7903723 siox: treat type errors as status errors)
$ git merge siox/siox/next
Merge made by the 'recursive' strategy.
Merging ida/ida (2f16266e31f6 ida: Convert to XArray)
$ git merge ida/ida
Auto-merging lib/Makefile
Auto-merging lib/Kconfig.debug
Auto-merging include/linux/idr.h
Auto-merging fs/super.c
Auto-merging fs/namespace.c
Auto-merging fs/devpts/inode.c
Auto-merging drivers/target/iscsi/iscsi_target_login.c
Auto-merging drivers/target/iscsi/iscsi_target.c
Auto-merging drivers/scsi/sd.c
Auto-merging drivers/media/media-device.c
Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
Merge made by the 'recursive' strategy.
 Documentation/core-api/xarray.rst             |  19 +-
 arch/powerpc/mm/mmu_context_book3s64.c        |  44 +--
 arch/powerpc/platforms/powernv/vas-window.c   |  26 +-
 drivers/block/mtip32xx/mtip32xx.c             |  29 +-
 drivers/block/rsxx/core.c                     |  21 +-
 drivers/dma/dmaengine.c                       |  23 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c |  41 +--
 drivers/media/media-device.c                  |  16 +-
 drivers/misc/cb710/core.c                     |  23 +-
 drivers/scsi/osd/osd_uld.c                    |  22 +-
 drivers/scsi/sd.c                             |  21 +-
 drivers/target/iscsi/iscsi_target.c           |  10 +-
 drivers/target/iscsi/iscsi_target.h           |   4 +-
 drivers/target/iscsi/iscsi_target_login.c     |  20 +-
 fs/devpts/inode.c                             |  47 +--
 fs/namespace.c                                |  50 +---
 fs/super.c                                    |  67 ++---
 include/linux/idr.h                           |  79 +++--
 include/linux/xarray.h                        |   6 +
 lib/Kconfig.debug                             |   3 +
 lib/Makefile                                  |   1 +
 lib/idr.c                                     | 412 +++++++++++---------------
 lib/radix-tree.c                              |  40 +--
 lib/test_ida.c                                | 177 +++++++++++
 lib/test_xarray.c                             |  64 ++++
 lib/xarray.c                                  |  99 ++++++-
 net/core/net_namespace.c                      |  16 +-
 tools/testing/radix-tree/Makefile             |   1 +
 tools/testing/radix-tree/idr-test.c           | 218 +++-----------
 tools/testing/radix-tree/main.c               |   3 +-
 tools/testing/radix-tree/test.h               |   3 +-
 31 files changed, 759 insertions(+), 846 deletions(-)
 create mode 100644 lib/test_ida.c
Merging akpm-current/current (adf65376d2a9 bfs: add sanity check at bfs_fill_super())
$ git merge --no-ff akpm-current/current
Auto-merging security/selinux/hooks.c
Auto-merging security/apparmor/lsm.c
Auto-merging mm/zsmalloc.c
Auto-merging mm/workingset.c
Auto-merging mm/vmscan.c
Auto-merging mm/swap_state.c
Auto-merging mm/shmem.c
Auto-merging mm/page-writeback.c
Auto-merging mm/mincore.c
Auto-merging mm/migrate.c
Auto-merging mm/memcontrol.c
Auto-merging mm/khugepaged.c
Auto-merging mm/hugetlb.c
Auto-merging mm/huge_memory.c
Auto-merging kernel/sys.c
Auto-merging kernel/fork.c
Auto-merging kernel/cgroup/cgroup.c
CONFLICT (content): Merge conflict in kernel/cgroup/cgroup.c
Auto-merging init/do_mounts_initrd.c
Auto-merging init/do_mounts.c
Auto-merging init/Kconfig
Auto-merging include/linux/swap.h
Auto-merging include/linux/sched.h
Auto-merging include/linux/fsnotify_backend.h
Auto-merging include/linux/fs.h
Auto-merging include/asm-generic/pgtable.h
Auto-merging fs/xfs/xfs_file.c
Auto-merging fs/super.c
Auto-merging fs/proc/task_mmu.c
Auto-merging fs/proc/internal.h
Auto-merging fs/proc/inode.c
Auto-merging fs/proc/base.c
Auto-merging fs/ocfs2/file.c
Auto-merging fs/notify/inotify/inotify_user.c
Auto-merging fs/notify/fanotify/fanotify_user.c
Auto-merging fs/nilfs2/super.c
Auto-merging fs/namei.c
Auto-merging fs/hfsplus/super.c
Auto-merging fs/fat/namei_vfat.c
Auto-merging fs/fat/namei_msdos.c
Auto-merging fs/fat/inode.c
Auto-merging fs/f2fs/data.c
Auto-merging fs/ext4/inode.c
Auto-merging fs/ext4/ext4.h
Auto-merging fs/dcache.c
Auto-merging fs/buffer.c
Auto-merging fs/btrfs/extent_io.c
Auto-merging fs/bfs/inode.c
Auto-merging fs/autofs/autofs_i.h
Auto-merging drivers/iommu/intel-svm.c
Auto-merging Documentation/sysctl/kernel.txt
Resolved 'kernel/cgroup/cgroup.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 683e87528af1] Merge branch 'akpm-current/current'
$ git diff -M --stat --summary HEAD^..
 Documentation/ABI/testing/sysfs-class-bdi  |   8 +
 Documentation/admin-guide/cgroup-v2.rst    |  74 ++++
 Documentation/filesystems/seq_file.txt     |  63 ++--
 Documentation/sysctl/fs.txt                |  36 ++
 Documentation/sysctl/kernel.txt            |  15 +-
 arch/alpha/mm/fault.c                      |   3 +-
 arch/arc/mm/fault.c                        |   4 +-
 arch/arm/include/asm/page.h                |   2 +
 arch/arm/mm/fault.c                        |   7 +-
 arch/arm64/mm/fault.c                      |   6 +-
 arch/h8300/include/asm/bitops.h            |   2 +-
 arch/hexagon/mm/vm_fault.c                 |   2 +-
 arch/ia64/mm/fault.c                       |   2 +-
 arch/m68k/mm/fault.c                       |   4 +-
 arch/microblaze/mm/fault.c                 |   2 +-
 arch/mips/mm/fault.c                       |   2 +-
 arch/nds32/mm/fault.c                      |   2 +-
 arch/nios2/mm/fault.c                      |   2 +-
 arch/openrisc/mm/fault.c                   |   2 +-
 arch/parisc/include/asm/io.h               |   9 +
 arch/parisc/lib/iomap.c                    |  64 ++++
 arch/parisc/mm/fault.c                     |   2 +-
 arch/powerpc/include/asm/copro.h           |   4 +-
 arch/powerpc/include/asm/io.h              |   2 +
 arch/powerpc/mm/copro_fault.c              |   2 +-
 arch/powerpc/mm/fault.c                    |   7 +-
 arch/powerpc/platforms/cell/spufs/fault.c  |   2 +-
 arch/riscv/mm/fault.c                      |   3 +-
 arch/s390/mm/fault.c                       |  13 +-
 arch/sh/boards/of-generic.c                |   7 +-
 arch/sh/mm/fault.c                         |   4 +-
 arch/sparc/mm/fault_32.c                   |   3 +-
 arch/sparc/mm/fault_64.c                   |   3 +-
 arch/um/kernel/trap.c                      |   2 +-
 arch/unicore32/mm/fault.c                  |   9 +-
 arch/x86/kvm/mmu.c                         |   2 +-
 arch/x86/mm/fault.c                        |   5 +-
 arch/xtensa/mm/fault.c                     |   2 +-
 block/genhd.c                              |   2 +-
 drivers/base/firmware_loader/fallback.c    |   5 -
 drivers/base/memory.c                      |   2 -
 drivers/base/node.c                        |  49 +--
 drivers/dax/device.c                       |   2 +-
 drivers/iommu/amd_iommu_v2.c               |   2 +-
 drivers/iommu/intel-svm.c                  |   4 +-
 drivers/misc/cxl/fault.c                   |   2 +-
 drivers/misc/ocxl/link.c                   |   3 +-
 drivers/ntb/hw/intel/ntb_hw_intel.h        |  30 +-
 drivers/ntb/hw/mscc/ntb_hw_switchtec.c     |  36 +-
 fs/9p/vfs_file.c                           |   2 +-
 fs/adfs/inode.c                            |  11 +-
 fs/autofs/autofs_i.h                       |   8 +-
 fs/autofs/expire.c                         | 143 ++++---
 fs/autofs/root.c                           |  33 +-
 fs/bfs/inode.c                             |   9 +-
 fs/btrfs/extent_io.c                       |   2 +-
 fs/buffer.c                                |  12 +-
 fs/dcache.c                                |   3 +-
 fs/exec.c                                  |   1 +
 fs/ext2/file.c                             |   1 -
 fs/ext4/ext4.h                             |   2 +-
 fs/ext4/file.c                             |   2 +-
 fs/ext4/inode.c                            |   5 +-
 fs/ext4/readpage.c                         |   5 +-
 fs/f2fs/data.c                             |   5 +
 fs/fat/dir.c                               |   2 +-
 fs/fat/fat.h                               |   6 +-
 fs/fat/inode.c                             |  18 +-
 fs/fat/misc.c                              |  12 +-
 fs/fat/namei_msdos.c                       |  17 +-
 fs/fat/namei_vfat.c                        |  20 +-
 fs/hfs/brec.c                              |   7 +-
 fs/hfsplus/brec.c                          |   7 +-
 fs/hfsplus/super.c                         |   4 +-
 fs/hostfs/hostfs.h                         |   2 +-
 fs/mpage.c                                 | 115 +++---
 fs/namei.c                                 |  53 ++-
 fs/nilfs2/file.c                           |   2 +-
 fs/nilfs2/super.c                          |   2 +-
 fs/notify/dnotify/dnotify.c                |   5 +-
 fs/notify/fanotify/fanotify.c              |  14 +-
 fs/notify/fanotify/fanotify_user.c         |   5 +-
 fs/notify/group.c                          |   3 +
 fs/notify/inotify/inotify_fsnotify.c       |   7 +-
 fs/notify/inotify/inotify_user.c           |   5 +-
 fs/ntfs/aops.c                             |   9 +-
 fs/ntfs/compress.c                         |  28 +-
 fs/ntfs/mft.c                              |  12 +-
 fs/ocfs2/alloc.c                           |  60 ++-
 fs/ocfs2/buffer_head_io.c                  |  77 +++-
 fs/ocfs2/cluster/heartbeat.c               |  12 +-
 fs/ocfs2/cluster/nodemanager.c             |   6 +-
 fs/ocfs2/cluster/tcp.c                     |   2 -
 fs/ocfs2/dir.c                             |   3 +-
 fs/ocfs2/dlmglue.c                         |  30 +-
 fs/ocfs2/file.c                            |   4 +-
 fs/ocfs2/inode.c                           |   5 +-
 fs/ocfs2/journal.c                         |  51 ++-
 fs/ocfs2/localalloc.c                      |   9 +-
 fs/ocfs2/quota_local.c                     |  15 +-
 fs/ocfs2/stackglue.c                       |   6 -
 fs/ocfs2/stackglue.h                       |   3 -
 fs/proc/base.c                             |  44 ++-
 fs/proc/generic.c                          |   4 +-
 fs/proc/inode.c                            |   6 +-
 fs/proc/internal.h                         |  21 +-
 fs/proc/loadavg.c                          |   4 +-
 fs/proc/stat.c                             |   2 +-
 fs/proc/task_mmu.c                         |   3 +-
 fs/proc/uptime.c                           |  10 +-
 fs/proc/vmcore.c                           |   2 +-
 fs/reiserfs/item_ops.c                     |  16 +-
 fs/reiserfs/journal.c                      |  22 +-
 fs/reiserfs/procfs.c                       |  11 +-
 fs/reiserfs/reiserfs.h                     |   4 +-
 fs/seq_file.c                              |  53 +--
 fs/super.c                                 |  11 +-
 fs/xfs/xfs_file.c                          |   2 +-
 include/asm-generic/bug.h                  |  16 +-
 include/asm-generic/iomap.h                |  26 +-
 include/asm-generic/pgtable.h              |  18 +
 include/linux/cgroup-defs.h                |   5 +
 include/linux/fs.h                         |   7 +-
 include/linux/fsnotify_backend.h           |  12 +-
 include/linux/io-64-nonatomic-hi-lo.h      |  64 ++++
 include/linux/io-64-nonatomic-lo-hi.h      |  64 ++++
 include/linux/kasan.h                      |  13 +-
 include/linux/list_lru.h                   |  18 +-
 include/linux/memcontrol.h                 | 111 +++++-
 include/linux/mm.h                         |   3 +-
 include/linux/node.h                       |  12 +-
 include/linux/oom.h                        |  12 +-
 include/linux/page_ext.h                   |  15 +-
 include/linux/proc_fs.h                    |   2 +-
 include/linux/sched.h                      |   8 +-
 include/linux/sched/mm.h                   |  37 ++
 include/linux/sched/signal.h               |   5 +-
 include/linux/sched/sysctl.h               |   1 +
 include/linux/shrinker.h                   |  11 +-
 include/linux/signal.h                     |   4 +-
 include/linux/slab.h                       |   2 +-
 include/linux/swap.h                       |  13 +-
 include/uapi/linux/auto_fs.h               |   8 +-
 include/uapi/linux/prctl.h                 |   4 +
 init/Kconfig                               |   5 +
 init/do_mounts.c                           |  10 -
 init/do_mounts_initrd.c                    |  10 -
 init/do_mounts_md.c                        |  10 -
 init/do_mounts_rd.c                        |  10 -
 init/initramfs.c                           |  10 -
 kernel/cgroup/cgroup.c                     |  21 +-
 kernel/crash_core.c                        |   2 +-
 kernel/cred.c                              |   1 +
 kernel/exit.c                              |   4 +
 kernel/fork.c                              |   8 +
 kernel/hung_task.c                         |  15 +-
 kernel/memremap.c                          |  10 +
 kernel/signal.c                            | 170 ++++-----
 kernel/sys.c                               |  11 +
 kernel/sysctl.c                            |  37 +-
 lib/bitmap.c                               |   9 +-
 lib/iomap.c                                | 140 ++++++-
 lib/test_debug_virtual.c                   |   2 +-
 mm/Kconfig                                 |   2 +-
 mm/backing-dev.c                           |  35 ++
 mm/fadvise.c                               |   8 +-
 mm/hmm.c                                   |  14 +-
 mm/huge_memory.c                           |  11 +-
 mm/hugetlb.c                               |  27 +-
 mm/kasan/kasan_init.c                      | 316 +++++++++++++++-
 mm/khugepaged.c                            |  60 +--
 mm/ksm.c                                   |   5 +-
 mm/list_lru.c                              | 109 ++++--
 mm/memblock.c                              |  49 +--
 mm/memcontrol.c                            | 586 ++++++++++++++++++++++++++---
 mm/memory.c                                | 136 ++++---
 mm/memory_hotplug.c                        |  96 +++--
 mm/mempool.c                               |  12 +-
 mm/migrate.c                               |   3 +-
 mm/mincore.c                               |  12 +-
 mm/mlock.c                                 |   3 +-
 mm/mmap.c                                  |   9 +-
 mm/nommu.c                                 |   4 -
 mm/oom_kill.c                              | 210 +++++++----
 mm/page-writeback.c                        |   4 +-
 mm/page_alloc.c                            |  24 +-
 mm/page_ext.c                              |   4 +-
 mm/page_owner.c                            |   4 +-
 mm/rmap.c                                  |   8 +-
 mm/shmem.c                                 |   3 +-
 mm/slab.h                                  |   8 +-
 mm/slab_common.c                           |   8 +-
 mm/slub.c                                  |  80 ++--
 mm/sparse-vmemmap.c                        |   4 -
 mm/sparse.c                                |  41 +-
 mm/swap_slots.c                            |   4 +-
 mm/swap_state.c                            |  16 +-
 mm/swapfile.c                              | 156 ++++++--
 mm/vmalloc.c                               |   4 -
 mm/vmscan.c                                | 237 ++++++++++--
 mm/workingset.c                            |  23 +-
 mm/zsmalloc.c                              |  12 +-
 scripts/checkpatch.pl                      |  96 +++--
 scripts/spelling.txt                       |  88 +++++
 security/apparmor/lsm.c                    |   1 +
 security/selinux/hooks.c                   |   1 +
 tools/testing/selftests/proc/.gitignore    |   2 +
 tools/testing/selftests/proc/Makefile      |   3 +
 tools/testing/selftests/proc/proc.h        |  12 +
 tools/testing/selftests/proc/self.c        |  39 ++
 tools/testing/selftests/proc/thread-self.c |  64 ++++
 tools/vm/page-types.c                      | 112 +++++-
 212 files changed, 3864 insertions(+), 1494 deletions(-)
 create mode 100644 tools/testing/selftests/proc/self.c
 create mode 100644 tools/testing/selftests/proc/thread-self.c
$ git clone -s -l -n -q . ../rebase-tmp
$ cd ../rebase-tmp
$ git checkout -b akpm remotes/origin/akpm/master
Switched to a new branch 'akpm'
$ git rebase --onto master remotes/origin/akpm/master-base
First, rewinding head to replay your work on top of it...
Applying: drivers/hwtracing/intel_th/msu.c: change return type to vm_fault_t
Applying: fs/nfs/file.c: use new return type vm_fault_t
Applying: fs/afs: use new return type vm_fault_t
Applying: treewide: correct "differenciate" and "instanciate" typos
Applying: fs/proc/vmcore.c: hide vmcoredd_mmap_dumps() for nommu builds
Applying: kernel/kexec_file.c: add walk_system_ram_res_rev()
Applying: kernel/kexec_file.c: load kernel at top of system RAM if required
Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
Applying: sparc64: NG4 memset 32 bits overflow
$ cd ../next
$ git fetch -f ../rebase-tmp akpm:akpm/master
From ../rebase-tmp
 + ae90530f6e81...5c9d3637b5e5 akpm       -> akpm/master  (forced update)
$ rm -rf ../rebase-tmp
Merging akpm/master (5c9d3637b5e5 sparc64: NG4 memset 32 bits overflow)
$ git merge --no-ff akpm/master
Merge made by the 'recursive' strategy.
 .../bindings/reserved-memory/reserved-memory.txt   |  2 +-
 arch/powerpc/kvm/book3s_pr.c                       |  2 +-
 arch/powerpc/kvm/book3s_xive.c                     |  2 +-
 arch/powerpc/platforms/powermac/low_i2c.c          |  2 +-
 arch/powerpc/sysdev/xive/common.c                  |  2 +-
 arch/sparc/lib/NG4memset.S                         | 26 ++++-----
 drivers/hwtracing/intel_th/msu.c                   |  2 +-
 drivers/media/platform/sti/delta/delta-ipc.c       |  4 +-
 drivers/thermal/intel_powerclamp.c                 |  2 +-
 fs/afs/internal.h                                  |  3 +-
 fs/afs/write.c                                     |  2 +-
 fs/nfs/file.c                                      |  4 +-
 fs/proc/vmcore.c                                   |  2 +
 include/linux/ioport.h                             |  3 ++
 kernel/kexec_file.c                                |  2 +
 kernel/resource.c                                  | 63 ++++++++++++++++++++++
 scripts/spelling.txt                               |  2 +
 sound/soc/intel/common/sst-dsp-priv.h              |  4 +-
 18 files changed, 101 insertions(+), 28 deletions(-)