Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Author: Ralf Baechle <[email protected]> Fri Jun 22 06:01:55 2018 +0200
Commit: b0c817c345b18352d2dbd63dd1904e0f70b9da62
Gitweb: https://git.linux-mips.org/g/ralf/linux/b0c817c345b1
Branch: master

---

 Documentation/admin-guide/pm/intel_pstate.rst      |    2 
 drivers/acpi/acpi_lpss.c                           |   18 +
 drivers/acpi/ec.c                                  |   20 +
 drivers/base/core.c                                |   15 +
 drivers/cpufreq/intel_pstate.c                     |   27 +-
 drivers/cpufreq/qcom-cpufreq-kryo.c                |   25 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         |   10 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c         |   24 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h            |    1 
 drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c            |   14 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h            |    2 
 drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c       |   39 ++-
 .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c |    2 
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c    |    2 
 drivers/gpu/drm/bridge/sil-sii8620.c               |  309 ++++++++------------
 drivers/gpu/drm/drm_drv.c                          |   14 -
 drivers/gpu/drm/i915/i915_drv.h                    |   21 +
 drivers/gpu/drm/i915/i915_gem.c                    |   57 +++-
 drivers/gpu/drm/i915/i915_gem_context.c            |    2 
 drivers/gpu/drm/i915/i915_gem_execbuffer.c         |   49 ++-
 drivers/gpu/drm/i915/i915_irq.c                    |   12 +
 drivers/gpu/drm/i915/i915_reg.h                    |    5 
 drivers/gpu/drm/i915/intel_crt.c                   |   20 +
 drivers/gpu/drm/i915/intel_display.c               |   16 +
 drivers/gpu/drm/i915/intel_dp.c                    |   34 +-
 drivers/gpu/drm/i915/intel_dp_mst.c                |    6 
 drivers/gpu/drm/i915/intel_dsi.c                   |    6 
 drivers/gpu/drm/i915/intel_dvo.c                   |    6 
 drivers/gpu/drm/i915/intel_hdmi.c                  |    6 
 drivers/gpu/drm/i915/intel_lrc.c                   |   18 +
 drivers/gpu/drm/i915/intel_lvds.c                  |    5 
 drivers/gpu/drm/i915/intel_sdvo.c                  |    6 
 drivers/gpu/drm/i915/intel_tv.c                    |   12 +
 drivers/gpu/drm/nouveau/dispnv50/curs507a.c        |    2 
 drivers/gpu/drm/nouveau/dispnv50/wndw.c            |   13 +
 drivers/gpu/drm/qxl/qxl_display.c                  |    7 
 drivers/gpu/drm/sun4i/sun4i_tcon.c                 |   25 --
 drivers/hwmon/dell-smm-hwmon.c                     |    7 
 drivers/hwmon/nct6775.c                            |    2 
 drivers/opp/core.c                                 |    2 
 drivers/pinctrl/actions/pinctrl-owl.c              |    2 
 drivers/pinctrl/devicetree.c                       |    7 
 drivers/pinctrl/mediatek/pinctrl-mt7622.c          |    6 
 drivers/pinctrl/mediatek/pinctrl-mtk-common.c      |    5 
 drivers/pinctrl/pinctrl-single.c                   |   14 +
 fs/nfs/delegation.c                                |    4 
 fs/nfs/flexfilelayout/flexfilelayout.c             |   21 +
 fs/nfs/nfs4proc.c                                  |   33 ++
 fs/nfs/pnfs.h                                      |    5 
 include/acpi/processor.h                           |    3 
 include/linux/nfs_xdr.h                            |    2 
 net/sunrpc/xprt.c                                  |   10 -
 tools/power/x86/turbostat/turbostat.8              |    2 
 tools/power/x86/turbostat/turbostat.c              |  240 +++++++++++-----
 54 files changed, 753 insertions(+), 464 deletions(-)