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)
commitd263dfa7d2697a43f3299b9731cd568ee49cdd2c
treef5d993c7000ac41ee926acf0b357ec572ef7908f
parent9834dfef55cc09e0c0e35fdf282247055ee50378
parentfb5cfcaa2efbb4c71abb1dfbc8f4da727e0bfd89
Merge drm/drm-next into drm-intel-gt-next

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>
drivers/gpu/drm/i915/gt/intel_reset.c