From: Thomas Zimmermann <tzimmermann@suse.de>
Date: Tue, 31 Jan 2023 13:18:33 +0000 (+0100)
Subject: Merge drm/drm-next into drm-misc-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=df5bf3b942a8d344bd9cbbe6ac31c9a2ea1557a4;p=linux.git

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

Backmerging to get v6.2-rc6.

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

df5bf3b942a8d344bd9cbbe6ac31c9a2ea1557a4
diff --cc drivers/accel/Kconfig
index 2d88f2afee8ce,834863902e16d..c437206aa3f11
--- a/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