]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge drm/drm-next into drm-intel-next
authorJani Nikula <jani.nikula@intel.com>
Fri, 29 Oct 2021 10:38:34 +0000 (13:38 +0300)
committerJani Nikula <jani.nikula@intel.com>
Fri, 29 Oct 2021 10:40:45 +0000 (13:40 +0300)
Backmerge to get the DP 2.0 MST changes merged to drm-next. This also
syncs us up to v5.15-rc7.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
1  2 
drivers/gpu/drm/i915/display/intel_dp_mst.c
drivers/gpu/drm/i915/gem/i915_gem_context.c
drivers/gpu/drm/i915/intel_pm.c

Simple merge