Merge drm/drm-next into drm-misc-next
authorThomas Zimmermann <tzimmermann@suse.de>
Tue, 31 Jan 2023 13:18:33 +0000 (14:18 +0100)
committerThomas Zimmermann <tzimmermann@suse.de>
Tue, 31 Jan 2023 13:18:33 +0000 (14:18 +0100)
Backmerging to get v6.2-rc6.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
1  2 
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