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

Author: Ralf Baechle <[email protected]> Tue Jul 17 07:39:50 2018 +0200
Commit: 4af0ccfca2a12552d4b0104fa48b488eeb2bff2b
Gitweb: https://git.linux-mips.org/g/ralf/linux/4af0ccfca2a1
Branch: master

---

 drivers/char/agp/alpha-agp.c                       |    2 -
 drivers/char/agp/amd64-agp.c                       |    4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c             |    4 ++
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c             |    4 +-
 .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c    |   20 +++-----
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c |    5 +-
 drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c  |   10 +---
 drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c |   27 ++++++++++-
 .../drm/amd/display/dc/dce100/dce100_resource.c    |   19 +++++++-
 drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h   |    5 +-
 drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c |   23 +++++-----
 drivers/gpu/drm/armada/armada_crtc.c               |   12 ++++-
 drivers/gpu/drm/armada/armada_hw.h                 |    1 
 drivers/gpu/drm/armada/armada_overlay.c            |   30 +++++++++----
 drivers/gpu/drm/i915/gvt/cmd_parser.c              |   23 ++++++++++
 drivers/gpu/drm/i915/gvt/gvt.h                     |   29 ++++++++++++
 drivers/gpu/drm/i915/gvt/handlers.c                |   24 ++++++++++
 drivers/gpu/drm/i915/gvt/mmio.h                    |    2 +
 drivers/gpu/drm/i915/gvt/mmio_context.c            |    4 +-
 drivers/gpu/drm/i915/i915_irq.c                    |   32 +++++++++++++
 drivers/gpu/drm/sun4i/Makefile                     |    5 ++
 drivers/gpu/drm/tegra/drm.c                        |    2 -
 drivers/gpu/host1x/dev.c                           |    3 +
 drivers/gpu/host1x/job.c                           |    3 +
 drivers/pinctrl/bcm/pinctrl-nsp-mux.c              |    6 ++-
 drivers/pinctrl/mediatek/pinctrl-mt7622.c          |   48 ++++++++++++++------
 drivers/pinctrl/pinctrl-ingenic.c                  |    2 -
 drivers/pinctrl/sh-pfc/pfc-r8a77970.c              |   14 +++---
 include/linux/mm.h                                 |    2 -
 mm/page_alloc.c                                    |    4 +-
 30 files changed, 280 insertions(+), 89 deletions(-)