Merge drm/drm-next into drm-intel-gt-next
authorTvrtko Ursulin <tvrtko.ursulin@intel.com>
Mon, 5 Jun 2023 10:10:23 +0000 (11:10 +0100)
committerTvrtko Ursulin <tvrtko.ursulin@intel.com>
Mon, 5 Jun 2023 10:10:23 +0000 (11:10 +0100)
commit9ff17e6bdaa50892dd9bdb1b116cb71b73dd711a
treecbffbccb83865b418a0aabb4487b6e8fe70c590d
parentd922b80b1010cd6164fa7d3c197b4fbf94b47beb
parent2e1492835e439fceba57a5b0f9b17da8e78ffa3d
Merge drm/drm-next into drm-intel-gt-next

For conflict avoidance we need the following commit:

  c9a9f18d3ad8 drm/i915/huc: use const struct bus_type pointers

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>