Merge drm/drm-next into drm-misc-next-fixes

Backmerging from drm/drm-next to prepare drm-misc-next-fixes for
the rest of the release cycle.

Signed-off-by: Thomas Zimmermann <[email protected]>

diff --cc drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
Simple merge