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

Bring in series "drm/{i915,xe}: sort out step enums between the drivers"
that was merged through i915.

Link: https://lore.kernel.org/all/cover.1772635152.git.jani.nikula@intel.com
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>

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

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