Merge drm/drm-next into drm-intel-gt-next
authorJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Fri, 15 Jan 2021 06:49:57 +0000 (08:49 +0200)
committerJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Fri, 15 Jan 2021 06:49:57 +0000 (08:49 +0200)
Backmerging to get a common base for merging topic branches between
drm-intel-next and drm-intel-gt-next.

Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
1  2 
drivers/gpu/drm/i915/gt/intel_reset.c

Simple merge