Merge drm/drm-next into drm-intel-next-queued
authorJani Nikula <jani.nikula@intel.com>
Tue, 20 Nov 2018 11:14:08 +0000 (13:14 +0200)
committerJani Nikula <jani.nikula@intel.com>
Tue, 20 Nov 2018 11:14:08 +0000 (13:14 +0200)
Pull in v4.20-rc3 via drm-next.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
14 files changed:
1  2 
drivers/gpu/drm/drm_atomic.c
drivers/gpu/drm/drm_atomic_helper.c
drivers/gpu/drm/drm_connector.c
drivers/gpu/drm/i915/Makefile
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_execbuffer.c
drivers/gpu/drm/i915/i915_vma.c
drivers/gpu/drm/i915/intel_hdmi.c
include/drm/drm_connector.h
include/drm/drm_dp_helper.h
include/linux/swap.h
mm/shmem.c
mm/vmscan.c
sound/x86/intel_hdmi_audio.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/shmem.c
Simple merge
diff --cc mm/vmscan.c
Simple merge
Simple merge