Merge drm/drm-next into drm-xe-next

Backmerging to resolve a conflict with core locally.

Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>

diff --cc drivers/gpu/drm/xe/xe_device.c
Simple merge

diff --cc drivers/gpu/drm/xe/xe_gt.c
Simple merge

diff --cc drivers/gpu/drm/xe/xe_gt.h
Simple merge

diff --cc drivers/gpu/drm/xe/xe_gt_idle.c
Simple merge

diff --cc drivers/gpu/drm/xe/xe_oa.c
Simple merge