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

Backmerging to get v6.2-rc6.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>

diff --cc drivers/accel/Kconfig
index 2d88f2afee8cee4fe634b2d1ecda70d68021f292,834863902e16da1c5cfd1b0d6733ddeeec5baf92..c437206aa3f11a9a7b8fb568bf72f6ef6db5c41d
--- 1/drivers/accel/Kconfig
--- 2/drivers/accel/Kconfig
+++ b/drivers/accel/Kconfig
@@@ -24,6 -23,5 +24,7 @@@ menuconfig DRM_ACCE
          different device files, called accel/accel* (in /dev, sysfs
          and debugfs).
  
+ source "drivers/accel/habanalabs/Kconfig"
  source "drivers/accel/ivpu/Kconfig"
 +
 +endif